Skip to content

Commit

Permalink
ohci(4): remove support for Sun PCIO-2 USB controllers
Browse files Browse the repository at this point in the history
It's no longer used since 58aa35d
and r357455 respectively.
  • Loading branch information
sparcplug committed Dec 25, 2020
1 parent 28ca6c2 commit 5db1ed2
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 16 deletions.
2 changes: 0 additions & 2 deletions share/man/man4/ohci.4
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 0 additions & 14 deletions sys/dev/usb/controller/ohci_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 5db1ed2

Please sign in to comment.