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

Add AMD766 OHCI USB controller. Remove unused VENDORID lists.

Browse Source
This commit is contained in:
Peter Wemm 2001-11-06 23:44:03 +00:00
parent e9d3164d29
commit da73fe05e1
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/dev/usb/ohci_pci.c
View File

@ -72,19 +72,12 @@
#include <dev/usb/ohcireg.h>
#include <dev/usb/ohcivar.h>
#define PCI_OHCI_VENDORID_ALI 0x10b9
#define PCI_OHCI_VENDORID_AMD756 0x1022
#define PCI_OHCI_VENDORID_APPLE 0x106b
#define PCI_OHCI_VENDORID_CMDTECH 0x1095
#define PCI_OHCI_VENDORID_COMPAQ 0x0e11
#define PCI_OHCI_VENDORID_NEC 0x1033
#define PCI_OHCI_VENDORID_OPTI 0x1045
#define PCI_OHCI_VENDORID_SIS 0x1039
#define PCI_OHCI_DEVICEID_ALADDIN_V 0x523710b9
static const char *ohci_device_aladdin_v = "AcerLabs M5237 (Aladdin-V) USB controller";
#define PCI_OHCI_DEVICEID_AMD756 0x740c1022
static const char *ohci_device_amd756 = "AMD-756 USB Controller";
#define PCI_OHCI_DEVICEID_AMD766 0x74141022
static const char *ohci_device_amd766 = "AMD-766 USB Controller";
#define PCI_OHCI_DEVICEID_FIRELINK 0xc8611045
static const char *ohci_device_firelink = "OPTi 82C861 (FireLink) USB controller";
#define PCI_OHCI_DEVICEID_NEC 0x00351033
@ -116,6 +109,8 @@ ohci_pci_match(device_t self)
return (ohci_device_aladdin_v);
case PCI_OHCI_DEVICEID_AMD756:
return (ohci_device_amd756);
case PCI_OHCI_DEVICEID_AMD766:
return (ohci_device_amd766);
case PCI_OHCI_DEVICEID_USB0670:
return (ohci_device_usb0670);
case PCI_OHCI_DEVICEID_USB0673:
@ -198,6 +193,10 @@ ohci_pci_attach(device_t self)
device_set_desc(sc->sc_bus.bdev, ohci_device_amd756);
sprintf(sc->sc_vendor, "AMD");
break;
case PCI_OHCI_DEVICEID_AMD766:
device_set_desc(sc->sc_bus.bdev, ohci_device_amd766);
sprintf(sc->sc_vendor, "AMD");
break;
case PCI_OHCI_DEVICEID_FIRELINK:
device_set_desc(sc->sc_bus.bdev, ohci_device_firelink);
sprintf(sc->sc_vendor, "OPTi");

17
sys/pci/ohci_pci.c
View File

@ -72,19 +72,12 @@
#include <dev/usb/ohcireg.h>
#include <dev/usb/ohcivar.h>
#define PCI_OHCI_VENDORID_ALI 0x10b9
#define PCI_OHCI_VENDORID_AMD756 0x1022
#define PCI_OHCI_VENDORID_APPLE 0x106b
#define PCI_OHCI_VENDORID_CMDTECH 0x1095
#define PCI_OHCI_VENDORID_COMPAQ 0x0e11
#define PCI_OHCI_VENDORID_NEC 0x1033
#define PCI_OHCI_VENDORID_OPTI 0x1045
#define PCI_OHCI_VENDORID_SIS 0x1039
#define PCI_OHCI_DEVICEID_ALADDIN_V 0x523710b9
static const char *ohci_device_aladdin_v = "AcerLabs M5237 (Aladdin-V) USB controller";
#define PCI_OHCI_DEVICEID_AMD756 0x740c1022
static const char *ohci_device_amd756 = "AMD-756 USB Controller";
#define PCI_OHCI_DEVICEID_AMD766 0x74141022
static const char *ohci_device_amd766 = "AMD-766 USB Controller";
#define PCI_OHCI_DEVICEID_FIRELINK 0xc8611045
static const char *ohci_device_firelink = "OPTi 82C861 (FireLink) USB controller";
#define PCI_OHCI_DEVICEID_NEC 0x00351033
@ -116,6 +109,8 @@ ohci_pci_match(device_t self)
return (ohci_device_aladdin_v);
case PCI_OHCI_DEVICEID_AMD756:
return (ohci_device_amd756);
case PCI_OHCI_DEVICEID_AMD766:
return (ohci_device_amd766);
case PCI_OHCI_DEVICEID_USB0670:
return (ohci_device_usb0670);
case PCI_OHCI_DEVICEID_USB0673:
@ -198,6 +193,10 @@ ohci_pci_attach(device_t self)
device_set_desc(sc->sc_bus.bdev, ohci_device_amd756);
sprintf(sc->sc_vendor, "AMD");
break;
case PCI_OHCI_DEVICEID_AMD766:
device_set_desc(sc->sc_bus.bdev, ohci_device_amd766);
sprintf(sc->sc_vendor, "AMD");
break;
case PCI_OHCI_DEVICEID_FIRELINK:
device_set_desc(sc->sc_bus.bdev, ohci_device_firelink);
sprintf(sc->sc_vendor, "OPTi");