Changeset 944f8fdd in mainline for uspace/lib/usbhost/src/hcd.c

Timestamp:

2018-01-19T17:38:22Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2833bb4

Parents:

861b5d6

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-19 17:06:40)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-19 17:38:22)

Message:

libusbhost: move utility functions to new header utility.h

File:

• uspace/lib/usbhost/src/hcd.c (modified) (1 diff)

uspace/lib/usbhost/src/hcd.c

@@ -370 +370 @@
 }
 
-/** Get max packet size for the control endpoint 0.
- *
- * For LS, HS, and SS devices this value is fixed. For FS devices we must fetch
- * the first 8B of the device descriptor to determine it.
- *
- * @return Max packet size for EP 0
- */
-int hcd_get_ep0_max_packet_size(uint16_t *mps, bus_t *bus, device_t *dev)
-{
-        assert(mps);
-
-        static const uint16_t mps_fixed [] = {
-                [USB_SPEED_LOW] = 8,
-                [USB_SPEED_HIGH] = 64,
-                [USB_SPEED_SUPER] = 512,
-        };
-
-        if (dev->speed < ARRAY_SIZE(mps_fixed) && mps_fixed[dev->speed] != 0) {
-                *mps = mps_fixed[dev->speed];
-                return EOK;
-        }
-
-        const usb_target_t control_ep = {{
-                .address = dev->address,
-                .endpoint = 0,
-        }};
-
-        usb_standard_device_descriptor_t desc = { 0 };
-        const usb_device_request_setup_packet_t get_device_desc_8 =
-            GET_DEVICE_DESC(CTRL_PIPE_MIN_PACKET_SIZE);
-
-        usb_log_debug("Requesting first 8B of device descriptor to determine MPS.");
-        ssize_t got = bus_device_send_batch_sync(dev, control_ep, USB_DIRECTION_IN,
-            (char *) &desc, CTRL_PIPE_MIN_PACKET_SIZE, *(uint64_t *)&get_device_desc_8,
-            "read first 8 bytes of dev descriptor");
-
-        if (got != CTRL_PIPE_MIN_PACKET_SIZE) {
-                const int err = got < 0 ? got : EOVERFLOW;
-                usb_log_error("Failed to get 8B of dev descr: %s.", str_error(err));
-                return err;
-        }
-
-        if (desc.descriptor_type != USB_DESCTYPE_DEVICE) {
-                usb_log_error("The device responded with wrong device descriptor.");
-                return EIO;
-        }
-
-        uint16_t version = uint16_usb2host(desc.usb_spec_version);
-        if (version < 0x0300) {
-                /* USB 2 and below have MPS raw in the field */
-                *mps = desc.max_packet_size;
-        } else {
-                /* USB 3 have MPS as an 2-based exponent */
-                *mps = (1 << desc.max_packet_size);
-        }
-        return EOK;
-}
-
-/** Check setup packet data for signs of toggle reset.
- *
- * @param[in] requst Setup requst data.
- *
- * @retval -1 No endpoints need reset.
- * @retval 0 All endpoints need reset.
- * @retval >0 Specified endpoint needs reset.
- *
- */
-toggle_reset_mode_t hcd_get_request_toggle_reset_mode(
-    const usb_device_request_setup_packet_t *request)
-{
-        assert(request);
-        switch (request->request)
-        {
-        /* Clear Feature ENPOINT_STALL */
-        case USB_DEVREQ_CLEAR_FEATURE: /*resets only cleared ep */
-                /* 0x2 ( HOST to device | STANDART | TO ENPOINT) */
-                if ((request->request_type == 0x2) &&
-                    (request->value == USB_FEATURE_ENDPOINT_HALT))
-                        return RESET_EP;
-                break;
-        case USB_DEVREQ_SET_CONFIGURATION:
-        case USB_DEVREQ_SET_INTERFACE:
-                /* Recipient must be device, this resets all endpoints,
-                 * In fact there should be no endpoints but EP 0 registered
-                 * as different interfaces use different endpoints,
-                 * unless you're changing configuration or alternative
-                 * interface of an already setup device. */
-                if (!(request->request_type & SETUP_REQUEST_TYPE_DEVICE_TO_HOST))
-                        return RESET_ALL;
-                break;
-        default:
-                break;
-        }
-
-        return RESET_NONE;
-}
-
 
 /**