Changeset d8cdf39e in mainline

Timestamp:

2012-12-22T23:34:36Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

db8b7ca

Parents:

3c4663e

Message:

libusbhost: Remove fun_to_hcd helper.

Use dev_to_hcd instead.

Location:

uspace/lib/usbhost

Files:

• include/usb/host/hcd.h (modified) (1 diff)
• src/iface.c (modified) (9 diffs)

uspace/lib/usbhost/include/usb/host/hcd.h

@@ -87 +87 @@
     usbhc_iface_transfer_out_callback_t out, void *arg, const char* name);
 
-/** Data retrieve wrapper.
- * @param fun ddf function, non-null.
- * @return pointer cast to hcd_t*.
- */
-static inline hcd_t *fun_to_hcd(ddf_fun_t *fun)
-{
-        return ddf_fun_data_get(fun);
-}
-
-
 #endif
-
 /**
  * @}

uspace/lib/usbhost/src/iface.c

@@ -40 +40 @@
 #include <usb/host/endpoint.h>
 #include <usb/host/hcd.h>
+#include "ddf_helpers.h"
 
 /** Calls ep_add_hook upon endpoint registration.
@@ -97 +98 @@
 {
         assert(fun);
-        hcd_t *hcd = fun_to_hcd(fun);
+        hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun));
         assert(hcd);
         assert(address);
@@ -118 +119 @@
 {
         assert(fun);
-        hcd_t *hcd = fun_to_hcd(fun);
+        hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun));
         assert(hcd);
 
@@ -137 +138 @@
 {
         assert(fun);
-        hcd_t *hcd = fun_to_hcd(fun);
+        hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun));
         assert(hcd);
         return usb_device_manager_get_info_by_address(
@@ -152 +153 @@
 {
         assert(fun);
-        hcd_t *hcd = fun_to_hcd(fun);
+        hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun));
         assert(hcd);
         usb_log_debug("Address release %d.\n", address);
@@ -177 +178 @@
 {
         assert(fun);
-        hcd_t *hcd = fun_to_hcd(fun);
+        hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun));
         assert(hcd);
         const size_t size = max_packet_size;
@@ -209 +210 @@
 {
         assert(fun);
-        hcd_t *hcd = fun_to_hcd(fun);
+        hcd_t *hcd = dev_to_hcd(ddf_fun_get_dev(fun));
         assert(hcd);
         usb_log_debug("Unregister endpoint %d:%d %s.\n",
@@ -231 +232 @@
     void *arg)
 {
-        return hcd_send_batch(fun_to_hcd(fun), target, USB_DIRECTION_IN,
+        return hcd_send_batch(dev_to_hcd(ddf_fun_get_dev(fun)), target, USB_DIRECTION_IN,
             data, size, setup_data, callback, NULL, arg, "READ");
 }
@@ -249 +250 @@
     usbhc_iface_transfer_out_callback_t callback, void *arg)
 {
-        return hcd_send_batch(fun_to_hcd(fun), target, USB_DIRECTION_OUT,
-            (uint8_t*)data, size, setup_data, NULL, callback, arg, "WRITE");
+        return hcd_send_batch(dev_to_hcd(ddf_fun_get_dev(fun)),
+            target, USB_DIRECTION_OUT, (uint8_t*)data, size, setup_data, NULL,
+            callback, arg, "WRITE");
 }