Changeset 5fe1c32 in mainline

Timestamp:

2010-04-21T22:01:54Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

f928a8a

Parents:

5dc9622

Message:

backup (unstable)

Files:

• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/srv/drivers/isa/isa.c (modified) (9 diffs)
• uspace/srv/drivers/serial/Makefile (added)
• uspace/srv/drivers/serial/serial.c (added)
• uspace/srv/drivers/serial/serial.ma (added)

boot/arch/amd64/Makefile.inc

@@ -40 +40 @@
         rootia32 \
         pciintel \
-        isa
+        isa \
+        serial
 
 RD_DRV_CONF = \

uspace/Makefile

@@ -80 +80 @@
         DIRS += srv/drivers/pciintel
         DIRS += srv/drivers/isa
+        DIRS += srv/drivers/serial
 #       DIRS += srv/hw/bus/pci
 endif

uspace/srv/drivers/isa/isa.c

@@ -312 +312 @@
         char *end = val;
         
-        while (isspace(*end)) {
+        while (!isspace(*end)) {
                 end++;
         }       
@@ -330 +330 @@
         val = skip_spaces(val); 
         
-        score = (int)strtol(val, &end, 0x10);
+        score = (int)strtol(val, &end, 10);
         if (val == end) {
+                printf(NAME " : error - could not read match score for device %s.\n", dev->name);
                 return;
         }
@@ -337 +338 @@
         match_id_t *match_id = create_match_id();
         if (NULL == match_id) {
+                printf(NAME " : failed to allocate match id for device %s.\n", dev->name);
                 return;
         }
@@ -343 +345 @@
         get_match_id(&id, val);
         if (NULL == id) {
+                printf(NAME " : error - could not read match id for device %s.\n", dev->name);
                 delete_match_id(match_id);
                 return;
@@ -350 +353 @@
         match_id->score = score;
         
+        printf(NAME ": adding match id %s with score %d to device %s\n", id, score, dev->name);
         add_match_id(&dev->match_ids, match_id);
 }
 
+static bool read_dev_prop(
+        device_t *dev, char *line, const char *prop, void (* read_fn)(device_t *, char *)) 
+{
+        size_t proplen = str_size(prop);
+        if (0 == str_lcmp(line, prop, proplen)) {
+                line += proplen;
+                line = skip_spaces(line);
+                (*read_fn)(dev, line);
+                return true;
+        }
+        return false;           
+}
+
 static void get_dev_prop(device_t *dev, char *line)
 {
+        printf(NAME " get_dev_prop from line '%s'\n", line);
         // skip leading spaces
         line = skip_spaces(line);
         
-        // value of the property
-        char *val;
-        
-        if (NULL != (val = strtok(line, "io_range"))) {         
-                get_dev_io_range(dev, val);
-        } else if (NULL != (val = strtok(line, "irq"))) {
-                get_dev_irq(dev, val);          
-        } else if (NULL != (val = strtok(line, "match"))) {
-                get_dev_match_id(dev, val);
+        if (!read_dev_prop(dev, line, "io_range", &get_dev_io_range) &&
+                !read_dev_prop(dev, line, "irq", &get_dev_irq) &&
+                !read_dev_prop(dev, line, "match", &get_dev_match_id)
+        ) {             
+                printf(NAME " error undefined device property at line %s\n", line);
         }       
 }
@@ -397 +411 @@
         }
         
+        printf(NAME ": next line ='%s'\n", dev_conf);
+        printf(NAME ": current line ='%s'\n", line);
+        
         // get device name
         dev_name = get_device_name(line);
@@ -424 +441 @@
                 // get the device's property from the configuration line and store it in the device structure
                 get_dev_prop(dev, line);
+                
+                printf(NAME ": next line ='%s'\n", dev_conf);
+                printf(NAME ": current line ='%s'\n", line);            
         }
         
@@ -429 +449 @@
         dev->class = &isa_child_class;
         
-        child_device_register(dev, parent);
+        child_device_register(dev, parent);     
         
         return dev_conf;        
@@ -456 +476 @@
         // add child devices    
         add_legacy_children(dev);
+        printf(NAME ": finished the enumeration of legacy devices\n", dev->handle);
         
         return true;