Changeset 9a66bc2 in mainline for uspace/lib/libdrv/generic/driver.c

Timestamp:

2010-04-04T21:52:26Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

8c06905

Parents:

5cd136ab

Message:

several bugs fixed

File:

• uspace/lib/libdrv/generic/driver.c (modified) (12 diffs)

uspace/lib/libdrv/generic/driver.c

@@ -57 +57 @@
 static driver_t *driver;
 LIST_INITIALIZE(devices);
+FIBRIL_MUTEX_INITIALIZE(devices_mutex);
 
 static device_t * driver_create_device()
@@ -67 +68 @@
 }
 
+static void add_to_devices_list(device_t *dev)
+{
+        fibril_mutex_lock(&devices_mutex);
+        list_append(&dev->link, &devices);
+        fibril_mutex_unlock(&devices_mutex);
+}
+
+static void remove_from_devices_list(device_t *dev)
+{
+        fibril_mutex_lock(&devices_mutex);
+        list_append(&dev->link, &devices);
+        fibril_mutex_unlock(&devices_mutex);
+}
+
 static device_t * driver_get_device(link_t *devices, device_handle_t handle)
 {
         device_t *dev = NULL;
+        
+        fibril_mutex_lock(&devices_mutex);      
         link_t *link = devices->next;
-
         while (link != devices) {
                 dev = list_get_instance(link, device_t, link);
                 if (handle == dev->handle) {
+                        fibril_mutex_unlock(&devices_mutex);
                         return dev;
                 }
-        }
+                link = link->next;
+        }
+        fibril_mutex_unlock(&devices_mutex);
 
         return NULL;
@@ -86 +105 @@
         printf("%s: driver_add_device\n", driver->name);
 
-        // result of the operation - device was added, device is not present etc.
-        ipcarg_t ret = 0;
+        // TODO device state - the driver may detect the device is not actually present 
+        // (old non PnP devices) or is not working properly. 
+        // We should send such information to device manager.
+        
+        ipcarg_t ret;
         device_handle_t dev_handle =  IPC_GET_ARG1(*icall);
         device_t *dev = driver_create_device();
         dev->handle = dev_handle;
-        if (driver->driver_ops->add_device(dev)) {
-                list_append(&dev->link, &devices);
-                // TODO set return value
-        }
-        printf("%s: new device with handle = %x was added.\n", driver->name, dev_handle);
-
+        add_to_devices_list(dev);
+        if (driver->driver_ops->add_device(dev)) {              
+                printf("%s: new device with handle = %x was added.\n", driver->name, dev_handle);
+                ret = 1;
+        } else {
+                printf("%s: failed to add a new device with handle = %x.\n", driver->name, dev_handle); 
+                remove_from_devices_list(dev);
+                // TODO delete device           
+                ret = 0;
+        }
         ipc_answer_1(iid, EOK, ret);
 }
@@ -129 +155 @@
  * Generic client connection handler both for applications and drivers.
  *
- * @param driver true for driver client, false for other clients (applications, services etc.).
- */
-static void driver_connection_gen(ipc_callid_t iid, ipc_call_t *icall, bool driver)
+ * @param drv true for driver client, false for other clients (applications, services etc.).
+ */
+static void driver_connection_gen(ipc_callid_t iid, ipc_call_t *icall, bool drv)
 {
         // Answer the first IPC_M_CONNECT_ME_TO call and remember the handle of the device to which the client connected.
-        device_handle_t handle = IPC_GET_ARG1(*icall);
+        device_handle_t handle = IPC_GET_ARG2(*icall);
         device_t *dev = driver_get_device(&devices, handle);
 
         if (dev == NULL) {
+                printf("%s: driver_connection_gen error - no device with handle %x was found.\n", driver->name, handle);
                 ipc_answer_0(iid, ENOENT);
                 return;
@@ -147 +174 @@
         // TODO open the device (introduce some callbacks for opening and closing devices registered by the driver)
         
-        ipc_answer_0(iid, EOK);
+        printf("%s: driver_connection_gen: accepting connection.\n", driver->name);
+        ipc_answer_0(iid, EOK); 
 
         while (1) {
@@ -153 +181 @@
                 ipc_call_t call;
 
+                printf("%s: driver_connection_gen: waiting for call.\n", driver->name);
                 callid = async_get_call(&call);
                 ipcarg_t method = IPC_GET_METHOD(call);
@@ -166 +195 @@
                         if (!is_valid_iface_id(method)) {
                                 // this is not device's interface
+                                printf("%s: driver_connection_gen error - invalid interface id %x.", driver->name, method);
                                 ipc_answer_0(callid, ENOTSUP);
                                 break;
@@ -175 +205 @@
                         void *iface = device_get_iface(dev, method);
                         if (NULL == iface) {
+                                printf("%s: driver_connection_gen error - ", driver->name);
+                                printf("device with handle %x has no interface with id %x.\n", handle, method);
                                 ipc_answer_0(callid, ENOTSUP);
                                 break;
@@ -188 +220 @@
                         if (NULL == iface_method_ptr) {
                                 // the interface has not such method
+                                printf("%s: driver_connection_gen error - invalid interface method.", driver->name);
                                 ipc_answer_0(callid, ENOTSUP);
                                 break;
@@ -203 +236 @@
 static void driver_connection_driver(ipc_callid_t iid, ipc_call_t *icall)
 {
+        printf("%s: driver_connection_driver\n", driver->name);
         driver_connection_gen(iid, icall, true);
 }
@@ -208 +242 @@
 static void driver_connection_client(ipc_callid_t iid, ipc_call_t *icall)
 {
+        printf("%s: driver_connection_client\n", driver->name);
         driver_connection_gen(iid, icall, false);
 }
@@ -244 +279 @@
         assert(NULL != child->name);
 
+        add_to_devices_list(child);
         if (EOK == devman_child_device_register(child->name, &child->match_ids, parent->handle, &child->handle)) {
                 return true;
         }
+        remove_from_devices_list(child);        
         return false;
 }