summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/controller/atmegadci.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb/controller/atmegadci.c')
-rw-r--r--sys/dev/usb/controller/atmegadci.c90
1 files changed, 48 insertions, 42 deletions
diff --git a/sys/dev/usb/controller/atmegadci.c b/sys/dev/usb/controller/atmegadci.c
index 1e8c4a6..dc9372a 100644
--- a/sys/dev/usb/controller/atmegadci.c
+++ b/sys/dev/usb/controller/atmegadci.c
@@ -1551,29 +1551,33 @@ USB_MAKE_STRING_DESC(STRING_LANG, atmegadci_langtab);
USB_MAKE_STRING_DESC(STRING_VENDOR, atmegadci_vendor);
USB_MAKE_STRING_DESC(STRING_PRODUCT, atmegadci_product);
-static void
-atmegadci_roothub_exec(struct usb2_bus *bus)
+static usb2_error_t
+atmegadci_roothub_exec(struct usb2_device *udev,
+ struct usb2_device_request *req, const void **pptr, uint16_t *plength)
{
- struct atmegadci_softc *sc = ATMEGA_BUS2SC(bus);
- struct usb2_sw_transfer *std = &sc->sc_bus.roothub_req;
+ struct atmegadci_softc *sc = ATMEGA_BUS2SC(udev->bus);
+ const void *ptr;
+ uint16_t len;
uint16_t value;
uint16_t index;
uint8_t temp;
+ usb2_error_t err;
USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
/* buffer reset */
- std->ptr = USB_ADD_BYTES(&sc->sc_hub_temp, 0);
- std->len = 0;
+ ptr = (const void *)&sc->sc_hub_temp;
+ len = 0;
+ err = 0;
- value = UGETW(std->req.wValue);
- index = UGETW(std->req.wIndex);
+ value = UGETW(req->wValue);
+ index = UGETW(req->wIndex);
/* demultiplex the control request */
- switch (std->req.bmRequestType) {
+ switch (req->bmRequestType) {
case UT_READ_DEVICE:
- switch (std->req.bRequest) {
+ switch (req->bRequest) {
case UR_GET_DESCRIPTOR:
goto tr_handle_get_descriptor;
case UR_GET_CONFIG:
@@ -1586,7 +1590,7 @@ atmegadci_roothub_exec(struct usb2_bus *bus)
break;
case UT_WRITE_DEVICE:
- switch (std->req.bRequest) {
+ switch (req->bRequest) {
case UR_SET_ADDRESS:
goto tr_handle_set_address;
case UR_SET_CONFIG:
@@ -1602,9 +1606,9 @@ atmegadci_roothub_exec(struct usb2_bus *bus)
break;
case UT_WRITE_ENDPOINT:
- switch (std->req.bRequest) {
+ switch (req->bRequest) {
case UR_CLEAR_FEATURE:
- switch (UGETW(std->req.wValue)) {
+ switch (UGETW(req->wValue)) {
case UF_ENDPOINT_HALT:
goto tr_handle_clear_halt;
case UF_DEVICE_REMOTE_WAKEUP:
@@ -1614,7 +1618,7 @@ atmegadci_roothub_exec(struct usb2_bus *bus)
}
break;
case UR_SET_FEATURE:
- switch (UGETW(std->req.wValue)) {
+ switch (UGETW(req->wValue)) {
case UF_ENDPOINT_HALT:
goto tr_handle_set_halt;
case UF_DEVICE_REMOTE_WAKEUP:
@@ -1631,7 +1635,7 @@ atmegadci_roothub_exec(struct usb2_bus *bus)
break;
case UT_READ_ENDPOINT:
- switch (std->req.bRequest) {
+ switch (req->bRequest) {
case UR_GET_STATUS:
goto tr_handle_get_ep_status;
default:
@@ -1640,7 +1644,7 @@ atmegadci_roothub_exec(struct usb2_bus *bus)
break;
case UT_WRITE_INTERFACE:
- switch (std->req.bRequest) {
+ switch (req->bRequest) {
case UR_SET_INTERFACE:
goto tr_handle_set_interface;
case UR_CLEAR_FEATURE:
@@ -1652,7 +1656,7 @@ atmegadci_roothub_exec(struct usb2_bus *bus)
break;
case UT_READ_INTERFACE:
- switch (std->req.bRequest) {
+ switch (req->bRequest) {
case UR_GET_INTERFACE:
goto tr_handle_get_interface;
case UR_GET_STATUS:
@@ -1673,7 +1677,7 @@ atmegadci_roothub_exec(struct usb2_bus *bus)
break;
case UT_WRITE_CLASS_DEVICE:
- switch (std->req.bRequest) {
+ switch (req->bRequest) {
case UR_CLEAR_FEATURE:
goto tr_valid;
case UR_SET_DESCRIPTOR:
@@ -1685,7 +1689,7 @@ atmegadci_roothub_exec(struct usb2_bus *bus)
break;
case UT_WRITE_CLASS_OTHER:
- switch (std->req.bRequest) {
+ switch (req->bRequest) {
case UR_CLEAR_FEATURE:
goto tr_handle_clear_port_feature;
case UR_SET_FEATURE:
@@ -1701,7 +1705,7 @@ atmegadci_roothub_exec(struct usb2_bus *bus)
break;
case UT_READ_CLASS_OTHER:
- switch (std->req.bRequest) {
+ switch (req->bRequest) {
case UR_GET_TT_STATE:
goto tr_handle_get_tt_state;
case UR_GET_STATUS:
@@ -1712,7 +1716,7 @@ atmegadci_roothub_exec(struct usb2_bus *bus)
break;
case UT_READ_CLASS_DEVICE:
- switch (std->req.bRequest) {
+ switch (req->bRequest) {
case UR_GET_DESCRIPTOR:
goto tr_handle_get_class_descriptor;
case UR_GET_STATUS:
@@ -1733,31 +1737,31 @@ tr_handle_get_descriptor:
if (value & 0xff) {
goto tr_stalled;
}
- std->len = sizeof(atmegadci_devd);
- std->ptr = USB_ADD_BYTES(&atmegadci_devd, 0);
+ len = sizeof(atmegadci_devd);
+ ptr = (const void *)&atmegadci_devd;
goto tr_valid;
case UDESC_CONFIG:
if (value & 0xff) {
goto tr_stalled;
}
- std->len = sizeof(atmegadci_confd);
- std->ptr = USB_ADD_BYTES(&atmegadci_confd, 0);
+ len = sizeof(atmegadci_confd);
+ ptr = (const void *)&atmegadci_confd;
goto tr_valid;
case UDESC_STRING:
switch (value & 0xff) {
case 0: /* Language table */
- std->len = sizeof(atmegadci_langtab);
- std->ptr = USB_ADD_BYTES(&atmegadci_langtab, 0);
+ len = sizeof(atmegadci_langtab);
+ ptr = (const void *)&atmegadci_langtab;
goto tr_valid;
case 1: /* Vendor */
- std->len = sizeof(atmegadci_vendor);
- std->ptr = USB_ADD_BYTES(&atmegadci_vendor, 0);
+ len = sizeof(atmegadci_vendor);
+ ptr = (const void *)&atmegadci_vendor;
goto tr_valid;
case 2: /* Product */
- std->len = sizeof(atmegadci_product);
- std->ptr = USB_ADD_BYTES(&atmegadci_product, 0);
+ len = sizeof(atmegadci_product);
+ ptr = (const void *)&atmegadci_product;
goto tr_valid;
default:
break;
@@ -1769,12 +1773,12 @@ tr_handle_get_descriptor:
goto tr_stalled;
tr_handle_get_config:
- std->len = 1;
+ len = 1;
sc->sc_hub_temp.wValue[0] = sc->sc_conf;
goto tr_valid;
tr_handle_get_status:
- std->len = 2;
+ len = 2;
USETW(sc->sc_hub_temp.wValue, UDS_SELF_POWERED);
goto tr_valid;
@@ -1793,7 +1797,7 @@ tr_handle_set_config:
goto tr_valid;
tr_handle_get_interface:
- std->len = 1;
+ len = 1;
sc->sc_hub_temp.wValue[0] = 0;
goto tr_valid;
@@ -1801,7 +1805,7 @@ tr_handle_get_tt_state:
tr_handle_get_class_status:
tr_handle_get_iface_status:
tr_handle_get_ep_status:
- std->len = 2;
+ len = 2;
USETW(sc->sc_hub_temp.wValue, 0);
goto tr_valid;
@@ -1877,7 +1881,7 @@ tr_handle_clear_port_feature:
sc->sc_flags.change_suspend = 0;
break;
default:
- std->err = USB_ERR_IOERROR;
+ err = USB_ERR_IOERROR;
goto done;
}
goto tr_valid;
@@ -1902,7 +1906,7 @@ tr_handle_set_port_feature:
sc->sc_flags.port_powered = 1;
break;
default:
- std->err = USB_ERR_IOERROR;
+ err = USB_ERR_IOERROR;
goto done;
}
goto tr_valid;
@@ -1950,22 +1954,24 @@ tr_handle_get_port_status:
value |= UPS_C_SUSPEND;
}
USETW(sc->sc_hub_temp.ps.wPortChange, value);
- std->len = sizeof(sc->sc_hub_temp.ps);
+ len = sizeof(sc->sc_hub_temp.ps);
goto tr_valid;
tr_handle_get_class_descriptor:
if (value & 0xFF) {
goto tr_stalled;
}
- std->ptr = USB_ADD_BYTES(&atmegadci_hubd, 0);
- std->len = sizeof(atmegadci_hubd);
+ ptr = (const void *)&atmegadci_hubd;
+ len = sizeof(atmegadci_hubd);
goto tr_valid;
tr_stalled:
- std->err = USB_ERR_STALLED;
+ err = USB_ERR_STALLED;
tr_valid:
done:
- return;
+ *plength = len;
+ *pptr = ptr;
+ return (err);
}
static void
OpenPOWER on IntegriCloud