Changeset c6f82e5 in mainline for uspace/lib/usbhost/include/usb

Timestamp:

2018-01-19T20:56:14Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

7ec7b7e

Parents:

69b2dfee

Message:

libusbhost: do not try to handle the toggle bit in a generic way

Location:

uspace/lib/usbhost/include/usb/host

Files:

• bus.h (modified) (1 diff)
• endpoint.h (modified) (1 diff)
• usb_transfer_batch.h (modified) (2 diffs)
• utility.h (modified) (1 diff)

uspace/lib/usbhost/include/usb/host/bus.h

@@ -115 +115 @@
         void (*endpoint_unregister)(endpoint_t *);
         void (*endpoint_destroy)(endpoint_t *);                 /**< Optional */
-        void (*endpoint_toggle_reset)(endpoint_t *);            /**< Optional */
         ssize_t (*endpoint_count_bw) (endpoint_t *, size_t);    /**< Optional */
         usb_transfer_batch_t *(*batch_create)(endpoint_t *);    /**< Optional */

uspace/lib/usbhost/include/usb/host/endpoint.h

@@ -61 +61 @@
         /** Reserved bandwidth. */
         size_t bandwidth;
-        /** Value of the toggle bit. Untouched by the library. */
-        unsigned toggle:1;
         /** The currently active transfer batch. Write using methods, read under guard. */
         usb_transfer_batch_t *active_batch;

uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h

@@ -52 +52 @@
 typedef struct bus bus_t;
 
-/** How many toggles need to be reset */
-typedef enum {
-        RESET_NONE,
-        RESET_EP,
-        RESET_ALL
-} toggle_reset_mode_t;
-
 /** Structure stores additional data needed for communication with EP */
 typedef struct usb_transfer_batch {
@@ -81 +74 @@
                 uint64_t packed;
         } setup;
-
-        /** Resetting the Toggle */
-        toggle_reset_mode_t toggle_reset_mode;
 
         /** Place for data to send/receive */

uspace/lib/usbhost/include/usb/host/utility.h

@@ -44 +44 @@
 #include <usb/request.h>
 
+typedef void (*endpoint_reset_toggle_t)(endpoint_t *);
+
 int hc_get_ep0_max_packet_size(uint16_t *, bus_t *, device_t *);
-toggle_reset_mode_t hc_get_request_toggle_reset_mode(const usb_device_request_setup_packet_t *request);
+void hc_reset_toggles(const usb_transfer_batch_t *batch, endpoint_reset_toggle_t);
 int hc_setup_virtual_root_hub(hc_device_t *);
 int hc_get_device_desc(device_t *, usb_standard_device_descriptor_t *);