mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-16 07:58:04 +00:00
Code Issues Releases Activity

- Process the -P option when compiled with smb(4) support.

Browse Source 
- Add PCI IDs for both SMBus controllers of AMD-8111.  NB:
  The non-smb(4) access to the AMD-8111 SMBus 2.0 controller
  is broken -- should use EC, like our amdsmb.c driver does.
This commit is contained in:
Ruslan Ermilov 2005-12-30 21:33:17 +00:00
parent 5c2789e1ca
commit 5ffd89d915
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=152452
10 changed files with 178 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysutils/mbmon/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= xmbmon
PORTVERSION= 205
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/
.if defined(WITHOUT_X11)

13
sysutils/mbmon/files/patch-mbmon.c Normal file
View File

@ -0,0 +1,13 @@
$FreeBSD$
--- mbmon.c Fri Aug 13 10:23:32 2004
+++ mbmon.c Tue Dec 27 16:59:48 2005
@@ -315,7 +315,7 @@
name = argv[0];
#if !defined(LINUX) && defined(HAVE_SMBUS) && defined(SMBUS_IOCTL)
- while ((ch = getopt(argc,argv,"VSIAfdDYe:p:s:c:T:F:tunNirh")) != -1) {
+ while ((ch = getopt(argc,argv,"VSIAfdDYe:p:s:c:T:F:tunNirhP:")) != -1) {
#else
while ((ch = getopt(argc,argv,"VSIAfdDYe:p:c:T:F:tunNirhP:")) != -1) {
#endif

28
sysutils/mbmon/files/patch-pci_pm.c Normal file
View File

@ -0,0 +1,28 @@
--- pci_pm.c.orig Tue Aug 17 19:38:04 2004
+++ pci_pm.c Fri Dec 30 23:05:40 2005
@@ -64,7 +64,7 @@
comt = "Intel8XX(ICH/ICH2/ICH3/ICH4/ICH5/ICH6)";
break;
case AMD756SMB:
- comt = "AMD756/766/768";
+ comt = "AMD756/766/768/8111";
break;
case NFORCESMB:
comt = "NVidia nForce";
@@ -166,6 +166,7 @@
case ID_AMD756:
case ID_AMD766:
case ID_AMD768:
+ case ID_AMD8111_1:
ret = AMD756SMB;
inq_smbba = getSMBBA3;
break;
@@ -182,7 +183,7 @@
inq_smbba = getSMBBA4;
}
break;
- case ID_AMD8111:
+ case ID_AMD8111_2:
ret = AMD8111SMB;
inq_smbba = getSMBBA6;
break;

22
sysutils/mbmon/files/patch-pci_pm.h
View File

@ -1,13 +1,27 @@
$FreeBSD$
--- pci_pm.h.orig Wed Jul 14 18:02:49 2004
+++ pci_pm.h Fri Dec 16 18:13:15 2005
@@ -68,7 +68,7 @@
--- pci_pm.h Wed Jul 14 18:02:49 2004
+++ pci_pm.h Fri Dec 30 23:06:26 2005
@@ -32,10 +32,10 @@
#define getSMBBA0 0x90 /* PIIX4, VIA596,686 */
#define getSMBBA1 0xD0 /* VT8233/A/C */
#define getSMBBA2 0x20 /* Intel801_ICH's */
-#define getSMBBA3 0x58 /* AMD756,766,768 */
+#define getSMBBA3 0x58 /* AMD756,766,768,8111 */
#define getSMBBA4 0x14 /* NVidia nForce */
#define getSMBBA5 0xE2 /* ALI7101 */
-#define getSMBBA6 0x10 /* AMD8111 */
+#define getSMBBA6 0x10 /* AMD8111 SMBus 2.0 */
#define getSMBBA70 0x50 /* NVidia nForce2, bus0 */
#define getSMBBA71 0x54 /* NVidia nForce2, bus1 */
@@ -68,7 +68,8 @@
#define ID_AMD756 0x740B1022
#define ID_AMD766 0x74131022
#define ID_AMD768 0x74431022
-#define ID_AMD8111 0x746A1022
+#define ID_AMD8111 0x746B1022
+#define ID_AMD8111_1 0x746B1022
+#define ID_AMD8111_2 0x746A1022
#define ID_NFORCE 0x01B410DE
#define ID_NFORCE2 0x006410DE
#define ID_ALI7101 0x710110B9

37
sysutils/mbmon/files/patch-testsmb.c
View File

@ -1,9 +1,31 @@
$FreeBSD$
--- testsmb.c.orig Mon Aug 2 09:54:32 2004
+++ testsmb.c Mon Aug 2 09:55:00 2004
@@ -126,7 +126,7 @@
--- testsmb.c Thu Aug 12 07:34:48 2004
+++ testsmb.c Fri Dec 30 23:11:29 2005
@@ -105,8 +105,9 @@
case ID_AMD756:
case ID_AMD766:
case ID_AMD768:
+ case ID_AMD8111_1:
smbus = &smbus_amd;
- fprintf(stderr, "AMD756/766/768 found.\n");
+ fprintf(stderr, "AMD756/766/768/8111 found.\n");
break;
case ID_NFORCE:
smbus = &smbus_amd;
@@ -116,9 +117,9 @@
smbus = &smbus_ali;
fprintf(stderr, "ALi M1535D+ found.\n");
break;
- case ID_AMD8111:
+ case ID_AMD8111_2:
smbus = &smbus_amd8;
- fprintf(stderr, "AMD8111 found.\n");
+ fprintf(stderr, "AMD8111 SMBus 2.0 found.\n");
break;
case ID_NFORCE2:
smbus = &smbus_amd8;
@@ -126,7 +127,7 @@
break;
default:
fprintf(stderr, "No known SMBus(I2C) chip found.\n");
@ -12,12 +34,11 @@ $FreeBSD$
}
if(OpenIO() == -1) return -1;
@@ -141,7 +141,6 @@
@@ -141,7 +142,6 @@
}
CloseIO();
-exit:
; /* dummy statment for gcc 3.4 or after */
; /* dummy statment for gcc 3.4 or after */
} /* endo of Big roop for smb_base candidates */
exit (0);
} /* endo of Big loop for smb_base candidates */

