Changeset 2745176 in mainline

Timestamp:

2013-01-27T15:48:12Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5debe97

Parents:

4ca778b

Message:

libusb: Hide/remove unused functions.

Location:

uspace/lib/usb

Files:

• include/usb/dev.h (modified) (1 diff)
• src/dev.c (modified) (2 diffs)
• src/hc.c (modified) (1 diff)

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

@@ -38 +38 @@
 #include <usb/usb.h>
 
-int usb_get_info_by_handle(devman_handle_t,
-    devman_handle_t *, usb_address_t *, int *);
-
-static inline int usb_get_hc_by_handle(devman_handle_t dev, devman_handle_t *hc)
-{
-        return usb_get_info_by_handle(dev, hc, NULL, NULL);
-}
-
-static inline int usb_get_address_by_handle(
-    devman_handle_t dev, usb_address_t *address)
-{
-        return usb_get_info_by_handle(dev, NULL, address, NULL);
-}
-
-static inline int usb_get_iface_by_handle(devman_handle_t dev, int *iface)
-{
-        return usb_get_info_by_handle(dev, NULL, NULL, iface);
-}
-
 int usb_resolve_device_handle(const char *, devman_handle_t *, usb_address_t *,
     devman_handle_t *);

uspace/lib/usb/src/dev.c

@@ -46 +46 @@
  * @return Error code.
  */
-int usb_get_info_by_handle(devman_handle_t device_handle,
+static int usb_get_info_by_handle(devman_handle_t device_handle,
     devman_handle_t *hc_handle, usb_address_t *address, int *iface)
 {
@@ -111 +111 @@
 
         return EOK;
+}
+
+static inline int usb_get_hc_by_handle(devman_handle_t dev, devman_handle_t *hc)
+{
+        return usb_get_info_by_handle(dev, hc, NULL, NULL);
+}
+
+static inline int usb_get_address_by_handle(
+    devman_handle_t dev, usb_address_t *address)
+{
+        return usb_get_info_by_handle(dev, NULL, address, NULL);
 }
 

uspace/lib/usb/src/hc.c

@@ -108 +108 @@
 } else (void)0
 
-/** Initialize connection to USB host controller.
- *
- * @param connection Connection to be initialized.
- * @param device Device connecting to the host controller.
- * @return Error code.
- */
-int usb_hc_connection_initialize_from_device(usb_hc_connection_t *connection,
-    ddf_dev_t *device)
-{
-        if (device == NULL)
-                return EBADMEM;
-
-        devman_handle_t hc_handle;
-        const int rc = usb_get_hc_by_handle(ddf_dev_get_handle(device), &hc_handle);
-        if (rc == EOK) {
-                usb_hc_connection_initialize(connection, hc_handle);
-        }
-
-        return rc;
-}
 
 void usb_hc_connection_deinitialize(usb_hc_connection_t *connection)