- Enable smb(4) support (on amd64 and i386 for now).

- Fix PCI ID for AMD-8111's SMBus 1.0 supported by amdpm(4).
This commit is contained in:
Ruslan Ermilov 2005-12-16 16:23:40 +00:00
parent d1cc1173e1
commit 54fae43aab
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=151333
8 changed files with 124 additions and 2 deletions

View file

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

View file

@ -0,0 +1,24 @@
$FreeBSD$
--- configure.orig Fri Aug 13 10:22:18 2004
+++ configure Fri Dec 16 17:50:05 2005
@@ -3486,8 +3486,9 @@
case "${host}" in
- i?86-*-freebsd*)
+ i?86-*-freebsd* | amd64-*-freebsd*)
CC=cc
+ HOSTDEF="-DSMBUS_IOCTL"
;;
i?86-*-linux-*)
CC=gcc
@@ -3946,7 +3947,7 @@
done
-for ac_header in machine/smb.h
+for ac_header in dev/smbus/smb.h machine/smb.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then

View file

@ -0,0 +1,24 @@
$FreeBSD$
--- getMB-smb_ioctl.c.orig Sat Jul 5 18:15:24 2003
+++ getMB-smb_ioctl.c Fri Dec 16 17:56:54 2005
@@ -5,6 +5,7 @@
#ifdef HAVE_SMBUS
/* assume SMBus ioctl support, only for FreeBSD */
+#include <sys/param.h>
#include <stdlib.h>
#include <stdio.h>
#include <fcntl.h>
@@ -13,7 +14,11 @@
#include <sys/types.h>
#include <sys/ioctl.h>
+#if __FreeBSD_version >= 500000
+#include <dev/smbus/smb.h>
+#else
#include <machine/smb.h>
+#endif
#include "methods.h"

View file

@ -0,0 +1,13 @@
$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 @@
#define ID_AMD756 0x740B1022
#define ID_AMD766 0x74131022
#define ID_AMD768 0x74431022
-#define ID_AMD8111 0x746A1022
+#define ID_AMD8111 0x746B1022
#define ID_NFORCE 0x01B410DE
#define ID_NFORCE2 0x006410DE
#define ID_ALI7101 0x710110B9

View file

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

View file

@ -0,0 +1,24 @@
$FreeBSD$
--- configure.orig Fri Aug 13 10:22:18 2004
+++ configure Fri Dec 16 17:50:05 2005
@@ -3486,8 +3486,9 @@
case "${host}" in
- i?86-*-freebsd*)
+ i?86-*-freebsd* | amd64-*-freebsd*)
CC=cc
+ HOSTDEF="-DSMBUS_IOCTL"
;;
i?86-*-linux-*)
CC=gcc
@@ -3946,7 +3947,7 @@
done
-for ac_header in machine/smb.h
+for ac_header in dev/smbus/smb.h machine/smb.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then

View file

@ -0,0 +1,24 @@
$FreeBSD$
--- getMB-smb_ioctl.c.orig Sat Jul 5 18:15:24 2003
+++ getMB-smb_ioctl.c Fri Dec 16 17:56:54 2005
@@ -5,6 +5,7 @@
#ifdef HAVE_SMBUS
/* assume SMBus ioctl support, only for FreeBSD */
+#include <sys/param.h>
#include <stdlib.h>
#include <stdio.h>
#include <fcntl.h>
@@ -13,7 +14,11 @@
#include <sys/types.h>
#include <sys/ioctl.h>
+#if __FreeBSD_version >= 500000
+#include <dev/smbus/smb.h>
+#else
#include <machine/smb.h>
+#endif
#include "methods.h"

View file

@ -0,0 +1,13 @@
$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 @@
#define ID_AMD756 0x740B1022
#define ID_AMD766 0x74131022
#define ID_AMD768 0x74431022
-#define ID_AMD8111 0x746A1022
+#define ID_AMD8111 0x746B1022
#define ID_NFORCE 0x01B410DE
#define ID_NFORCE2 0x006410DE
#define ID_ALI7101 0x710110B9