summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/controller
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb/controller')
-rw-r--r--sys/dev/usb/controller/at91dci.c1
-rw-r--r--sys/dev/usb/controller/at91dci_atmelarm.c1
-rw-r--r--sys/dev/usb/controller/atmegadci.c1
-rw-r--r--sys/dev/usb/controller/atmegadci_atmelarm.c1
-rw-r--r--sys/dev/usb/controller/ehci.c3
-rw-r--r--sys/dev/usb/controller/ehci.h2
-rw-r--r--sys/dev/usb/controller/ehci_ixp4xx.c1
-rw-r--r--sys/dev/usb/controller/ehci_mbus.c1
-rw-r--r--sys/dev/usb/controller/ehci_pci.c1
-rw-r--r--sys/dev/usb/controller/musb_otg.c1
-rw-r--r--sys/dev/usb/controller/musb_otg_atmelarm.c1
-rw-r--r--sys/dev/usb/controller/ohci.c3
-rw-r--r--sys/dev/usb/controller/ohci.h2
-rw-r--r--sys/dev/usb/controller/ohci_atmelarm.c1
-rw-r--r--sys/dev/usb/controller/ohci_pci.c1
-rw-r--r--sys/dev/usb/controller/uhci.c3
-rw-r--r--sys/dev/usb/controller/uhci.h2
-rw-r--r--sys/dev/usb/controller/uhci_pci.c1
-rw-r--r--sys/dev/usb/controller/usb_controller.c1
-rw-r--r--sys/dev/usb/controller/uss820dci.c1
-rw-r--r--sys/dev/usb/controller/uss820dci_atmelarm.c1
21 files changed, 6 insertions, 24 deletions
diff --git a/sys/dev/usb/controller/at91dci.c b/sys/dev/usb/controller/at91dci.c
index fec3b27..cfb74a3 100644
--- a/sys/dev/usb/controller/at91dci.c
+++ b/sys/dev/usb/controller/at91dci.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usb.h>
#include <dev/usb/usb_mfunc.h>
#include <dev/usb/usb_error.h>
-#include <dev/usb/usb_defs.h>
#define USB_DEBUG_VAR at91dcidebug
diff --git a/sys/dev/usb/controller/at91dci_atmelarm.c b/sys/dev/usb/controller/at91dci_atmelarm.c
index 71d2937..164f9bd 100644
--- a/sys/dev/usb/controller/at91dci_atmelarm.c
+++ b/sys/dev/usb/controller/at91dci_atmelarm.c
@@ -28,7 +28,6 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usb_mfunc.h>
-#include <dev/usb/usb_defs.h>
#include <dev/usb/usb.h>
#include <dev/usb/usb_core.h>
diff --git a/sys/dev/usb/controller/atmegadci.c b/sys/dev/usb/controller/atmegadci.c
index edaef19..a052385 100644
--- a/sys/dev/usb/controller/atmegadci.c
+++ b/sys/dev/usb/controller/atmegadci.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usb.h>
#include <dev/usb/usb_mfunc.h>
#include <dev/usb/usb_error.h>
-#include <dev/usb/usb_defs.h>
#define USB_DEBUG_VAR atmegadci_debug
diff --git a/sys/dev/usb/controller/atmegadci_atmelarm.c b/sys/dev/usb/controller/atmegadci_atmelarm.c
index 7cf2eb4..1fc929f 100644
--- a/sys/dev/usb/controller/atmegadci_atmelarm.c
+++ b/sys/dev/usb/controller/atmegadci_atmelarm.c
@@ -26,7 +26,6 @@ __FBSDID("$FreeBSD$");
* SUCH DAMAGE.
*/
-#include <dev/usb/usb_defs.h>
#include <dev/usb/usb.h>
#include <dev/usb/usb_core.h>
diff --git a/sys/dev/usb/controller/ehci.c b/sys/dev/usb/controller/ehci.c
index 7c873d9..42f41ff 100644
--- a/sys/dev/usb/controller/ehci.c
+++ b/sys/dev/usb/controller/ehci.c
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usb.h>
#include <dev/usb/usb_mfunc.h>
#include <dev/usb/usb_error.h>
-#include <dev/usb/usb_defs.h>
#define USB_DEBUG_VAR ehcidebug
@@ -3168,7 +3167,7 @@ ehci_root_ctrl_done(struct usb2_xfer *xfer,
USETW(sc->sc_hub_desc.stat.wStatus, 0);
break;
case C(UR_SET_ADDRESS, UT_WRITE_DEVICE):
- if (value >= USB_MAX_DEVICES) {
+ if (value >= EHCI_MAX_DEVICES) {
std->err = USB_ERR_IOERROR;
goto done;
}
diff --git a/sys/dev/usb/controller/ehci.h b/sys/dev/usb/controller/ehci.h
index 5b54809..ddb2d9c 100644
--- a/sys/dev/usb/controller/ehci.h
+++ b/sys/dev/usb/controller/ehci.h
@@ -38,7 +38,7 @@
#ifndef _EHCI_H_
#define _EHCI_H_
-#define EHCI_MAX_DEVICES USB_MAX_DEVICES
+#define EHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128)
/* PCI config registers */
#define PCI_CBMEM 0x10 /* configuration base MEM */
diff --git a/sys/dev/usb/controller/ehci_ixp4xx.c b/sys/dev/usb/controller/ehci_ixp4xx.c
index 1e0e253..5ce8e68 100644
--- a/sys/dev/usb/controller/ehci_ixp4xx.c
+++ b/sys/dev/usb/controller/ehci_ixp4xx.c
@@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$");
#include "opt_bus.h"
#include <dev/usb/usb_mfunc.h>
-#include <dev/usb/usb_defs.h>
#include <dev/usb/usb.h>
#include <dev/usb/usb_core.h>
diff --git a/sys/dev/usb/controller/ehci_mbus.c b/sys/dev/usb/controller/ehci_mbus.c
index 66cf8cc..31431a1 100644
--- a/sys/dev/usb/controller/ehci_mbus.c
+++ b/sys/dev/usb/controller/ehci_mbus.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
#include "opt_bus.h"
#include <dev/usb/usb_mfunc.h>
-#include <dev/usb/usb_defs.h>
#include <dev/usb/usb.h>
#include <dev/usb/usb_core.h>
diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c
index 2f097fc..f739c3a 100644
--- a/sys/dev/usb/controller/ehci_pci.c
+++ b/sys/dev/usb/controller/ehci_pci.c
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
*/
#include <dev/usb/usb_mfunc.h>
-#include <dev/usb/usb_defs.h>
#include <dev/usb/usb.h>
#include <dev/usb/usb_core.h>
diff --git a/sys/dev/usb/controller/musb_otg.c b/sys/dev/usb/controller/musb_otg.c
index cda1a67..be0af93 100644
--- a/sys/dev/usb/controller/musb_otg.c
+++ b/sys/dev/usb/controller/musb_otg.c
@@ -39,7 +39,6 @@
#include <dev/usb/usb.h>
#include <dev/usb/usb_mfunc.h>
#include <dev/usb/usb_error.h>
-#include <dev/usb/usb_defs.h>
#define USB_DEBUG_VAR musbotgdebug
diff --git a/sys/dev/usb/controller/musb_otg_atmelarm.c b/sys/dev/usb/controller/musb_otg_atmelarm.c
index 3ee5cfb..38fa304 100644
--- a/sys/dev/usb/controller/musb_otg_atmelarm.c
+++ b/sys/dev/usb/controller/musb_otg_atmelarm.c
@@ -25,7 +25,6 @@
*/
#include <dev/usb/usb_mfunc.h>
-#include <dev/usb/usb_defs.h>
#include <dev/usb/usb.h>
#include <dev/usb/usb_core.h>
diff --git a/sys/dev/usb/controller/ohci.c b/sys/dev/usb/controller/ohci.c
index ad2b1cc..d453de8 100644
--- a/sys/dev/usb/controller/ohci.c
+++ b/sys/dev/usb/controller/ohci.c
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usb.h>
#include <dev/usb/usb_mfunc.h>
#include <dev/usb/usb_error.h>
-#include <dev/usb/usb_defs.h>
#define USB_DEBUG_VAR ohcidebug
@@ -2256,7 +2255,7 @@ ohci_root_ctrl_done(struct usb2_xfer *xfer,
USETW(sc->sc_hub_desc.stat.wStatus, 0);
break;
case C(UR_SET_ADDRESS, UT_WRITE_DEVICE):
- if (value >= USB_MAX_DEVICES) {
+ if (value >= OHCI_MAX_DEVICES) {
std->err = USB_ERR_IOERROR;
goto done;
}
diff --git a/sys/dev/usb/controller/ohci.h b/sys/dev/usb/controller/ohci.h
index 84a6afd..47d3be3 100644
--- a/sys/dev/usb/controller/ohci.h
+++ b/sys/dev/usb/controller/ohci.h
@@ -39,7 +39,7 @@
#ifndef _OHCI_H_
#define _OHCI_H_
-#define OHCI_MAX_DEVICES USB_MAX_DEVICES
+#define OHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128)
/* PCI config registers */
#define PCI_CBMEM 0x10 /* configuration base memory */
diff --git a/sys/dev/usb/controller/ohci_atmelarm.c b/sys/dev/usb/controller/ohci_atmelarm.c
index 562cf3d..34826e0 100644
--- a/sys/dev/usb/controller/ohci_atmelarm.c
+++ b/sys/dev/usb/controller/ohci_atmelarm.c
@@ -26,7 +26,6 @@
__FBSDID("$FreeBSD$");
#include <dev/usb/usb_mfunc.h>
-#include <dev/usb/usb_defs.h>
#include <dev/usb/usb.h>
#include <dev/usb/usb_core.h>
diff --git a/sys/dev/usb/controller/ohci_pci.c b/sys/dev/usb/controller/ohci_pci.c
index c9f586d..fec8acd 100644
--- a/sys/dev/usb/controller/ohci_pci.c
+++ b/sys/dev/usb/controller/ohci_pci.c
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usb.h>
#include <dev/usb/usb_mfunc.h>
#include <dev/usb/usb_error.h>
-#include <dev/usb/usb_defs.h>
#include <dev/usb/usb_core.h>
#include <dev/usb/usb_busdma.h>
diff --git a/sys/dev/usb/controller/uhci.c b/sys/dev/usb/controller/uhci.c
index 82a9623..de4026d 100644
--- a/sys/dev/usb/controller/uhci.c
+++ b/sys/dev/usb/controller/uhci.c
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usb.h>
#include <dev/usb/usb_mfunc.h>
#include <dev/usb/usb_error.h>
-#include <dev/usb/usb_defs.h>
#define USB_DEBUG_VAR uhcidebug
@@ -2626,7 +2625,7 @@ uhci_root_ctrl_done(struct usb2_xfer *xfer,
USETW(sc->sc_hub_desc.stat.wStatus, 0);
break;
case C(UR_SET_ADDRESS, UT_WRITE_DEVICE):
- if (value >= USB_MAX_DEVICES) {
+ if (value >= UHCI_MAX_DEVICES) {
std->err = USB_ERR_IOERROR;
goto done;
}
diff --git a/sys/dev/usb/controller/uhci.h b/sys/dev/usb/controller/uhci.h
index 9365a4c..c652dd8 100644
--- a/sys/dev/usb/controller/uhci.h
+++ b/sys/dev/usb/controller/uhci.h
@@ -39,7 +39,7 @@
#ifndef _UHCI_H_
#define _UHCI_H_
-#define UHCI_MAX_DEVICES USB_MAX_DEVICES
+#define UHCI_MAX_DEVICES MIN(USB_MAX_DEVICES, 128)
/* PCI config registers */
#define PCI_USBREV 0x60 /* USB protocol revision */
diff --git a/sys/dev/usb/controller/uhci_pci.c b/sys/dev/usb/controller/uhci_pci.c
index a61693b..379841b 100644
--- a/sys/dev/usb/controller/uhci_pci.c
+++ b/sys/dev/usb/controller/uhci_pci.c
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
*/
#include <dev/usb/usb_mfunc.h>
-#include <dev/usb/usb_defs.h>
#include <dev/usb/usb.h>
#include <dev/usb/usb_core.h>
diff --git a/sys/dev/usb/controller/usb_controller.c b/sys/dev/usb/controller/usb_controller.c
index f835ec1..70099ef 100644
--- a/sys/dev/usb/controller/usb_controller.c
+++ b/sys/dev/usb/controller/usb_controller.c
@@ -25,7 +25,6 @@
*/
#include <dev/usb/usb_mfunc.h>
-#include <dev/usb/usb_defs.h>
#include <dev/usb/usb_error.h>
#include <dev/usb/usb.h>
diff --git a/sys/dev/usb/controller/uss820dci.c b/sys/dev/usb/controller/uss820dci.c
index 5fc8e98..8e1e2bc 100644
--- a/sys/dev/usb/controller/uss820dci.c
+++ b/sys/dev/usb/controller/uss820dci.c
@@ -36,7 +36,6 @@
#include <dev/usb/usb_mfunc.h>
#include <dev/usb/usb_revision.h>
#include <dev/usb/usb_error.h>
-#include <dev/usb/usb_defs.h>
#define USB_DEBUG_VAR uss820dcidebug
diff --git a/sys/dev/usb/controller/uss820dci_atmelarm.c b/sys/dev/usb/controller/uss820dci_atmelarm.c
index 5691d4b..4cd0862 100644
--- a/sys/dev/usb/controller/uss820dci_atmelarm.c
+++ b/sys/dev/usb/controller/uss820dci_atmelarm.c
@@ -28,7 +28,6 @@ __FBSDID("$FreeBSD$");
*/
#include <dev/usb/usb_mfunc.h>
-#include <dev/usb/usb_defs.h>
#include <dev/usb/usb.h>
#include <dev/usb/usb_core.h>
OpenPOWER on IntegriCloud