Changeset 5d684e4 in mainline for kernel

Timestamp:

2006-09-23T13:12:10Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6ff1f1e

Parents:

28ecadb

Message:

Convert sparc64 framebuffer code to configure from the OpenFirmware device tree memory representation.

Location:

kernel

Files:

• arch/sparc64/Makefile.inc (modified) (1 diff)
• arch/sparc64/include/boot/boot.h (modified) (2 diffs)
• arch/sparc64/include/drivers/scr.h (added)
• arch/sparc64/src/console.c (modified) (3 diffs)
• arch/sparc64/src/drivers/scr.c (added)
• genarch/include/ofw/ofw_tree.h (modified) (1 diff)
• genarch/src/ofw/pci.c (modified) (2 diffs)

kernel/arch/sparc64/Makefile.inc

@@ -96 +96 @@
         arch/$(ARCH)/src/ddi/ddi.c \
         arch/$(ARCH)/src/drivers/tick.c \
-        arch/$(ARCH)/src/drivers/kbd.c
+        arch/$(ARCH)/src/drivers/kbd.c \
+        arch/$(ARCH)/src/drivers/scr.c
 
 ifeq ($(CONFIG_TSB),y)

kernel/arch/sparc64/include/boot/boot.h

@@ -72 +72 @@
 
 typedef struct {
-        uintptr_t addr;
-        uint32_t width;
-        uint32_t height;
-        uint32_t bpp;
-        uint32_t scanline;
-} screen_t;
-
-typedef struct {
         uint32_t clock_frequency;
 } processor_t;
@@ -90 +82 @@
         taskmap_t taskmap;
         memmap_t memmap;
-        screen_t screen;
         processor_t processor;
         ballocs_t ballocs;

kernel/arch/sparc64/src/console.c

@@ -36 +36 @@
 #include <arch/types.h>
 #include <typedefs.h>
-#include <genarch/fb/fb.h>
-#include <arch/drivers/fb.h>
 
+#include <arch/drivers/scr.h>
 #include <arch/drivers/kbd.h>
+
 #ifdef CONFIG_Z8530
 #include <genarch/kbd/z8530.h>
@@ -53 +53 @@
 #include <proc/thread.h>
 #include <arch/mm/tlb.h>
-#include <arch/boot/boot.h>
 #include <genarch/ofw/ofw_tree.h>
 #include <arch.h>
@@ -84 +83 @@
                 panic("Can't find %s\n", prop->value);
 
-        fb_init(bootinfo.screen.addr, bootinfo.screen.width, bootinfo.screen.height,
-                bootinfo.screen.bpp, bootinfo.screen.scanline, true);
-        
+        scr_init(screen);
+
         prop = ofw_tree_getprop(aliases, "keyboard");
         if (!prop)

kernel/genarch/include/ofw/ofw_tree.h

@@ -134 +134 @@
 extern bool ofw_ffb_apply_ranges(ofw_tree_node_t *node, ofw_ffb_reg_t *reg, uintptr_t *pa);
 
+extern bool ofw_pci_reg_absolutize(ofw_tree_node_t *node, ofw_pci_reg_t *reg, ofw_pci_reg_t *out);
+
 #endif

kernel/genarch/src/ofw/pci.c

@@ -42 +42 @@
 #include <macros.h>
 
-#define PCI_SPACE_MASK  0x03000000
+#define PCI_SPACE_MASK          0x03000000
+#define PCI_ABS_MASK            0x80000000      
+#define PCI_REG_MASK            0x000000ff
 
 bool ofw_pci_apply_ranges(ofw_tree_node_t *node, ofw_pci_reg_t *reg, uintptr_t *pa)
@@ -74 +76 @@
 }
 
+bool ofw_pci_reg_absolutize(ofw_tree_node_t *node, ofw_pci_reg_t *reg, ofw_pci_reg_t *out)
+{
+        if (reg->space & PCI_ABS_MASK) {
+                /* already absolute */
+                out->space = reg->space;
+                out->addr = reg->addr;
+                out->size = reg->size;
+                return true;
+        }
+        
+        ofw_tree_property_t *prop;
+        ofw_pci_reg_t *assigned_address;
+        count_t assigned_addresses;
+        
+        prop = ofw_tree_getprop(node, "assigned-addresses");
+        if (!prop)
+                panic("Can't find \"assigned-addresses\" property.\n");
+        
+        assigned_addresses = prop->size / sizeof(ofw_pci_reg_t);
+        assigned_address = prop->value;
+        
+        int i;
+        
+        for (i = 0; i < assigned_addresses; i++) {
+                if ((assigned_address[i].space & PCI_REG_MASK) == (reg->space & PCI_REG_MASK)) {
+                        out->space = assigned_address[i].space;
+                        out->addr = reg->addr + assigned_address[i].addr;
+                        out->size = reg->size;
+                        return true;
+                }
+        }
+        
+        return false;
+}
+
 /** @}
  */