From 21033cbdb850fae830dc15b5d4613b258ad065f0 Mon Sep 17 00:00:00 2001 From: n_hibma Date: Wed, 13 Jan 1999 01:05:43 +0000 Subject: [PATCH] Removed warning and comments --- sys/dev/pci/ohci_pci.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/sys/dev/pci/ohci_pci.c b/sys/dev/pci/ohci_pci.c index c9b1802e8701..ece467c1a5aa 100644 --- a/sys/dev/pci/ohci_pci.c +++ b/sys/dev/pci/ohci_pci.c @@ -79,14 +79,11 @@ #define PCI_VENDOR(d) ((d) & 0xffff) #define PCI_DEVICE(d) (((d) >> 8) & 0xffff) -#define PCI_OHCI_VENDORID_ADS 0x #define PCI_OHCI_VENDORID_ALI 0x10b9 #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 Host Controller"; -#define PCI_OHCI_DEVICEID_ADS 0x -static const char ohci_device_ads[] = "ADS Technologies USB Host Controller"; +static const char ohci_device_aladdin_v[] = "AcerLabs M5237 (Aladdin-V) USB Host Controller"; static const char ohci_device_generic[] = "OHCI USB Host Controller (generic)"; #define PCI_OHCI_BASE_REG 0x10 @@ -113,10 +110,6 @@ ohci_pci_probe(pcici_t config_id, pcidi_t device_id) if (device_id == PCI_OHCI_DEVICEID_ALADDIN_V) { return (ohci_device_aladdin_v); - /* - } else if (device_id == PCI_OHCI_DEVICEID_ADS) { - return (ohci_device_ads); - */ } else { class = pci_conf_read(config_id, PCI_CLASS_REG); if ( (PCI_CLASS(class) == PCI_CLASS_SERIALBUS) @@ -162,10 +155,6 @@ ohci_pci_attach(pcici_t config_id, int unit) id = pci_conf_read(config_id, PCI_ID_REG); if (PCI_VENDOR(id) == PCI_OHCI_VENDORID_ALI) sprintf(sc->sc_vendor, "AcerLabs"); - /* - else if (PCI_VENDOR(id) == PCI_OHCI_VENDORID_ADS) - sprintf(sc->sc_vendor, "ADS"); - */ else if (PCI_VENDOR(id) == PCI_OHCI_VENDORID_SIS) sprintf(sc->sc_vendor, "SiS"); else @@ -202,11 +191,6 @@ ohci_pci_attach(pcici_t config_id, int unit) case PCI_OHCI_DEVICEID_ALADDIN_V: device_set_desc(sc->sc_bus.bdev, ohci_device_aladdin_v); break; - /* - case PCI_OHCI_DEVICEID_ADS: - device_set_desc(sc->sc_bus.bdev, ohci_device_ads); - break; - */ default: printf("(New OHCI DeviceId=0x%08x)\n", id); device_set_desc(sc->sc_bus.bdev, ohci_device_generic);