Changes in uspace/drv/bus/usb/usbhub/port.h [a1cb170:cae002c] in mainline

File:

• uspace/drv/bus/usb/usbhub/port.h (modified) (4 diffs)

uspace/drv/bus/usb/usbhub/port.h

@@ -40 +40 @@
 #include <usb/classes/hub.h>
 
-typedef struct usb_hub_info_t usb_hub_info_t;
+typedef struct usb_hub_dev usb_hub_dev_t;
 
 /** Information about single port on a hub. */
 typedef struct {
+        /* Port number as reported in descriptors. */
         size_t port_number;
+        /** Device communication pipe. */
         usb_pipe_t *control_pipe;
         /** Mutex needed not only by CV for checking port reset. */
@@ -58 +60 @@
 
         /** Information about attached device. */
-        usb_hc_attached_device_t attached_device;
+        usb_hub_attached_device_t attached_device;
 } usb_hub_port_t;
 
@@ -70 +72 @@
         assert(port);
         port->attached_device.address = -1;
-        port->attached_device.handle = 0;
+        port->attached_device.fun = NULL;
         port->port_number = port_number;
         port->control_pipe = control_pipe;
@@ -76 +78 @@
         fibril_condvar_initialize(&port->reset_cv);
 }
-
-void usb_hub_port_reset_fail(usb_hub_port_t *port);
-void usb_hub_port_process_interrupt(usb_hub_port_t *port, usb_hub_info_t *hub);
+int usb_hub_port_fini(usb_hub_port_t *port, usb_hub_dev_t *hub);
 int usb_hub_port_clear_feature(
     usb_hub_port_t *port, usb_hub_class_feature_t feature);
 int usb_hub_port_set_feature(
     usb_hub_port_t *port, usb_hub_class_feature_t feature);
+void usb_hub_port_reset_fail(usb_hub_port_t *port);
+void usb_hub_port_process_interrupt(usb_hub_port_t *port, usb_hub_dev_t *hub);
 
 #endif