Changeset 8e7c9fe in mainline for uspace/srv/locsrv/locsrv.c

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/srv/locsrv/locsrv.c (modified) (2 diffs)

uspace/srv/locsrv/locsrv.c

@@ -320 +320 @@
                 svc_categ_t *memb = list_get_instance(link, svc_categ_t,
                     svc_link);
-                fibril_mutex_lock(&memb->cat->mutex);
+                category_t *cat = memb->cat;
+                
+                fibril_mutex_lock(&cat->mutex);
                 category_remove_service(memb);
-                fibril_mutex_unlock(&memb->cat->mutex);
+                fibril_mutex_unlock(&cat->mutex);
         }
         
@@ -1330 +1332 @@
 
         cat = category_new("mouse");
+        categ_dir_add_cat(&cdir, cat);
+
+        cat = category_new("led");
         categ_dir_add_cat(&cdir, cat);