Changeset 6ff1f1e in mainline

Timestamp:

2006-09-25T20:46:50Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

45b26dad

Parents:

5d684e4

Message:

Support for FFB (Creator 3D) framebuffer detection on sparc64.
(Not tested as the Ultra 60, which I have for testing, and which
only has this type of framebuffer doesn't boot for some unknown reason.)

Location:

kernel

Files:

• 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/upa.c (added)

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

@@ -41 +41 @@
 #include <align.h>
 #include <print.h>
+
+#define FFB_REG_24BPP   7
 
 scr_type_t scr_type = SCR_UNKNOWN;
@@ -121 +123 @@
                 
                 break;
-        case SCR_FFB:
+        case SCR_FFB:   
+                fb_depth = 24;
+                fb_scanline = 8192;
+
+                ofw_upa_reg_t *reg = &((ofw_upa_reg_t *) prop->value)[FFB_REG_24BPP];
+                if (!ofw_upa_apply_ranges(node->parent, reg, &fb_addr)) {
+                        printf("Failed to determine screen address.\n");
+                        return;
+                }
+
+                break;
         default:
                 panic("Unexpected type.\n");

kernel/genarch/Makefile.inc

@@ -99 +99 @@
                 genarch/src/ofw/ebus.c \
                 genarch/src/ofw/fhc.c \
-                genarch/src/ofw/pci.c 
+                genarch/src/ofw/pci.c  \
+                genarch/src/ofw/upa.c 
 endif

kernel/genarch/include/ofw/ofw_tree.h

@@ -118 +118 @@
 typedef struct ofw_pci_range ofw_pci_range_t;
 
-struct ofw_ffb_reg {
+struct ofw_upa_reg {
+        uint64_t addr;
+        uint64_t size;
 } __attribute__ ((packed));
-typedef struct ofw_ffb_reg ofw_ffb_reg_t;
+typedef struct ofw_upa_reg ofw_upa_reg_t;
 
 extern void ofw_tree_init(ofw_tree_node_t *root);
@@ -132 +134 @@
 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_ffb_apply_ranges(ofw_tree_node_t *node, ofw_ffb_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);
 
 extern bool ofw_pci_reg_absolutize(ofw_tree_node_t *node, ofw_pci_reg_t *reg, ofw_pci_reg_t *out);