Changes in uspace/lib/drv/generic/driver.c [228e490:7e752b2] in mainline

File:

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

uspace/lib/drv/generic/driver.c

@@ -81 +81 @@
 static void driver_irq_handler(ipc_callid_t iid, ipc_call_t *icall)
 {
-        int id = (int)IPC_GET_IMETHOD(*icall);
+        int id = (int)IPC_GET_METHOD(*icall);
         interrupt_context_t *ctx;
         
@@ -165 +165 @@
         
         devman_handle_t dev_handle =  IPC_GET_ARG1(*icall);
-        devman_handle_t parent_dev_handle = IPC_GET_ARG2(*icall);
-    
         device_t *dev = create_device();
         dev->handle = dev_handle;
@@ -174 +172 @@
         
         add_to_devices_list(dev);
-        dev->parent = driver_get_device(&devices, parent_dev_handle);
-        
         res = driver->driver_ops->add_device(dev);
         if (0 == res) {
@@ -200 +196 @@
                 ipc_callid_t callid = async_get_call(&call);
 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (IPC_GET_METHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         cont = false;
@@ -254 +250 @@
                 ipc_call_t call;
                 callid = async_get_call(&call);
-                sysarg_t method = IPC_GET_IMETHOD(call);
+                ipcarg_t method = IPC_GET_METHOD(call);
                 int iface_idx;
                 
@@ -308 +304 @@
 
                         /* get the method of the remote interface */
-                        sysarg_t iface_method_idx = IPC_GET_ARG1(call);
+                        ipcarg_t iface_method_idx = IPC_GET_ARG1(call);
                         remote_iface_func_ptr_t iface_method_ptr =
                             get_remote_method(rem_iface, iface_method_idx);
@@ -346 +342 @@
 {
         /* Select interface */
-        switch ((sysarg_t) (IPC_GET_ARG1(*icall))) {
+        switch ((ipcarg_t) (IPC_GET_ARG1(*icall))) {
         case DRIVER_DEVMAN:
                 /* handle PnP events from device manager */
@@ -381 +377 @@
 }
 
-/** Wrapper for child_device_register for devices with single match id.
- *
- * @param parent Parent device.
- * @param child_name Child device name.
- * @param child_match_id Child device match id.
- * @param child_match_score Child device match score.
- * @return Error code.
- */
-int child_device_register_wrapper(device_t *parent, const char *child_name,
-    const char *child_match_id, int child_match_score)
-{
-        device_t *child = NULL;
-        match_id_t *match_id = NULL;
-        int rc;
-
-        child = create_device();
-        if (child == NULL) {
-                rc = ENOMEM;
-                goto failure;
-        }
-
-        child->name = child_name;
-
-        match_id = create_match_id();
-        if (match_id == NULL) {
-                rc = ENOMEM;
-                goto failure;
-        }
-
-        match_id->id = child_match_id;
-        match_id->score = child_match_score;
-        add_match_id(&child->match_ids, match_id);
-
-        rc = child_device_register(child, parent);
-        if (EOK != rc)
-                goto failure;
-
-        return EOK;
-
-failure:
-        if (match_id != NULL) {
-                match_id->id = NULL;
-                delete_match_id(match_id);
-        }
-
-        if (child != NULL) {
-                child->name = NULL;
-                delete_device(child);
-        }
-
-        return rc;
-}
-
 int driver_main(driver_t *drv)
 {