Changeset d7ff048 in mainline for uspace/srv/devman

Timestamp:

2011-10-08T13:08:53Z (15 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

bf08ff0

Parents:

8367d1d (diff), 80099c19 (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

Location:

uspace/srv/devman

Files:

• devman.c (modified) (2 diffs)
• main.c (modified) (1 diff)

uspace/srv/devman/devman.c

@@ -794 +794 @@
         case EOK:
                 dev->state = DEVICE_USABLE;
+                exch = async_exchange_begin(drv->sess);
+                async_msg_1(exch, DRIVER_DEV_ADDED, dev->handle);
+                async_exchange_end(exch);
                 break;
         case ENOENT:
@@ -1066 +1069 @@
         
         link = hash_table_find(&tree->devman_devices, &key);
+        if (link == NULL)
+                return NULL;
+        
         return hash_table_get_instance(link, dev_node_t, devman_dev);
 }

uspace/srv/devman/main.c

@@ -634 +634 @@
                                 fibril_rwlock_read_unlock(&device_tree.rwlock);
                                 dev_del_ref(dev);
+                                if (gone_rc == EOK)
+                                        gone_rc = ENOTSUP;
+                                async_answer_0(callid, gone_rc);
                                 return;
                         }