2
sysutils/xmbmon/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= xmbmon
PORTVERSION= 205
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/
.if defined(WITHOUT_X11)

13
sysutils/xmbmon/files/patch-mbmon.c Normal file
View File

@ -0,0 +1,13 @@
$FreeBSD$
--- mbmon.c Fri Aug 13 10:23:32 2004
+++ mbmon.c Tue Dec 27 16:59:48 2005
@@ -315,7 +315,7 @@
name = argv[0];
#if !defined(LINUX) && defined(HAVE_SMBUS) && defined(SMBUS_IOCTL)
- while ((ch = getopt(argc,argv,"VSIAfdDYe:p:s:c:T:F:tunNirh")) != -1) {
+ while ((ch = getopt(argc,argv,"VSIAfdDYe:p:s:c:T:F:tunNirhP:")) != -1) {
#else
while ((ch = getopt(argc,argv,"VSIAfdDYe:p:c:T:F:tunNirhP:")) != -1) {
#endif

28
sysutils/xmbmon/files/patch-pci_pm.c Normal file
View File

@ -0,0 +1,28 @@
--- pci_pm.c.orig Tue Aug 17 19:38:04 2004
+++ pci_pm.c Fri Dec 30 23:05:40 2005
@@ -64,7 +64,7 @@
comt = "Intel8XX(ICH/ICH2/ICH3/ICH4/ICH5/ICH6)";
break;
case AMD756SMB:
- comt = "AMD756/766/768";
+ comt = "AMD756/766/768/8111";
break;
case NFORCESMB:
comt = "NVidia nForce";
@@ -166,6 +166,7 @@
case ID_AMD756:
case ID_AMD766:
case ID_AMD768:
+ case ID_AMD8111_1:
ret = AMD756SMB;
inq_smbba = getSMBBA3;
break;
@@ -182,7 +183,7 @@
inq_smbba = getSMBBA4;
}
break;
- case ID_AMD8111:
+ case ID_AMD8111_2:
ret = AMD8111SMB;
inq_smbba = getSMBBA6;
break;

22
sysutils/xmbmon/files/patch-pci_pm.h
View File

@ -1,13 +1,27 @@
$FreeBSD$
--- pci_pm.h.orig Wed Jul 14 18:02:49 2004
+++ pci_pm.h Fri Dec 16 18:13:15 2005
@@ -68,7 +68,7 @@
--- pci_pm.h Wed Jul 14 18:02:49 2004
+++ pci_pm.h Fri Dec 30 23:06:26 2005
@@ -32,10 +32,10 @@
#define getSMBBA0 0x90 /* PIIX4, VIA596,686 */
#define getSMBBA1 0xD0 /* VT8233/A/C */
#define getSMBBA2 0x20 /* Intel801_ICH's */
-#define getSMBBA3 0x58 /* AMD756,766,768 */
+#define getSMBBA3 0x58 /* AMD756,766,768,8111 */
#define getSMBBA4 0x14 /* NVidia nForce */
#define getSMBBA5 0xE2 /* ALI7101 */
-#define getSMBBA6 0x10 /* AMD8111 */
+#define getSMBBA6 0x10 /* AMD8111 SMBus 2.0 */
#define getSMBBA70 0x50 /* NVidia nForce2, bus0 */
#define getSMBBA71 0x54 /* NVidia nForce2, bus1 */
@@ -68,7 +68,8 @@
#define ID_AMD756 0x740B1022
#define ID_AMD766 0x74131022
#define ID_AMD768 0x74431022
-#define ID_AMD8111 0x746A1022
+#define ID_AMD8111 0x746B1022
+#define ID_AMD8111_1 0x746B1022
+#define ID_AMD8111_2 0x746A1022
#define ID_NFORCE 0x01B410DE
#define ID_NFORCE2 0x006410DE
#define ID_ALI7101 0x710110B9

37
sysutils/xmbmon/files/patch-testsmb.c
View File

@ -1,9 +1,31 @@
$FreeBSD$
--- testsmb.c.orig Mon Aug 2 09:54:32 2004
+++ testsmb.c Mon Aug 2 09:55:00 2004
@@ -126,7 +126,7 @@
--- testsmb.c Thu Aug 12 07:34:48 2004
+++ testsmb.c Fri Dec 30 23:11:29 2005
@@ -105,8 +105,9 @@
case ID_AMD756:
case ID_AMD766:
case ID_AMD768:
+ case ID_AMD8111_1:
smbus = &smbus_amd;
- fprintf(stderr, "AMD756/766/768 found.\n");
+ fprintf(stderr, "AMD756/766/768/8111 found.\n");
break;
case ID_NFORCE:
smbus = &smbus_amd;
@@ -116,9 +117,9 @@
smbus = &smbus_ali;
fprintf(stderr, "ALi M1535D+ found.\n");
break;
- case ID_AMD8111:
+ case ID_AMD8111_2:
smbus = &smbus_amd8;
- fprintf(stderr, "AMD8111 found.\n");
+ fprintf(stderr, "AMD8111 SMBus 2.0 found.\n");
break;
case ID_NFORCE2:
smbus = &smbus_amd8;
@@ -126,7 +127,7 @@
break;
default:
fprintf(stderr, "No known SMBus(I2C) chip found.\n");
@ -12,12 +34,11 @@ $FreeBSD$
}
if(OpenIO() == -1) return -1;
@@ -141,7 +141,6 @@
@@ -141,7 +142,6 @@
}
CloseIO();
-exit:
; /* dummy statment for gcc 3.4 or after */
; /* dummy statment for gcc 3.4 or after */
} /* endo of Big roop for smb_base candidates */
exit (0);
} /* endo of Big loop for smb_base candidates */