Changeset 5af21c5 in mainline

Timestamp:

2010-04-23T13:40:39Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

953bc1ef

Parents:

df747b9c

Message:

fixed a bug

Location:

uspace/lib

Files:

• libc/include/ipc/devman.h (modified) (2 diffs)
• libdrv/generic/driver.c (modified) (4 diffs)
• libdrv/include/driver.h (modified) (2 diffs)

uspace/lib/libc/include/ipc/devman.h

@@ -37 +37 @@
 #include <ipc/ipc.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 
@@ -100 +101 @@
 }
 
+static inline void init_match_ids(match_id_list_t *id_list)
+{
+        list_initialize(&id_list->ids);
+}
+
 static inline void clean_match_ids(match_id_list_t *ids)
 {

uspace/lib/libdrv/generic/driver.c

@@ -59 +59 @@
 FIBRIL_MUTEX_INITIALIZE(devices_mutex);
 
-static device_t * driver_create_device()
-{
-        device_t *dev = (device_t *)malloc(sizeof(device_t));
-        if (NULL != dev) {
-                memset(dev, 0, sizeof(device_t));
-        }
-        return dev;
-}
-
 static void add_to_devices_list(device_t *dev)
 {
@@ -78 +69 @@
 {
         fibril_mutex_lock(&devices_mutex);
-        list_append(&dev->link, &devices);
+        list_remove(&dev->link);
         fibril_mutex_unlock(&devices_mutex);
 }
@@ -107 +98 @@
         
         device_handle_t dev_handle =  IPC_GET_ARG1(*icall);
-        device_t *dev = driver_create_device();
+        device_t *dev = create_device();
         dev->handle = dev_handle;
         
@@ -120 +111 @@
                 printf("%s: failed to add a new device with handle = %d.\n", driver->name, dev_handle); 
                 remove_from_devices_list(dev);
-                delete_device(dev);             
+                delete_device(dev);     
         }
         

uspace/lib/libdrv/include/driver.h

@@ -121 +121 @@
 } driver_t;
 
-
-
-
-
 int driver_main(driver_t *drv);
 
@@ -136 +132 @@
         if (NULL != dev) {
                 memset(dev, 0, sizeof(device_t));
-        }
-        list_initialize(&dev->match_ids.ids);
+                init_match_ids(&dev->match_ids);
+        }       
         return dev;
 }