Changeset 28ecadb in mainline for kernel/genarch/src

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:

kernel/genarch/src

Files:

• kbd/i8042.c (modified) (2 diffs)
• kbd/key.c (modified) (1 diff)
• kbd/ns16550.c (modified) (2 diffs)
• kbd/z8530.c (modified) (2 diffs)
• ofw/ebus.c (added)
• ofw/fhc.c (added)
• ofw/ofw_tree.c (modified) (3 diffs)
• ofw/pci.c (added)

kernel/genarch/src/kbd/i8042.c

@@ -81 +81 @@
 static void i8042_resume(chardev_t *);
 
-chardev_t kbrd;
 static chardev_operations_t ops = {
         .suspend = i8042_suspend,
         .resume = i8042_resume,
-        .read = key_read
+        .read = i8042_key_read
 };
 
@@ -174 +173 @@
 }
 
-char key_read(chardev_t *d)
+char i8042_key_read(chardev_t *d)
 {
         char ch;        

kernel/genarch/src/kbd/key.c

@@ -54 +54 @@
 #define ACTIVE_READ_BUFF_SIZE 16        /* Must be power of 2 */
 
+chardev_t kbrd;
+
 static uint8_t active_read_buff[ACTIVE_READ_BUFF_SIZE];
 

kernel/genarch/src/kbd/ns16550.c

@@ -60 +60 @@
 static void ns16550_resume(chardev_t *);
 
-chardev_t kbrd;
 static chardev_operations_t ops = {
         .suspend = ns16550_suspend,
         .resume = ns16550_resume,
-        .read = key_read
+        .read = ns16550_key_read
 };
 
@@ -119 +118 @@
 }
 
-char key_read(chardev_t *d)
+char ns16550_key_read(chardev_t *d)
 {
         char ch;        

kernel/genarch/src/kbd/z8530.c

@@ -63 +63 @@
 static void z8530_resume(chardev_t *);
 
-chardev_t kbrd;
 static chardev_operations_t ops = {
         .suspend = z8530_suspend,
         .resume = z8530_resume,
-        .read = key_read
+        .read = z8530_key_read
 };
 
@@ -142 +141 @@
 }
 
-char key_read(chardev_t *d)
+char z8530_key_read(chardev_t *d)
 {
         char ch;        

kernel/genarch/src/ofw/ofw_tree.c

@@ -52 +52 @@
 }
 
+/** Get OpenFirmware node property.
+ *
+ * @param node Node in which to lookup the property.
+ * @param name Name of the property.
+ *
+ * @return Pointer to the property structure or NULL if no such property.
+ */
+ofw_tree_property_t *ofw_tree_getprop(const ofw_tree_node_t *node, const char *name)
+{
+        int i;
+        
+        for (i = 0; i < node->properties; i++) {
+                if (strcmp(node->property[i].name, name) == 0)
+                        return &node->property[i];
+        }
+
+        return NULL;
+}
+
 /** Return value of the 'name' property.
  *
@@ -60 +79 @@
 const char *ofw_tree_node_name(const ofw_tree_node_t *node)
 {
-        int i;
+        ofw_tree_property_t *prop;
         
-        for (i = 0; i < node->properties; i++) {
-                if (strncmp(node->property[i].name, "name", strlen("name")) == 0) {
-                        if (node->property[i].size < 2)
-                                panic("Invalid name property.\n");
-                        return node->property[i].value;
-                }
-        }
+        prop = ofw_tree_getprop(node, "name");
+        if (!prop)
+                panic("Node without name property.\n");
+                
+        if (prop->size < 2)
+                panic("Invalid name property.\n");
         
-        panic("Node without name property.\n");
+        return prop->value;
 }
 
@@ -76 +94 @@
  *
  * @param node Node whose child is being looked up.
- * @param da_name Disambigued name of the child being looked up.
+ * @param name Name of the child being looked up.
  *
  * @return NULL if there is no such child or pointer to the matching child node.
  */
-static ofw_tree_node_t *ofw_tree_find_child(ofw_tree_node_t *node, const char *da_name)
+static ofw_tree_node_t *ofw_tree_find_child(ofw_tree_node_t *node, const char *name)
 {
         ofw_tree_node_t *cur;
         
+        /*
+         * Try to find the disambigued name.
+         */
         for (cur = node->child; cur; cur = cur->peer) {
-                if (strncmp(cur->da_name, da_name, strlen(da_name)) == 0)
+                if (strcmp(cur->da_name, name) == 0)
                         return cur;
         }
         
+        /*
+         * Disambigued name not found.
+         * Lets try our luck with possibly ambiguous "name" property.
+         *
+         * We need to do this because paths stored in "/aliases"
+         * are not always fully-qualified.
+         */
+        for (cur = node->child; cur; cur = cur->peer) {
+                if (strcmp(ofw_tree_node_name(cur), name) == 0)
+                        return cur;
+        }
+                
         return NULL;
 }