Changes in uspace/srv/devman/main.c [80a96d2:f278930] in mainline

File:

• uspace/srv/devman/main.c (modified) (7 diffs)

uspace/srv/devman/main.c

@@ -316 +316 @@
                 if (fun->child != NULL) {
                         dev_node_t *dev = fun->child;
-                        device_state_t dev_state;
                         
                         dev_add_ref(dev);
-                        dev_state = dev->state;
+                        fibril_rwlock_write_unlock(&device_tree.rwlock);
                         
-                        fibril_rwlock_write_unlock(&device_tree.rwlock);
-
                         /* If device is owned by driver, ask driver to give it up. */
-                        if (dev_state == DEVICE_USABLE) {
+                        if (dev->state == DEVICE_USABLE) {
                                 rc = driver_dev_remove(&device_tree, dev);
                                 if (rc != EOK) {
@@ -336 +333 @@
                         if (!list_empty(&dev->functions)) {
                                 fibril_rwlock_read_unlock(&device_tree.rwlock);
-                                dev_del_ref(dev);
                                 return EIO;
                         }
-                        
                         driver_t *driver = dev->drv;
                         fibril_rwlock_read_unlock(&device_tree.rwlock);
@@ -512 +507 @@
         fun_node_t *fun;
         int rc;
-        
-        log_msg(LVL_DEBUG, "devman_drv_fun_online()");
-        
+
+        printf("devman_drv_fun_online()\n");
         fun = find_fun_node(&device_tree, IPC_GET_ARG1(*icall));
         if (fun == NULL) {
@@ -532 +526 @@
         rc = online_function(fun);
         if (rc != EOK) {
+                printf("devman_drv_fun_online() online_fun->ERROR\n");
                 fun_del_ref(fun);
                 async_answer_0(iid, (sysarg_t) rc);
@@ -538 +533 @@
         
         fun_del_ref(fun);
+        printf("devman_drv_fun_online() online_fun->OK\n");
         
         async_answer_0(iid, (sysarg_t) EOK);
@@ -584 +580 @@
         int rc;
         
+        
         fun_node_t *fun = find_fun_node(&device_tree, fun_handle);
         if (fun == NULL) {
@@ -602 +599 @@
         
         if (fun->ftype == fun_inner) {
-                /* This is a surprise removal. Handle possible descendants */
+                /* Handle possible descendants */
+                /* TODO - This is a surprise removal */
                 if (fun->child != NULL) {
-                        dev_node_t *dev = fun->child;
-                        device_state_t dev_state;
-                        int gone_rc;
-                        
-                        dev_add_ref(dev);
-                        dev_state = dev->state;
-                        
-                        fibril_rwlock_write_unlock(&device_tree.rwlock);
-                        
-                        /* If device is owned by driver, inform driver it is gone. */
-                        if (dev_state == DEVICE_USABLE)
-                                gone_rc = driver_dev_gone(&device_tree, dev);
-                        else
-                                gone_rc = EOK;
-                        
-                        fibril_rwlock_read_lock(&device_tree.rwlock);
-                        
-                        /* Verify that driver succeeded and removed all functions */
-                        if (gone_rc != EOK || !list_empty(&dev->functions)) {
-                                log_msg(LVL_ERROR, "Driver did not remove "
-                                    "functions for device that is gone. "
-                                    "Device node is now defunct.");
-                                
-                                /*
-                                 * Not much we can do but mark the device
-                                 * node as having invalid state. This
-                                 * is a driver bug.
-                                 */
-                                dev->state = DEVICE_INVALID;
-                                fibril_rwlock_read_unlock(&device_tree.rwlock);
-                                dev_del_ref(dev);
-                                return;
-                        }
-                        
-                        driver_t *driver = dev->drv;
-                        fibril_rwlock_read_unlock(&device_tree.rwlock);
-                        
-                        if (driver)
-                                detach_driver(&device_tree, dev);
-                        
-                        fibril_rwlock_write_lock(&device_tree.rwlock);
-                        remove_dev_node(&device_tree, dev);
-                        
-                        /* Delete ref created when node was inserted */
-                        dev_del_ref(dev);
-                        /* Delete ref created by dev_add_ref(dev) above */
-                        dev_del_ref(dev);
+                        log_msg(LVL_WARN, "devman_remove_function(): not handling "
+                            "descendants\n");
                 }
         } else {