diff options
| author | Marius Strobl <marius@FreeBSD.org> | 2020-12-24 19:38:46 +0000 |
|---|---|---|
| committer | Marius Strobl <marius@FreeBSD.org> | 2020-12-25 18:47:46 +0000 |
| commit | 5db1ed2f332fd784b7c8bf3a0c2182d86cd00d57 (patch) | |
| tree | 7e7ec56174a3851e34fd9efbdb7b3633002fca89 | |
| parent | 28ca6c20cf728f9eec1596bfa61464877f471483 (diff) | |
| download | src-5db1ed2f332fd784b7c8bf3a0c2182d86cd00d57.tar.gz src-5db1ed2f332fd784b7c8bf3a0c2182d86cd00d57.zip | |
ohci(4): remove support for Sun PCIO-2 USB controllers
It's no longer used since 58aa35d42975c298ca0adba705c042596303c9f5
and r357455 respectively.
| -rw-r--r-- | share/man/man4/ohci.4 | 2 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ohci_pci.c | 14 |
2 files changed, 0 insertions, 16 deletions
diff --git a/share/man/man4/ohci.4 b/share/man/man4/ohci.4 index a2f2e9ef8e08..318ee511fb61 100644 --- a/share/man/man4/ohci.4 +++ b/share/man/man4/ohci.4 @@ -56,8 +56,6 @@ CMD Tech 670 (USB0670) CMD Tech 673 (USB0673) .It NVIDIA nForce3 -.It -Sun PCIO-2 (RIO USB) .El .Sh SYSCTL VARIABLES The following variables are available as both diff --git a/sys/dev/usb/controller/ohci_pci.c b/sys/dev/usb/controller/ohci_pci.c index 882a9db8885e..8c3ee521b5b1 100644 --- a/sys/dev/usb/controller/ohci_pci.c +++ b/sys/dev/usb/controller/ohci_pci.c @@ -89,7 +89,6 @@ __FBSDID("$FreeBSD$"); #define PCI_OHCI_VENDORID_NVIDIA2 0x10DE #define PCI_OHCI_VENDORID_OPTI 0x1045 #define PCI_OHCI_VENDORID_SIS 0x1039 -#define PCI_OHCI_VENDORID_SUN 0x108e #define PCI_OHCI_BASE_REG 0x10 @@ -174,9 +173,6 @@ ohci_pci_match(device_t self) case 0x70011039: return ("SiS 5571 USB controller"); - case 0x1103108e: - return "Sun PCIO-2 USB controller"; - case 0x0019106b: return ("Apple KeyLargo USB controller"); case 0x003f106b: @@ -228,13 +224,6 @@ ohci_pci_attach(device_t self) pci_enable_busmaster(self); - /* - * Some Sun PCIO-2 USB controllers have their intpin register - * bogusly set to 0, although it should be 4. Correct that. - */ - if (pci_get_devid(self) == 0x1103108e && pci_get_intpin(self) == 0) - pci_set_intpin(self, 4); - rid = PCI_CBMEM; sc->sc_io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, RF_ACTIVE); @@ -297,9 +286,6 @@ ohci_pci_attach(device_t self) case PCI_OHCI_VENDORID_SIS: sprintf(sc->sc_vendor, "SiS"); break; - case PCI_OHCI_VENDORID_SUN: - sprintf(sc->sc_vendor, "SUN"); - break; default: if (bootverbose) { device_printf(self, "(New OHCI DeviceId=0x%08x)\n", |