Changeset 0c0f823b in mainline for uspace/lib

Timestamp:

2011-11-14T20:50:08Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

765678f, d5ba17f

Parents:

612ad864

Message:

Rename DDF entry point add_device to dev_add.

Location:

uspace/lib

Files:

• drv/generic/driver.c (modified) (1 diff)
• drv/include/ddf/driver.h (modified) (2 diffs)
• usbdev/src/devdrv.c (modified) (1 diff)

uspace/lib/drv/generic/driver.c

@@ -288 +288 @@
         (void) parent_fun_handle;
         
-        res = driver->driver_ops->add_device(dev);
+        res = driver->driver_ops->dev_add(dev);
         
         if (res != EOK) {

uspace/lib/drv/include/ddf/driver.h

@@ -136 +136 @@
 typedef struct driver_ops {
         /** Callback method for passing a new device to the device driver */
-        int (*add_device)(ddf_dev_t *);
-        /**
-         * Notification that the device was succesfully added.
-         * The driver can do any blocking operation without
-         * blocking the device manager.
-         */
-        void (*device_added)(ddf_dev_t *dev);
+        int (*dev_add)(ddf_dev_t *);
         /** Ask driver to remove a device */
         int (*dev_remove)(ddf_dev_t *);
@@ -151 +145 @@
         /** Ask driver to offline a specific function */
         int (*fun_offline)(ddf_fun_t *);
+
+        /**
+         * Notification that the device was succesfully added.
+         * The driver can do any blocking operation without
+         * blocking the device manager.
+         *
+         * XXX REMOVE THIS
+         */
+        void (*device_added)(ddf_dev_t *dev);
 } driver_ops_t;
 

uspace/lib/usbdev/src/devdrv.c

@@ -46 +46 @@
 
 static driver_ops_t generic_driver_ops = {
-        .add_device = generic_device_add,
+        .dev_add = generic_device_add,
         .dev_remove = generic_device_remove,
         .dev_gone = generic_device_gone,