Changes in uspace/lib/usbdev/src/devdrv.c [2bdf92a5:816f5f4] in mainline

File:

• uspace/lib/usbdev/src/devdrv.c (modified) (12 diffs)

uspace/lib/usbdev/src/devdrv.c

@@ -53 +53 @@
 
 /** USB device structure. */
-struct usb_device {
+typedef struct usb_device {
         /** Connection to device on USB bus */
         usb_dev_session_t *bus_session;
-        
+
         /** devman handle */
         devman_handle_t handle;
-        
+
         /** The default control pipe. */
         usb_pipe_t ctrl_pipe;
-        
+
         /** Other endpoint pipes.
          *
@@ -69 +69 @@
          */
         usb_endpoint_mapping_t *pipes;
-        
+
         /** Number of other endpoint pipes. */
         size_t pipes_count;
-        
+
         /** Current interface.
          *
@@ -79 +79 @@
          */
         int interface_no;
-        
+
         /** Alternative interfaces. */
         usb_alternate_interfaces_t alternate_interfaces;
-        
+
         /** Some useful descriptors for USB device. */
         usb_device_descriptors_t descriptors;
-        
+
         /** Generic DDF device backing this one. DO NOT TOUCH! */
         ddf_dev_t *ddf_dev;
-        
+
         /** Custom driver data.
          *
@@ -95 +95 @@
          */
         void *driver_data;
-};
+} usb_device_t;
 
 /** Count number of pipes the driver expects.
@@ -146 +146 @@
                 return rc;
         }
-        
+
         /* Change current alternative */
         usb_dev->alternate_interfaces.current = alternate_setting;
@@ -296 +296 @@
         assert(usb_dev);
         assert(usb_dev->pipes || usb_dev->pipes_count == 0);
-        
+
         /* Destroy the pipes. */
         for (size_t i = 0; i < usb_dev->pipes_count; ++i) {
@@ -304 +304 @@
                         usb_pipe_unregister(&usb_dev->pipes[i].pipe);
         }
-        
+
         free(usb_dev->pipes);
         usb_dev->pipes = NULL;
@@ -332 +332 @@
         assert(usb_dev);
         for (unsigned i = 0; i < usb_dev->pipes_count; ++i) {
-                if (usb_dev->pipes[i].pipe.endpoint_no == ep)
+                if (usb_dev->pipes[i].pipe.desc.endpoint_no == ep)
                         return &usb_dev->pipes[i];
         }
@@ -462 +462 @@
         assert(handle);
         assert(iface_no);
-        
+
         async_exch_t *exch = async_exchange_begin(sess);
         if (!exch)
                 return EPARTY;
-        
+
         int ret = usb_get_my_device_handle(exch, handle);
         if (ret == EOK) {
@@ -475 +475 @@
                 }
         }
-        
+
         async_exchange_end(exch);
         return ret;
@@ -489 +489 @@
         int iface_no = -1;
 
-        async_sess_t *sess = ddf_dev_parent_sess_get(ddf_dev);
+        async_sess_t *sess = devman_parent_device_connect(
+            ddf_dev_get_handle(ddf_dev), IPC_FLAG_BLOCKING);
         if (sess == NULL)
                 return ENOMEM;
         const int ret = usb_device_get_info(sess, &h, &iface_no);
+        async_hangup(sess);
         if (ret != EOK)
                 return ret;
@@ -502 +504 @@
                 return ENOMEM;
         }
-        
+
         return usb_device_init(usb_dev, ddf_dev, desc, err, h, iface_no);
 }