Changes in uspace/lib/drv/generic/driver.c [a996ae31:80a96d2] in mainline

File:

• uspace/lib/drv/generic/driver.c (modified) (9 diffs)

uspace/lib/drv/generic/driver.c

@@ -80 +80 @@
 
 static irq_code_t default_pseudocode = {
-        0,
-        NULL,
         sizeof(default_cmds) / sizeof(irq_cmd_t),
         default_cmds
@@ -200 +198 @@
                 pseudocode = &default_pseudocode;
         
-        int res = irq_register(irq, dev->handle, ctx->id, pseudocode);
+        int res = register_irq(irq, dev->handle, ctx->id, pseudocode);
         if (res != EOK) {
                 remove_interrupt_context(&interrupt_contexts, ctx);
@@ -213 +211 @@
         interrupt_context_t *ctx = find_interrupt_context(&interrupt_contexts,
             dev, irq);
-        int res = irq_unregister(irq, dev->handle);
+        int res = unregister_irq(irq, dev->handle);
         
         if (ctx != NULL) {
@@ -273 +271 @@
         
         devman_handle_t dev_handle = IPC_GET_ARG1(*icall);
-        devman_handle_t parent_fun_handle = IPC_GET_ARG2(*icall);
+        devman_handle_t parent_fun_handle = IPC_GET_ARG2(*icall);
         
         ddf_dev_t *dev = create_device();
@@ -290 +288 @@
         (void) parent_fun_handle;
         
-        res = driver->driver_ops->dev_add(dev);
+        res = driver->driver_ops->add_device(dev);
         
         if (res != EOK) {
@@ -303 +301 @@
         
         async_answer_0(iid, res);
-}
-
-static void driver_dev_added(ipc_callid_t iid, ipc_call_t *icall)
-{
-        fibril_mutex_lock(&devices_mutex);
-        ddf_dev_t *dev = driver_get_device(IPC_GET_ARG1(*icall));
-        fibril_mutex_unlock(&devices_mutex);
-        
-        if (dev != NULL && driver->driver_ops->device_added != NULL)
-                driver->driver_ops->device_added(dev);
 }
 
@@ -462 +450 @@
                 case DRIVER_DEV_ADD:
                         driver_dev_add(callid, &call);
-                        break;
-                case DRIVER_DEV_ADDED:
-                        async_answer_0(callid, EOK);
-                        driver_dev_added(callid, &call);
                         break;
                 case DRIVER_DEV_REMOVE:
@@ -972 +956 @@
         
         match_id->id = str_dup(match_id_str);
-        match_id->score = match_score;
+        match_id->score = 90;
         
         add_match_id(&fun->match_ids, match_id);
@@ -1018 +1002 @@
          * incoming connections.
          */
-        async_set_client_connection(driver_connection);
-        rc = devman_driver_register(driver->name);
+        rc = devman_driver_register(driver->name, driver_connection);
         if (rc != EOK) {
                 printf("Error: Failed to register driver with device manager "