Changeset eff1a590 in mainline

Timestamp:

2010-03-25T14:47:20Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

a1769ee

Parents:

a087f2e

Message:

parts of code of a dummy root HW device driver for ia32 platform

Files:

• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/lib/libdrv/include/driver.h (modified) (2 diffs)
• uspace/srv/devman/devman.c (modified) (1 diff)
• uspace/srv/drivers/root/root.c (modified) (3 diffs)
• uspace/srv/drivers/rootia32/Makefile (added)
• uspace/srv/drivers/rootia32/rootia32.c (added)
• uspace/srv/drivers/rootia32/rootia32.ma (added)

boot/arch/amd64/Makefile.inc

@@ -37 +37 @@
 
 RD_DRVS = \
-        root 
+        root \
+        rootia32
 
 MODULES := $(notdir $(COMPONENTS))

uspace/Makefile

@@ -76 +76 @@
 
 ifeq ($(UARCH),ia32)
-        DIRS += srv/dd 
+        DIRS += srv/dd
+        DIRS += srv/drivers/rootia32
 #       DIRS += srv/hw/bus/pci
 endif

uspace/lib/libdrv/include/driver.h

@@ -44 +44 @@
         const char *name;
         match_id_list_t match_ids;
+        void *driver_data;
         
-        // TODO add more items - parent bus type etc.
+        // TODO add more items
         
         link_t link;
@@ -72 +73 @@
 }
 
-static inline delete_device(device_t *dev) {
+static inline void delete_device(device_t *dev) {
         clean_match_ids(&dev->match_ids);
         if (NULL != dev->name) {

uspace/srv/devman/devman.c

@@ -591 +591 @@
         size_t pathsize = (str_size(node->name) + 1);   
         if (NULL != parent) {           
-                pathsize += str_size(parent->name) + 1;         
+                pathsize += str_size(parent->pathname) + 1;             
         }
         

uspace/srv/drivers/root/root.c

@@ -80 +80 @@
         if (NULL == (platform = create_device())) {
                 goto failure;
-        }
+        }       
         
-        // TODO - replace this with some better solution (sysinfo ?)
-        platform->name = STRING(UARCH);
+        platform->name = "hw";
         printf(NAME ": the new device's name is %s.\n", platform->name);
         
@@ -90 +89 @@
                 goto failure;
         }
-        match_id->id = platform->name;
+        
+        // TODO - replace this with some better solution (sysinfo ?)
+        match_id->id = STRING(UARCH);
         match_id->score = 100;
         add_match_id(&platform->match_ids, match_id);   
@@ -130 +131 @@
 }
 
-static bool root_init() 
-{
-        // TODO  driver initialization  
-        return true;
-}
-
 int main(int argc, char *argv[])
 {
-        printf(NAME ": HelenOS root device driver\n");
-        if (!root_init()) {
-                printf(NAME ": Error while initializing driver.\n");
-                return -1;
-        }
-        
+        printf(NAME ": HelenOS root device driver\n");  
         return driver_main(&root_driver);
 }