Changeset 77ad86c in mainline for uspace/lib/usbdev/include/usb

Timestamp:

2012-06-01T19:00:32Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b713ff80

Parents:

4e5dabf

Message:

cstyle (no change in functionality)

Location:

uspace/lib/usbdev/include/usb/dev

Files:

• driver.h (modified) (1 diff)
• hub.h (modified) (4 diffs)
• recognise.h (modified) (2 diffs)

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

@@ -33 +33 @@
  * USB device driver framework.
  */
+
 #ifndef LIBUSBDEV_DRIVER_H_
 #define LIBUSBDEV_DRIVER_H_

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
+
 /**
  * @}

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

@@ -33 +33 @@
  * USB device recognition.
  */
+
 #ifndef LIBUSBDEV_RECOGNISE_H_
 #define LIBUSBDEV_RECOGNISE_H_
@@ -41 +42 @@
 #include <ipc/devman.h>
 
-int usb_device_create_match_ids_from_device_descriptor(
+extern int usb_device_create_match_ids_from_device_descriptor(
     const usb_standard_device_descriptor_t *, match_id_list_t *);
 
-int usb_device_create_match_ids_from_interface(
+extern int usb_device_create_match_ids_from_interface(
     const usb_standard_device_descriptor_t *,
     const usb_standard_interface_descriptor_t *, match_id_list_t *);
 
-int usb_device_create_match_ids(usb_pipe_t *, match_id_list_t *);
+extern int usb_device_create_match_ids(usb_pipe_t *, match_id_list_t *);
 
-int usb_device_register_child_in_devman(usb_pipe_t *ctrl_pipe,
+extern int usb_device_register_child_in_devman(usb_pipe_t *ctrl_pipe,
     ddf_dev_t *, ddf_dev_ops_t *, void *, ddf_fun_t **);
 
 #endif
+
 /**
  * @}