d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add PCI device support for Intel S7000FC4UR in usb and ichwd, systems

Browse Source 
will not install without the usb changes in the install kernel, so I
would like to MFC this in time for 7.0 RC

MFC: 3 days
This commit is contained in:
Jack F Vogel 2007-11-15 23:59:36 +00:00
parent faad9cae56
commit b8b1729d3c
4 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/dev/ichwd/ichwd.c
View File

@ -93,6 +93,7 @@ static struct ichwd_device ichwd_devices[] = {
{ DEVICEID_ICH8, "Intel ICH8 watchdog timer", 8 },
{ DEVICEID_ICH8DH, "Intel ICH8DH watchdog timer", 8 },
{ DEVICEID_ICH8DO, "Intel ICH8DO watchdog timer", 8 },
{ DEVICEID_63XXESB, "Intel 63XXESB watchdog timer", 8 },
{ 0, NULL, 0 },
};

1
sys/dev/ichwd/ichwd.h
View File

@ -78,6 +78,7 @@ struct ichwd_softc {
#define DEVICEID_82801FBR 0x2640
#define DEVICEID_ICH6M 0x2641
#define DEVICEID_ICH6W 0x2642
#define DEVICEID_63XXESB 0x2670
#define DEVICEID_ICH7 0x27b8
#define DEVICEID_ICH7M 0x27b9
#define DEVICEID_ICH7MDH 0x27bd

4
sys/dev/usb/ehci_pci.c
View File

@ -117,6 +117,8 @@ static const char *ehci_device_ich5 = "Intel 82801EB/R (ICH5) USB 2.0 controller
static const char *ehci_device_ich6 = "Intel 82801FB (ICH6) USB 2.0 controller";
#define PCI_EHCI_DEVICEID_ICH7 0x27cc8086
static const char *ehci_device_ich7 = "Intel 82801GB/R (ICH7) USB 2.0 controller";
#define PCI_EHCI_DEVICEID_63XX 0x268c8086
static const char *ehci_device_63XX = "Intel 63XXESB USB 2.0 controller";
/* NEC */
#define PCI_EHCI_DEVICEID_NEC 0x00e01033
@ -218,6 +220,8 @@ ehci_pci_match(device_t self)
return (ehci_device_sb400);
case PCI_EHCI_DEVICEID_6300:
return (ehci_device_6300);
case PCI_EHCI_DEVICEID_63XX:
return (ehci_device_63XX);
case PCI_EHCI_DEVICEID_ICH4:
return (ehci_device_ich4);
case PCI_EHCI_DEVICEID_ICH5:

20
sys/dev/usb/uhci_pci.c
View File

@ -139,6 +139,18 @@ static const char *uhci_device_ich6_c = "Intel 82801FB/FR/FW/FRW (ICH6) USB cont
#define PCI_UHCI_DEVICEID_ICH6_D 0x265b8086
static const char *uhci_device_ich6_d = "Intel 82801FB/FR/FW/FRW (ICH6) USB controller USB-D";
#define PCI_UHCI_DEVICEID_63XXESB_1 0x26888086
static const char *uhci_device_esb_1 = "Intel 631XESB/632XESB/3100 USB controller USB-1";
#define PCI_UHCI_DEVICEID_63XXESB_2 0x26898086
static const char *uhci_device_esb_2 = "Intel 631XESB/632XESB/3100 USB controller USB-2";
#define PCI_UHCI_DEVICEID_63XXESB_3 0x268a8086
static const char *uhci_device_esb_3 = "Intel 631XESB/632XESB/3100 USB controller USB-3";
#define PCI_UHCI_DEVICEID_63XXESB_4 0x268b8086
static const char *uhci_device_esb_4 = "Intel 631XESB/632XESB/3100 USB controller USB-4";
#define PCI_UHCI_DEVICEID_440MX 0x719a8086
static const char *uhci_device_440mx = "Intel 82443MX USB controller";
@ -230,6 +242,14 @@ uhci_pci_match(device_t self)
return (uhci_device_ich6_c);
} else if (device_id == PCI_UHCI_DEVICEID_ICH6_D) {
return (uhci_device_ich6_d);
} else if (device_id == PCI_UHCI_DEVICEID_63XXESB_1) {
return (uhci_device_esb_1);
} else if (device_id == PCI_UHCI_DEVICEID_63XXESB_2) {
return (uhci_device_esb_2);
} else if (device_id == PCI_UHCI_DEVICEID_63XXESB_3) {
return (uhci_device_esb_3);
} else if (device_id == PCI_UHCI_DEVICEID_63XXESB_4) {
return (uhci_device_esb_4);
} else if (device_id == PCI_UHCI_DEVICEID_440MX) {
return (uhci_device_440mx);
} else if (device_id == PCI_UHCI_DEVICEID_460GX) {