Changeset 15d0046 in mainline for uspace/lib/drv/generic/driver.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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/generic/driver.c (modified) (3 diffs)

uspace/lib/drv/generic/driver.c

@@ -36 +36 @@
 /** @file
  */
-
-#define _DDF_DATA_IMPLANT
 
 #include <assert.h>
@@ -596 +594 @@
 }
 
-/** Implant foreign driver-specific device data.
- *
- * XXX This is used to transition USB to new interface. Do not use
- * in new code. Use of this function must be removed.
- */
-void ddf_fun_data_implant(ddf_fun_t *fun, void *data)
-{
-        assert(fun->driver_data == NULL);
-        fun->driver_data = data;
-}
-
 /** Return driver-specific device data. */
 void *ddf_dev_data_get(ddf_dev_t *dev)
@@ -963 +950 @@
          */
         driver = drv;
-        
-        /* Initialize interrupt module */
-        interrupt_init();
         
         /*