Changeset 0f79283b in mainline for uspace/lib/usb

Timestamp:

2018-01-18T12:39:27Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

2bff2cc2

Parents:

babcc423

Message:

usb: remove speed storing (and fix that misuse in xhci rh)

Location:

uspace/lib/usb

Files:

• include/usb/port.h (modified) (3 diffs)
• src/port.c (modified) (2 diffs)

uspace/lib/usb/include/usb/port.h

@@ -41 +41 @@
  *
  * This subsystem abstracts the rather complicated state machine, and offers
- * a simple call interface to announce events, and a callback structure for
- * implementations to supply the hardware-dependent part.
+ * a simple interface to announce events and leave the fibril management on the
+ * library.
  */
 
@@ -65 +65 @@
         /** Current state of the port */
         usb_port_state_t state;
-        /** A speed of the device connected (if any). Valid unless state == PORT_DISABLED. */
-        usb_speed_t speed;
         /** CV signalled on fibril exit. */
         fibril_condvar_t finished_cv;
@@ -87 +85 @@
 void usb_port_init(usb_port_t *);
 int usb_port_connected(usb_port_t *, usb_port_enumerate_t);
-void usb_port_enabled(usb_port_t *, usb_speed_t);
+void usb_port_enabled(usb_port_t *);
 void usb_port_disabled(usb_port_t *, usb_port_remove_t);
 void usb_port_fini(usb_port_t *);

uspace/lib/usb/src/port.c

@@ -41 +41 @@
  *
  * This subsystem abstracts the rather complicated state machine, and offers
- * a simple call interface to announce events, and a callback structure for
- * implementations to supply the hardware-dependent part.
+ * a simple interface to announce events and leave the fibril management on the
+ * library.
  */
 
@@ -127 +127 @@
 }
 
-void usb_port_enabled(usb_port_t *port, usb_speed_t speed)
-{
-        assert(port);
-
-        fibril_mutex_lock(&port->guard);
-        port->speed = speed;
+void usb_port_enabled(usb_port_t *port)
+{
+        assert(port);
+
+        fibril_mutex_lock(&port->guard);
         fibril_condvar_broadcast(&port->enabled_cv);
         fibril_mutex_unlock(&port->guard);