Changeset 9b35499 in mainline

Timestamp:

2007-09-05T20:01:36Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c785296

Parents:

267ab56

Message:

Experimental support for the cgsix framebuffer, which is found on old Ultra 1
worksations, and the SBUS bus and devices. Not tested.

Location:

kernel

Files:

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

kernel/arch/sparc64/include/drivers/scr.h

@@ -42 +42 @@
         SCR_UNKNOWN,
         SCR_ATYFB,
-        SCR_FFB
+        SCR_FFB,
+        SCR_CGSIX
 } scr_type_t;
 

kernel/arch/sparc64/src/drivers/scr.c

@@ -64 +64 @@
         else if (strcmp(name, "SUNW,ffb") == 0)
                 scr_type = SCR_FFB;
+        else if (strcmp(name, "cgsix") == 0)
+                scr_type = SCR_CGSIX;
         
         if (scr_type == SCR_UNKNOWN) {
@@ -152 +154 @@
 
                 break;
+        case SCR_CGSIX:
+                switch (fb_depth) {
+                case 8:
+                        fb_scanline = fb_linebytes;
+                        visual = VISUAL_INDIRECT_8;
+                        break;
+                default:
+                        printf("Not implemented.\n");
+                        return;
+                }
+                
+                ofw_sbus_reg_t *cg6_reg = &((ofw_sbus_reg_t *) prop->value)[0];
+                if (!ofw_sbus_apply_ranges(node->parent, cg6_reg, &fb_addr)) {
+                        printf("Failed to determine screen address.\n");
+                        return;
+                }
+        
+                break;
         default:
                 panic("Unexpected type.\n");

kernel/genarch/Makefile.inc

@@ -100 +100 @@
                 genarch/src/ofw/fhc.c \
                 genarch/src/ofw/pci.c  \
+                genarch/src/ofw/sbus.c \
                 genarch/src/ofw/upa.c 
 endif

kernel/genarch/include/ofw/ofw_tree.h

@@ -141 +141 @@
 typedef struct ofw_pci_range ofw_pci_range_t;
 
+struct ofw_sbus_reg {
+        uint64_t addr;
+        uint32_t size;
+} __attribute__ ((packed));
+typedef struct ofw_sbus_reg ofw_sbus_reg_t;
+
+struct ofw_sbus_range {
+        uint64_t child_base;
+        uint64_t parent_base;
+        uint32_t size;
+} __attribute__ ((packed));
+typedef struct ofw_sbus_range ofw_sbus_range_t;
+
 struct ofw_upa_reg {
         uint64_t addr;
@@ -161 +174 @@
 extern bool ofw_ebus_apply_ranges(ofw_tree_node_t *node, ofw_ebus_reg_t *reg, uintptr_t *pa);
 extern bool ofw_pci_apply_ranges(ofw_tree_node_t *node, ofw_pci_reg_t *reg, uintptr_t *pa);
+extern bool ofw_sbus_apply_ranges(ofw_tree_node_t *node, ofw_sbus_reg_t *reg, uintptr_t *pa);
 extern bool ofw_upa_apply_ranges(ofw_tree_node_t *node, ofw_upa_reg_t *reg, uintptr_t *pa);