Changeset 965dc18 in mainline for kernel/arch/sparc64/src/drivers/scr.c

Timestamp:

2008-12-05T19:59:03Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

49093a4

Parents:

0258e67

Message:

Merge sparc branch to trunk.

File:

• kernel/arch/sparc64/src/drivers/scr.c (modified) (7 diffs)

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

@@ -56 +56 @@
 {
         ofw_tree_property_t *prop;
+        ofw_pci_reg_t *pci_reg;
+        ofw_pci_reg_t pci_abs_reg;
+        ofw_upa_reg_t *upa_reg;
+        ofw_sbus_reg_t *sbus_reg;
         const char *name;
         
@@ -62 +66 @@
         if (strcmp(name, "SUNW,m64B") == 0)
                 scr_type = SCR_ATYFB;
+        else if (strcmp(name, "SUNW,XVR-100") == 0)
+                scr_type = SCR_XVR;
         else if (strcmp(name, "SUNW,ffb") == 0)
                 scr_type = SCR_FFB;
@@ -68 +74 @@
         
         if (scr_type == SCR_UNKNOWN) {
-                printf("Unknown keyboard device.\n");
+                printf("Unknown screen device.\n");
                 return;
         }
@@ -107 +113 @@
                 }
         
-                ofw_pci_reg_t *fb_reg = &((ofw_pci_reg_t *) prop->value)[1];
-                ofw_pci_reg_t abs_reg;
-                
-                if (!ofw_pci_reg_absolutize(node, fb_reg, &abs_reg)) {
+                pci_reg = &((ofw_pci_reg_t *) prop->value)[1];
+                
+                if (!ofw_pci_reg_absolutize(node, pci_reg, &pci_abs_reg)) {
                         printf("Failed to absolutize fb register.\n");
                         return;
                 }
         
-                if (!ofw_pci_apply_ranges(node->parent, &abs_reg , &fb_addr)) {
+                if (!ofw_pci_apply_ranges(node->parent, &pci_abs_reg,
+                    &fb_addr)) {
                         printf("Failed to determine screen address.\n");
                         return;
@@ -143 +149 @@
                 
                 break;
+        case SCR_XVR:
+                if (prop->size / sizeof(ofw_pci_reg_t) < 2) {
+                        printf("Too few screen registers.\n");
+                        return;
+                }
+        
+                pci_reg = &((ofw_pci_reg_t *) prop->value)[1];
+                
+                if (!ofw_pci_reg_absolutize(node, pci_reg, &pci_abs_reg)) {
+                        printf("Failed to absolutize fb register.\n");
+                        return;
+                }
+        
+                if (!ofw_pci_apply_ranges(node->parent, &pci_abs_reg,
+                    &fb_addr)) {
+                        printf("Failed to determine screen address.\n");
+                        return;
+                }
+
+                switch (fb_depth) {
+                case 8:
+                        fb_scanline = fb_linebytes * (fb_depth >> 3);
+                        visual = VISUAL_SB1500_PALETTE;
+                        break;
+                case 16:
+                        fb_scanline = fb_linebytes * (fb_depth >> 3);
+                        visual = VISUAL_RGB_5_6_5;
+                        break;
+                case 24:
+                        fb_scanline = fb_linebytes * 4;
+                        visual = VISUAL_RGB_8_8_8_0;
+                        break;
+                case 32:
+                        fb_scanline = fb_linebytes * (fb_depth >> 3);
+                        visual = VISUAL_RGB_0_8_8_8;
+                        break;
+                default:
+                        printf("Unsupported bits per pixel.\n");
+                        return;
+                }
+                
+                break;
         case SCR_FFB:   
                 fb_scanline = 8192;
                 visual = VISUAL_BGR_0_8_8_8;
 
-                ofw_upa_reg_t *reg = &((ofw_upa_reg_t *) prop->value)[FFB_REG_24BPP];
-                if (!ofw_upa_apply_ranges(node->parent, reg, &fb_addr)) {
+                upa_reg = &((ofw_upa_reg_t *) prop->value)[FFB_REG_24BPP];
+                if (!ofw_upa_apply_ranges(node->parent, upa_reg, &fb_addr)) {
                         printf("Failed to determine screen address.\n");
                         return;
@@ -165 +213 @@
                 }
                 
-                ofw_sbus_reg_t *cg6_reg = &((ofw_sbus_reg_t *) prop->value)[0];
-                if (!ofw_sbus_apply_ranges(node->parent, cg6_reg, &fb_addr)) {
+                sbus_reg = &((ofw_sbus_reg_t *) prop->value)[0];
+                if (!ofw_sbus_apply_ranges(node->parent, sbus_reg, &fb_addr)) {
                         printf("Failed to determine screen address.\n");
                         return;
@@ -176 +224 @@
         }
 
-        fb_init(fb_addr, fb_width, fb_height, fb_scanline, visual);
+        fb_properties_t props = {
+                .addr = fb_addr,
+                .offset = 0,
+                .x = fb_width,
+                .y = fb_height,
+                .scan = fb_scanline,
+                .visual = visual,
+        };
+        fb_init(&props);
 }