Changeset 7aaed09 in mainline for uspace/lib/drv/include/ddf/driver.h

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (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.

File:

• uspace/lib/drv/include/ddf/driver.h (modified) (2 diffs)

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;