Changeset 28ecadb in mainline for boot

Timestamp:

2006-09-22T21:44:54Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5d684e4

Parents:

16529d5

Message:

Convert sparc64 to detect keyboard and determine
its physical address by walking the memory representation
of the OpenFirmware device tree.

Add bus-specific functions that know how to apply the
"ranges" property to one component of the "reg" property.
Buses supported so far include FHC, EBUS and PCI.

Location:

boot

Files:

• arch/sparc64/loader/main.c (modified) (2 diffs)
• arch/sparc64/loader/main.h (modified) (1 diff)
• arch/sparc64/loader/ofwarch.c (modified) (1 diff)
• genarch/ofw_tree.c (modified) (2 diffs)
• generic/string.c (modified) (2 diffs)
• generic/string.h (modified) (1 diff)

boot/arch/sparc64/loader/main.c

@@ -66 +66 @@
         bootinfo.screen.scanline = bootinfo.screen.scanline*bpp2align[bootinfo.screen.bpp >> 3];
         
-        if (!ofw_keyboard(&bootinfo.keyboard))
-                printf("Error: unable to get keyboard properties\n");
-
         if (!ofw_cpu(&bootinfo.cpu))
                 printf("Error: unable to get cpu properties\n");
@@ -76 +73 @@
         printf(" memory: %dM\n", bootinfo.memmap.total>>20);
         printf(" screen at %P, resolution %dx%d, %d bpp (scanline %d bytes)\n", (uintptr_t) bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height, bootinfo.screen.bpp, bootinfo.screen.scanline);
-        printf(" keyboard at %P (size %d bytes)\n", (uintptr_t) bootinfo.keyboard.addr, bootinfo.keyboard.size);
 
         printf("\nMemory statistics\n");

boot/arch/sparc64/loader/main.h

@@ -55 +55 @@
         memmap_t memmap;
         screen_t screen;
-        keyboard_t keyboard;
         cpu_t cpu;
         ballocs_t ballocs;

boot/arch/sparc64/loader/ofwarch.c

@@ -96 +96 @@
         for (; node != 0 && node != -1; node = ofw_get_peer_node(node)) {
                 if (ofw_get_property(node, "device_type", type_name, sizeof(type_name)) > 0) {
-                        if (strncmp(type_name, "cpu", 3) == 0) {
+                        if (strcmp(type_name, "cpu") == 0) {
                                 uint32_t mhz;
                                 

boot/genarch/ofw_tree.c

@@ -48 +48 @@
 static void * ofw_tree_space_alloc(size_t size)
 {
-        return balloc(size, size);
+        char *addr;
+
+        /*
+         * What we do here is a nasty hack :-)
+         * Problem: string property values that are allocated via this
+         * function typically do not contain the trailing '\0'. This
+         * is very uncomfortable for kernel, which is supposed to deal
+         * with the properties.
+         * Solution: when allocating space via this function, we always
+         * allocate space for the extra '\0' character that we store
+         * behind the requested memory.
+         */
+        addr = balloc(size + 1, size);
+        if (addr)
+                addr[size] = '\0';
+        return addr;
 }
 
@@ -154 +169 @@
                         break;
                 
-                strncpy(current_node->property[i].name, name, sizeof(name));
+                memcpy(current_node->property[i].name, name, OFW_TREE_PROPERTY_MAX_NAMELEN);
+                current_node->property[i].name[OFW_TREE_PROPERTY_MAX_NAMELEN] = '\0';
 
                 size = ofw_get_proplen(current, name);

boot/generic/string.c

@@ -58 +58 @@
  * Do a char-by-char comparison of two NULL terminated strings.
  * The strings are considered equal iff they consist of the same
+ * characters on the minimum of their lengths.
+ *
+ * @param src First string to compare.
+ * @param dst Second string to compare.
+ *
+ * @return 0 if the strings are equal, -1 if first is smaller, 1 if second smaller.
+ *
+ */
+int strcmp(const char *src, const char *dst)
+{
+        for (; *src && *dst; src++, dst++) {
+                if (*src < *dst)
+                        return -1;
+                if (*src > *dst)
+                        return 1;
+        }
+        if (*src == *dst)
+                return 0;
+        if (!*src)
+                return -1;
+        return 1;
+}
+
+
+/** Compare two NULL terminated strings
+ *
+ * Do a char-by-char comparison of two NULL terminated strings.
+ * The strings are considered equal iff they consist of the same
  * characters on the minimum of their lengths and specified maximal
  * length.
@@ -72 +100 @@
         int i;
         
-        i = 0;
-        for (;*src && *dst && i < len;src++,dst++,i++) {
+        for (i = 0; *src && *dst && i < len; src++, dst++, i++) {
                 if (*src < *dst)
                         return -1;

boot/generic/string.h

@@ -39 +39 @@
 
 extern size_t strlen(const char *str);
+extern int strcmp(const char *src, const char *dst);
 extern int strncmp(const char *src, const char *dst, size_t len);
 extern void strncpy(char *dest, const char *src, size_t len);