Changeset 467bf40 in mainline for uspace

Timestamp:

2010-12-25T15:13:07Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a465a56, e84d65a

Parents:

ab49a0d (diff), 6eb794a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Conflicts: no problem resolving.

Location:

uspace

Files:

• Makefile (modified) (1 diff)
• app/sysinfo/Makefile (added)
• app/sysinfo/sysinfo.c (added)
• drv/root/root.c (modified) (3 diffs)
• drv/rootpc/rootpc.c (modified) (3 diffs)
• drv/rootpc/rootpc.ma (modified) (1 diff)

uspace/Makefile

@@ -55 +55 @@
         app/nettest2 \
         app/ping \
+        app/sysinfo \
         srv/clip \
         srv/devmap \

uspace/drv/root/root.c

@@ -47 +47 @@
 #include <macros.h>
 #include <inttypes.h>
+#include <sysinfo.h>
 
 #include <driver.h>
@@ -55 +56 @@
 
 #define PLATFORM_DEVICE_NAME "hw"
-#define PLATFORM_DEVICE_MATCH_ID STRING(UARCH)
+#define PLATFORM_DEVICE_MATCH_ID_FMT "platform/%s"
 #define PLATFORM_DEVICE_MATCH_SCORE 100
 
@@ -100 +101 @@
 static int add_platform_child(device_t *parent)
 {
+        char *match_id;
+        char *platform;
+        size_t platform_size;
+        int res;
+
+        /* Get platform name from sysinfo. */
+
+        platform = sysinfo_get_data("platform", &platform_size);
+        if (platform == NULL) {
+                printf(NAME ": Failed to obtain platform name.\n");
+                return ENOENT;
+        }
+
+        /* Null-terminate string. */
+        platform = realloc(platform, platform_size + 1);
+        if (platform == NULL) {
+                printf(NAME ": Memory allocation failed.\n");
+                return ENOMEM;
+        }
+
+        platform[platform_size] = '\0';
+
+        /* Construct match ID. */
+
+        if (asprintf(&match_id, PLATFORM_DEVICE_MATCH_ID_FMT, platform) == -1) {
+                printf(NAME ": Memory allocation failed.\n");
+                return ENOMEM;
+        }
+
+        /* Add child. */
+
         printf(NAME ": adding new child for platform device.\n");
         printf(NAME ":   device node is `%s' (%d %s)\n", PLATFORM_DEVICE_NAME,
-            PLATFORM_DEVICE_MATCH_SCORE, PLATFORM_DEVICE_MATCH_ID);
-        
-        int res = child_device_register_wrapper(parent, PLATFORM_DEVICE_NAME,
-            PLATFORM_DEVICE_MATCH_ID, PLATFORM_DEVICE_MATCH_SCORE,
-            NULL);
+            PLATFORM_DEVICE_MATCH_SCORE, match_id);
+
+        res = child_device_register_wrapper(parent, PLATFORM_DEVICE_NAME,
+            match_id, PLATFORM_DEVICE_MATCH_SCORE, NULL);
 
         return res;

uspace/drv/rootpc/rootpc.c

@@ -28 +28 @@
 
 /**
- * @defgroup root_pc Root HW device driver for ia32 and amd64 platform.
- * @brief HelenOS root HW device driver for ia32 and amd64 platform.
+ * @defgroup root_pc PC platform driver.
+ * @brief HelenOS PC platform driver.
  * @{
  */
@@ -182 +182 @@
         /* Register child devices. */
         if (!rootpc_add_children(dev)) {
-                printf(NAME ": failed to add child devices for platform "
-                    "ia32.\n");
+                printf(NAME ": failed to add child devices for PC platform.\n");
         }
         
@@ -196 +195 @@
 int main(int argc, char *argv[])
 {
-        printf(NAME ": HelenOS rootpc device driver\n");
+        printf(NAME ": HelenOS PC platform driver\n");
         root_pc_init();
         return driver_main(&rootpc_driver);

uspace/drv/rootpc/rootpc.ma

@@ -1 @@
-10 ia32
-10 amd64
+10 platform/pc