| /trunk/kernel/genarch/include/ofw/ofw_tree.h |
|---|
| 133,4 → 133,6 |
| 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_pci_reg_absolutize(ofw_tree_node_t *node, ofw_pci_reg_t *reg, ofw_pci_reg_t *out); |
| #endif |
| /trunk/kernel/genarch/src/ofw/pci.c |
|---|
| 41,7 → 41,9 |
| #include <panic.h> |
| #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) |
| { |
| 73,5 → 75,40 |
| return false; |
| } |
| 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; |
| } |
| /** @} |
| */ |
| /trunk/kernel/arch/sparc64/include/boot/boot.h |
|---|
| 71,14 → 71,6 |
| } memmap_t; |
| 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; |
| 89,7 → 81,6 |
| typedef struct { |
| taskmap_t taskmap; |
| memmap_t memmap; |
| screen_t screen; |
| processor_t processor; |
| ballocs_t ballocs; |
| ofw_tree_node_t *ofw_root; |
| /trunk/kernel/arch/sparc64/include/drivers/scr.h |
|---|
| 0,0 → 1,54 |
| /* |
| * Copyright (C) 2006 Jakub Jermar |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup sparc64 |
| * @{ |
| */ |
| /** @file |
| */ |
| #ifndef KERN_sparc64_SCR_H_ |
| #define KERN_sparc64_SCR_H_ |
| #include <arch/types.h> |
| #include <genarch/ofw/ofw_tree.h> |
| typedef enum { |
| SCR_UNKNOWN, |
| SCR_ATYFB, |
| SCR_FFB |
| } scr_type_t; |
| extern scr_type_t scr_type; |
| extern void scr_init(ofw_tree_node_t *node); |
| #endif |
| /** @} |
| */ |
| /trunk/kernel/arch/sparc64/Makefile.inc |
|---|
| 95,7 → 95,8 |
| arch/$(ARCH)/src/trap/syscall.c \ |
| 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) |
| ARCH_SOURCES += \ |
| /trunk/kernel/arch/sparc64/src/console.c |
|---|
| 35,10 → 35,10 |
| #include <arch/console.h> |
| #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> |
| #endif |
| 52,7 → 52,6 |
| #include <arch/register.h> |
| #include <proc/thread.h> |
| #include <arch/mm/tlb.h> |
| #include <arch/boot/boot.h> |
| #include <genarch/ofw/ofw_tree.h> |
| #include <arch.h> |
| #include <panic.h> |
| 83,9 → 82,8 |
| if (!screen) |
| 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) |
| panic("Can't find property \"keyboard\".\n"); |
| /trunk/kernel/arch/sparc64/src/drivers/scr.c |
|---|
| 0,0 → 1,132 |
| /* |
| * Copyright (C) 2006 Jakub Jermar |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup sparc64 |
| * @{ |
| */ |
| /** @file |
| */ |
| #include <arch/drivers/scr.h> |
| #include <genarch/ofw/ofw_tree.h> |
| #include <genarch/fb/fb.h> |
| #include <arch/types.h> |
| #include <typedefs.h> |
| #include <func.h> |
| #include <align.h> |
| #include <print.h> |
| scr_type_t scr_type = SCR_UNKNOWN; |
| /** Initialize screen. |
| * |
| * Traverse OpenFirmware device tree in order to find necessary |
| * info about the screen device. |
| * |
| * @param node Screen device node. |
| */ |
| void scr_init(ofw_tree_node_t *node) |
| { |
| ofw_tree_property_t *prop; |
| const char *name; |
| name = ofw_tree_node_name(node); |
| if (strcmp(name, "SUNW,m64B") == 0) |
| scr_type = SCR_ATYFB; |
| else if (strcmp(name, "SUNW,ffb") == 0) |
| scr_type = SCR_FFB; |
| if (scr_type == SCR_UNKNOWN) { |
| printf("Unknown keyboard device.\n"); |
| return; |
| } |
| uintptr_t fb_addr; |
| uint32_t fb_width = 0; |
| uint32_t fb_height = 0; |
| uint32_t fb_depth = 0; |
| uint32_t fb_linebytes = 0; |
| uint32_t fb_scanline = 0; |
| prop = ofw_tree_getprop(node, "width"); |
| if (prop && prop->value) |
| fb_width = *((uint32_t *) prop->value); |
| prop = ofw_tree_getprop(node, "height"); |
| if (prop && prop->value) |
| fb_height = *((uint32_t *) prop->value); |
| prop = ofw_tree_getprop(node, "depth"); |
| if (prop && prop->value) |
| fb_depth = *((uint32_t *) prop->value); |
| prop = ofw_tree_getprop(node, "linebytes"); |
| if (prop && prop->value) |
| fb_linebytes = *((uint32_t *) prop->value); |
| prop = ofw_tree_getprop(node, "reg"); |
| if (!prop) |
| panic("Can't find \"reg\" property.\n"); |
| switch (scr_type) { |
| case SCR_ATYFB: |
| if (prop->size / sizeof(ofw_pci_reg_t) < 2) { |
| printf("Too few screen registers.\n"); |
| return; |
| } |
| 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)) { |
| printf("Failed to absolutize fb register.\n"); |
| return; |
| } |
| if (!ofw_pci_apply_ranges(node->parent, &abs_reg , &fb_addr)) { |
| printf("Failed to determine screen address.\n"); |
| return; |
| } |
| if (fb_depth == 24) |
| fb_scanline = fb_linebytes * 4; |
| else |
| fb_scanline = fb_linebytes * (fb_depth >> 3); |
| break; |
| case SCR_FFB: |
| default: |
| panic("Unexpected type.\n"); |
| } |
| fb_init(fb_addr, fb_width, fb_height, fb_depth, fb_scanline, true); |
| } |
| /** @} |
| */ |