Changeset 6785b538 in mainline

Timestamp:

2013-01-26T16:15:08Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b6812a1

Parents:

7c69861

Message:

usbmid, usbhid, usbhub, usbflbk: Don't access ddf_dev directly, use provided functions.

Location:

uspace/drv/bus/usb

Files:

• usbflbk/main.c (modified) (1 diff)
• usbhid/generic/hiddev.c (modified) (1 diff)
• usbhid/kbd/kbddev.c (modified) (1 diff)
• usbhid/mouse/mousedev.c (modified) (1 diff)
• usbhid/multimedia/multimedia.c (modified) (1 diff)
• usbhub/usbhub.c (modified) (1 diff)
• usbmid/explore.c (modified) (1 diff)
• usbmid/main.c (modified) (2 diffs)
• usbmid/usbmid.c (modified) (1 diff)

uspace/drv/bus/usb/usbflbk/main.c

@@ -48 +48 @@
 static int usbfallback_device_add(usb_device_t *dev)
 {
-        usb_log_info("Pretending to control %s `%s' (handle %" PRIun ").\n",
+        usb_log_info("Pretending to control %s `%s'.\n",
             dev->interface_no < 0 ? "device" : "interface",
-            usb_device_get_name(dev), ddf_dev_get_handle(dev->ddf_dev));
+            usb_device_get_name(dev));
         return EOK;
 }

uspace/drv/bus/usb/usbhid/generic/hiddev.c

@@ -195 +195 @@
         /* Create the exposed function. */
         usb_log_debug("Creating DDF function %s...\n", HID_GENERIC_FUN_NAME);
-        ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 
-            HID_GENERIC_FUN_NAME);
+        ddf_fun_t *fun = usb_device_ddf_fun_create(hid_dev->usb_dev,
+            fun_exposed, HID_GENERIC_FUN_NAME);
         if (fun == NULL) {
                 usb_log_error("Could not create DDF function node.\n");

uspace/drv/bus/usb/usbhid/kbd/kbddev.c

@@ -627 +627 @@
         /* Create the exposed function. */
         usb_log_debug("Creating DDF function %s...\n", HID_KBD_FUN_NAME);
-        ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev,
+        ddf_fun_t *fun = usb_device_ddf_fun_create(hid_dev->usb_dev,
             fun_exposed, HID_KBD_FUN_NAME);
         if (fun == NULL) {

uspace/drv/bus/usb/usbhid/mouse/mousedev.c

@@ -332 +332 @@
         /* Create the exposed function. */
         usb_log_debug("Creating DDF function %s...\n", HID_MOUSE_FUN_NAME);
-        ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed,
-            HID_MOUSE_FUN_NAME);
+        ddf_fun_t *fun = usb_device_ddf_fun_create(hid_dev->usb_dev,
+            fun_exposed, HID_MOUSE_FUN_NAME);
         if (fun == NULL) {
                 usb_log_error("Could not create DDF function node `%s'.\n",

uspace/drv/bus/usb/usbhid/multimedia/multimedia.c

@@ -161 +161 @@
 
         /* Create the exposed function. */
-        ddf_fun_t *fun = ddf_fun_create(
-            hid_dev->usb_dev->ddf_dev, fun_exposed, NAME);
+        ddf_fun_t *fun = usb_device_ddf_fun_create(
+            hid_dev->usb_dev, fun_exposed, NAME);
         if (fun == NULL) {
                 usb_log_error("Could not create DDF function node.\n");

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -128 +128 @@
         /* Create hub control function. */
         usb_log_debug("Creating DDF function '" HUB_FNC_NAME "'.\n");
-        hub_dev->hub_fun = ddf_fun_create(hub_dev->usb_device->ddf_dev,
+        hub_dev->hub_fun = usb_device_ddf_fun_create(hub_dev->usb_device,
             fun_exposed, HUB_FNC_NAME);
         if (hub_dev->hub_fun == NULL) {

uspace/drv/bus/usb/usbmid/explore.c

@@ -180 +180 @@
 
         /* Create control function. */
-        usb_mid->ctl_fun = ddf_fun_create(dev->ddf_dev, fun_exposed, "ctl");
+        usb_mid->ctl_fun = usb_device_ddf_fun_create(dev, fun_exposed, "ctl");
         if (usb_mid->ctl_fun == NULL) {
                 usb_log_error("Failed to create control function.\n");

uspace/drv/bus/usb/usbmid/main.c

@@ -51 +51 @@
 static int usbmid_device_add(usb_device_t *dev)
 {
-        usb_log_info("Taking care of new MID `%s'.\n", ddf_dev_get_name(dev->ddf_dev));
+        usb_log_info("Taking care of new MID `%s'.\n", usb_device_get_name(dev));
 
         return usbmid_explore_device(dev);
@@ -116 +116 @@
         assert(usb_mid);
 
-        usb_log_info("USB MID gone: `%s'.\n", ddf_dev_get_name(dev->ddf_dev));
+        usb_log_info("USB MID gone: `%s'.\n", usb_device_get_name(dev));
 
         /* Remove ctl function */

uspace/drv/bus/usb/usbmid/usbmid.c

@@ -112 +112 @@
 
         /* Create the device. */
-        child = ddf_fun_create(parent->ddf_dev, fun_inner, child_name);
+        child = usb_device_ddf_fun_create(parent, fun_inner, child_name);
         free(child_name);
         if (child == NULL) {