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

- 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.

10 files changed, 178 insertions, 26 deletions

diff --git a/sysutils/mbmon/Makefile b/sysutils/mbmon/Makefile
index 3f89b2928141..dabcb64e2b49 100644
--- a/sysutils/mbmon/Makefile
+++ b/sysutils/mbmon/Makefile
@@ -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)
diff --git a/sysutils/mbmon/files/patch-mbmon.c b/sysutils/mbmon/files/patch-mbmon.c
new file mode 100644
index 000000000000..5eca1d5b8d37
--- /dev/null
+++ b/sysutils/mbmon/files/patch-mbmon.c
@@ -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
diff --git a/sysutils/mbmon/files/patch-pci_pm.c b/sysutils/mbmon/files/patch-pci_pm.c
new file mode 100644
index 000000000000..a5b7076e7588
--- /dev/null
+++ b/sysutils/mbmon/files/patch-pci_pm.c
@@ -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;
diff --git a/sysutils/mbmon/files/patch-pci_pm.h b/sysutils/mbmon/files/patch-pci_pm.h
index d8ca17ec2f59..8a7203e02cb8 100644
--- a/sysutils/mbmon/files/patch-pci_pm.h
+++ b/sysutils/mbmon/files/patch-pci_pm.h
@@ -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
diff --git a/sysutils/mbmon/files/patch-testsmb.c b/sysutils/mbmon/files/patch-testsmb.c
index f02a2e6b69cb..52d6d6cf7934 100644
--- a/sysutils/mbmon/files/patch-testsmb.c
+++ b/sysutils/mbmon/files/patch-testsmb.c
@@ -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 */
diff --git a/sysutils/xmbmon/Makefile b/sysutils/xmbmon/Makefile
index 3f89b2928141..dabcb64e2b49 100644
--- a/sysutils/xmbmon/Makefile
+++ b/sysutils/xmbmon/Makefile
@@ -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)
diff --git a/sysutils/xmbmon/files/patch-mbmon.c b/sysutils/xmbmon/files/patch-mbmon.c
new file mode 100644
index 000000000000..5eca1d5b8d37
--- /dev/null
+++ b/sysutils/xmbmon/files/patch-mbmon.c
@@ -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
diff --git a/sysutils/xmbmon/files/patch-pci_pm.c b/sysutils/xmbmon/files/patch-pci_pm.c
new file mode 100644
index 000000000000..a5b7076e7588
--- /dev/null
+++ b/sysutils/xmbmon/files/patch-pci_pm.c
@@ -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;
diff --git a/sysutils/xmbmon/files/patch-pci_pm.h b/sysutils/xmbmon/files/patch-pci_pm.h
index d8ca17ec2f59..8a7203e02cb8 100644
--- a/sysutils/xmbmon/files/patch-pci_pm.h
+++ b/sysutils/xmbmon/files/patch-pci_pm.h
@@ -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
diff --git a/sysutils/xmbmon/files/patch-testsmb.c b/sysutils/xmbmon/files/patch-testsmb.c
index f02a2e6b69cb..52d6d6cf7934 100644
--- a/sysutils/xmbmon/files/patch-testsmb.c
+++ b/sysutils/xmbmon/files/patch-testsmb.c
@@ -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 */