Changeset 520acaf in mainline for uspace/lib/usbdev/include/usb/dev/hub.h

Timestamp:

2012-06-06T21:13:29Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

5f679702

Parents:

11b9ad7 (diff), 3123d2a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/usbdev/include/usb/dev/hub.h (modified) (4 diffs)

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

@@ -35 +35 @@
  * For class specific requests, see usb/classes/hub.h.
  */
+
 #ifndef LIBUSBDEV_HUB_H_
 #define LIBUSBDEV_HUB_H_
@@ -43 +44 @@
 #include <usb/hc.h>
 
-int usb_hc_new_device_wrapper(ddf_dev_t *, usb_hc_connection_t *, usb_speed_t,
+extern int usb_hc_new_device_wrapper(ddf_dev_t *, usb_hc_connection_t *, usb_speed_t,
     int (*)(void *), void *, usb_address_t *, ddf_dev_ops_t *, void *,
     ddf_fun_t **);
@@ -60 +61 @@
 } usb_hub_attached_device_t;
 
-int usb_hub_register_device(usb_hc_connection_t *,
+extern int usb_hub_register_device(usb_hc_connection_t *,
     const usb_hub_attached_device_t *);
 
@@ -69 +70 @@
         if (attached_device == NULL)
                 return EBADMEM;
+        
         return usb_hc_release_address(conn, attached_device->address);
 }
 
 #endif
+
 /**
  * @}