Changeset 3f42eab in mainline

Timestamp:

2018-01-05T22:50:13Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

c901632

Parents:

86650db

Message:

usbdev: remove dead code

Location:

uspace/lib/usbdev

Files:

• include/usb/dev/pipes.h (modified) (1 diff)
• src/pipesinit.c (modified) (1 diff)

uspace/lib/usbdev/include/usb/dev/pipes.h

@@ -103 +103 @@
 int usb_pipe_initialize_default_control(usb_pipe_t *, usb_dev_session_t *);
 
-int usb_pipe_probe_default_control(usb_pipe_t *);
 int usb_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
     size_t, const uint8_t *, size_t, usb_dev_session_t *);

uspace/lib/usbdev/src/pipesinit.c

@@ -379 +379 @@
 }
 
-/** Probe default control pipe for max packet size.
- *
- * The function tries to get the correct value of max packet size several
- * time before giving up.
- *
- * The session on the pipe shall not be started.
- *
- * @param pipe Default control pipe.
- * @return Error code.
- */
-int usb_pipe_probe_default_control(usb_pipe_t *pipe)
-{
-        assert(pipe);
-        static_assert(DEV_DESCR_MAX_PACKET_SIZE_OFFSET < CTRL_PIPE_MIN_PACKET_SIZE);
-
-        if ((pipe->desc.direction != USB_DIRECTION_BOTH) ||
-            (pipe->desc.transfer_type != USB_TRANSFER_CONTROL) ||
-            (pipe->desc.endpoint_no != 0)) {
-                return EINVAL;
-        }
-
-        uint8_t dev_descr_start[CTRL_PIPE_MIN_PACKET_SIZE];
-        size_t transferred_size;
-        int rc;
-        for (size_t attempt_var = 0; attempt_var < 3; ++attempt_var) {
-                rc = usb_request_get_descriptor(pipe, USB_REQUEST_TYPE_STANDARD,
-                    USB_REQUEST_RECIPIENT_DEVICE, USB_DESCTYPE_DEVICE,
-                    0, 0, dev_descr_start, CTRL_PIPE_MIN_PACKET_SIZE,
-                    &transferred_size);
-                if (rc == EOK) {
-                        if (transferred_size != CTRL_PIPE_MIN_PACKET_SIZE) {
-                                rc = ELIMIT;
-                                continue;
-                        }
-                        break;
-                }
-        }
-        if (rc != EOK) {
-                return rc;
-        }
-
-        pipe->desc.max_packet_size
-            = dev_descr_start[DEV_DESCR_MAX_PACKET_SIZE_OFFSET];
-
-        return EOK;
-}
-
 /**
  * @}