Changeset e1e4192 in mainline for uspace/lib/usb/include

Timestamp:

2012-06-03T20:45:58Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

90478727

Parents:

f7e69f5 (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

Location:

uspace/lib/usb/include/usb

Files:

• ddfiface.h (modified) (2 diffs)
• debug.h (modified) (1 diff)

uspace/lib/usb/include/usb/ddfiface.h

@@ -33 +33 @@
  * Implementations of DDF interfaces functions.
  */
+
 #ifndef LIBUSB_DDFIFACE_H_
 #define LIBUSB_DDFIFACE_H_
@@ -39 +40 @@
 #include <usb_iface.h>
 
-int usb_iface_get_hc_handle_device_impl(ddf_fun_t *, devman_handle_t *);
-int usb_iface_get_my_address_forward_impl(ddf_fun_t *, usb_address_t *);
+extern int usb_iface_get_hc_handle_device_impl(ddf_fun_t *, devman_handle_t *);
+extern int usb_iface_get_my_address_forward_impl(ddf_fun_t *, usb_address_t *);
 extern usb_iface_t usb_iface_hub_impl;
 
-int usb_iface_get_my_address_from_device_data(ddf_fun_t *, usb_address_t *);
+extern int usb_iface_get_my_address_from_device_data(ddf_fun_t *, usb_address_t *);
 extern usb_iface_t usb_iface_hub_child_impl;
 
-int usb_iface_get_hc_handle_hc_impl(ddf_fun_t *, devman_handle_t *);
+extern int usb_iface_get_hc_handle_hc_impl(ddf_fun_t *, devman_handle_t *);
 
 #endif
+
 /**
  * @}

uspace/lib/usb/include/usb/debug.h

@@ -82 +82 @@
 /** Default log level. */
 #ifdef CONFIG_USB_VERBOSE
-#  define USB_LOG_LEVEL_DEFAULT USB_LOG_LEVEL_DEBUG
+        #define USB_LOG_LEVEL_DEFAULT USB_LOG_LEVEL_DEBUG
 #else
-#  define USB_LOG_LEVEL_DEFAULT USB_LOG_LEVEL_INFO
+        #define USB_LOG_LEVEL_DEFAULT USB_LOG_LEVEL_INFO
 #endif