Changeset 2480e19 in mainline

Timestamp:

2010-04-08T14:04:48Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d1fc8f0

Parents:

89ce401a

Message:

fixed some bugs

Location:

uspace

Files:

• app/init/init.c (modified) (1 diff)
• lib/libdrv/generic/driver.c (modified) (7 diffs)
• srv/devman/devman.c (modified) (5 diffs)
• srv/devman/main.c (modified) (8 diffs)
• srv/drivers/pciintel/pci.c (modified) (3 diffs)

uspace/app/init/init.c

@@ -313 +313 @@
         getterm("term/vc5", "/app/bdsh");
         getterm("term/vc6", "/app/klog");
-
-        usleep(1000000);
+        getterm("term/vc7", "/srv/devman");
+
+        //usleep(1000000);
         //spawn("/srv/dd");
-        
-        srv_start("/srv/devman");       
+                
         
         return 0;

uspace/lib/libdrv/generic/driver.c

@@ -103 +103 @@
 static void driver_add_device(ipc_callid_t iid, ipc_call_t *icall)
 {
-        printf("%s: driver_add_device\n", driver->name);
-
         // TODO device state - the driver may detect the device is not actually present 
         // (old non PnP devices) or is not working properly. 
@@ -128 +126 @@
 static void driver_connection_devman(ipc_callid_t iid, ipc_call_t *icall)
 {
-        printf("%s: driver_connection_devman \n", driver->name);
-
         /* Accept connection */
         ipc_answer_0(iid, EOK);
@@ -174 +170 @@
         // TODO open the device (introduce some callbacks for opening and closing devices registered by the driver)
         
-        printf("%s: driver_connection_gen: accepting connection.\n", driver->name);
         ipc_answer_0(iid, EOK); 
 
@@ -180 +175 @@
                 ipc_callid_t callid;
                 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);
@@ -236 +229 @@
 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);
 }
@@ -242 +234 @@
 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);
 }
@@ -275 +266 @@
 bool child_device_register(device_t *child, device_t *parent)
 {
-        printf("%s: child_device_register\n", driver->name);
+        // printf("%s: child_device_register\n", driver->name);
 
         assert(NULL != child->name);

uspace/srv/devman/devman.c

@@ -341 +341 @@
 driver_t * find_best_match_driver(driver_list_t *drivers_list, node_t *node)
 {
-        printf(NAME ": find_best_match_driver for device '%s' \n", node->pathname);
+        //printf(NAME ": find_best_match_driver for device '%s' \n", node->pathname);
         driver_t *best_drv = NULL, *drv = NULL;
         int best_score = 0, score = 0;
@@ -371 +371 @@
 void attach_driver(node_t *node, driver_t *drv) 
 {
+        printf(NAME ": attach_driver %s to device %s\n", drv->name, node->pathname);
+        
         fibril_mutex_lock(&drv->driver_mutex);
         
@@ -524 +526 @@
 bool assign_driver(node_t *node, driver_list_t *drivers_list) 
 {
-        printf(NAME ": assign_driver\n");
+        //printf(NAME ": assign_driver\n");
         
         // find the driver which is the most suitable for handling this device
@@ -620 +622 @@
 bool insert_dev_node(dev_tree_t *tree, node_t *node, char *dev_name, node_t *parent)
 {
-        printf(NAME ": insert_dev_node\n");
+        // printf(NAME ": insert_dev_node\n");
         
         assert(NULL != node && NULL != tree && NULL != dev_name);
@@ -709 +711 @@
                         return dev;                     
                 }
+                
+                link = link->next;
         }       
         

uspace/srv/devman/main.c

@@ -142 +142 @@
         }
         
+        ipc_answer_0(callid, EOK);
+        
         match_id->score = IPC_GET_ARG1(call);
         
@@ -147 +149 @@
         if (EOK != rc) {
                 delete_match_id(match_id);
+                printf(NAME ": devman_receive_match_id - failed to receive match id string.\n");
                 return rc;
         }
@@ -157 +160 @@
 
 static int devman_receive_match_ids(ipcarg_t match_count, match_id_list_t *match_ids) 
-{
+{       
         int ret = EOK;
         size_t i;
@@ -170 +173 @@
 static void devman_add_child(ipc_callid_t callid, ipc_call_t *call, driver_t *driver)
 {
-        printf(NAME ": devman_add_child\n");
+        // printf(NAME ": devman_add_child\n");
         
         device_handle_t parent_handle = IPC_GET_ARG1(*call);
@@ -188 +191 @@
                 return;
         }
-        printf(NAME ": newly added child device's name is '%s'.\n", dev_name);
+        // printf(NAME ": newly added child device's name is '%s'.\n", dev_name);
         
         node_t *node = create_dev_node();
@@ -196 +199 @@
                 return;
         }       
+        
+        printf(NAME ": devman_add_child %s\n", node->pathname);
         
         devman_receive_match_ids(match_count, &node->match_ids);
@@ -261 +266 @@
         
         device_handle_t handle = IPC_GET_ARG2(*icall);
-        printf(NAME ": devman_forward - trying to forward connection to device with handle %x.\n", handle);
+        // printf(NAME ": devman_forward - trying to forward connection to device with handle %x.\n", handle);
         
         node_t *dev = find_dev_node(&device_tree, handle);
@@ -297 +302 @@
                 return;
         }
-        printf(NAME ": devman_forward: forward to driver %s with phone %d.\n", driver->name, driver->phone);
+        printf(NAME ": devman_forward: forward connection to device %s to driver %s with phone %d.\n", 
+                dev->pathname, driver->name, driver->phone);
         ipc_forward_fast(iid, driver->phone, method, dev->handle, 0, IPC_FF_NONE);      
 }

uspace/srv/drivers/pciintel/pci.c

@@ -156 +156 @@
         match_id = create_match_id();
         if (NULL != match_id) {
-                asprintf(&match_id->id, "pci/ven=%04x,dev=%04x", dev_data->vendor_id, dev_data->device_id);
+                asprintf(&match_id->id, "pci/ven=%04x&dev=%04x", dev_data->vendor_id, dev_data->device_id);
                 match_id->score = 90;
                 add_match_id(&dev->match_ids, match_id);
@@ -198 +198 @@
                         
                         create_pci_dev_name(dev);
-                        printf(NAME ": adding new device name %s.\n", dev->name);
+                        printf(NAME ": adding new child device %s.\n", dev->name);
                         
                         create_pci_match_ids(dev);
@@ -208 +208 @@
                                 continue;
                         }
+                        
+                        //printf(NAME ": new device %s was successfully registered by device manager.\n", dev->name);
                         
                         if (header_type == PCI_HEADER_TYPE_BRIDGE || header_type == PCI_HEADER_TYPE_CARDBUS ) {