- OpenBIOS - mail.coreboot.org

r426 - in openbios-devel: arch/sparc32 drivers
by svn＠openbios.org 25 Jan '09

25 Jan '09

Author: blueswirl Date: 2009-01-25 13:20:12 +0100 (Sun, 25 Jan 2009) New Revision: 426 Modified: openbios-devel/arch/sparc32/entry.S openbios-devel/drivers/obio.c Log: Use RAM for SMP init instead of NVRAM Modified: openbios-devel/arch/sparc32/entry.S =================================================================== --- openbios-devel/arch/sparc32/entry.S 2009-01-25 09:56:08 UTC (rev 425) +++ openbios-devel/arch/sparc32/entry.S 2009-01-25 12:20:12 UTC (rev 426) @@ -10,25 +10,19 @@ #include "psr.h" #include "asm/asi.h" #include "asm/crs.h" -#define __ASSEMBLY__ -#include "openbios/firmware_abi.h" #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" #define CFG_ADDR 0x00000510 #define CFG_ASI 0x2d -#define PHYS_JJ_EEPROM 0x71200000 /* [2000] MK48T08 */ #define PHYS_JJ_INTR0 0x71E00000 /* CPU0 interrupt control registers */ -#define PHYS_SS10_EEPROM 0xf1200000 #define PHYS_SS10_INTR0 0xf1400000 -#define PHYS_SS2_EEPROM 0xf2000000 #define PHYS_SS2_INTR0 0xf5000000 #define SER_ADDR2 0xf1000004 -#define PHYS_SS1000_EEPROM 0x00280000 #define PHYS_SS1000_SBI 0x02800000 #define SER_ADDR1000 0x00200004 @@ -39,6 +33,40 @@ .section ".text", "ax" .align 8 + /* Memory map: + * + * Top +-------------------------+ + * | SMP CPU table | + * | s + 0xf00 ... 0xf0f | + * | s + 0xf0c valid | + * | s + 0xf08 entry | + * | s + 0xf04 ctxtbl | + * | s + 0xf00 ctx | + * +-------------------------+ + * | Bootstrap | + * | MMU L3 tables 5 * 0x100 | + * | s + 0xa00 ... 0xeff | + * +-------------------------+ + * | Bootstrap | + * | MMU L2 tables 2 * 0x100 | + * | s + 0x800 ... 0x9ff | + * +-------------------------+ + * | Bootstrap | + * | MMU L1 table 0x400 | + * | s + 0x400 ... 0x7ff | + * +-------------------------+ + * | Bootstrap | + * | MMU L0/ctx table 0x400 | + * | s + 0x000 ... 0x3ff | + * +-------------------------+ + * | | + * | ROM into RAM | + * | | + * +-------------------------+ + * : : + * Bottom + */ + /* * Entry point * We start execution from here. @@ -92,6 +120,16 @@ or %g3, %g4, %g1 ! %g1 contains end of memory + + ! Start of private memory in %g6 + set 0x1000, %g3 + sub %g1, %g3, %g6 + + ! Calculate SMP table location + add %g6, 0xf0c, %g2 ! valid? + lda [%g2] ASI_M_BYPASS, %g7 + sta %g0, [%g2] ASI_M_BYPASS + ! Get machine ID from configuration device mov FW_CFG_MACHINE_ID, %g2 sub %g5, 2, %g5 @@ -113,20 +151,12 @@ nop ! Ok, this is SS-5 - ! Find architecture specific part - set PHYS_JJ_EEPROM + OHW_ARCH_PTR, %g5 - lduha [%g5] ASI_M_BYPASS, %g2 - set PHYS_JJ_EEPROM, %g5 - add %g5, %g2, %g3 - ! Check if this not the first SMP CPU, if so, bypass PROM entirely - add %g3, SPARC_SMP_VALID, %g5 - lduba [%g5] ASI_M_BYPASS, %g2 - stba %g0, [%g5] ASI_M_BYPASS - tst %g2 + + tst %g7 bz first_cpu nop - ! SMP init, jump to user specified address + ! Clear softints used for SMP CPU startup set PHYS_JJ_INTR0 + 0x04, %g1 sll %g2, 12, %g2 add %g1, %g2, %g2 @@ -134,62 +164,41 @@ sta %g1, [%g2] ASI_M_BYPASS ! clear softints add %g2, 4, %g2 sta %g0, [%g2] ASI_M_BYPASS ! clear softints - add %g3, SPARC_SMP_CTXTBL, %g1 - lda [%g1] ASI_M_BYPASS, %g2 - sta %g0, [%g1] ASI_M_BYPASS + +load_ctx: + ! SMP init, jump to user specified address + add %g6, 0xf04, %g5 ! ctxtbl + lda [%g5] ASI_M_BYPASS, %g2 + sta %g0, [%g5] ASI_M_BYPASS set AC_M_CTPR, %g1 sta %g2, [%g1] ASI_M_MMUREGS ! set ctx table ptr - add %g3, SPARC_SMP_CTX, %g1 - lda [%g1] ASI_M_BYPASS, %g2 - sta %g0, [%g1] ASI_M_BYPASS + add %g6, 0xf00, %g5 ! ctx + lda [%g5] ASI_M_BYPASS, %g2 + sta %g0, [%g5] ASI_M_BYPASS set AC_M_CXR, %g1 sta %g2, [%g1] ASI_M_MMUREGS ! set context - add %g3, SPARC_SMP_ENTRY, %g1 - lda [%g1] ASI_M_BYPASS, %g2 - sta %g0, [%g1] ASI_M_BYPASS + add %g6, 0xf08, %g5 ! entry + lda [%g5] ASI_M_BYPASS, %g2 + sta %g0, [%g5] ASI_M_BYPASS set 1, %g1 jmp %g2 ! jump to kernel sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu ss10: ! Ok, this is SS-10 or SS-600MP - ! Find architecture specific part - set PHYS_SS10_EEPROM + OHW_ARCH_PTR, %g5 - lduha [%g5] ASI_M_CTL, %g2 - set PHYS_SS10_EEPROM, %g5 - add %g5, %g2, %g3 - ! Check if this not the first SMP CPU, if so, bypass PROM entirely - add %g3, SPARC_SMP_VALID, %g5 - lduba [%g5] ASI_M_CTL, %g2 - stba %g0, [%g5] ASI_M_CTL - tst %g2 + tst %g7 bz first_cpu nop - ! SMP init, jump to user specified address + ! Clear softints used for SMP CPU startup set PHYS_SS10_INTR0 + 0x04, %g1 sll %g2, 12, %g2 add %g1, %g2, %g2 set 0xffffffff, %g1 - sta %g1, [%g2] ASI_M_CTL ! clear softints + sta %g1, [%g2] ASI_M_CTL ! clear softints add %g2, 4, %g2 - sta %g0, [%g2] ASI_M_CTL ! clear softints - add %g3, SPARC_SMP_CTXTBL, %g1 - lda [%g1] ASI_M_CTL, %g2 - sta %g0, [%g1] ASI_M_CTL - set AC_M_CTPR, %g1 - sta %g2, [%g1] ASI_M_MMUREGS ! set ctx table ptr - add %g3, SPARC_SMP_CTX, %g1 - lda [%g1] ASI_M_CTL, %g2 - sta %g0, [%g1] ASI_M_CTL - set AC_M_CXR, %g1 - sta %g2, [%g1] ASI_M_MMUREGS ! set context - add %g3, SPARC_SMP_ENTRY, %g1 - lda [%g1] ASI_M_CTL, %g2 - sta %g0, [%g1] ASI_M_CTL - set 1, %g1 - jmp %g2 ! jump to kernel - sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu + b load_ctx + sta %g0, [%g2] ASI_M_CTL ! clear softints ss2: ! Ok, this is SS-2 @@ -206,16 +215,11 @@ first_cpu: /* Create temporary page tables and map the ROM area to end of RAM. This will be done properly in iommu.c later. */ - set _end, %g3 - set 0xfff, %g2 - add %g3, %g2, %g3 - andn %g3, %g2, %g3 - set _start, %g2 - sub %g3, %g2, %g3 - set 0x1000, %g4 ! add 0x1000 for page tables - add %g4, %g3, %g2 - sub %g1, %g2, %g2 ! start of private memory - srl %g2, 0x4, %g7 ! ctx table at s+0x0 + ! Calculate start of page tables etc. to %g6 + set 0x1000, %g4 + sub %g1, %g4, %g6 ! start of private memory + + mov %g6, %g2 ! ctx table at s+0x0 add %g2, 0x400, %g3 ! l1 table at s+0x400 srl %g3, 0x4, %g3 or %g3, 0x1, %g3 @@ -264,7 +268,7 @@ or %g3, 0x1, %g3 sta %g3, [%g2] ASI_M_BYPASS add %g2, 4, %g2 ! s+0x9e0 - add %g2, 0xd00 - 0x9e0, %g3 ! 5th l3 table for rom at s+0xe00 + add %g2, 0xe00 - 0x9e0, %g3 ! 5th l3 table for rom at s+0xe00 srl %g3, 0x4, %g3 or %g3, 0x1, %g3 sta %g3, [%g2] ASI_M_BYPASS @@ -275,10 +279,11 @@ set _end, %g6 set _start, %g4 sub %g6, %g4, %g6 + sub %g1, %g6, %g3 + set 0x1000, %g5 + sub %g3, %g5, %g3 ! start of ROM copy + mov %g3, %g7 ! save in %g7 srl %g6, 12, %g6 ! # of all pages - set 0x1000, %g5 - sll %g7, 0x4, %g3 - add %g5, %g3, %g3 ! ctx table + 0x1000 1: srl %g3, 0x4, %g4 or %g4, ((7 << 2) | 2), %g4 ! 7 = U: --- S: RWX sta %g4, [%g2] ASI_M_BYPASS @@ -291,10 +296,8 @@ mov %g1, %g6 ! %g6 = memory size /* Copy the code, rodata and data sections from ROM. */ - set 0x1000 - 4, %g4 - sll %g7, 0x4, %g3 - add %g4, %g3, %g3 ! ctx table + 0x1000 - 4 - set _start - 4, %g4 ! First address of TEXT + sub %g7, 4, %g3 + set _start - 4, %g4 ! First address of TEXT - 4 set _bss, %g5 ! Last address of DATA ba 2f nop @@ -307,8 +310,10 @@ bl 1b add %g4, 0x4, %g4 - + set 0x1000, %g3 + sub %g6, %g3, %g7 ! ctx table at s+0x0 set AC_M_CTPR, %g2 + srl %g7, 4, %g7 sta %g7, [%g2] ASI_M_MMUREGS ! set ctx table ptr set AC_M_CXR, %g2 sta %g0, [%g2] ASI_M_MMUREGS ! context 0 @@ -350,11 +355,15 @@ set qemu_mem_size, %g1 st %g6, [%g1] - sll %g7, 4, %g7 ! Store va->pa conversion factor - set _start - 0x1000, %g1 - sub %g1, %g7, %g7 + set _end, %o0 ! Store va->pa conversion factor + set _start, %o2 + sub %o0, %o2, %o0 + sub %g6, %o0, %o0 + set 0x1000, %o1 + sub %o0, %o1, %o0 ! start of ROM copy + sub %o2, %o0, %o0 ! start of ROM copy set va_shift, %g1 - st %g7, [%g1] + st %o0, [%g1] set qemu_machine_type, %g1 mov %y, %g2 Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2009-01-25 09:56:08 UTC (rev 425) +++ openbios-devel/drivers/obio.c 2009-01-25 12:20:12 UTC (rev 426) @@ -1132,28 +1132,45 @@ fword("finish-device"); } +/* SMP CPU boot structure */ +struct smp_cfg { + uint32_t smp_ctx; + uint32_t smp_ctxtbl; + uint32_t smp_entry; + uint32_t valid; +}; + +static struct smp_cfg *smp_header; + int start_cpu(unsigned int pc, unsigned int context_ptr, unsigned int context, int cpu) { - ohwcfg_v3_t *header = (ohwcfg_v3_t *)nvram; - struct sparc_arch_cfg *sparc_header; - if (!cpu) return -1; - sparc_header = (struct sparc_arch_cfg *)&nvram[header->nvram_arch_ptr]; - sparc_header->smp_entry = pc; - sparc_header->smp_ctxtbl = context_ptr; - sparc_header->smp_ctx = context; - sparc_header->valid = 1; + cpu &= 7; - cpu &= 7; + smp_header->smp_entry = pc; + smp_header->smp_ctxtbl = context_ptr; + smp_header->smp_ctx = context; + smp_header->valid = cpu; + intregs->cpu_intregs[cpu].set = SUN4M_SOFT_INT(14); return 0; } +static void +ob_smp_init(void) +{ + unsigned long mem_size; + // See arch/sparc32/entry.S for memory layout + mem_size = fw_cfg_read_i32(FW_CFG_RAM_SIZE); + smp_header = (struct smp_cfg *)map_io((uint64_t)(mem_size - 0x100), + sizeof(struct smp_cfg)); +} + static void ob_obio_open(__attribute__((unused))int *idx) { @@ -1276,5 +1293,7 @@ ob_interrupt_init(slavio_base, intr_offset); + ob_smp_init(); + return 0; }

1 0

Sparc32 "see" crashes on "" literals
by Mark Cave-Ayland 25 Jan '09

25 Jan '09

Hi all, Having been looking at the OpenBIOS Sparc implementation recently, I came across the following interesting reproducible test case with latest SVN of Qemu and openbios: ./qemu-system-sparc -nographic -serial stdio Configuration device id QEMU version 1 machine id 32 UUID: 00000000-0000-0000-0000-000000000000 CPUs: 1 x FMI,MB86904 Welcome to OpenBIOS v1.0RC1 built on Jan 24 2009 10:08 Type 'help' for detailed information [sparc] Booting file 'disk' with parameters '' Trying disk (disk) Trying disk:d (disk:d) Unsupported image format 0 > see see : see ' (see) ; ok 0 > see test-all : test-all active-package cr (lit) (lit) then Unhandled Exception 0x00000009 PC = 0xffd066c4 NPC = 0xffd066c8 Stopping execution Similarly I see the same error in get-package-path too: 0 > see get-package-path : get-package-path ?dup 0= if 0 0 dup >dn.parent @ 0= if drop (lit) (lit) then Unhandled Exception 0x00000009 PC = 0xffd066c4 NPC = 0xffd066c8 Stopping execution AFAICT the problem is related to the occurence of string constants like "foo" or "bar" in the source code. Does anyone else see this on other platforms? I suspect given that forth is interpreted that this is a lower-level issue of some kind... ATB, Mark. -- Mark Cave-Ayland Sirius Corporation - The Open Source Experts http://www.siriusit.co.uk T: +44 870 608 0063

3 5

r425 - in openbios-devel: arch/sparc32 arch/x86 drivers include/openbios include/sparc32
by svn＠openbios.org 25 Jan '09

25 Jan '09

Author: blueswirl Date: 2009-01-25 10:56:08 +0100 (Sun, 25 Jan 2009) New Revision: 425 Modified: openbios-devel/arch/sparc32/openbios.c openbios-devel/arch/x86/openbios.c openbios-devel/drivers/floppy.c openbios-devel/drivers/obio.c openbios-devel/drivers/pci.c openbios-devel/include/openbios/drivers.h openbios-devel/include/sparc32/io.h Log: Add support for floppy boot on Sparc32 Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2009-01-25 07:31:15 UTC (rev 424) +++ openbios-devel/arch/sparc32/openbios.c 2009-01-25 09:56:08 UTC (rev 425) @@ -14,6 +14,7 @@ #include "openbios/kernel.h" #include "openbios/stack.h" #include "openbios/nvram.h" +#include "../../drivers/timer.h" // XXX #include "sys_info.h" #include "openbios.h" #include "boot.h" @@ -98,6 +99,18 @@ static const struct hwdef *hwdef; +void setup_timers(void) +{ +} + +void udelay(unsigned int usecs) +{ +} + +void mdelay(unsigned int msecs) +{ +} + static void init_memory(void) { memory = malloc(MEMORY_SIZE); Modified: openbios-devel/arch/x86/openbios.c =================================================================== --- openbios-devel/arch/x86/openbios.c 2009-01-25 07:31:15 UTC (rev 424) +++ openbios-devel/arch/x86/openbios.c 2009-01-25 09:56:08 UTC (rev 425) @@ -48,7 +48,7 @@ ob_ide_init("/pci/isa", 0x1f0, 0x3f4, 0x170, 0x374); #endif #ifdef CONFIG_DRIVER_FLOPPY - ob_floppy_init("/isa", "floppy0"); + ob_floppy_init("/isa", "floppy0", 0x3f0, 0); #endif #ifdef CONFIG_XBOX init_video(phys_to_virt(0x3C00000), 640, 480, 32, 2560); Modified: openbios-devel/drivers/floppy.c =================================================================== --- openbios-devel/drivers/floppy.c 2009-01-25 07:31:15 UTC (rev 424) +++ openbios-devel/drivers/floppy.c 2009-01-25 09:56:08 UTC (rev 425) @@ -20,22 +20,18 @@ #endif #define printk_err printk -#ifndef FD_BASE -#define FD_BASE 0x3f0 -#endif - #define FD_DRIVE 0 -#define FD_STATUS_A (FD_BASE + 0) /* Status register A */ -#define FD_STATUS_B (FD_BASE + 1) /* Status register B */ -#define FD_DOR (FD_BASE + 2) /* Digital Output Register */ -#define FD_TDR (FD_BASE + 3) /* Tape Drive Register */ -#define FD_STATUS (FD_BASE + 4) /* Main Status Register */ -#define FD_DSR (FD_BASE + 4) /* Data Rate Select Register (old) */ -#define FD_DATA (FD_BASE + 5) /* Data Transfer (FIFO) register */ -#define FD_DIR (FD_BASE + 7) /* Digital Input Register (read) */ -#define FD_DCR (FD_BASE + 7) /* Diskette Control Register (write)*/ +#define FD_STATUS_A (0) /* Status register A */ +#define FD_STATUS_B (1) /* Status register B */ +#define FD_DOR (2) /* Digital Output Register */ +#define FD_TDR (3) /* Tape Drive Register */ +#define FD_STATUS (4) /* Main Status Register */ +#define FD_DSR (4) /* Data Rate Select Register (old) */ +#define FD_DATA (5) /* Data Transfer (FIFO) register */ +#define FD_DIR (7) /* Digital Input Register (read) */ +#define FD_DCR (7) /* Diskette Control Register (write)*/ /* Bit of FD_STATUS_A */ #define STA_INT_PENDING 0x80 /* Interrupt Pending */ @@ -210,10 +206,12 @@ int dtr; unsigned char dor; unsigned char version; /* FDC version code */ + void (*fdc_outb)(unsigned char data, unsigned long port); + unsigned char (*fdc_inb)(unsigned long port); + unsigned long io_base; + unsigned long mmio_base; } fdc_state; - - /* Synchronization of FDC access. */ #define FD_COMMAND_NONE -1 #define FD_COMMAND_ERROR 2 @@ -227,7 +225,36 @@ static void show_floppy(void); static void floppy_reset(void); +/* + * IO port operations + */ +static unsigned char +ob_fdc_inb(unsigned long port) +{ + return inb(fdc_state.io_base + port); +} +static void +ob_fdc_outb(unsigned char data, unsigned long port) +{ + outb(data, fdc_state.io_base + port); +} + +/* + * MMIO operations + */ +static unsigned char +ob_fdc_mmio_readb(unsigned long port) +{ + return *(unsigned char *)(fdc_state.mmio_base + port); +} + +static void +ob_fdc_mmio_writeb(unsigned char data, unsigned long port) +{ + *(unsigned char *)(fdc_state.mmio_base + port) = data; +} + static int set_dor(char mask, char data) { unsigned char newdor,olddor; @@ -236,7 +263,7 @@ newdor = (olddor & mask) | data; if (newdor != olddor){ fdc_state.dor = newdor; - outb(newdor, FD_DOR); + fdc_state.fdc_outb(newdor, FD_DOR); } return olddor; } @@ -246,7 +273,7 @@ { int counter, status; for (counter = 0; counter < 10000; counter++) { - status = inb(FD_STATUS); + status = fdc_state.fdc_inb(FD_STATUS); if (status & STATUS_READY) { return status; } @@ -265,7 +292,7 @@ if ((status = wait_til_ready()) < 0) return status; if ((status & (STATUS_READY|STATUS_DIR|STATUS_NON_DMA)) == STATUS_READY){ - outb(byte,FD_DATA); + fdc_state.fdc_outb(byte,FD_DATA); return 0; } printk_debug("Unable to send byte %x to FDC_STATE. Status=%x\n", @@ -288,7 +315,7 @@ return i; } if (status == (STATUS_DIR|STATUS_READY|STATUS_BUSY)) - reply_buffer[i] = inb(FD_DATA); + reply_buffer[i] = fdc_state.fdc_inb(FD_DATA); else break; } @@ -366,7 +393,7 @@ } max_sensei--; }while(((reply_buffer[0] & 0x83) != FD_DRIVE) && (nr == 2) && max_sensei); - status = inb(FD_STATUS); + status = fdc_state.fdc_inb(FD_STATUS); printk_debug("status = %x, reply_buffer=", status); for(i = 0; i < nr; i++) { printk_debug(" %x", @@ -405,7 +432,7 @@ mdelay(DRIVE_H1440_SPINUP); - status = inb(FD_STATUS); + status = fdc_state.fdc_inb(FD_STATUS); printk_debug("set_drive status = %02x, new_dor = %02x\n", status, new_dor); if (status != STATUS_READY) { @@ -440,7 +467,7 @@ return; /* Set dtr */ - outb(rate, FD_DCR); + fdc_state.fdc_outb(rate, FD_DCR); /* TODO: some FDC/drive combinations (C&T 82C711 with TEAC 1.2MB) * need a stabilization period of several milliseconds to be @@ -586,11 +613,11 @@ /* Irrelevant for systems with true DMA (i386). */ if (fdc_state.version >= FDC_82072A) - outb(0x80 | (fdc_state.dtr &3), FD_DSR); + fdc_state.fdc_outb(0x80 | (fdc_state.dtr &3), FD_DSR); else { - outb(fdc_state.dor & ~DOR_NO_RESET, FD_DOR); + fdc_state.fdc_outb(fdc_state.dor & ~DOR_NO_RESET, FD_DOR); udelay(FD_RESET_DELAY); - outb(fdc_state.dor, FD_DOR); + fdc_state.fdc_outb(fdc_state.dor, FD_DOR); } result(reply, MAX_REPLIES); } @@ -605,11 +632,14 @@ printk_debug("-------------------\n"); printk_debug("fdc_bytes: %02x %02x xx %02x %02x %02x xx %02x\n", - inb(FD_BASE + 0), inb(FD_BASE + 1), - inb(FD_BASE + 3), inb(FD_BASE + 4), inb(FD_BASE + 5), - inb(FD_BASE + 7)); + fdc_state.fdc_inb(FD_STATUS_A), + fdc_state.fdc_inb(FD_STATUS_B), + fdc_state.fdc_inb(FD_TDR), + fdc_state.fdc_inb(FD_STATUS), + fdc_state.fdc_inb(FD_DATA), + fdc_state.fdc_inb(FD_DIR)); - printk_debug("status=%x\n", inb(FD_STATUS)); + printk_debug("status=%x\n", fdc_state.fdc_inb(FD_STATUS)); printk_debug("\n"); } @@ -719,7 +749,7 @@ printk_debug("nr = %d\n", nr); printk_debug("ST0 = %02x\n", reply[0]); printk_debug("PCN = %02x\n", reply[1]); - printk_debug("status = %d\n", inb(FD_STATUS)); + printk_debug("status = %d\n", fdc_state.fdc_inb(FD_STATUS)); } return success; } @@ -818,7 +848,7 @@ /* The execution stage begins when STATUS_READY&STATUS_NON_DMA is set */ do { - status = inb(FD_STATUS); + status = fdc_state.fdc_inb(FD_STATUS); status &= STATUS_READY | STATUS_NON_DMA; } while(status != (STATUS_READY|STATUS_NON_DMA)); @@ -831,7 +861,7 @@ if (status != (STATUS_READY|STATUS_DIR|STATUS_NON_DMA)) { break; } - byte = inb(FD_DATA); + byte = fdc_state.fdc_inb(FD_DATA); if ((i >= byte_offset) && (i < end_offset)) { dest[i - byte_offset] = byte; } @@ -839,12 +869,12 @@ bytes_read = i; /* The result stage begins when STATUS_NON_DMA is cleared */ - while((status = inb(FD_STATUS)) & STATUS_NON_DMA) { + while((status = fdc_state.fdc_inb(FD_STATUS)) & STATUS_NON_DMA) { /* We get extra bytes in the fifo past * the end of the sector and drop them on the floor. * Otherwise the fifo is polluted. */ - inb(FD_DATA); + fdc_state.fdc_inb(FD_DATA); } /* Did I get an error? */ result_ok = read_ok(head); @@ -995,7 +1025,7 @@ } /* get_fdc_version */ -static int floppy_init(void) +static int floppy_init(unsigned long io_base, unsigned long mmio_base) { printk_debug("floppy_init\n"); fdc_state.in_sync = 0; @@ -1004,6 +1034,15 @@ fdc_state.dtr = -1; fdc_state.dor = DOR_NO_RESET; fdc_state.version = FDC_UNKNOWN; + if (mmio_base) { + fdc_state.fdc_inb = ob_fdc_mmio_readb; + fdc_state.fdc_outb = ob_fdc_mmio_writeb; + } else { + fdc_state.fdc_inb = ob_fdc_inb; + fdc_state.fdc_outb = ob_fdc_outb; + } + fdc_state.io_base = io_base; + fdc_state.mmio_base = mmio_base; reset_fdc(); /* Try to determine the floppy controller type */ fdc_state.version = get_fdc_version(); @@ -1032,10 +1071,10 @@ } static void -ob_floppy_initialize(int *idx) +ob_floppy_initialize(const char *path) { int props[3]; - phandle_t ph=get_cur_dev(); + phandle_t ph = find_dev(path); push_str("block"); fword("device-type"); @@ -1103,7 +1142,6 @@ } NODE_METHODS(ob_floppy) = { - { NULL, ob_floppy_initialize }, { "open", ob_floppy_open }, { "close", ob_floppy_close }, { "read-blocks", ob_floppy_read_blocks }, @@ -1112,12 +1150,19 @@ }; -int ob_floppy_init(const char *path, const char *dev_name) +int ob_floppy_init(const char *path, const char *dev_name, + unsigned long io_base, unsigned long mmio_base) { char nodebuff[128]; snprintf(nodebuff, sizeof(nodebuff), "%s/%s", path, dev_name); - REGISTER_NAMED_NODE(ob_floppy, nodebuff); - floppy_init(); + if (!mmio_base) { + REGISTER_NAMED_NODE(ob_floppy, nodebuff); + ob_floppy_initialize(nodebuff); + } else { + // Already in tree and mapped + REGISTER_NODE_METHODS(ob_floppy, nodebuff); + } + floppy_init(io_base, mmio_base); return 0; } Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2009-01-25 07:31:15 UTC (rev 424) +++ openbios-devel/drivers/obio.c 2009-01-25 09:56:08 UTC (rev 425) @@ -969,12 +969,18 @@ static void ob_fd_init(uint64_t base, uint64_t offset, int intr) { + unsigned long addr; + ob_new_obio_device("SUNW,fdtwo", "block"); - ob_reg(base, offset, FD_REGS, 0); + addr = ob_reg(base, offset, FD_REGS, 1); ob_intr(intr); + fword("is-deblocker"); + + ob_floppy_init("/obio", "SUNW,fdtwo", 0, addr); + fword("finish-device"); } Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-25 07:31:15 UTC (rev 424) +++ openbios-devel/drivers/pci.c 2009-01-25 09:56:08 UTC (rev 425) @@ -443,7 +443,7 @@ { #ifdef CONFIG_DRIVER_EBUS #ifdef CONFIG_DRIVER_FLOPPY - ob_floppy_init(config->path, "fdthree"); + ob_floppy_init(config->path, "fdthree", 0x3f0ULL, 0); #endif #ifdef CONFIG_DRIVER_PC_SERIAL ob_pc_serial_init(config->path, "su", arch->io_base, 0x3f8ULL, 0); Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2009-01-25 07:31:15 UTC (rev 424) +++ openbios-devel/include/openbios/drivers.h 2009-01-25 09:56:08 UTC (rev 425) @@ -86,7 +86,8 @@ extern char boot_device; #endif #ifdef CONFIG_DRIVER_FLOPPY -int ob_floppy_init(const char *path, const char *dev_name); +int ob_floppy_init(const char *path, const char *dev_name, + unsigned long io_base, unsigned long mmio_base); #endif #ifdef CONFIG_DRIVER_PC_KBD void ob_pc_kbd_init(const char *path, const char *dev_name, uint64_t base, Modified: openbios-devel/include/sparc32/io.h =================================================================== --- openbios-devel/include/sparc32/io.h 2009-01-25 07:31:15 UTC (rev 424) +++ openbios-devel/include/sparc32/io.h 2009-01-25 09:56:08 UTC (rev 425) @@ -61,7 +61,7 @@ { int ret; - __asm__ __volatile__("lduba [%1] 0x20, %0\n\t" + __asm__ __volatile__("ldub [%1], %0\n\t" "stbar\n\t" :"=r"(ret):"r"(addr):"memory"); @@ -70,7 +70,7 @@ static inline void out_8(volatile unsigned char *addr, int val) { - __asm__ __volatile__("stba %0, [%1] 0x20\n\t" + __asm__ __volatile__("stb %0, [%1]\n\t" "stbar\n\t" : : "r"(val), "r"(addr):"memory"); } @@ -80,7 +80,7 @@ int ret; // XXX - __asm__ __volatile__("lduha [%1] 0x20, %0\n\t" + __asm__ __volatile__("lduh [%1], %0\n\t" "stbar\n\t" :"=r"(ret):"r"(addr):"memory"); @@ -91,7 +91,7 @@ { int ret; - __asm__ __volatile__("lduha [%1] 0x20, %0\n\t" + __asm__ __volatile__("lduh [%1], %0\n\t" "stbar\n\t" :"=r"(ret):"r"(addr):"memory"); @@ -101,14 +101,14 @@ static inline void out_le16(volatile unsigned short *addr, int val) { // XXX - __asm__ __volatile__("stha %0, [%1] 0x20\n\t" + __asm__ __volatile__("sth %0, [%1]\n\t" "stbar\n\t" : : "r"(val), "r"(addr):"memory"); } static inline void out_be16(volatile unsigned short *addr, int val) { - __asm__ __volatile__("stha %0, [%1] 0x20\n\t" + __asm__ __volatile__("sth %0, [%1]\n\t" "stbar\n\t" : : "r"(val), "r"(addr):"memory"); } @@ -118,7 +118,7 @@ unsigned ret; // XXX - __asm__ __volatile__("lda [%1] 0x20, %0\n\t" + __asm__ __volatile__("ld [%1], %0\n\t" "stbar\n\t" :"=r"(ret):"r"(addr):"memory"); @@ -129,7 +129,7 @@ { unsigned ret; - __asm__ __volatile__("lda [%1] 0x20, %0\n\t" + __asm__ __volatile__("ld [%1], %0\n\t" "stbar\n\t" :"=r"(ret):"r"(addr):"memory"); @@ -139,14 +139,14 @@ static inline void out_le32(volatile unsigned *addr, int val) { // XXX - __asm__ __volatile__("sta %0, [%1] 0x20\n\t" + __asm__ __volatile__("st %0, [%1]\n\t" "stbar\n\t" : : "r"(val), "r"(addr):"memory"); } static inline void out_be32(volatile unsigned *addr, int val) { - __asm__ __volatile__("sta %0, [%1] 0x20\n\t" + __asm__ __volatile__("st %0, [%1]\n\t" "stbar\n\t" : : "r"(val), "r"(addr):"memory"); }

1 0

r424 - openbios-devel/arch/sparc64
by svn＠openbios.org 25 Jan '09

25 Jan '09

Author: blueswirl Date: 2009-01-25 08:31:15 +0100 (Sun, 25 Jan 2009) New Revision: 424 Modified: openbios-devel/arch/sparc64/tree.fs Log: Add UPA decode and encode methods Modified: openbios-devel/arch/sparc64/tree.fs =================================================================== --- openbios-devel/arch/sparc64/tree.fs 2009-01-25 07:30:45 UTC (rev 423) +++ openbios-devel/arch/sparc64/tree.fs 2009-01-25 07:31:15 UTC (rev 424) @@ -1,11 +1,29 @@ +\ ------------------------------------------------------------------------- +\ UPA encode/decode unit +\ ------------------------------------------------------------------------- +: decode-unit-upa ( str len -- id lun ) + ascii , left-split + ( addr-R len-R addr-L len-L ) + parse-hex + -rot parse-hex + swap +; + +: encode-unit-upa ( id lun -- str len) + swap + pocket tohexstr + " ," pocket tmpstrcat >r + rot pocket tohexstr r> tmpstrcat drop +; + " /" find-device 2 encode-int " #address-cells" property 2 encode-int " #size-cells" property " sun4u" encode-string " compatible" property - \ : encode-unit encode-unit-sbus ; - \ : decode-unit decode-unit-sbus ; + : encode-unit encode-unit-upa ; + : decode-unit decode-unit-upa ; new-device " memory" device-name

1 0

r423 - openbios-devel/arch/sparc64
by svn＠openbios.org 25 Jan '09

25 Jan '09

Author: blueswirl Date: 2009-01-25 08:30:45 +0100 (Sun, 25 Jan 2009) New Revision: 423 Modified: openbios-devel/arch/sparc64/openbios.c Log: Fix Sabre device ID Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2009-01-24 08:23:33 UTC (rev 422) +++ openbios-devel/arch/sparc64/openbios.c 2009-01-25 07:30:45 UTC (rev 423) @@ -65,7 +65,7 @@ .pci = { .name = "SUNW,sabre", .vendor_id = 0x108e, - .device_id = 0xa000, + .device_id = 0x5000, .cfg_addr = APB_SPECIAL_BASE + 0x1000000ULL, .cfg_data = APB_MEM_BASE, .cfg_base = 0x80000000ULL,

1 0

Re: [OpenBIOS] [sparc64] Problematic pci at 0 and pci nodes in the device tree
by Mark Cave-Ayland 24 Jan '09

24 Jan '09

Hi Blue Swirl, > First, you need binutils and gcc. For cross compiling I'd recommend > sparc64-elf target, then you avoid a lot of unneeded Linux > headers/libgcc stuff. At least binutils 2.18 and gcc 4.2.4 build > working binaries. I still don't have a working cross gdb for Sparc64, > the obvious configuration (--target=sparc64-elf) doesn't work. I now have a cross-compile environment setup after a lot of effort. The hardest part was building a cross-gdb for Sparc64 as all I ever received was the "Reply packet too long error". I ended up spending about half a day going through the gdb sources until I found that unless you specify a platform with configure when you come to build gdb, the extra 64-bit register sets don't get built in! In the end, I went for "./configure --target=sparc64-linux" and magically everything started to work. If I build and install the non-stripped Sparc64 OpenBIOS built-in image, I can then do this: qemu-system-sparc64 .... -s -S sparc64-linux-gdb (gdb) file openbios-sparc64 Reading symbols from openbios-sparc64...done. (gdb) break openbios Breakpoint 1 at 0xffd0d014: file arch/sparc64/openbios.c, line 516. (gdb) target remote :1234 Remote debugging using :1234 [New Thread 1] 0x000001fff0000020 in ?? () (gdb) cont Continuing. Breakpoint 1, openbios () at arch/sparc64/openbios.c:516 516 const struct hwdef *hwdef = NULL; Cool :) ATB, Mark. -- Mark Cave-Ayland Sirius Corporation - The Open Source Experts http://www.siriusit.co.uk T: +44 870 608 0063

2 1

r422 - in openbios-devel: config/examples include/libc libc
by svn＠openbios.org 24 Jan '09

24 Jan '09

Author: blueswirl Date: 2009-01-24 09:23:33 +0100 (Sat, 24 Jan 2009) New Revision: 422 Modified: openbios-devel/config/examples/sparc64_rules.xml openbios-devel/include/libc/string.h openbios-devel/libc/misc.c Log: Add Propolice support Modified: openbios-devel/config/examples/sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/sparc64_rules.xml 2009-01-24 07:31:45 UTC (rev 421) +++ openbios-devel/config/examples/sparc64_rules.xml 2009-01-24 08:23:33 UTC (rev 422) @@ -38,10 +38,6 @@ INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-xarch=v9b -Wa,-64 -g -ifeq ($(shell uname), OpenBSD) - CFLAGS+= -fno-stack-protector -endif - # # pre rules # Modified: openbios-devel/include/libc/string.h =================================================================== --- openbios-devel/include/libc/string.h 2009-01-24 07:31:45 UTC (rev 421) +++ openbios-devel/include/libc/string.h 2009-01-24 08:23:33 UTC (rev 422) @@ -99,4 +99,9 @@ extern int errno_int; +// Propolice support +extern long __guard[8]; + +void __stack_smash_handler(const char *func, int damaged); + #endif /* _H_STRING */ Modified: openbios-devel/libc/misc.c =================================================================== --- openbios-devel/libc/misc.c 2009-01-24 07:31:45 UTC (rev 421) +++ openbios-devel/libc/misc.c 2009-01-24 08:23:33 UTC (rev 422) @@ -75,3 +75,24 @@ return sum * sign; } + +// Propolice support +long __guard[8] = { +#ifdef CONFIG_BIG_ENDIAN + (0 << 24) | (0 << 16) | ('\n' << 8) | 255, +#else + (255 << 24) | ('\n' << 16) | (0 << 8) | 0, +#endif + 0, 0, 0, 0, 0, 0, 0 +}; + +void __stack_smash_handler(const char *func, int damaged) +{ + printk("Propolice detected a stack smashing attack %x at function %s," + " freezing\n", damaged, func); + + // Freeze + // XXX: Disable interrupts? + for(;;) + ; +}

1 0

r421 - openbios-devel/drivers
by svn＠openbios.org 24 Jan '09

24 Jan '09

Author: blueswirl Date: 2009-01-24 08:31:45 +0100 (Sat, 24 Jan 2009) New Revision: 421 Modified: openbios-devel/drivers/obio.c Log: Add slavioconfig only for SS-4, SS-5 and S3GX Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2009-01-23 20:09:26 UTC (rev 420) +++ openbios-devel/drivers/obio.c 2009-01-24 07:31:45 UTC (rev 421) @@ -116,7 +116,7 @@ } static void -ob_eccmemctl_init(void) +ob_eccmemctl_init(uint64_t base) { uint32_t version, *regs; const char *mc_type; @@ -535,17 +535,27 @@ for (;;); } -static void dummy_mach_init(void) +static void dummy_mach_init(uint64_t base) { } +static void +ss5_init(uint64_t base) +{ + ob_new_obio_device("slavioconfig", NULL); + + ob_reg(base, SLAVIO_SCONFIG, SCONFIG_REGS, 0); + + fword("finish-device"); +} + struct machdef { uint16_t machine_id; const char *banner_name; const char *model; const char *name; int mid_offset; - void (*initfn)(void); + void (*initfn)(uint64_t base); }; static const struct machdef sun4m_defs[] = { @@ -555,7 +565,7 @@ .model = "SUNW,501-3059", .name = "SUNW,SPARCstation-5", .mid_offset = 0, - .initfn = dummy_mach_init, + .initfn = ss5_init, }, { .machine_id = 33, @@ -579,7 +589,7 @@ .model = "SUNW,501-2572", .name = "SUNW,SPARCstation-4", .mid_offset = 0, - .initfn = dummy_mach_init, + .initfn = ss5_init, }, { .machine_id = 36, @@ -595,7 +605,7 @@ .model = "S3", .name = "Tadpole_S3GX", .mid_offset = 0, - .initfn = dummy_mach_init, + .initfn = ss5_init, }, { .machine_id = 64, @@ -768,8 +778,6 @@ mach = id_machine(machine_id); - mach->initfn(); - push_str(mach->banner_name); fword("encode-string"); push_str("banner-name"); @@ -786,6 +794,8 @@ push_str("name"); fword("property"); + mach->initfn(base); + // Add cpus temp = fw_cfg_read_i32(FW_CFG_NB_CPUS); @@ -968,18 +978,7 @@ fword("finish-device"); } - static void -ob_sconfig_init(uint64_t base, uint64_t offset) -{ - ob_new_obio_device("slavioconfig", NULL); - - ob_reg(base, offset, SCONFIG_REGS, 0); - - fword("finish-device"); -} - -static void ob_auxio_init(uint64_t base, uint64_t offset) { ob_new_obio_device("auxio", NULL); @@ -1262,8 +1261,6 @@ if (fd_offset != (unsigned long) -1) ob_fd_init(slavio_base, fd_offset, FD_INTR); - ob_sconfig_init(slavio_base, SLAVIO_SCONFIG); - ob_auxio_init(slavio_base, aux1_offset); if (aux2_offset != (unsigned long) -1)

1 0

sparc32 node order different than openboot
by Robert Reif 24 Jan '09

24 Jan '09

Something that has bugged me for a while is that the current nodes children are listed in reverse order compared to suns openboot. Doing an ls produces generally the same names but in reverse order from sun.

1 0

r420 - in openbios-devel: . arch/ppc arch/sparc32 arch/sparc64 arch/x86 config/examples config/scripts config/xml fs/hfs fs/hfsplus
by svn＠openbios.org 23 Jan '09

23 Jan '09

Author: blueswirl Date: 2009-01-23 21:09:26 +0100 (Fri, 23 Jan 2009) New Revision: 420 Modified: openbios-devel/Makefile openbios-devel/arch/ppc/build.xml openbios-devel/arch/sparc32/build.xml openbios-devel/arch/sparc64/build.xml openbios-devel/arch/x86/build.xml openbios-devel/config/examples/amd64_rules.xml openbios-devel/config/examples/cross-ppc_rules.xml openbios-devel/config/examples/cross-sparc32_rules.xml openbios-devel/config/examples/cross-sparc64_rules.xml openbios-devel/config/examples/cross-x86_rules.xml openbios-devel/config/examples/ppc_rules.xml openbios-devel/config/examples/sparc32_rules.xml openbios-devel/config/examples/sparc64_rules.xml openbios-devel/config/examples/x86_rules.xml openbios-devel/config/scripts/switch-arch openbios-devel/config/xml/dictionary.xsl openbios-devel/config/xml/makefile.xsl openbios-devel/config/xml/object.xsl openbios-devel/config/xml/util.xsl openbios-devel/fs/hfs/build.xml openbios-devel/fs/hfsplus/build.xml Log: Add support for configuring for multiple targets Modified: openbios-devel/Makefile =================================================================== --- openbios-devel/Makefile 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/Makefile 2009-01-23 20:09:26 UTC (rev 420) @@ -1,96 +1,36 @@ -ARCH= $(shell test -r rules.xml && cat rules.xml |grep "^ARCH" |cut -d\= -f2|tr -d \ ) HOSTARCH=$(shell config/scripts/archname) -CROSSCFLAGS=$(shell config/scripts/crosscflags $(HOSTARCH) $(ARCH)) -ODIR=obj-$(ARCH) +ODIRS=$(wildcard obj-*) +TARGETS=$(subst obj-,,$(ODIRS)) -all: requirements archtest info build +all: requirements info build -archtest: prepare - @test -r config.xml -a -r rules.xml || \ - ( echo ; echo "Please run the following command first:"; echo ; \ - echo " $$ config/scripts/switch-arch <arch>"; \ - echo; echo "<arch> can be one out of x86, amd64, cross-ppc, ppc"; \ - echo " cross-sparc32, sparc32, cross-sparc64, sparc64"; \ - echo; exit 1 ) - requirements: - @which toke &>/dev/null || ( echo ; echo "Please install the OpenBIOS fcode utilities."; \ - echo; echo "Download with :"; \ - echo " $$ svn co svn://openbios.org/openbios/fcode-utils"; \ - echo; exit 1 ) @which xsltproc &>/dev/null || ( echo ; echo "Please install libxslt2"; \ echo; exit 1 ) info: - @echo "Building OpenBIOS on $(HOSTARCH) for $(ARCH)" + @echo "Building OpenBIOS on $(HOSTARCH) for $(TARGETS)" clean: @printf "Cleaning up..." - @rm -rf $(ODIR) forth.dict.core + @rm -rf $(ODIRS) forth.dict.core @find . -type f -name "*~" -exec rm \{\} \; @echo " ok" -directories: clean - @printf "Initializing build tree..." - @mkdir $(ODIR) - @mkdir -p $(ODIR)/target - @mkdir -p $(ODIR)/target/include - @mkdir -p $(ODIR)/target/arch - @mkdir -p $(ODIR)/target/arch/unix - @mkdir -p $(ODIR)/target/arch/$(ARCH) - @mkdir -p $(ODIR)/target/arch/ppc - @mkdir -p $(ODIR)/target/arch/ppc/briq # no autodetection of those.. - @mkdir -p $(ODIR)/target/arch/ppc/pearpc - @mkdir -p $(ODIR)/target/arch/ppc/qemu - @mkdir -p $(ODIR)/target/arch/ppc/mol - @mkdir -p $(ODIR)/target/arch/x86 - @mkdir -p $(ODIR)/target/arch/x86/xbox - @mkdir -p $(ODIR)/target/libgcc - @mkdir -p $(ODIR)/target/kernel - @mkdir -p $(ODIR)/target/modules - @mkdir -p $(ODIR)/target/fs - @mkdir -p $(ODIR)/target/fs/grubfs - @mkdir -p $(ODIR)/target/fs/hfs - @mkdir -p $(ODIR)/target/fs/hfsplus - @mkdir -p $(ODIR)/target/drivers - @mkdir -p $(ODIR)/target/libc - @mkdir -p $(ODIR)/host/include - @mkdir -p $(ODIR)/host/kernel - @mkdir -p $(ODIR)/forth - @ln -s $(PWD)/include/$(ARCH) $(ODIR)/target/include/asm - @#compile the host binary with target settings instead - @#ln -s $(PWD)/include/$(HOSTARCH) $(ODIR)/host/include/asm - @echo "ok." - -# This is needed because viewvc messes with the permissions of executables: -prepare: - @chmod 755 utils/dist/debian/rules - @chmod 755 config/scripts/switch-arch - @chmod 755 config/scripts/archname - @chmod 755 config/scripts/reldir - @chmod 755 config/scripts/crosscflags - -xml: directories - @printf "Creating target Makefile..." - @xsltproc config/xml/xinclude.xsl build.xml > $(ODIR)/build-full.xml - @xsltproc config/xml/makefile.xsl $(ODIR)/build-full.xml > $(ODIR)/Makefile - @echo "ok." - @printf "Creating config files..." - @xsltproc config/xml/config-c.xsl config.xml > $(ODIR)/host/include/autoconf.h - @xsltproc config/xml/config-c.xsl config.xml > $(ODIR)/target/include/autoconf.h - @xsltproc config/xml/config-forth.xsl config.xml > $(ODIR)/forth/config.fs - @echo "ok." - -build: xml +build: @printf "Building..." - @( $(MAKE) -f $(ODIR)/Makefile "CROSSCFLAGS=$(CROSSCFLAGS)" > $(ODIR)/build.log 2>&1 && echo "ok." ) || \ - ( echo "error:"; tail -15 $(ODIR)/build.log ) + @for dir in $(ODIRS); do \ + $(MAKE) -C $$dir > $$dir/build.log 2>&1 && echo "ok." || \ + ( echo "error:"; tail -15 $$$dir/build.log; exit 1 ) \ + done build-verbose: @echo "Building..." - $(MAKE) -f $(ODIR)/Makefile "CROSSCFLAGS=$(CROSSCFLAGS)" + @for dir in $(ODIRS); do \ + $(MAKE) -C $$dir || exit 1; \ + done -run: +run: @echo "Running..." @$(ODIR)/openbios-unix $(ODIR)/openbios-unix.dict Modified: openbios-devel/arch/ppc/build.xml =================================================================== --- openbios-devel/arch/ppc/build.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/arch/ppc/build.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -39,7 +39,7 @@ <executable name="target/arch/ppc/briq/kernel.o" target="target" condition="BRIQ"> <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/ppc/briq/kernel.c + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/ppc/briq/kernel.c ]]></rule> <external-object source="target/include/briq-dict.h"/> </executable> @@ -57,7 +57,7 @@ <executable name="target/arch/ppc/pearpc/kernel.o" target="target" condition="PEARPC"> <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/ppc/pearpc/kernel.c + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/ppc/pearpc/kernel.c ]]></rule> <external-object source="target/include/pearpc-dict.h"/> </executable> @@ -74,7 +74,7 @@ <executable name="target/arch/ppc/qemu/kernel.o" target="target" condition="QEMU"> <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/ppc/qemu/kernel.c + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/ppc/qemu/kernel.c ]]></rule> <external-object source="target/include/qemu-dict.h"/> </executable> @@ -92,7 +92,7 @@ <executable name="target/arch/ppc/mol/kernel.o" target="target" condition="MOL"> <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/ppc/mol/kernel.c + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/ppc/mol/kernel.c ]]></rule> <external-object source="target/include/mol-dict.h"/> </executable> @@ -105,13 +105,13 @@ $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="ofmem.c"/> - <object source="briq/briq.c" flags="-Iarch/ppc"/> - <object source="briq/init.c" flags="-Iarch/ppc"/> + <object source="briq/briq.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="briq/init.c" flags="-I$(SRCDIR)/arch/ppc"/> <external-object source="target/arch/ppc/briq/kernel.o"/> - <object source="briq/main.c" flags="-Iarch/ppc"/> - <object source="briq/methods.c" flags="-Iarch/ppc"/> - <object source="briq/tree.c" flags="-Iarch/ppc"/> - <object source="briq/vfd.c" flags="-Iarch/ppc"/> + <object source="briq/main.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="briq/methods.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="briq/tree.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="briq/vfd.c" flags="-I$(SRCDIR)/arch/ppc"/> </library> <library name="pearpc" target="target" type="static" condition="PEARPC"> @@ -120,15 +120,15 @@ $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="ofmem.c"/> - <object source="pearpc/pearpc.c" flags="-Iarch/ppc"/> - <object source="pearpc/init.c" flags="-Iarch/ppc"/> + <object source="pearpc/pearpc.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="pearpc/init.c" flags="-I$(SRCDIR)/arch/ppc"/> <external-object source="target/arch/ppc/pearpc/kernel.o"/> - <object source="pearpc/main.c" flags="-Iarch/ppc"/> - <object source="pearpc/methods.c" flags="-Iarch/ppc"/> - <object source="pearpc/tree.c" flags="-Iarch/ppc"/> - <object source="pearpc/vfd.c" flags="-Iarch/ppc"/> + <object source="pearpc/main.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="pearpc/methods.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="pearpc/tree.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="pearpc/vfd.c" flags="-I$(SRCDIR)/arch/ppc"/>  - <object source="pearpc/console.c" flags="-Iarch/ppc"/> + <object source="pearpc/console.c" flags="-I$(SRCDIR)/arch/ppc"/> </library> <library name="qemu" target="target" type="static" condition="QEMU"> @@ -137,13 +137,13 @@ $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="qemu/ofmem.c"/> - <object source="qemu/qemu.c" flags="-Iarch/ppc"/> - <object source="qemu/init.c" flags="-Iarch/ppc"/> + <object source="qemu/qemu.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="qemu/init.c" flags="-I$(SRCDIR)/arch/ppc"/> <external-object source="target/arch/ppc/qemu/kernel.o"/> - <object source="qemu/main.c" flags="-Iarch/ppc"/> - <object source="qemu/methods.c" flags="-Iarch/ppc"/> - <object source="qemu/vfd.c" flags="-Iarch/ppc"/> - <object source="qemu/console.c" flags="-Iarch/ppc"/> + <object source="qemu/main.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="qemu/methods.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="qemu/vfd.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="qemu/console.c" flags="-I$(SRCDIR)/arch/ppc"/> </library> @@ -153,16 +153,16 @@ $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="ofmem.c"/> - <object source="mol/init.c" flags="-Iarch/ppc"/> - <object source="mol/main.c" flags="-Iarch/ppc"/> - <object source="mol/mol.c" flags="-Iarch/ppc"/> - <object source="mol/console.c" flags="-Iarch/ppc"/> - <object source="mol/osi-blk.c" flags="-Iarch/ppc"/> - <object source="mol/osi-scsi.c" flags="-Iarch/ppc"/> - <object source="mol/pseudodisk.c" flags="-Iarch/ppc"/> - <object source="mol/methods.c" flags="-Iarch/ppc"/> - <object source="mol/prom.c" flags="-Iarch/ppc"/> - <object source="mol/tree.c" flags="-Iarch/ppc"/> + <object source="mol/init.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="mol/main.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="mol/mol.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="mol/console.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="mol/osi-blk.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="mol/osi-scsi.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="mol/pseudodisk.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="mol/methods.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="mol/prom.c" flags="-I$(SRCDIR)/arch/ppc"/> + <object source="mol/tree.c" flags="-I$(SRCDIR)/arch/ppc"/> <external-object source="target/arch/ppc/mol/kernel.o"/> </library> @@ -215,7 +215,7 @@ <executable name="openbios-qemu.elf" target="target" condition="QEMU"> <rule> - $(LD) --warn-common -N -T arch/ppc/qemu/ldscript $^ -o $@ + $(LD) --warn-common -N -T $(SRCDIR)/arch/ppc/qemu/ldscript $^ -o $@ $(NM) $@ | sort > $(ODIR)/openbios-qemu.syms cp $@ $@.nostrip $(STRIP) $@ Modified: openbios-devel/arch/sparc32/build.xml =================================================================== --- openbios-devel/arch/sparc32/build.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/arch/sparc32/build.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -23,17 +23,17 @@ </library> <executable name="target/arch/sparc32/entry.o" target="target"> - <rule><![CDATA[ arch/sparc32/entry.S + <rule><![CDATA[ $(SRCDIR)/arch/sparc32/entry.S $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </executable> <executable name="target/arch/sparc32/vectors.o" target="target"> - <rule><![CDATA[ arch/sparc32/vectors.S arch/sparc32/wof.S arch/sparc32/wuf.S - $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc32/vectors.S]]></rule> + <rule><![CDATA[ $(SRCDIR)/arch/sparc32/vectors.S $(SRCDIR)/arch/sparc32/wof.S $(SRCDIR)/arch/sparc32/wuf.S + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/sparc32/vectors.S]]></rule> </executable> <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF"> <rule> - $(LD) --warn-common -N -T arch/sparc32/ldscript -o $@.nostrip $^ + $(LD) --warn-common -N -T $(SRCDIR)/arch/sparc32/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms cp $@.nostrip $@ $(STRIP) $@</rule> @@ -61,15 +61,15 @@ </executable> <executable name="target/arch/sparc32/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED"> - <rule><![CDATA[ arch/sparc32/builtin.c $(ODIR)/target/include/static-dict.h - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc32/builtin.c]]></rule> + <rule><![CDATA[ $(SRCDIR)/arch/sparc32/builtin.c $(ODIR)/target/include/static-dict.h + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/sparc32/builtin.c]]></rule> </executable>  <executable name="openbios-builtin.elf" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule> - $(LD) --warn-common -N -T arch/sparc32/ldscript -o $@.nostrip $^ + $(LD) --warn-common -N -T $(SRCDIR)/arch/sparc32/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms cp $@.nostrip $@ $(STRIP) $@</rule> Modified: openbios-devel/arch/sparc64/build.xml =================================================================== --- openbios-devel/arch/sparc64/build.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/arch/sparc64/build.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -22,17 +22,17 @@ </library> <executable name="target/arch/sparc64/entry.o" target="target"> - <rule><![CDATA[ arch/sparc64/entry.S + <rule><![CDATA[ $(SRCDIR)/arch/sparc64/entry.S $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </executable> <executable name="target/arch/sparc64/vectors.o" target="target"> - <rule><![CDATA[ arch/sparc64/vectors.S + <rule><![CDATA[ $(SRCDIR)/arch/sparc64/vectors.S $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </executable> <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF"> <rule> - $(LD) --warn-common -T arch/sparc64/ldscript -o $@.nostrip $^ + $(LD) --warn-common -T $(SRCDIR)/arch/sparc64/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms cp $@.nostrip $@ $(STRIP) $@</rule> @@ -61,8 +61,8 @@ </executable> <executable name="target/arch/sparc64/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED"> - <rule><![CDATA[ arch/sparc64/builtin.c $(ODIR)/target/include/static-dict.h - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc64/builtin.c]]></rule> + <rule><![CDATA[ $(SRCDIR)/arch/sparc64/builtin.c $(ODIR)/target/include/static-dict.h + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/sparc64/builtin.c]]></rule> </executable>  @@ -70,7 +70,7 @@ <executable name="openbios-builtin.elf" target="target" condition="IMAGE_ELF_EMBEDDED">  <rule> - $(LD) --warn-common -N -T arch/sparc64/ldscript -o $@.nostrip $^ + $(LD) --warn-common -N -T $(SRCDIR)/arch/sparc64/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms cp $@.nostrip $@ $(STRIP) $@</rule> Modified: openbios-devel/arch/x86/build.xml =================================================================== --- openbios-devel/arch/x86/build.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/arch/x86/build.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -22,13 +22,13 @@ </library> <executable name="target/arch/x86/entry.o" target="target"> - <rule><![CDATA[ arch/x86/entry.S + <rule><![CDATA[ $(SRCDIR)/arch/x86/entry.S $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </executable> <executable name="openbios.multiboot" target="target" condition="IMAGE_ELF_MULTIBOOT"> <rule> - $(LD) --warn-common -N -T arch/x86/ldscript -o $@.nostrip $^ + $(LD) --warn-common -N -T $(SRCDIR)/arch/x86/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-multiboot.syms cp $@.nostrip $@ $(STRIP) $@ @@ -47,7 +47,7 @@ <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF"> <rule> - $(LD) --warn-common -N -T arch/x86/ldscript -o $@.nostrip $^ + $(LD) --warn-common -N -T $(SRCDIR)/arch/x86/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms cp $@.nostrip $@ $(STRIP) $@ @@ -78,7 +78,7 @@ <executable name="target/arch/x86/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/x86/builtin.c + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $(SRCDIR)/arch/x86/builtin.c ]]></rule> <external-object source="target/include/static-dict.h"/> </executable> @@ -87,7 +87,7 @@ <executable name="openbios-builtin.elf" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule> - $(LD) --warn-common -N -T arch/x86/ldscript -o $@.nostrip $^ + $(LD) --warn-common -N -T $(SRCDIR)/arch/x86/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms cp $@.nostrip $@ $(STRIP) $@</rule> Modified: openbios-devel/config/examples/amd64_rules.xml =================================================================== --- openbios-devel/config/examples/amd64_rules.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/examples/amd64_rules.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -7,12 +7,15 @@ # ARCH := amd64 -ODIR := obj-$(ARCH) +ODIR := . +SRCDIR := .. HOSTCC := gcc +HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include CC := gcc AS := as @@ -26,7 +29,7 @@ CFLAGS := -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include # # pre rules Modified: openbios-devel/config/examples/cross-ppc_rules.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_rules.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/examples/cross-ppc_rules.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -7,12 +7,15 @@ # ARCH := ppc -ODIR := obj-$(ARCH) +ODIR := . +SRCDIR := .. HOSTCC := gcc +HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -Os -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include # # MOLPATH is needed if you want to build openbios-mol.elf # @@ -29,7 +32,7 @@ CFLAGS := -Os -Wall -msoft-float -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin-bcopy -fno-builtin-log2 CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Werror CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include M4 := m4 Modified: openbios-devel/config/examples/cross-sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_rules.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/examples/cross-sparc32_rules.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -7,12 +7,15 @@ # ARCH := sparc32 -ODIR := obj-$(ARCH) +ODIR := . +SRCDIR := .. HOSTCC := gcc +HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include TARGET=sparc-elf- CC := $(TARGET)gcc @@ -26,7 +29,7 @@ CFLAGS+= -Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-xarch=v8 -Wa,-32 -g # Modified: openbios-devel/config/examples/cross-sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_rules.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/examples/cross-sparc64_rules.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -7,12 +7,15 @@ # ARCH := sparc64 -ODIR := obj-$(ARCH) +ODIR := . +SRCDIR := .. HOSTCC := gcc +HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include TARGET=sparc64-elf- CC := $(TARGET)gcc @@ -27,7 +30,7 @@ CFLAGS+= -fno-builtin -nostdlib -ffreestanding CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-xarch=v9b -Wa,-64 -g # Modified: openbios-devel/config/examples/cross-x86_rules.xml =================================================================== --- openbios-devel/config/examples/cross-x86_rules.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/examples/cross-x86_rules.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -7,12 +7,15 @@ # ARCH := x86 -ODIR := obj-$(ARCH) +ODIR := . +SRCDIR := .. HOSTCC := gcc +HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include #TARGET=i386-elf- TARGET= @@ -27,7 +30,7 @@ CFLAGS+= -m32 CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-32 -g # Modified: openbios-devel/config/examples/ppc_rules.xml =================================================================== --- openbios-devel/config/examples/ppc_rules.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/examples/ppc_rules.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -7,12 +7,15 @@ # ARCH := ppc -ODIR := obj-$(ARCH) +ODIR := . +SRCDIR := .. HOSTCC := gcc +HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -Os -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include # # MOLPATH is needed if you want to build openbios-mol.elf # @@ -28,7 +31,7 @@ CFLAGS := -Os -Wall -msoft-float -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin-bcopy -fno-builtin-log2 CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Werror -INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include M4 := m4 Modified: openbios-devel/config/examples/sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/sparc32_rules.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/examples/sparc32_rules.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -7,12 +7,15 @@ # ARCH := sparc32 -ODIR := obj-$(ARCH) +ODIR := . +SRCDIR := .. HOSTCC := gcc +HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include CC := gcc AS := as @@ -31,7 +34,7 @@ CFLAGS+= -Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-xarch=v8 -Wa,-32 -g # Modified: openbios-devel/config/examples/sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/sparc64_rules.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/examples/sparc64_rules.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -7,13 +7,16 @@ # ARCH := sparc64 -ODIR := obj-$(ARCH) +ODIR := . +SRCDIR := .. HOSTCC := gcc +HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wa,-xarch=v9 -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include CC := gcc AS := as @@ -32,7 +35,7 @@ CFLAGS+= -Wa,-xarch=v9b -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-xarch=v9b -Wa,-64 -g ifeq ($(shell uname), OpenBSD) Modified: openbios-devel/config/examples/x86_rules.xml =================================================================== --- openbios-devel/config/examples/x86_rules.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/examples/x86_rules.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -7,12 +7,15 @@ # ARCH := x86 -ODIR := obj-$(ARCH) +ODIR := . +SRCDIR := .. HOSTCC := gcc +HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include CC := gcc AR := ar @@ -29,7 +32,7 @@ CFLAGS+= -m32 CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-32 -g # Modified: openbios-devel/config/scripts/switch-arch =================================================================== --- openbios-devel/config/scripts/switch-arch 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/scripts/switch-arch 2009-01-23 20:09:26 UTC (rev 420) @@ -1,7 +1,7 @@ #!/bin/sh if [ x"$1" = x ]; then - printf "Usage:\n $0 [arch-config]\n" + printf "Usage:\n $0 [arch-config]...\n" printf "arch-config values supported for native builds:\n" printf " amd64, ppc, sparc32, sparc64, x86\n" printf "arch-config values supported for cross compiled builds:\n" @@ -9,9 +9,64 @@ exit 0 fi -ARCH=$1 +# This is needed because viewvc messes with the permissions of executables: +chmod 755 utils/dist/debian/rules +chmod 755 config/scripts/switch-arch +chmod 755 config/scripts/archname +chmod 755 config/scripts/reldir +chmod 755 config/scripts/crosscflags +HOSTARCH=`config/scripts/archname` -rm -f rules.xml -rm -f config.xml -ln -s config/examples/${ARCH}_rules.xml rules.xml -ln -s config/examples/${ARCH}_config.xml config.xml +echo "Configuring OpenBIOS on $HOSTARCH for $*" +for RULES_ARCH in $*; do + ARCH=`cat config/examples/${RULES_ARCH}_rules.xml |grep "^ARCH" |cut -d\= -f2|tr -d \ ` + OBJDIR=obj-$ARCH + printf "Initializing build tree $OBJDIR..." + rm -rf "$OBJDIR" + mkdir "$OBJDIR" + mkdir -p $OBJDIR/target + mkdir -p $OBJDIR/target/include + mkdir -p $OBJDIR/target/arch + mkdir -p $OBJDIR/target/arch/unix + mkdir -p $OBJDIR/target/arch/$ARCH + mkdir -p $OBJDIR/target/arch/ppc + mkdir -p $OBJDIR/target/arch/ppc/briq # no autodetection of those.. + mkdir -p $OBJDIR/target/arch/ppc/pearpc + mkdir -p $OBJDIR/target/arch/ppc/qemu + mkdir -p $OBJDIR/target/arch/ppc/mol + mkdir -p $OBJDIR/target/arch/x86 + mkdir -p $OBJDIR/target/arch/x86/xbox + mkdir -p $OBJDIR/target/libgcc + mkdir -p $OBJDIR/target/kernel + mkdir -p $OBJDIR/target/modules + mkdir -p $OBJDIR/target/fs + mkdir -p $OBJDIR/target/fs/grubfs + mkdir -p $OBJDIR/target/fs/hfs + mkdir -p $OBJDIR/target/fs/hfsplus + mkdir -p $OBJDIR/target/drivers + mkdir -p $OBJDIR/target/libc + mkdir -p $OBJDIR/host/include + mkdir -p $OBJDIR/host/kernel + mkdir -p $OBJDIR/forth + ln -s ../../../include/$ARCH $OBJDIR/target/include/asm + #compile the host binary with target settings instead + #ln -s ../../../include/$HOSTARCH $OBJDIR/host/include/asm + echo "ok." + + cd $OBJDIR + SRCDIR=.. + ODIR=. + + printf "Creating target Makefile..." + ln -s $SRCDIR/config/examples/${RULES_ARCH}_rules.xml $ODIR/rules.xml + ln -s $SRCDIR/config/examples/${RULES_ARCH}_config.xml $ODIR/config.xml + xsltproc $SRCDIR/config/xml/xinclude.xsl $SRCDIR/build.xml > $ODIR/build-full.xml + xsltproc $SRCDIR/config/xml/makefile.xsl $ODIR/build-full.xml > $ODIR/Makefile + echo "ok." + printf "Creating config files..." + xsltproc $SRCDIR/config/xml/config-c.xsl $SRCDIR/config/examples/${RULES_ARCH}_config.xml > $ODIR/host/include/autoconf.h + xsltproc $SRCDIR/config/xml/config-c.xsl $SRCDIR/config/examples/${RULES_ARCH}_config.xml > $ODIR/target/include/autoconf.h + xsltproc $SRCDIR/config/xml/config-forth.xsl $SRCDIR/config/examples/${RULES_ARCH}_config.xml > $ODIR/forth/config.fs + echo "ok." + cd $SRCDIR +done Modified: openbios-devel/config/xml/dictionary.xsl =================================================================== --- openbios-devel/config/xml/dictionary.xsl 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/xml/dictionary.xsl 2009-01-23 20:09:26 UTC (rev 420) @@ -56,6 +56,7 @@ <xsl:value-of select="$dictname"/><xsl:text>-DICTIONARY:=$(</xsl:text> <xsl:value-of select="$dictname"/><xsl:text>-DICTIONARY) </xsl:text> + <xsl:text>$(SRCDIR)/</xsl:text> <xsl:value-of select="$path"/> <xsl:value-of select="@source"/> <xsl:text>
</xsl:text> @@ -116,6 +117,7 @@ <xsl:if test="$conditions = 0"> <xsl:text> -I</xsl:text> + <xsl:text>$(SRCDIR)/</xsl:text> <xsl:value-of select="$path"/> </xsl:if> </xsl:for-each> Modified: openbios-devel/config/xml/makefile.xsl =================================================================== --- openbios-devel/config/xml/makefile.xsl 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/xml/makefile.xsl 2009-01-23 20:09:26 UTC (rev 420) @@ -7,7 +7,7 @@ <xsl:include href="object.xsl"/> <xsl:template match="/"> - <xsl:value-of select="document('../../rules.xml')/rules/pre"/> + <xsl:value-of select="document('rules.xml',.)/rules/pre"/> <xsl:apply-templates select="." mode="dictionaries"/> <xsl:apply-templates select="." mode="objects"/> </xsl:template> Modified: openbios-devel/config/xml/object.xsl =================================================================== --- openbios-devel/config/xml/object.xsl 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/xml/object.xsl 2009-01-23 20:09:26 UTC (rev 420) @@ -52,6 +52,7 @@ <xsl:text>.o: </xsl:text>  + <xsl:text>$(SRCDIR)/</xsl:text> <xsl:value-of select="$path"/> <xsl:value-of select="@source"/> @@ -68,7 +69,7 @@ <xsl:text>" ;\</xsl:text> </xsl:if>  - <xsl:value-of select="document('../../rules.xml')//rule[@target=$target][@entity='object']"/> + <xsl:value-of select="document('rules.xml',.)//rule[@target=$target][@entity='object']"/> </xsl:otherwise> </xsl:choose> @@ -154,7 +155,7 @@ </xsl:when> <xsl:otherwise>  - <xsl:value-of select="document('../../rules.xml')//rule[@target=$target][@entity='executable']"/> + <xsl:value-of select="document('rules.xml',.)//rule[@target=$target][@entity='executable']"/> </xsl:otherwise> </xsl:choose> @@ -252,7 +253,7 @@  - <xsl:value-of select="document('../../rules.xml')//rule[@target=$target][@entity='library']"/> + <xsl:value-of select="document('rules.xml',.)//rule[@target=$target][@entity='library']"/> </xsl:if> </xsl:if> Modified: openbios-devel/config/xml/util.xsl =================================================================== --- openbios-devel/config/xml/util.xsl 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/config/xml/util.xsl 2009-01-23 20:09:26 UTC (rev 420) @@ -44,8 +44,8 @@ <xsl:choose> <xsl:when test="$expression!=''"> - <xsl:variable name="value"><xsl:value-of select="document('../../config.xml')//option[@name=$confexpr]/attribute::value"/></xsl:variable> - <xsl:variable name="type"><xsl:value-of select="document('../../config.xml')//option[@name=$confexpr]/attribute::type"/></xsl:variable> + <xsl:variable name="value"><xsl:value-of select="document('config.xml',.)//option[@name=$confexpr]/attribute::value"/></xsl:variable> + <xsl:variable name="type"><xsl:value-of select="document('config.xml',.)//option[@name=$confexpr]/attribute::type"/></xsl:variable> <xsl:choose> <xsl:when test="$type='boolean'"> <xsl:choose> Modified: openbios-devel/fs/hfs/build.xml =================================================================== --- openbios-devel/fs/hfs/build.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/fs/hfs/build.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -1,15 +1,15 @@ <build> <library name="fs" type="static" target="target"> - <object source="block.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> - <object source="btree.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> - <object source="data.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> - <object source="file.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> - <object source="hfs.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> - <object source="low.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> - <object source="medium.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> - <object source="node.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> - <object source="record.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> - <object source="volume.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> - <object source="hfs_fs.c" flags="-Ifs/hfs/include -Ifs/ -fno-strict-aliasing" condition="HFS"/> + <object source="block.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> + <object source="btree.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> + <object source="data.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> + <object source="file.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> + <object source="hfs.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> + <object source="low.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> + <object source="medium.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> + <object source="node.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> + <object source="record.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> + <object source="volume.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> + <object source="hfs_fs.c" flags="-I$(SRCDIR)/fs/hfs/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFS"/> </library> </build> Modified: openbios-devel/fs/hfsplus/build.xml =================================================================== --- openbios-devel/fs/hfsplus/build.xml 2009-01-18 10:14:58 UTC (rev 419) +++ openbios-devel/fs/hfsplus/build.xml 2009-01-23 20:09:26 UTC (rev 420) @@ -1,11 +1,11 @@ <build> <library name="fs" type="static" target="target"> - <object source="blockiter.c" flags="-Ifs/hfsplus/include -Ifs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="btree.c" flags="-Ifs/hfsplus/include -Ifs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="libhfsp.c" flags="-Ifs/hfsplus/include -Ifs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="record.c" flags="-Ifs/hfsplus/include -Ifs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="unicode.c" flags="-Ifs/hfsplus/include -Ifs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="volume.c" flags="-Ifs/hfsplus/include -Ifs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="hfsp_fs.c" flags="-Ifs/hfsplus/include -Ifs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="blockiter.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="btree.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="libhfsp.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="record.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="unicode.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="volume.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="hfsp_fs.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> </library> </build>

1 0

sparc32 solaris 2.5.1 boot problem
by Robert Reif 23 Jan '09

23 Jan '09

I'm trying to boot solaris 2.5.1 and it appears based on the addresses it's accessing that mbus systems think they are a single processor system. Commenting out ob_sconfig_init gets further so this should depend on the machine type. Only single processor systems should have a slavioconfig entry.

2 3

OpenBIOS dictionary relocation - can anyone explain this?
by Mark Cave-Ayland 22 Jan '09

22 Jan '09

Hi everyone, I'm trying to check the the forth dictionary is being loaded correctly on Sparc64, and I'm struggling to understand the dynamic relocation code from kernel/dict.c: ==== cut ==== dicthead = target_long(header->length); memcpy(dict, data, dicthead); reloc_table=(ucell *)(data+dicthead); #ifdef CONFIG_DEBUG_DICTIONARY printk("\nmoving dictionary (%x bytes) to %x\n", (ucell)dicthead, (ucell)dict); printk("\ndynamic relocation..."); #endif for (walk = (ucell *) dict; walk < (ucell *) (dict + dicthead); walk++) { int pos, bit, l; l=(walk-(ucell *)dict); pos=l/BITS; bit=l&~(-BITS); if (reloc_table[pos]&target_ucell(1UL<<bit)) { // printk("%lx, pos %x, bit %d\n",*walk, pos, bit); write_ucell(walk, read_ucell(walk)+pointer2cell(dict)); } } #ifdef CONFIG_DEBUG_DICTIONARY printk(" done.\n"); #endif ==== cut ==== Stepping through with the debugger, l appears to be a count of the number of words from the beginning of the dictionary, pos is set to either 0 or 1 depending upon whether the word offset is a multiple of the target word size and bit is a modulo of l, again based upon the word size. It looks as if bit is being used to set up a shifting bit mask up to the word size in bits, and it is based upon the interaction of this and reloc_table[pos] which decides whether any code is moved. Can anyone shed any light on exactly what this code does, and how it actually does it? The part that confuses me the most is that decisions are being made on which words to relocate, but these criteria are based upon some strange combination of arithmetic involving the current offset and the target word size. Many thanks, Mark. -- Mark Cave-Ayland Sirius Corporation - The Open Source Experts http://www.siriusit.co.uk T: +44 870 608 0063

2 3

[sparc64] Problematic pci@0 and pci nodes in the device tree
by Jakub Jermar 18 Jan '09

18 Jan '09

Hi, I have the following problem with the OpenBIOS device tree (the current Qemu version): In the root directory, there are currently two pci nodes: ffd97778 pci@0 ffd98808 pci The "screen" alias is defined as: /pci/pci/pci/QEMU,VGA When HelenOS attempts to lookup this path, it fails, because it matches /pci instead of /pci@0 and /pci does not have any children. HelenOS is normally designed to cope with ambiguous node names, but in this case the /pci node matches and sends it to the wrong direction. I think the "screen" alias should be either defined using the non-ambiguous pci@0 path components or the /pci node should not exist at all. Can you confirm this is a problem in the tree? Thanks, Jakub

2 6

[PATCH][RFC] Consolidate Makefiles
by Blue Swirl 18 Jan '09

18 Jan '09

Hi, This patch (to be applied after the previous one) collects identical Makefile fragments to common files. Known bugs: Cross compiling should be detected automatically. I should also revert the rules.xml change in the previous patch to avoid one extra link for each target.

1 0

[PATCH][RFC] mac-io IDE support
by Laurent Vivier 18 Jan '09

18 Jan '09

Hi, this patch adds the mac-io IDE support to openBIOS. It works well with openBIOS (to load kernel) and with kernel 2.4 but has some problems with linux 2.6. For instance, using debian-31r8-powerpc-netinst.iso with kernel 2.4 works well (but not kernel 2.6), but using debian-40r6-powerpc- netinst.iso fails when debian-installer loads all udeb components. Is there a bug in qemu, linux or the mac-io IDE device tree is not initialized correctly ? Regards, Laurent

3 4

[PATCH][RFC] Multiple target support
by Blue Swirl 18 Jan '09

18 Jan '09

Hi, This patch allows configuration for multiple targets, like: ./config/scripts/switch-arch amd64 cross-ppc cross-sparc32 cross-sparc64 cross-x86 The command creates directories (obj-amd64 obj-ppc obj-sparc32 obj-sparc64 obj-x86), Makefiles and other config stuff. To build all configured targets, use: make build or make build-verbose The benefit is that after a change to a file that affect several architectures, total recompile time is reduced greatly because only the changed file need to be recompiled and linked. Also there is no need to use rules.xml and config.xml links in the top level directory. I've only tested the following targets: amd64 cross-ppc cross-sparc32 cross-sparc64 cross-x86. Maybe with small further changes it would also be possible to put the object directories completely outside of the source tree. Comments?

1 0

r419 - openbios-devel/config/scripts
by svn＠openbios.org 18 Jan '09

18 Jan '09

Author: blueswirl Date: 2009-01-18 11:14:58 +0100 (Sun, 18 Jan 2009) New Revision: 419 Modified: openbios-devel/config/scripts/switch-arch Log: Update build target description Modified: openbios-devel/config/scripts/switch-arch =================================================================== --- openbios-devel/config/scripts/switch-arch 2009-01-17 20:39:12 UTC (rev 418) +++ openbios-devel/config/scripts/switch-arch 2009-01-18 10:14:58 UTC (rev 419) @@ -1,8 +1,11 @@ #!/bin/sh if [ x"$1" = x ]; then - printf "Usage:\n $0 [arch-config]" - printf "\narch-config: cross-ppc, x86\n" + printf "Usage:\n $0 [arch-config]\n" + printf "arch-config values supported for native builds:\n" + printf " amd64, ppc, sparc32, sparc64, x86\n" + printf "arch-config values supported for cross compiled builds:\n" + printf " cross-ppc, cross-sparc32, cross-sparc64, cross-x86\n" exit 0 fi

1 0

r418 - openbios-devel/drivers
by svn＠openbios.org 17 Jan '09

17 Jan '09

Author: blueswirl Date: 2009-01-17 21:39:12 +0100 (Sat, 17 Jan 2009) New Revision: 418 Modified: openbios-devel/drivers/escc.c Log: Send key on key press, not release: closes #26 Modified: openbios-devel/drivers/escc.c =================================================================== --- openbios-devel/drivers/escc.c 2009-01-17 20:28:21 UTC (rev 417) +++ openbios-devel/drivers/escc.c 2009-01-17 20:39:12 UTC (rev 418) @@ -272,8 +272,8 @@ else if (ch == 238) shiftstate &= ~2; //printk("getch: %d\n", ch); - } - while ((ch & 0x80) == 0 || ch == 238 || ch == 227); // Wait for key release + } // If release, wait for key press + while ((ch & 0x80) == 0x80 || ch == 238 || ch == 227); //printk("getch rel: %d\n", ch); ch &= 0x7f; if (shiftstate)

1 0

r417 - openbios-devel/kernel
by svn＠openbios.org 17 Jan '09

17 Jan '09

Author: blueswirl Date: 2009-01-17 21:28:21 +0100 (Sat, 17 Jan 2009) New Revision: 417 Modified: openbios-devel/kernel/bootstrap.c Log: Suppress OpenBSD linker warning Modified: openbios-devel/kernel/bootstrap.c =================================================================== --- openbios-devel/kernel/bootstrap.c 2009-01-17 19:02:38 UTC (rev 416) +++ openbios-devel/kernel/bootstrap.c 2009-01-17 20:28:21 UTC (rev 417) @@ -447,9 +447,7 @@ include *incl = &includes; while (incl) { - strncpy(fullpath, incl->path, MAX_PATH_LEN); - strncat(fullpath, "/", MAX_PATH_LEN); - strncat(fullpath, fil, MAX_PATH_LEN); + snprintf(fullpath, sizeof(fullpath), "%s/%s", incl->path, fil); ret = fopen(fullpath, "r"); if (ret != NULL) return ret;

1 0

[PATCH] PowerPC: Fix PCI I/O ports allocation
by Aurelien Jarno 17 Jan '09

17 Jan '09

Long story, small patch... On the PowerPC target, the PCI devices using I/O ports are currently not working correctly with a relatively old kernel (<= 2.6.24). This is due to the assignation of I/O port 0, while the I/O ports start at 1, which keeps the device disabled. Recent version of Linux assign resources to those devices, that's why the problem wasn't present on those versions. Moreover the QEMU OldWorld machine have a few devices mapped on fixed I/O ports, that should be skipped when assigning I/O ports to PCI devices. Those devices are: - video card (0x3c0-0x3cf, 0x3b4-0x3b5, 0x3ba, 0x1ce-0x1cf, 0x1d0-0x1d1) - i8259 (0x20-0x21, 0xa0-0x1a, 0x4d0-0x4d1) - m48t59 (0x74-0x79) - OpenBIOS debug port (0xf00-0xf03) Given that ranges, I have decided to start mapping PCI I/O ports at 0x1000. Note that real G3 beige starts to map them at 0x400. This can be changed later, when we get rid of the i8259 and m48t59 and if we move the OpenBIOS debug port. I have done this change unconditionally because Sparc also have the problem, though the first I/O port can be chosen differently. Index: drivers/pci.c =================================================================== --- drivers/pci.c (révision 411) +++ drivers/pci.c (copie de travail) @@ -760,7 +760,8 @@ /* Find all PCI bridges */ mem_base = arch->mem_base; - io_base = arch->io_base; + /* I/O ports under 0x1000 are used by devices mapped at fixed location. */ + io_base = arch->io_base + 0x1000; path = strdup(""); for (bus = 0; bus<0x100; bus++) { ob_scan_pci_bus(bus, &mem_base, &io_base, &path); -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32(a)debian.org | aurelien(a)aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net

2 2

r416 - openbios-devel/drivers
by svn＠openbios.org 17 Jan '09

17 Jan '09

Author: blueswirl Date: 2009-01-17 20:02:38 +0100 (Sat, 17 Jan 2009) New Revision: 416 Modified: openbios-devel/drivers/pci.c Log: Fix PCI I/O ports allocation (Aurelien Jarno) Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-17 18:42:48 UTC (rev 415) +++ openbios-devel/drivers/pci.c 2009-01-17 19:02:38 UTC (rev 416) @@ -760,7 +760,9 @@ /* Find all PCI bridges */ mem_base = arch->mem_base; - io_base = arch->io_base; + /* I/O ports under 0x400 are used by devices mapped at fixed + location. */ + io_base = arch->io_base + 0x400; path = strdup(""); for (bus = 0; bus<0x100; bus++) { ob_scan_pci_bus(bus, &mem_base, &io_base, &path);

1 0

r415 - in openbios-devel: arch/sparc64 config/examples
by svn＠openbios.org 17 Jan '09

17 Jan '09

Author: blueswirl Date: 2009-01-17 19:42:48 +0100 (Sat, 17 Jan 2009) New Revision: 415 Modified: openbios-devel/arch/sparc64/openbios.c openbios-devel/config/examples/cross-sparc64_config.xml openbios-devel/config/examples/sparc64_config.xml Log: Use PCI IDE controller Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2009-01-17 15:37:30 UTC (rev 414) +++ openbios-devel/arch/sparc64/openbios.c 2009-01-17 18:42:48 UTC (rev 415) @@ -498,9 +498,6 @@ arch_init( void ) { modules_init(); - // XXX use PCI IDE - setup_timers(); - ob_ide_init("/pci/pci/pci/ebus", 0x1f0, 0x3f4, 0x170, 0x374); #ifdef CONFIG_DRIVER_PCI ob_pci_init(); #endif Modified: openbios-devel/config/examples/cross-sparc64_config.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_config.xml 2009-01-17 15:37:30 UTC (rev 414) +++ openbios-devel/config/examples/cross-sparc64_config.xml 2009-01-17 18:42:48 UTC (rev 415) @@ -69,7 +69,7 @@ <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/> <option name="CONFIG_DEBUG_PCI" type="boolean" value="false"/> <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> - <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> + <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="2"/> <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/> <option name="CONFIG_DEBUG_FLOPPY" type="boolean" value="false"/> Modified: openbios-devel/config/examples/sparc64_config.xml =================================================================== --- openbios-devel/config/examples/sparc64_config.xml 2009-01-17 15:37:30 UTC (rev 414) +++ openbios-devel/config/examples/sparc64_config.xml 2009-01-17 18:42:48 UTC (rev 415) @@ -69,7 +69,7 @@ <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/> <option name="CONFIG_DEBUG_PCI" type="boolean" value="false"/> <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> - <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> + <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="2"/> <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/> <option name="CONFIG_DEBUG_FLOPPY" type="boolean" value="false"/>

1 0

r414 - openbios-devel/arch/sparc64
by svn＠openbios.org 17 Jan '09

17 Jan '09

Author: blueswirl Date: 2009-01-17 16:37:30 +0100 (Sat, 17 Jan 2009) New Revision: 414 Modified: openbios-devel/arch/sparc64/init.fs openbios-devel/arch/sparc64/openbios.c Log: Set up console input and output variables correctly Modified: openbios-devel/arch/sparc64/init.fs =================================================================== --- openbios-devel/arch/sparc64/init.fs 2009-01-17 10:15:13 UTC (rev 413) +++ openbios-devel/arch/sparc64/init.fs 2009-01-17 15:37:30 UTC (rev 414) @@ -38,15 +38,9 @@ \ use the tty interface if available : activate-tty-interface " /packages/terminal-emulator" find-dev if drop - " keyboard" " input-device" $setenv - " screen" " output-device" $setenv then ; -:noname - " keyboard" input -; CONSOLE-IN-initializer - device-end : rmap@ ( virt -- rmentry ) Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2009-01-17 10:15:13 UTC (rev 413) +++ openbios-devel/arch/sparc64/openbios.c 2009-01-17 15:37:30 UTC (rev 414) @@ -433,6 +433,7 @@ stdin_path = "/pci/pci/pci/ebus/kb_ps2"; stdout_path = "/pci/pci/pci/QEMU,VGA"; } + push_str(stdin_path); fword("open-dev"); fword("encode-int"); @@ -444,6 +445,20 @@ fword("encode-int"); push_str("stdout"); fword("property"); + + push_str(stdin_path); + push_str("input-device"); + fword("$setenv"); + + push_str(stdout_path); + push_str("output-device"); + fword("$setenv"); + + push_str(stdin_path); + fword("input"); + + push_str(stdout_path); + fword("output"); } void arch_nvram_put(char *data)

1 0

r413 - openbios-devel/drivers
by svn＠openbios.org 17 Jan '09

17 Jan '09

Author: blueswirl Date: 2009-01-17 11:15:13 +0100 (Sat, 17 Jan 2009) New Revision: 413 Modified: openbios-devel/drivers/escc.c openbios-devel/drivers/obio.c openbios-devel/drivers/sbus.c Log: Use aliases for console device selection Modified: openbios-devel/drivers/escc.c =================================================================== --- openbios-devel/drivers/escc.c 2009-01-17 09:55:09 UTC (rev 412) +++ openbios-devel/drivers/escc.c 2009-01-17 10:15:13 UTC (rev 413) @@ -318,6 +318,7 @@ ob_zs_init(uint64_t base, uint64_t offset, int intr, int slave, int keyboard) { char nodebuff[256]; + phandle_t aliases; ob_new_obio_device("zs", "serial"); @@ -348,8 +349,21 @@ (int)offset & 0xffffffff); if (keyboard) { REGISTER_NODE_METHODS(escc_keyboard, nodebuff); + + aliases = find_dev("/aliases"); + set_property(aliases, "keyboard", nodebuff, strlen(nodebuff) + 1); } else { REGISTER_NODE_METHODS(escc, nodebuff); + + aliases = find_dev("/aliases"); + snprintf(nodebuff, sizeof(nodebuff), "/obio/zs@0,%x:a", + (int)offset & 0xffffffff); + set_property(aliases, "ttya", nodebuff, strlen(nodebuff) + 1); + + snprintf(nodebuff, sizeof(nodebuff), "/obio/zs@0,%x:b", + (int)offset & 0xffffffff); + set_property(aliases, "ttyb", nodebuff, strlen(nodebuff) + 1); + } } Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2009-01-17 09:55:09 UTC (rev 412) +++ openbios-devel/drivers/obio.c 2009-01-17 10:15:13 UTC (rev 413) @@ -907,24 +907,26 @@ if (nographic) { obp_stdin = PROMDEV_TTYA; obp_stdout = PROMDEV_TTYA; - stdin = "/obio/zs@0,100000:a"; - stdout = "/obio/zs@0,100000:a"; + stdin = "ttya"; + stdout = "ttya"; } else { obp_stdin = PROMDEV_KBD; obp_stdout = PROMDEV_SCREEN; - stdin = "/obio/zs@0,0:a"; - stdout = "/iommu/sbus/SUNW,tcx"; + stdin = "keyboard"; + stdout = "screen"; } push_str("/"); fword("find-device"); push_str(stdin); + fword("pathres-resolve-aliases"); fword("encode-string"); push_str("stdin-path"); fword("property"); push_str(stdout); + fword("pathres-resolve-aliases"); fword("encode-string"); push_str("stdout-path"); fword("property"); Modified: openbios-devel/drivers/sbus.c =================================================================== --- openbios-devel/drivers/sbus.c 2009-01-17 09:55:09 UTC (rev 412) +++ openbios-devel/drivers/sbus.c 2009-01-17 10:15:13 UTC (rev 413) @@ -89,9 +89,11 @@ uint16_t graphic_depth; static void -ob_tcx_init(unsigned int slot) +ob_tcx_init(unsigned int slot, const char *path) { - push_str("/iommu/sbus/SUNW,tcx"); + phandle_t chosen, aliases; + + push_str(path); fword("find-device"); PUSH(slot); @@ -277,6 +279,14 @@ push_str("tcx-8-bit"); fword("property"); } + + chosen = find_dev("/chosen"); + push_str(path); + fword("open-dev"); + set_int_property(chosen, "screen", POP()); + + aliases = find_dev("/aliases"); + set_property(aliases, "screen", path, strlen(path) + 1); } static void @@ -373,7 +383,7 @@ // OpenBIOS and Qemu don't know how to do Sbus probing switch(slot) { case 3: // SUNW,tcx - ob_tcx_init(slot); + ob_tcx_init(slot, "/iommu/sbus/SUNW,tcx"); break; case 4: // SUNW,CS4231 @@ -395,7 +405,7 @@ // OpenBIOS and Qemu don't know how to do Sbus probing switch(slot) { case 2: // SUNW,tcx - ob_tcx_init(slot); + ob_tcx_init(slot, "/iommu/sbus/SUNW,tcx"); break; case 0xf: // le, esp, bpp, power-management ob_macio_init(slot, base, 0); @@ -413,7 +423,7 @@ // OpenBIOS and Qemu don't know how to do Sbus probing switch(slot) { case 2: // SUNW,tcx - ob_tcx_init(slot); + ob_tcx_init(slot, "/iommu/sbus/SUNW,tcx"); break; case 0xf: // le, esp, bpp, power-management #ifdef CONFIG_DRIVER_ESP

1 0

r412 - in openbios-devel: arch/sparc32 drivers
by svn＠openbios.org 17 Jan '09

17 Jan '09

Author: blueswirl Date: 2009-01-17 10:55:09 +0100 (Sat, 17 Jan 2009) New Revision: 412 Modified: openbios-devel/arch/sparc32/init.fs openbios-devel/drivers/obio.c Log: Fix Sparc32 nographic mode Modified: openbios-devel/arch/sparc32/init.fs =================================================================== --- openbios-devel/arch/sparc32/init.fs 2009-01-15 12:55:31 UTC (rev 411) +++ openbios-devel/arch/sparc32/init.fs 2009-01-17 09:55:09 UTC (rev 412) @@ -33,23 +33,8 @@ :noname " memory" " /memory" preopen " mmu" " /cpus/@0" preopen - " stdout" " /builtin/console" preopen - " stdin" " /builtin/console" preopen - ; SYSTEM-initializer -\ use the tty interface if available -:noname - " /builtin/console" find-dev if drop - " /builtin/console" " input-device" $setenv - " /builtin/console" " output-device" $setenv - then -; SYSTEM-initializer - -:noname - " keyboard" input -; CONSOLE-IN-initializer - device-end : rmap@ ( virt -- rmentry ) Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2009-01-15 12:55:31 UTC (rev 411) +++ openbios-devel/drivers/obio.c 2009-01-17 09:55:09 UTC (rev 412) @@ -684,6 +684,7 @@ ohwcfg_v3_t *header; char buf[256]; uint32_t temp; + phandle_t chosen; ob_new_obio_device("eeprom", NULL); @@ -917,6 +918,7 @@ push_str("/"); fword("find-device"); + push_str(stdin); fword("encode-string"); push_str("stdin-path"); @@ -927,6 +929,27 @@ push_str("stdout-path"); fword("property"); + chosen = find_dev("/chosen"); + push_str(stdin); + fword("open-dev"); + set_int_property(chosen, "stdin", POP()); + + chosen = find_dev("/chosen"); + push_str(stdout); + fword("open-dev"); + set_int_property(chosen, "stdout", POP()); + + push_str(stdin); + push_str("input-device"); + fword("$setenv"); + + push_str(stdout); + push_str("output-device"); + fword("$setenv"); + + push_str(stdin); + fword("input"); + obp_stdin_path = stdin; obp_stdout_path = stdout; }

1 0

Re: [OpenBIOS] [PATCH] Nographic mode for PPC
by Laurent Vivier 15 Jan '09

15 Jan '09

Le 15 janv. 09 à 19:41, Blue Swirl a écrit : > Hi, > > This patch would add support for -nographic switch passed from Qemu. > On Sparc32 the switch selects serial port for input and output instead > of keyboard and display. > > However, the patch does not work. Any suggestions? Perhaps something to do with "activate-tty-interface" ? Regards, Laurent -------------------- laurent(a)lvivier.info -------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

1 0

r411 - in openbios-devel: arch/ppc/qemu drivers
by svn＠openbios.org 15 Jan '09

15 Jan '09

Author: laurent Date: 2009-01-15 13:55:31 +0100 (Thu, 15 Jan 2009) New Revision: 411 Modified: openbios-devel/arch/ppc/qemu/main.c openbios-devel/drivers/ide.c openbios-devel/drivers/ide.h Log: ide: allow to have multiple instances Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2009-01-15 02:18:58 UTC (rev 410) +++ openbios-devel/arch/ppc/qemu/main.c 2009-01-15 12:55:31 UTC (rev 411) @@ -249,7 +249,6 @@ unsigned blknos[64]; }; - static void quik_startup( void ) { Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2009-01-15 02:18:58 UTC (rev 410) +++ openbios-devel/drivers/ide.c 2009-01-15 12:55:31 UTC (rev 411) @@ -25,7 +25,7 @@ #include "timer.h" /* DECLARE data structures for the nodes. */ -DECLARE_UNNAMED_NODE( ob_ide, INSTALL_OPEN, 2*sizeof(int) ); +DECLARE_UNNAMED_NODE( ob_ide, INSTALL_OPEN, sizeof(struct ide_drive*) ); DECLARE_UNNAMED_NODE( ob_ide_ctrl, INSTALL_OPEN, sizeof(int)); /* @@ -58,11 +58,27 @@ static int current_channel = FIRST_UNIT; -static struct ide_channel ob_ide_channels[IDE_MAX_CHANNELS]; +static struct ide_channel *channels = NULL; -static int io_ports[IDE_MAX_CHANNELS]; -static int ctl_ports[IDE_MAX_CHANNELS]; +static inline void ide_add_channel(struct ide_channel *chan) +{ + chan->next = channels; + channels = chan; +} +static struct ide_channel *ide_seek_channel(const char *name) +{ + struct ide_channel *current; + + current = channels; + while (current) { + if (!strcmp(current->name, name)) + return current; + current = current->next; + } + return NULL; +} + /* * don't be pedantic */ @@ -1150,7 +1166,7 @@ static void ob_ide_max_transfer(int *idx) { - struct ide_drive *drive=&ob_ide_channels[idx[1]].drives[idx[0]]; + struct ide_drive *drive = *(struct ide_drive **)idx; #ifdef CONFIG_DEBUG_IDE printk("max_transfer %x\n", drive->max_sectors * drive->bs); #endif @@ -1164,7 +1180,7 @@ cell n = POP(), cnt=n; ucell blk = POP(); unsigned char *dest = (unsigned char *)POP(); - struct ide_drive *drive=&ob_ide_channels[idx[1]].drives[idx[0]]; + struct ide_drive *drive = *(struct ide_drive **)idx; #ifdef CONFIG_DEBUG_IDE printk("ob_ide_read_blocks %lx block=%ld n=%ld\n", (unsigned long)dest, @@ -1192,7 +1208,7 @@ static void ob_ide_block_size(int *idx) { - struct ide_drive *drive=&ob_ide_channels[idx[1]].drives[idx[0]]; + struct ide_drive *drive = *(struct ide_drive **)idx; #ifdef CONFIG_DEBUG_IDE printk("ob_ide_block_size: block size %x\n", drive->bs); #endif @@ -1225,21 +1241,25 @@ int ret=1, len; phandle_t ph; struct ide_drive *drive; + struct ide_channel *chan; char *idename; + int unit; fword("my-unit"); - idx[0]=POP(); + unit = POP(); fword("my-parent"); fword("ihandle>phandle"); ph=(phandle_t)POP(); idename=get_property(ph, "name", &len); - idx[1]=(idename[strlen(idename) - 1] - '0' - FIRST_UNIT) % 2; + chan = ide_seek_channel(idename); + drive = &chan->drives[unit]; + *(struct ide_drive **)idx = drive; + #ifdef CONFIG_DEBUG_IDE printk("opening channel %d unit %d\n", idx[1], idx[0]); #endif - drive=&ob_ide_channels[idx[1]].drives[idx[0]]; dump_drive(drive); if (drive->type != ide_type_ata) @@ -1274,16 +1294,17 @@ static void ob_ide_ctrl_initialize(int *idx) { - int len, devnum, props[6]; + int len, props[6]; phandle_t ph=get_cur_dev(); char *idename; + struct ide_channel *chan; /* set device type */ push_str(DEV_TYPE); fword("device-type"); idename=get_property(ph, "name", &len); - devnum=idename[strlen(idename) - 1] - '0' - FIRST_UNIT; + chan = ide_seek_channel(idename); /* Create interrupt properties. */ props[0]=14; props[1]=0; @@ -1292,9 +1313,9 @@ set_int_property(ph, "#address-cells", 1); set_int_property(ph, "#size-cells", 0); - props[0] = __cpu_to_be32(io_ports[devnum]); + props[0] = __cpu_to_be32(chan->io_regs[0]); props[1] = __cpu_to_be32(1); props[2] = __cpu_to_be32(8); - props[3] = __cpu_to_be32(ctl_ports[devnum]); + props[3] = __cpu_to_be32(chan->io_regs[8]); props[4] = __cpu_to_be32(1); props[5] = __cpu_to_be32(2); set_property(ph, "reg", (char *)&props, 6*sizeof(int)); } @@ -1354,6 +1375,9 @@ int i, j; char nodebuff[128]; phandle_t dnode; + struct ide_channel *chan; + int io_ports[IDE_MAX_CHANNELS]; + int ctl_ports[IDE_MAX_CHANNELS]; io_ports[0] = io_port0; ctl_ports[0] = ctl_port0 + 2; @@ -1361,8 +1385,12 @@ ctl_ports[1] = ctl_port1 + 2; for (i = 0; i < IDE_NUM_CHANNELS; i++, current_channel++) { - struct ide_channel *chan = &ob_ide_channels[i]; + chan = malloc(sizeof(struct ide_channel)); + + snprintf(chan->name, sizeof(chan->name), + DEV_NAME, current_channel); + chan->mmio = 0; for (j = 0; j < 8; j++) @@ -1393,6 +1421,8 @@ chan->drives[j].nr = i * 2 + j; } + ide_add_channel(chan); + ob_ide_probe(chan); if (!chan->present) Modified: openbios-devel/drivers/ide.h =================================================================== --- openbios-devel/drivers/ide.h 2009-01-15 02:18:58 UTC (rev 410) +++ openbios-devel/drivers/ide.h 2009-01-15 12:55:31 UTC (rev 411) @@ -166,6 +166,10 @@ }; struct ide_channel { + + char name[32]; + struct ide_channel *next; + /* * either mmio or io_regs is set to indicate mmio or not */

1 0

r410 - openbios-devel/drivers
by svn＠openbios.org 15 Jan '09

15 Jan '09

Author: laurent Date: 2009-01-15 03:18:58 +0100 (Thu, 15 Jan 2009) New Revision: 410 Modified: openbios-devel/drivers/ide.c Log: ide: improve ide aliases management Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2009-01-15 02:17:00 UTC (rev 409) +++ openbios-devel/drivers/ide.c 2009-01-15 02:18:58 UTC (rev 410) @@ -1310,20 +1310,51 @@ { "decode-unit", ob_ide_ctrl_decodeunit }, }; +static void set_cd_alias(const char *path) +{ + phandle_t aliases; + + aliases = find_dev("/aliases"); + + if (get_property(aliases, "cd", NULL)) + return; + + set_property(aliases, "cd", path, strlen(path) + 1); + set_property(aliases, "cdrom", path, strlen(path) + 1); +} + +static void set_hd_alias(const char *path) +{ + phandle_t aliases; + + aliases = find_dev("/aliases"); + + if (get_property(aliases, "hd", NULL)) + return; + + set_property(aliases, "hd", path, strlen(path) + 1); + set_property(aliases, "disk", path, strlen(path) + 1); +} + +static void set_ide_alias(const char *path) +{ + phandle_t aliases; + static int ide_counter = 0; + char idestr[8]; + + aliases = find_dev("/aliases"); + + snprintf(idestr, sizeof(idestr), "ide%d", ide_counter++); + set_property(aliases, idestr, path, strlen(path) + 1); +} + int ob_ide_init(const char *path, uint32_t io_port0, uint32_t ctl_port0, uint32_t io_port1, uint32_t ctl_port1) { int i, j; char nodebuff[128]; - phandle_t dnode, aliases; - int hd_found, cd_found; - static int ide_counter = 0; - char idestr[8]; + phandle_t dnode; - aliases = find_dev("/aliases"); - hd_found = 0; - cd_found = 0; - io_ports[0] = io_port0; ctl_ports[0] = ctl_port0 + 2; io_ports[1] = io_port1; @@ -1415,25 +1446,11 @@ /* create aliases */ - snprintf(idestr, sizeof(idestr), - "ide%d", ide_counter++); - set_property(aliases, idestr, - nodebuff, strlen(nodebuff) + 1); - - if (drive->media == ide_media_cdrom && !cd_found) { - cd_found = 1; - set_property(aliases, "cd", - nodebuff, strlen(nodebuff) + 1); - set_property(aliases, "cdrom", - nodebuff, strlen(nodebuff) + 1); - } - if (drive->media == ide_media_disk && !hd_found) { - hd_found = 1; - set_property(aliases, "hd", - nodebuff, strlen(nodebuff) + 1); - set_property(aliases, "disk", - nodebuff, strlen(nodebuff) + 1); - } + set_ide_alias(nodebuff); + if (drive->media == ide_media_cdrom) + set_cd_alias(nodebuff); + if (drive->media == ide_media_disk) + set_hd_alias(nodebuff); } }

1 0

r409 - openbios-devel/drivers
by svn＠openbios.org 15 Jan '09

15 Jan '09

Author: laurent Date: 2009-01-15 03:17:00 +0100 (Thu, 15 Jan 2009) New Revision: 409 Modified: openbios-devel/drivers/ide.c openbios-devel/drivers/ide.h Log: ide: improve support of MMIO ide controller Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2009-01-14 23:30:09 UTC (rev 408) +++ openbios-devel/drivers/ide.c 2009-01-15 02:17:00 UTC (rev 409) @@ -89,27 +89,29 @@ * old style io port operations */ static unsigned char -ob_ide_inb(unsigned long port) +ob_ide_inb(struct ide_channel *chan, unsigned int port) { - return inb(port); + return inb(chan->io_regs[port]); } static void -ob_ide_outb(unsigned char data, unsigned long port) +ob_ide_outb(struct ide_channel *chan, unsigned char data, unsigned int port) { - outb(data, port); + outb(data, chan->io_regs[port]); } static void -ob_ide_insw(unsigned long port, unsigned char *addr, unsigned int count) +ob_ide_insw(struct ide_channel *chan, + unsigned int port, unsigned char *addr, unsigned int count) { - insw(port, addr, count); + insw(chan->io_regs[port], addr, count); } static void -ob_ide_outsw(unsigned long port, unsigned char *addr, unsigned int count) +ob_ide_outsw(struct ide_channel *chan, + unsigned int port, unsigned char *addr, unsigned int count) { - outsw(port, addr, count); + outsw(chan->io_regs[port], addr, count); } static inline unsigned char @@ -117,7 +119,7 @@ { struct ide_channel *chan = drive->channel; - return chan->obide_inb(chan->io_regs[offset]); + return chan->obide_inb(chan, offset); } static inline void @@ -126,7 +128,7 @@ { struct ide_channel *chan = drive->channel; - chan->obide_outb(data, chan->io_regs[offset]); + chan->obide_outb(chan, data, offset); } static inline void @@ -140,7 +142,7 @@ return; } - chan->obide_insw(chan->io_regs[offset], addr, len / 2); + chan->obide_insw(chan, offset, addr, len / 2); } static inline void @@ -154,7 +156,7 @@ return; } - chan->obide_outsw(chan->io_regs[offset], addr, len / 2); + chan->obide_outsw(chan, offset, addr, len / 2); } static void Modified: openbios-devel/drivers/ide.h =================================================================== --- openbios-devel/drivers/ide.h 2009-01-14 23:30:09 UTC (rev 408) +++ openbios-devel/drivers/ide.h 2009-01-15 02:17:00 UTC (rev 409) @@ -169,16 +169,22 @@ /* * either mmio or io_regs is set to indicate mmio or not */ - int mmio; + unsigned long mmio; int io_regs[10]; /* * can be set to a mmio hook, default it legacy outb/inb */ - void (*obide_outb)(unsigned char addr, unsigned long port); - unsigned char (*obide_inb)(unsigned long port); - void (*obide_insw)(unsigned long port, unsigned char *addr, unsigned int count); - void (*obide_outsw)(unsigned long port, unsigned char *addr, unsigned int count); + void (*obide_outb)(struct ide_channel *chan, + unsigned char addr, unsigned int port); + unsigned char (*obide_inb)(struct ide_channel *chan, + unsigned int port); + void (*obide_insw)(struct ide_channel *chan, + unsigned int port, unsigned char *addr, + unsigned int count); + void (*obide_outsw)(struct ide_channel *chan, + unsigned int port, unsigned char *addr, + unsigned int count); struct ide_drive drives[2]; char selected;

1 0

r408 - openbios-devel/drivers
by svn＠openbios.org 15 Jan '09

15 Jan '09

Author: laurent Date: 2009-01-15 00:30:09 +0100 (Thu, 15 Jan 2009) New Revision: 408 Modified: openbios-devel/drivers/macio.c Log: macio.c: remove unused functions Modified: openbios-devel/drivers/macio.c =================================================================== --- openbios-devel/drivers/macio.c 2009-01-14 23:25:41 UTC (rev 407) +++ openbios-devel/drivers/macio.c 2009-01-14 23:30:09 UTC (rev 408) @@ -101,33 +101,6 @@ #endif } -DECLARE_UNNAMED_NODE( ob_intctrl_node, INSTALL_OPEN, 2*sizeof(int) ); - -static void -ob_intctrl_open(int *idx) -{ - int ret=1; - RET ( -ret ); -} - -static void -ob_intctrl_close(int *idx) -{ -} - -static void -ob_intctrl_initialize(int *idx) -{ -} - -NODE_METHODS(ob_intctrl_node) = { - { NULL, ob_intctrl_initialize }, - { "open", ob_intctrl_open }, - { "close", ob_intctrl_close }, -}; - -phandle_t pic_handle; - void ob_macio_init(const char *path, uint32_t addr) {

1 0

[PATCH] PowerPC: Fix milliseconds prom call
by Aurelien Jarno 15 Jan '09

15 Jan '09

The current implementation of the milliseconds prom call on PowerPC is totally buggy: - The timer frequency returned by get_timer_freq() does not correspond to the timer which is read. - The dividend and the divisor of the division are swapped - If called very often, this function is not precise - Depending on the timer frequency and of the frequency of the calls, the variable overflow after a few dozen of seconds. Please find in this patch a totally new implementation. This fixes the problem observed with the quik when a timeout is defined. The timer frequency is defined using #define, I wonder if there is a better place to put it. It reads both low and high part of the timer to make sure there is no overflow. It also removes the function that returns 0 on the first call as this is not needed according to IEEE 1275-1994. Finally it computes the real value of the timer each time, instead of adding a small value to a variable at each function calls, in order to get a correct precision if this method is call very often. diff --git a/arch/ppc/qemu/methods.c b/arch/ppc/qemu/methods.c index ee34158..fa5aeb2 100644 --- a/arch/ppc/qemu/methods.c +++ b/arch/ppc/qemu/methods.c @@ -122,19 +122,28 @@ ciface_quiesce( ulong args[], ulong ret[] ) } /* ( -- ms ) */ +#define TIMER_FREQUENCY 16600000ULL + static void ciface_milliseconds( ulong args[], ulong ret[] ) { - extern unsigned long get_timer_freq(void); - static ulong mticks=0, usecs=0; - ulong t; - - asm volatile("mftb %0" : "=r" (t) : ); - if( mticks ) - usecs += get_timer_freq() / 1000000 * ( t-mticks ); - mticks = t; - - PUSH( usecs/1000 ); + ulong tbu, tbl, temp; + ullong ticks, msecs; + + asm volatile( + "1:\n" + "mftbu %2\n" + "mftb %0\n" + "mftbu %1\n" + "cmpw %2,%1\n" + "bne 1b\n" + : "=r"(tbl), "=r"(tbu), "=r"(temp) + : + : "cc"); + + ticks = (((ullong)tbu) << 32) | (ullong)tbl; + msecs = (1000 * ticks) / TIMER_FREQUENCY; + PUSH( msecs ); } -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32(a)debian.org | aurelien(a)aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net

2 1

r407 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 15 Jan '09

15 Jan '09

Author: laurent Date: 2009-01-15 00:25:41 +0100 (Thu, 15 Jan 2009) New Revision: 407 Modified: openbios-devel/arch/ppc/qemu/methods.c Log: PowerPC: Fix milliseconds prom call The current implementation of the milliseconds prom call on PowerPC is totally buggy: - The timer frequency returned by get_timer_freq() does not correspond to the timer which is read. - The dividend and the divisor of the division are swapped - If called very often, this function is not precise - Depending on the timer frequency and of the frequency of the calls, the variable overflow after a few dozen of seconds. Please find in this patch a totally new implementation. This fixes the problem observed with the quik when a timeout is defined. The timer frequency is defined using #define, I wonder if there is a better place to put it. It reads both low and high part of the timer to make sure there is no overflow. It also removes the function that returns 0 on the first call as this is not needed according to IEEE 1275-1994. Finally it computes the real value of the timer each time, instead of adding a small value to a variable at each function calls, in order to get a correct precision if this method is call very often. (Aurelien Jarno) Modified: openbios-devel/arch/ppc/qemu/methods.c =================================================================== --- openbios-devel/arch/ppc/qemu/methods.c 2009-01-13 20:24:52 UTC (rev 406) +++ openbios-devel/arch/ppc/qemu/methods.c 2009-01-14 23:25:41 UTC (rev 407) @@ -122,19 +122,28 @@ } /* ( -- ms ) */ +#define TIMER_FREQUENCY 16600000ULL + static void ciface_milliseconds( ulong args[], ulong ret[] ) { - extern unsigned long get_timer_freq(void); - static ulong mticks=0, usecs=0; - ulong t; + ulong tbu, tbl, temp; + ullong ticks, msecs; - asm volatile("mftb %0" : "=r" (t) : ); - if( mticks ) - usecs += get_timer_freq() / 1000000 * ( t-mticks ); - mticks = t; + asm volatile( + "1:\n" + "mftbu %2\n" + "mftb %0\n" + "mftbu %1\n" + "cmpw %2,%1\n" + "bne 1b\n" + : "=r"(tbl), "=r"(tbu), "=r"(temp) + : + : "cc"); - PUSH( usecs/1000 ); + ticks = (((ullong)tbu) << 32) | (ullong)tbl; + msecs = (1000 * ticks) / TIMER_FREQUENCY; + PUSH( msecs ); }

1 0

Re: [OpenBIOS] sparc64's get_physical_address_code should not fault on TTE's with V=0
by Jakub Jermar 14 Jan '09

14 Jan '09

Blue Swirl wrote: > On 1/12/09, Jakub Jermar <jakub(a)jermar.eu> wrote: >> Hi, >> >> when I make the following change to helper.c, get_physical_address_code: >> >> - // ctx match, vaddr match? >> + // ctx match, vaddr match, valid? >> if (env->dmmuregs[1] == (env->itlb_tag[i] & 0x1fff) && >> - (address & mask) == (env->itlb_tag[i] & ~0x1fffULL)) { >> - // valid, access ok? >> - if ((env->itlb_tte[i] & 0x8000000000000000ULL) == 0 || >> - ((env->itlb_tte[i] & 0x4) && is_user)) { >> + (address & mask) == (env->itlb_tag[i] & ~0x1fffULL) && >> + env->itlb_tte[i] & 0x8000000000000000ULL) { >> + // access ok? >> + if ((env->itlb_tte[i] & 0x4) && is_user) { >> >> HelenOS gets a little bit further than without this change and seems >> to panic more or less gracefully later. >> >> In short, non-valid entries should be skipped by the loop in >> get_physical_address_code instead of causing TFAULT, because >> the ITLB can contain a valid entry for the same address. The >> same is true for DTLB. >> >> Can you confirm this? > > Yes, this looks correct. I'll apply a fix. Thanks! With this fix in place, HelenOS most of the time panics on: Kernel panic: Cannot find property 'screen'. I.e. it searches property 'screen' in /aliases and doesn't find any. If it is not there already, could you please add it (together with keyboard) to openbios? Thanks, Jakub

2 3

r406 - in openbios-devel: arch/ppc/qemu drivers
by svn＠openbios.org 13 Jan '09

13 Jan '09

Author: laurent Date: 2009-01-13 21:24:52 +0100 (Tue, 13 Jan 2009) New Revision: 406 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/drivers/escc.c Log: CONFIG_SERIAL_PORT to 0 select ch-a (0x20 offset), other value select ch-b (0x00 offset). Idea from Blue Swirl Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2009-01-13 20:07:43 UTC (rev 405) +++ openbios-devel/arch/ppc/qemu/init.c 2009-01-13 20:24:52 UTC (rev 406) @@ -148,7 +148,7 @@ isa_io_base = arch->io_base; - uart_init(0x80013000ULL + CONFIG_SERIAL_PORT * 0x20, + uart_init(0x80013000ULL + (CONFIG_SERIAL_PORT ? 0 : 0x20), CONFIG_SERIAL_SPEED); printk("\n"); Modified: openbios-devel/drivers/escc.c =================================================================== --- openbios-devel/drivers/escc.c 2009-01-13 20:07:43 UTC (rev 405) +++ openbios-devel/drivers/escc.c 2009-01-13 20:24:52 UTC (rev 406) @@ -443,6 +443,6 @@ escc_add_channel(buf, "b", addr, 0); serial_dev = (unsigned char *)addr + IO_ESCC_OFFSET + - 0x20 * CONFIG_SERIAL_PORT; + (CONFIG_SERIAL_PORT ? 0 : 0x20); } #endif

1 0

Re: [OpenBIOS] [PATCH] Don't try to start Quik from hard disk ifbooting from theCD-ROM
by laurent＠lvivier.info 13 Jan '09

13 Jan '09

>Index: arch/ppc/qemu/main.c >=================================================================== >--- arch/ppc/qemu/main.c (révision 396) >+++ arch/ppc/qemu/main.c (copie de travail) >@@ -266,6 +266,10 @@ > } u; > phandle_t ph; > >+ /* Quik can only boot from a hard-disk */ >+ if (nvram_read(0x34) == 'd') >+ return; >+ Could you put this outside of the quik_startup() function ? I'd like to have only quik code inside (no nvram access). Regards, Laurent

3 2

r405 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 13 Jan '09

13 Jan '09

Author: laurent Date: 2009-01-13 21:07:43 +0100 (Tue, 13 Jan 2009) New Revision: 405 Modified: openbios-devel/arch/ppc/qemu/main.c Log: Don't try to start Quik from hard disk if booting from the CD-ROM (Aurelien Jarno) Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2009-01-13 20:02:40 UTC (rev 404) +++ openbios-devel/arch/ppc/qemu/main.c 2009-01-13 20:07:43 UTC (rev 405) @@ -393,8 +393,13 @@ void boot( void ) { + char boot_device = nvram_read(0x34); fword("update-chosen"); - check_preloaded_kernel(); - quik_startup(); + if (boot_device == 'm') { + check_preloaded_kernel(); + } + if (boot_device == 'c') { + quik_startup(); + } yaboot_startup(); }

1 0

Re: [OpenBIOS] [PATCH v2] use the kernel arguments when using -kernel-append
by laurent＠lvivier.info 13 Jan '09

13 Jan '09

>Please find a new version of the patch below, that verifies that a >command line has been given by qemu before defining the bootargs >property. > >Index: arch/ppc/qemu/main.c >=================================================================== >--- arch/ppc/qemu/main.c (révision 398) >+++ arch/ppc/qemu/main.c (copie de travail) >@@ -364,18 +368,24 @@ > > static void check_preloaded_kernel(void) > { >- unsigned long kernel_image, kernel_size, cmdline; >+ unsigned long kernel_image, kernel_size; > unsigned long initrd_image, initrd_size; >+ unsigned long cmdline, cmdline_len; > > kernel_size = nvram_read_be32(0x3c); > if (kernel_size) { > kernel_image = nvram_read_be32(0x38); > cmdline = nvram_read_be32(0x40); >+ cmdline_len = nvram_read_be32(0x44); > initrd_image = nvram_read_be32(0x48); > initrd_size = nvram_read_be32(0x4c); > printk("[ppc] Kernel already loaded (0x%8.8lx + 0x%8.8lx) " > "(initrd 0x%8.8lx + 0x%8.8lx)\n", > kernel_image, kernel_size, initrd_image, initrd_size); >+ if (cmdline_len > 0) { >+ phandle_t ph = find_dev("/chosen"); >+ set_property(ph, "bootargs", cmdline, cmdline_len + 1); Could you check "warnings" in your build.log ? Regards, Laurent

3 2

r404 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 13 Jan '09

13 Jan '09

Author: laurent Date: 2009-01-13 21:02:40 +0100 (Tue, 13 Jan 2009) New Revision: 404 Modified: openbios-devel/arch/ppc/qemu/main.c Log: use the kernel arguments when using -kernel-append (Aurelien Jarno) Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2009-01-13 19:54:29 UTC (rev 403) +++ openbios-devel/arch/ppc/qemu/main.c 2009-01-13 20:02:40 UTC (rev 404) @@ -364,18 +364,24 @@ static void check_preloaded_kernel(void) { - unsigned long kernel_image, kernel_size, cmdline; + unsigned long kernel_image, kernel_size; unsigned long initrd_image, initrd_size; + unsigned long cmdline, cmdline_len; kernel_size = nvram_read_be32(0x3c); if (kernel_size) { kernel_image = nvram_read_be32(0x38); cmdline = nvram_read_be32(0x40); + cmdline_len = nvram_read_be32(0x44); initrd_image = nvram_read_be32(0x48); initrd_size = nvram_read_be32(0x4c); printk("[ppc] Kernel already loaded (0x%8.8lx + 0x%8.8lx) " "(initrd 0x%8.8lx + 0x%8.8lx)\n", kernel_image, kernel_size, initrd_image, initrd_size); + if (cmdline_len > 0) { + phandle_t ph = find_dev("/chosen"); + set_property(ph, "bootargs", strdup((char *)cmdline), cmdline_len + 1); + } call_elf(initrd_image, initrd_size, kernel_image); } }

1 0

r403 - in openbios-devel: include/openbios modules
by svn＠openbios.org 13 Jan '09

13 Jan '09

Author: blueswirl Date: 2009-01-13 20:54:29 +0100 (Tue, 13 Jan 2009) New Revision: 403 Modified: openbios-devel/include/openbios/bindings.h openbios-devel/modules/bindings.c Log: Fix warning about shadowing Modified: openbios-devel/include/openbios/bindings.h =================================================================== --- openbios-devel/include/openbios/bindings.h 2009-01-13 19:31:14 UTC (rev 402) +++ openbios-devel/include/openbios/bindings.h 2009-01-13 19:54:29 UTC (rev 403) @@ -69,8 +69,9 @@ /* device tree iteration */ extern phandle_t dt_iter_begin( void ); -extern phandle_t dt_iterate( phandle_t last ); -extern phandle_t dt_iterate_type( phandle_t last, const char *type ); +extern phandle_t dt_iterate( phandle_t last_tree ); +extern phandle_t dt_iterate_type( phandle_t last_tree, + const char *type ); static inline phandle_t dt_find_type( const char *type ) { return dt_iterate_type( 0, type ); } Modified: openbios-devel/modules/bindings.c =================================================================== --- openbios-devel/modules/bindings.c 2009-01-13 19:31:14 UTC (rev 402) +++ openbios-devel/modules/bindings.c 2009-01-13 19:54:29 UTC (rev 403) @@ -374,29 +374,29 @@ } phandle_t -dt_iterate( phandle_t last ) +dt_iterate( phandle_t last_tree ) { - if( !last ) + if( !last_tree ) return dt_iter_begin(); - PUSH_ph( last ); + PUSH_ph( last_tree ); fword("iterate-tree"); return POP_ph(); } phandle_t -dt_iterate_type( phandle_t last, const char *type ) +dt_iterate_type( phandle_t last_tree, const char *type ) { - if( !last ) - last = dt_iter_begin(); + if( !last_tree ) + last_tree = dt_iter_begin(); /* root node is never matched but we don't care about that */ - while( (last=dt_iterate(last)) ) { - char *s = get_property( last, "device_type", NULL ); + while( (last_tree = dt_iterate(last_tree)) ) { + char *s = get_property( last_tree, "device_type", NULL ); if( s && !strcmp(type, s) ) break; } - return last; + return last_tree; }

1 0

r402 - openbios-devel/arch/unix
by svn＠openbios.org 13 Jan '09

13 Jan '09

Author: blueswirl Date: 2009-01-13 20:31:14 +0100 (Tue, 13 Jan 2009) New Revision: 402 Modified: openbios-devel/arch/unix/unix.c Log: Fix Sparc64 native unix build Modified: openbios-devel/arch/unix/unix.c =================================================================== --- openbios-devel/arch/unix/unix.c 2009-01-13 17:40:00 UTC (rev 401) +++ openbios-devel/arch/unix/unix.c 2009-01-13 19:31:14 UTC (rev 402) @@ -61,6 +61,8 @@ #ifdef CONFIG_PPC uint32_t isa_io_base; +#elif defined(CONFIG_SPARC64) +unsigned long isa_io_base; #endif int errno_int; /* implement for fs drivers, needed to build on Mac OS X */

1 0

[PATCH] fix ppc native build
by Aurelien Jarno 13 Jan '09

13 Jan '09

The patch belows changes ppc/io.h the same way as sparc32/io.h to correctly define in* and out* functions for the unix build. Without it gcc outputs the following error messages and bails out: arch/unix/unix.c:156: error: no previous prototype for ‘inb’ arch/unix/unix.c:168: error: no previous prototype for ‘inw’ arch/unix/unix.c:180: error: no previous prototype for ‘inl’ arch/unix/unix.c:192: error: no previous prototype for ‘outb’ arch/unix/unix.c:205: error: no previous prototype for ‘outw’ arch/unix/unix.c:217: error: no previous prototype for ‘outl’ Index: include/ppc/io.h =================================================================== --- include/ppc/io.h (révision 399) +++ include/ppc/io.h (copie de travail) @@ -141,6 +141,23 @@ ns--; } } +#else /* BOOTSTRAP */ +#ifdef FCOMPILER +#define inb(reg) ((u8)0xff) +#define inw(reg) ((u16)0xffff) +#define inl(reg) ((u32)0xffffffff) +#define outb(reg, val) do{} while(0) +#define outw(reg, val) do{} while(0) +#define outl(reg, val) do{} while(0) +#else +extern u8 inb(u32 reg); +extern u16 inw(u32 reg); +extern u32 inl(u32 reg); +extern void insw(u32 reg, void *addr, unsigned long count); +extern void outb(u32 reg, u8 val); +extern void outw(u32 reg, u16 val); +extern void outl(u32 reg, u32 val); +extern void outsw(u32 reg, const void *addr, unsigned long count); #endif - +#endif #endif /* _ASM_IO_H */ -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32(a)debian.org | aurelien(a)aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net

2 1

r401 - openbios-devel/include/ppc
by svn＠openbios.org 13 Jan '09

13 Jan '09

Author: blueswirl Date: 2009-01-13 18:40:00 +0100 (Tue, 13 Jan 2009) New Revision: 401 Modified: openbios-devel/include/ppc/io.h Log: Fix native compilation (Aurelien Jarno) Modified: openbios-devel/include/ppc/io.h =================================================================== --- openbios-devel/include/ppc/io.h 2009-01-13 16:42:29 UTC (rev 400) +++ openbios-devel/include/ppc/io.h 2009-01-13 17:40:00 UTC (rev 401) @@ -141,6 +141,23 @@ ns--; } } +#else /* BOOTSTRAP */ +#ifdef FCOMPILER +#define inb(reg) ((u8)0xff) +#define inw(reg) ((u16)0xffff) +#define inl(reg) ((u32)0xffffffff) +#define outb(reg, val) do{} while(0) +#define outw(reg, val) do{} while(0) +#define outl(reg, val) do{} while(0) +#else +extern u8 inb(u32 reg); +extern u16 inw(u32 reg); +extern u32 inl(u32 reg); +extern void insw(u32 reg, void *addr, unsigned long count); +extern void outb(u32 reg, u8 val); +extern void outw(u32 reg, u16 val); +extern void outl(u32 reg, u32 val); +extern void outsw(u32 reg, const void *addr, unsigned long count); #endif - +#endif #endif /* _ASM_IO_H */

1 0

r400 - in openbios-devel: arch/ppc/qemu drivers
by svn＠openbios.org 13 Jan '09

13 Jan '09

Author: laurent Date: 2009-01-13 17:42:29 +0100 (Tue, 13 Jan 2009) New Revision: 400 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/drivers/escc.c Log: ESCC: correctly use CONFIG_SERIAL_PORT Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2009-01-13 12:19:11 UTC (rev 399) +++ openbios-devel/arch/ppc/qemu/init.c 2009-01-13 16:42:29 UTC (rev 400) @@ -148,7 +148,8 @@ isa_io_base = arch->io_base; - uart_init(0x80013000ULL, CONFIG_SERIAL_SPEED); + uart_init(0x80013000ULL + CONFIG_SERIAL_PORT * 0x20, + CONFIG_SERIAL_SPEED); printk("\n"); printk("=============================================================\n"); Modified: openbios-devel/drivers/escc.c =================================================================== --- openbios-devel/drivers/escc.c 2009-01-13 12:19:11 UTC (rev 399) +++ openbios-devel/drivers/escc.c 2009-01-13 16:42:29 UTC (rev 400) @@ -117,8 +117,7 @@ void serial_putchar(int c) { - uart_putchar((int)(serial_dev + CONFIG_SERIAL_PORT), - (unsigned char) (c & 0xff)); + uart_putchar((int)serial_dev, (unsigned char) (c & 0xff)); } void serial_cls(void)

1 0

[PATCH] use the kernel arguments when using -kernel -append
by Aurelien Jarno 13 Jan '09

13 Jan '09

Index: arch/ppc/qemu/main.c =================================================================== --- arch/ppc/qemu/main.c (révision 396) +++ arch/ppc/qemu/main.c (copie de travail) @@ -364,18 +368,23 @@ static void check_preloaded_kernel(void) { - unsigned long kernel_image, kernel_size, cmdline; + unsigned long kernel_image, kernel_size; unsigned long initrd_image, initrd_size; + unsigned long cmdline, cmdline_len; + phandle_t ph; kernel_size = nvram_read_be32(0x3c); if (kernel_size) { kernel_image = nvram_read_be32(0x38); cmdline = nvram_read_be32(0x40); + cmdline_len = nvram_read_be32(0x44); initrd_image = nvram_read_be32(0x48); initrd_size = nvram_read_be32(0x4c); printk("[ppc] Kernel already loaded (0x%8.8lx + 0x%8.8lx) " "(initrd 0x%8.8lx + 0x%8.8lx)\n", kernel_image, kernel_size, initrd_image, initrd_size); + ph = find_dev("/chosen"); + set_property(ph, "bootargs", cmdline, cmdline_len + 1); call_elf(initrd_image, initrd_size, kernel_image); } } -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32(a)debian.org | aurelien(a)aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net

3 3

Re: [OpenBIOS] r399 - openbios-devel/config/examples
by Aurelien Jarno 13 Jan '09

13 Jan '09

On Tue, Jan 13, 2009 at 01:19:12PM +0100, svn(a)openbios.org wrote: > Author: laurent > Date: 2009-01-13 13:19:11 +0100 (Tue, 13 Jan 2009) > New Revision: 399 > > Modified: > openbios-devel/config/examples/cross-ppc_rules.xml > openbios-devel/config/examples/ppc_rules.xml > Log: > ppc, cross-ppc: add -Werror to CFLAGS Please note that it breaks the native build. I am working on a fix. -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32(a)debian.org | aurelien(a)aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net

1 0

r399 - openbios-devel/config/examples
by svn＠openbios.org 13 Jan '09

13 Jan '09

Author: laurent Date: 2009-01-13 13:19:11 +0100 (Tue, 13 Jan 2009) New Revision: 399 Modified: openbios-devel/config/examples/cross-ppc_rules.xml openbios-devel/config/examples/ppc_rules.xml Log: ppc, cross-ppc: add -Werror to CFLAGS Modified: openbios-devel/config/examples/cross-ppc_rules.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_rules.xml 2009-01-13 08:05:51 UTC (rev 398) +++ openbios-devel/config/examples/cross-ppc_rules.xml 2009-01-13 12:19:11 UTC (rev 399) @@ -27,7 +27,7 @@ STRIP := $(TARGET)strip RANLIB := $(TARGET)ranlib CFLAGS := -Os -Wall -msoft-float -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin-bcopy -fno-builtin-log2 -CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations +CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Werror CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include Modified: openbios-devel/config/examples/ppc_rules.xml =================================================================== --- openbios-devel/config/examples/ppc_rules.xml 2009-01-13 08:05:51 UTC (rev 398) +++ openbios-devel/config/examples/ppc_rules.xml 2009-01-13 12:19:11 UTC (rev 399) @@ -27,7 +27,7 @@ RANLIB := ranlib CFLAGS := -Os -Wall -msoft-float -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin-bcopy -fno-builtin-log2 CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes +CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Werror INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include M4 := m4

1 0

[PATCH] Don't try to start Quik from hard disk if booting from the CD-ROM
by Aurelien Jarno 13 Jan '09

13 Jan '09

Index: arch/ppc/qemu/main.c =================================================================== --- arch/ppc/qemu/main.c (révision 396) +++ arch/ppc/qemu/main.c (copie de travail) @@ -266,6 +266,10 @@ } u; phandle_t ph; + /* Quik can only boot from a hard-disk */ + if (nvram_read(0x34) == 'd') + return; + if ((fd = open_io(path)) == -1) { ELF_DPRINTF("Can't open %s\n", path); return; -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32(a)debian.org | aurelien(a)aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net

1 0

r398 - openbios-devel/drivers
by svn＠openbios.org 13 Jan '09

13 Jan '09

Author: laurent Date: 2009-01-13 09:05:51 +0100 (Tue, 13 Jan 2009) New Revision: 398 Modified: openbios-devel/drivers/escc.c Log: escc: add "AAPL," and "reg" properties (allow to use it with linux) Modified: openbios-devel/drivers/escc.c =================================================================== --- openbios-devel/drivers/escc.c 2009-01-13 07:49:44 UTC (rev 397) +++ openbios-devel/drivers/escc.c 2009-01-13 08:05:51 UTC (rev 398) @@ -363,6 +363,7 @@ char buf[64], tty[32]; phandle_t dnode, aliases; int len; + cell props[2]; /* add device */ @@ -393,7 +394,22 @@ snprintf(buf + len, sizeof(buf) - len, "CHRP,es2"); set_property(dnode, "compatible", buf, len + 9); + props[0] = IO_ESCC_OFFSET + offset * 0x20; + props[1] = 0x00000020; + set_property(dnode, "reg", (char *)&props, 2 * sizeof(cell)); + + props[0] = addr + IO_ESCC_OFFSET + offset * 0x20; + OLDWORLD(set_property(dnode, "AAPL,address", + (char *)&props, 1 * sizeof(cell))); + + props[0] = 0x00000010 - offset; + OLDWORLD(set_property(dnode, "AAPL,interrupts", + (char *)&props, 1 * sizeof(cell))); + device_end(); + + uart_init_line((unsigned char*)addr + IO_ESCC_OFFSET + offset * 0x20, + CONFIG_SERIAL_SPEED); } void @@ -424,10 +440,10 @@ fword("finish-device"); - escc_add_channel(buf, "a", IO_ESCC_OFFSET, 2); - escc_add_channel(buf, "b", IO_ESCC_OFFSET, 0); + escc_add_channel(buf, "a", addr, 1); + escc_add_channel(buf, "b", addr, 0); - /* Reinitialize uart */ - uart_init(addr + IO_ESCC_OFFSET, CONFIG_SERIAL_SPEED); + serial_dev = (unsigned char *)addr + IO_ESCC_OFFSET + + 0x20 * CONFIG_SERIAL_PORT; } #endif

1 0

r397 - openbios-devel/drivers
by svn＠openbios.org 13 Jan '09

13 Jan '09

Author: laurent Date: 2009-01-13 08:49:44 +0100 (Tue, 13 Jan 2009) New Revision: 397 Modified: openbios-devel/drivers/escc.c Log: Add aliases for ch-a and ch-b: ttya, ttyb for oldworld, and scca and sccb for all Modified: openbios-devel/drivers/escc.c =================================================================== --- openbios-devel/drivers/escc.c 2009-01-12 20:46:27 UTC (rev 396) +++ openbios-devel/drivers/escc.c 2009-01-13 07:49:44 UTC (rev 397) @@ -360,27 +360,40 @@ escc_add_channel(const char *path, const char *node, uint32_t addr, uint32_t offset) { - char buf[64]; - phandle_t dnode; + char buf[64], tty[32]; + phandle_t dnode, aliases; + int len; - push_str(path); - fword("find-device"); - fword("new-device"); + /* add device */ - push_str(node); - fword("device-name"); + snprintf(buf, sizeof(buf), "%s/ch-%s", path, node); - snprintf(buf, sizeof(buf), "%s/%s", path, node); + REGISTER_NAMED_NODE(escc, buf); - REGISTER_NODE_METHODS(escc, buf); + activate_device(buf); + /* add aliases */ + + aliases = find_dev("/aliases"); + + snprintf(buf, sizeof(buf), "%s/ch-%s", path, node); + OLDWORLD(snprintf(tty, sizeof(tty), "tty%s", node)); + OLDWORLD(set_property(aliases, tty, buf, strlen(buf) + 1)); + snprintf(tty, sizeof(tty), "scc%s", node); + set_property(aliases, tty, buf, strlen(buf) + 1); + + /* add properties */ + dnode = find_dev(buf); set_property(dnode, "device_type", "serial", strlen("serial") + 1); - memcpy(buf, node, 5); - memcpy(&buf[5], "CHRP,es2", 9); - set_property(dnode, "compatible", buf, 5 + 9); - fword("finish-device"); + + snprintf(buf, sizeof(buf), "ch-%s", node); + len = strlen(buf) + 1; + snprintf(buf + len, sizeof(buf) - len, "CHRP,es2"); + set_property(dnode, "compatible", buf, len + 9); + + device_end(); } void @@ -411,8 +424,8 @@ fword("finish-device"); - escc_add_channel(buf, "ch-a", IO_ESCC_OFFSET, 2); - escc_add_channel(buf, "ch-b", IO_ESCC_OFFSET, 0); + escc_add_channel(buf, "a", IO_ESCC_OFFSET, 2); + escc_add_channel(buf, "b", IO_ESCC_OFFSET, 0); /* Reinitialize uart */ uart_init(addr + IO_ESCC_OFFSET, CONFIG_SERIAL_SPEED);

1 0

r396 - openbios-devel/config/examples
by svn＠openbios.org 12 Jan '09

12 Jan '09

Author: blueswirl Date: 2009-01-12 21:46:27 +0100 (Mon, 12 Jan 2009) New Revision: 396 Modified: openbios-devel/config/examples/ppc_config.xml Log: Synch cross and native configs Modified: openbios-devel/config/examples/ppc_config.xml =================================================================== --- openbios-devel/config/examples/ppc_config.xml 2009-01-12 19:49:10 UTC (rev 395) +++ openbios-devel/config/examples/ppc_config.xml 2009-01-12 20:46:27 UTC (rev 396) @@ -64,7 +64,7 @@  <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/> - <option name="CONFIG_DEBUG_PCI" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_PCI" type="boolean" value="false"/> <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="2"/> <option name="CONFIG_IDE_FIRST_UNIT" type="integer" value="1"/>

1 0

r395 - openbios-devel/drivers
by svn＠openbios.org 12 Jan '09

12 Jan '09

Author: blueswirl Date: 2009-01-12 20:49:10 +0100 (Mon, 12 Jan 2009) New Revision: 395 Modified: openbios-devel/drivers/escc.c Log: Fix wrong property Modified: openbios-devel/drivers/escc.c =================================================================== --- openbios-devel/drivers/escc.c 2009-01-12 19:22:10 UTC (rev 394) +++ openbios-devel/drivers/escc.c 2009-01-12 19:49:10 UTC (rev 395) @@ -407,7 +407,7 @@ set_property(dnode, "reg", (char *)&props, sizeof(props)); set_property(dnode, "device_type", "escc", strlen("escc") + 1); - set_property(dnode, "compatible", "chrp\0CHRP,es0", 14); + set_property(dnode, "compatible", "escc\0CHRP,es0", 14); fword("finish-device");

1 0

r394 - openbios-devel/drivers
by svn＠openbios.org 12 Jan '09

12 Jan '09

Author: laurent Date: 2009-01-12 20:22:10 +0100 (Mon, 12 Jan 2009) New Revision: 394 Modified: openbios-devel/drivers/ide.c Log: Add ide0, ide1 ... ideN aliases needed by ybin (yaboot) Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2009-01-12 18:20:14 UTC (rev 393) +++ openbios-devel/drivers/ide.c 2009-01-12 19:22:10 UTC (rev 394) @@ -1315,6 +1315,8 @@ char nodebuff[128]; phandle_t dnode, aliases; int hd_found, cd_found; + static int ide_counter = 0; + char idestr[8]; aliases = find_dev("/aliases"); hd_found = 0; @@ -1411,6 +1413,11 @@ /* create aliases */ + snprintf(idestr, sizeof(idestr), + "ide%d", ide_counter++); + set_property(aliases, idestr, + nodebuff, strlen(nodebuff) + 1); + if (drive->media == ide_media_cdrom && !cd_found) { cd_found = 1; set_property(aliases, "cd",

1 0

r393 - openbios-devel/include/amd64
by svn＠openbios.org 12 Jan '09

12 Jan '09

Author: blueswirl Date: 2009-01-12 19:20:14 +0100 (Mon, 12 Jan 2009) New Revision: 393 Modified: openbios-devel/include/amd64/types.h Log: Fix amd64 warning Modified: openbios-devel/include/amd64/types.h =================================================================== --- openbios-devel/include/amd64/types.h 2009-01-12 17:47:56 UTC (rev 392) +++ openbios-devel/include/amd64/types.h 2009-01-12 18:20:14 UTC (rev 393) @@ -18,8 +18,8 @@ /* cell based types */ -typedef int64_t cell; -typedef uint64_t ucell; +typedef long long cell; +typedef unsigned long long ucell; typedef __int128_t dcell; typedef __uint128_t ducell;

1 0

r392 - in openbios-devel: arch/ppc/qemu config/examples drivers
by svn＠openbios.org 12 Jan '09

12 Jan '09

Author: blueswirl Date: 2009-01-12 18:47:56 +0100 (Mon, 12 Jan 2009) New Revision: 392 Modified: openbios-devel/arch/ppc/qemu/console.c openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/qemu.h openbios-devel/config/examples/cross-ppc_config.xml openbios-devel/config/examples/ppc_config.xml openbios-devel/drivers/macio.c Log: Use ESCC for PowerMac serial Modified: openbios-devel/arch/ppc/qemu/console.c =================================================================== --- openbios-devel/arch/ppc/qemu/console.c 2009-01-12 17:46:19 UTC (rev 391) +++ openbios-devel/arch/ppc/qemu/console.c 2009-01-12 17:47:56 UTC (rev 392) @@ -12,121 +12,11 @@ */ #include "openbios/config.h" -#include "openbios/kernel.h" #include "openbios/bindings.h" -#include "libc/diskio.h" -#include "ofmem.h" -#include "qemu/qemu.h" -#include "video_subr.h" +#include "openbios/drivers.h" #ifdef CONFIG_DEBUG_CONSOLE - /* ****************************************************************** - * serial console functions - * ****************************************************************** */ - -#ifdef CONFIG_DEBUG_CONSOLE_SERIAL - -#define UART(port) (port==2?0x2f8:0x3f8) - -#define RBR(port) (UART(port) + 0) -#define THR(port) (UART(port) + 0) -#define IER(port) (UART(port) + 1) -#define IIR(port) (UART(port) + 2) -#define LCR(port) (UART(port) + 3) -#define MCR(port) (UART(port) + 4) -#define LSR(port) (UART(port) + 5) -#define MSR(port) (UART(port) + 6) -#define SCR(port) (UART(port) + 7) -#define DLL(port) (UART(port) + 0) -#define DLM(port) (UART(port) + 1) - -static int uart_charav(int port) -{ - if (!port) - return -1; - return ((inb(LSR(port)) & 1) != 0); -} - -static char uart_getchar(int port) -{ - if (!port) - return -1; - while (!uart_charav(port)); - return ((char) inb(RBR(port)) & 0177); -} - -static void uart_putchar(int port, unsigned char c) -{ - if (!port) - return; - while (!(inb(LSR(port)) & 0x20)); - outb(c, THR(port)); -} - -static void serial_putchar(int c) -{ - if (c == '\n') - uart_putchar(CONFIG_SERIAL_PORT, '\r'); - uart_putchar(CONFIG_SERIAL_PORT, c); -} - -static void uart_init_line(int port, unsigned long baud) -{ - int i, baudconst; - - switch (baud) { - case 115200: - baudconst = 1; - break; - case 57600: - baudconst = 2; - break; - case 38400: - baudconst = 3; - break; - case 19200: - baudconst = 6; - break; - case 9600: - default: - baudconst = 12; - break; - } - - outb(0x87, LCR(port)); - outb(0x00, DLM(port)); - outb(baudconst, DLL(port)); - outb(0x07, LCR(port)); - outb(0x0f, MCR(port)); - - for (i = 10; i > 0; i--) { - if (inb(LSR(port)) == (unsigned int) 0) - break; - inb(RBR(port)); - } -} - -int -serial_init(void) -{ - if (CONFIG_SERIAL_PORT) - uart_init_line(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED); - return -1; -} - -static void serial_cls(void) -{ - serial_putchar(27); - serial_putchar('['); - serial_putchar('H'); - serial_putchar(27); - serial_putchar('['); - serial_putchar('J'); -} -#endif // CONFIG_DEBUG_CONSOLE_SERIAL - -/* ****************************************************************** * common functions, implementing simple concurrent console * ****************************************************************** */ @@ -155,11 +45,4 @@ #endif return 0; } - -void cls(void) -{ -#ifdef CONFIG_DEBUG_CONSOLE_SERIAL - serial_cls(); -#endif -} #endif // CONFIG_DEBUG_CONSOLE Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2009-01-12 17:46:19 UTC (rev 391) +++ openbios-devel/arch/ppc/qemu/init.c 2009-01-12 17:47:56 UTC (rev 392) @@ -148,7 +148,7 @@ isa_io_base = arch->io_base; - serial_init(); + uart_init(0x80013000ULL, CONFIG_SERIAL_SPEED); printk("\n"); printk("=============================================================\n"); Modified: openbios-devel/arch/ppc/qemu/qemu.h =================================================================== --- openbios-devel/arch/ppc/qemu/qemu.h 2009-01-12 17:46:19 UTC (rev 391) +++ openbios-devel/arch/ppc/qemu/qemu.h 2009-01-12 17:47:56 UTC (rev 392) @@ -19,9 +19,6 @@ extern int vfd_draw_str( const char *str ); extern void vfd_close( void ); -/* console.c */ -int serial_init(void); - #include "kernel.h" #endif /* _H_QEMU */ Modified: openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_config.xml 2009-01-12 17:46:19 UTC (rev 391) +++ openbios-devel/config/examples/cross-ppc_config.xml 2009-01-12 17:47:56 UTC (rev 392) @@ -24,7 +24,7 @@ <option name="CONFIG_DEBUG_INTERPRETER" type="boolean" value="false"/> <option name="CONFIG_DEBUG_CONSOLE" type="boolean" value="true"/> <option name="CONFIG_DEBUG_CONSOLE_SERIAL" type="boolean" value="true"/> - <option name="CONFIG_SERIAL_PORT" type="integer" value="1"/> + <option name="CONFIG_SERIAL_PORT" type="integer" value="0"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/> @@ -74,5 +74,6 @@ <option name="CONFIG_DRIVER_ADB" type="boolean" value="true"/> <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> <option name="CONFIG_DRIVER_MACIO" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_ESCC" type="boolean" value="true"/> </config> Modified: openbios-devel/config/examples/ppc_config.xml =================================================================== --- openbios-devel/config/examples/ppc_config.xml 2009-01-12 17:46:19 UTC (rev 391) +++ openbios-devel/config/examples/ppc_config.xml 2009-01-12 17:47:56 UTC (rev 392) @@ -24,7 +24,7 @@ <option name="CONFIG_DEBUG_INTERPRETER" type="boolean" value="false"/> <option name="CONFIG_DEBUG_CONSOLE" type="boolean" value="true"/> <option name="CONFIG_DEBUG_CONSOLE_SERIAL" type="boolean" value="true"/> - <option name="CONFIG_SERIAL_PORT" type="integer" value="1"/> + <option name="CONFIG_SERIAL_PORT" type="integer" value="0"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/> @@ -74,5 +74,6 @@ <option name="CONFIG_DRIVER_ADB" type="boolean" value="true"/> <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> <option name="CONFIG_DRIVER_MACIO" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_ESCC" type="boolean" value="true"/> </config> Modified: openbios-devel/drivers/macio.c =================================================================== --- openbios-devel/drivers/macio.c 2009-01-12 17:46:19 UTC (rev 391) +++ openbios-devel/drivers/macio.c 2009-01-12 17:47:56 UTC (rev 392) @@ -16,6 +16,7 @@ #include "macio.h" #include "cuda.h" +#include "escc.h" #define IO_NVRAM_SIZE 0x00020000 #define IO_NVRAM_OFFSET 0x00060000 @@ -137,4 +138,5 @@ cuda_init(path, addr); macio_nvram_init(path, addr); + escc_init(path, addr); }

1 0

r391 - in openbios-devel: config/examples drivers include/openbios
by svn＠openbios.org 12 Jan '09

12 Jan '09

Author: blueswirl Date: 2009-01-12 18:46:19 +0100 (Mon, 12 Jan 2009) New Revision: 391 Added: openbios-devel/drivers/escc.c openbios-devel/drivers/escc.h Modified: openbios-devel/config/examples/cross-sparc32_config.xml openbios-devel/config/examples/sparc32_config.xml openbios-devel/drivers/build.xml openbios-devel/drivers/obio.c openbios-devel/drivers/obio.h openbios-devel/include/openbios/drivers.h Log: Extract ESCC serial driver Modified: openbios-devel/config/examples/cross-sparc32_config.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_config.xml 2009-01-11 11:49:00 UTC (rev 390) +++ openbios-devel/config/examples/cross-sparc32_config.xml 2009-01-12 17:46:19 UTC (rev 391) @@ -74,5 +74,7 @@ <option name="CONFIG_DRIVER_ESP" type="boolean" value="true"/> <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/> <option name="CONFIG_DEBUG_FLOPPY" type="boolean" value="false"/> + <option name="CONFIG_DRIVER_ESCC" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_ESCC_SUN" type="boolean" value="true"/> </config> Modified: openbios-devel/config/examples/sparc32_config.xml =================================================================== --- openbios-devel/config/examples/sparc32_config.xml 2009-01-11 11:49:00 UTC (rev 390) +++ openbios-devel/config/examples/sparc32_config.xml 2009-01-12 17:46:19 UTC (rev 391) @@ -74,5 +74,6 @@ <option name="CONFIG_DRIVER_ESP" type="boolean" value="true"/> <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/> <option name="CONFIG_DEBUG_FLOPPY" type="boolean" value="false"/> + <option name="CONFIG_DRIVER_ESCC" type="boolean" value="true"/> </config> Modified: openbios-devel/drivers/build.xml =================================================================== --- openbios-devel/drivers/build.xml 2009-01-11 11:49:00 UTC (rev 390) +++ openbios-devel/drivers/build.xml 2009-01-12 17:46:19 UTC (rev 391) @@ -21,6 +21,7 @@ <object source="macio.c" condition="DRIVER_MACIO"/> <object source="pc_kbd.c" condition="DRIVER_PC_KBD"/> <object source="pc_serial.c" condition="DRIVER_PC_SERIAL"/> + <object source="escc.c" condition="DRIVER_ESCC"/> </library> <dictionary name="openbios" target="forth"> Added: openbios-devel/drivers/escc.c =================================================================== --- openbios-devel/drivers/escc.c (rev 0) +++ openbios-devel/drivers/escc.c 2009-01-12 17:46:19 UTC (rev 391) @@ -0,0 +1,420 @@ +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "libc/byteorder.h" +#include "libc/vsprintf.h" +#include "openbios/drivers.h" +#include "ofmem.h" + +#include "escc.h" + +/* ****************************************************************** + * serial console functions + * ****************************************************************** */ + +static volatile unsigned char *serial_dev; + +#define CTRL(addr) (*(volatile unsigned char *)(addr)) +#ifdef CONFIG_DRIVER_ESCC_SUN +#define DATA(addr) (*(volatile unsigned char *)(addr + 2)) +#else +#define DATA(addr) (*(volatile unsigned char *)(addr + 16)) +#endif + +/* Conversion routines to/from brg time constants from/to bits + * per second. + */ +#define BRG_TO_BPS(brg, freq) ((freq) / 2 / ((brg) + 2)) +#define BPS_TO_BRG(bps, freq) ((((freq) + (bps)) / (2 * (bps))) - 2) + +#ifdef CONFIG_DRIVER_ESCC_SUN +#define ESCC_CLOCK 4915200 /* Zilog input clock rate. */ +#else +#define ESCC_CLOCK 3686400 +#endif +#define ESCC_CLOCK_DIVISOR 16 /* Divisor this driver uses. */ + +/* Write Register 3 */ +#define RxENAB 0x1 /* Rx Enable */ +#define Rx8 0xc0 /* Rx 8 Bits/Character */ + +/* Write Register 4 */ +#define SB1 0x4 /* 1 stop bit/char */ +#define X16CLK 0x40 /* x16 clock mode */ + +/* Write Register 5 */ +#define RTS 0x2 /* RTS */ +#define TxENAB 0x8 /* Tx Enable */ +#define Tx8 0x60 /* Tx 8 bits/character */ +#define DTR 0x80 /* DTR */ + +/* Write Register 14 (Misc control bits) */ +#define BRENAB 1 /* Baud rate generator enable */ +#define BRSRC 2 /* Baud rate generator source */ + +/* Read Register 0 */ +#define Rx_CH_AV 0x1 /* Rx Character Available */ +#define Tx_BUF_EMP 0x4 /* Tx Buffer empty */ + +int uart_charav(int port) +{ + return (CTRL(port) & Rx_CH_AV) != 0; +} + +char uart_getchar(int port) +{ + while (!uart_charav(port)) + ; + return DATA(port) & 0177; +} + +static void uart_putchar(int port, unsigned char c) +{ + if (!serial_dev) + return; + + if (c == '\n') + uart_putchar(port, '\r'); + while (!(CTRL(port) & Tx_BUF_EMP)) + ; + DATA(port) = c; +} + +static void uart_init_line(volatile unsigned char *port, unsigned long baud) +{ + CTRL(port) = 4; // reg 4 + CTRL(port) = SB1 | X16CLK; // no parity, async, 1 stop bit, 16x + // clock + + baud = BPS_TO_BRG(baud, ESCC_CLOCK / ESCC_CLOCK_DIVISOR); + + CTRL(port) = 12; // reg 12 + CTRL(port) = baud & 0xff; + CTRL(port) = 13; // reg 13 + CTRL(port) = (baud >> 8) & 0xff; + CTRL(port) = 14; // reg 14 + CTRL(port) = BRSRC | BRENAB; + + CTRL(port) = 3; // reg 3 + CTRL(port) = RxENAB | Rx8; // enable rx, 8 bits/char + + CTRL(port) = 5; // reg 5 + CTRL(port) = RTS | TxENAB | Tx8 | DTR; // enable tx, 8 bits/char, + // set RTS & DTR + +} + +int uart_init(uint64_t port, unsigned long speed) +{ +#ifdef CONFIG_DRIVER_ESCC_SUN + serial_dev = map_io(port & ~7ULL, ZS_REGS); + serial_dev += port & 7ULL; +#else + serial_dev = (unsigned char *)(unsigned long)port; +#endif + uart_init_line(serial_dev, speed); + return -1; +} + +void serial_putchar(int c) +{ + uart_putchar((int)(serial_dev + CONFIG_SERIAL_PORT), + (unsigned char) (c & 0xff)); +} + +void serial_cls(void) +{ + serial_putchar(27); + serial_putchar('['); + serial_putchar('H'); + serial_putchar(27); + serial_putchar('['); + serial_putchar('J'); +} + +/* ( addr len -- actual ) */ +static void +escc_read(unsigned long *address) +{ + char *addr; + int len; + + len = POP(); + addr = (char *)POP(); + + if (len != 1) + printk("escc_read: bad len, addr %x len %x\n", (unsigned int)addr, len); + + if (uart_charav(*address)) { + *addr = (char)uart_getchar(*address); + PUSH(1); + } else { + PUSH(0); + } +} + +/* ( addr len -- actual ) */ +static void +escc_write(unsigned long *address) +{ + unsigned char *addr; + int i, len; + + len = POP(); + addr = (unsigned char *)POP(); + + for (i = 0; i < len; i++) { + uart_putchar(*address, addr[i]); + } + PUSH(len); +} + +static void +escc_close(void) +{ +} + +static void +escc_open(unsigned long *address) +{ + int len; + phandle_t ph; + unsigned long *prop; +#ifdef CONFIG_DRIVER_ESCC_SUN + char *args; +#endif + + fword("my-self"); + fword("ihandle>phandle"); + ph = (phandle_t)POP(); + prop = (unsigned long *)get_property(ph, "address", &len); + *address = *prop; +#ifdef CONFIG_DRIVER_ESCC_SUN + fword("my-args"); + args = pop_fstr_copy(); + if (args) { + if (args[0] == 'a') + *address += 4; + //printk("escc_open: address %lx, args %s\n", *address, args); + free(args); + } +#endif + RET ( -1 ); +} + +DECLARE_UNNAMED_NODE(escc, INSTALL_OPEN, sizeof(unsigned long)); + +NODE_METHODS(escc) = { + { "open", escc_open }, + { "close", escc_close }, + { "read", escc_read }, + { "write", escc_write }, +}; + +#ifdef CONFIG_DRIVER_ESCC_SUN +static volatile unsigned char *kbd_dev; + +void kbd_init(uint64_t base) +{ + kbd_dev = map_io(base, 2 * 4); + kbd_dev += 4; +} + +static const unsigned char sunkbd_keycode[128] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', 0, 8, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, + 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', '\\', 13, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + ' ', +}; + +static const unsigned char sunkbd_keycode_shifted[128] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+', 0, 8, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, + 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '"', '|', 13, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?', + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + ' ', +}; + +static int shiftstate; + +int +keyboard_dataready(void) +{ + return ((kbd_dev[0] & 1) == 1); +} + +unsigned char +keyboard_readdata(void) +{ + unsigned char ch; + + while (!keyboard_dataready()) { } + + do { + ch = kbd_dev[2] & 0xff; + if (ch == 99) + shiftstate |= 1; + else if (ch == 110) + shiftstate |= 2; + else if (ch == 227) + shiftstate &= ~1; + else if (ch == 238) + shiftstate &= ~2; + //printk("getch: %d\n", ch); + } + while ((ch & 0x80) == 0 || ch == 238 || ch == 227); // Wait for key release + //printk("getch rel: %d\n", ch); + ch &= 0x7f; + if (shiftstate) + ch = sunkbd_keycode_shifted[ch]; + else + ch = sunkbd_keycode[ch]; + //printk("getch xlate: %d\n", ch); + + return ch; +} + +/* ( addr len -- actual ) */ +static void +escc_read_keyboard(void) +{ + unsigned char *addr; + int len; + + len = POP(); + addr = (unsigned char *)POP(); + + if (len != 1) + printk("escc_read: bad len, addr %x len %x\n", (unsigned int)addr, len); + + if (keyboard_dataready()) { + *addr = keyboard_readdata(); + PUSH(1); + } else { + PUSH(0); + } +} + +DECLARE_UNNAMED_NODE(escc_keyboard, INSTALL_OPEN, sizeof(unsigned long)); + +NODE_METHODS(escc_keyboard) = { + { "open", escc_open }, + { "close", escc_close }, + { "read", escc_read_keyboard }, +}; + +void +ob_zs_init(uint64_t base, uint64_t offset, int intr, int slave, int keyboard) +{ + char nodebuff[256]; + + ob_new_obio_device("zs", "serial"); + + ob_reg(base, offset, ZS_REGS, 1); + + PUSH(slave); + fword("encode-int"); + push_str("slave"); + fword("property"); + + if (keyboard) { + PUSH(-1); + fword("encode-int"); + push_str("keyboard"); + fword("property"); + + PUSH(-1); + fword("encode-int"); + push_str("mouse"); + fword("property"); + } + + ob_intr(intr); + + fword("finish-device"); + + snprintf(nodebuff, sizeof(nodebuff), "/obio/zs@0,%x", + (int)offset & 0xffffffff); + if (keyboard) { + REGISTER_NODE_METHODS(escc_keyboard, nodebuff); + } else { + REGISTER_NODE_METHODS(escc, nodebuff); + } +} + +#else + +static void +escc_add_channel(const char *path, const char *node, uint32_t addr, + uint32_t offset) +{ + char buf[64]; + phandle_t dnode; + + push_str(path); + fword("find-device"); + fword("new-device"); + + push_str(node); + fword("device-name"); + + snprintf(buf, sizeof(buf), "%s/%s", path, node); + + REGISTER_NODE_METHODS(escc, buf); + + dnode = find_dev(buf); + set_property(dnode, "device_type", "serial", + strlen("serial") + 1); + memcpy(buf, node, 5); + memcpy(&buf[5], "CHRP,es2", 9); + set_property(dnode, "compatible", buf, 5 + 9); + fword("finish-device"); +} + +void +escc_init(const char *path, unsigned long addr) +{ + char buf[64]; + int props[2]; + phandle_t dnode; + + push_str(path); + fword("find-device"); + fword("new-device"); + + push_str("escc"); + fword("device-name"); + + snprintf(buf, sizeof(buf), "%s/escc", path); + + dnode = find_dev(buf); + + set_int_property(dnode, "#address-cells", 1); + props[0] = __cpu_to_be32(IO_ESCC_OFFSET); + props[1] = __cpu_to_be32(IO_ESCC_SIZE); + set_property(dnode, "reg", (char *)&props, sizeof(props)); + set_property(dnode, "device_type", "escc", + strlen("escc") + 1); + set_property(dnode, "compatible", "chrp\0CHRP,es0", 14); + + fword("finish-device"); + + escc_add_channel(buf, "ch-a", IO_ESCC_OFFSET, 2); + escc_add_channel(buf, "ch-b", IO_ESCC_OFFSET, 0); + + /* Reinitialize uart */ + uart_init(addr + IO_ESCC_OFFSET, CONFIG_SERIAL_SPEED); +} +#endif Added: openbios-devel/drivers/escc.h =================================================================== --- openbios-devel/drivers/escc.h (rev 0) +++ openbios-devel/drivers/escc.h 2009-01-12 17:46:19 UTC (rev 391) @@ -0,0 +1,9 @@ + +#define IO_ESCC_SIZE 0x00001000 +#define IO_ESCC_OFFSET 0x00013000 + +#define ZS_REGS 8 + +void escc_init(const char *path, unsigned long addr); +void ob_zs_init(uint64_t base, uint64_t offset, int intr, int slave, + int keyboard); Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2009-01-11 11:49:00 UTC (rev 390) +++ openbios-devel/drivers/obio.c 2009-01-12 17:46:19 UTC (rev 391) @@ -24,6 +24,7 @@ #include "openbios/firmware_abi.h" #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" +#include "escc.h" #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" @@ -48,7 +49,7 @@ /* DECLARE data structures for the nodes. */ DECLARE_UNNAMED_NODE( ob_obio, INSTALL_OPEN, sizeof(int) ); -static void +void ob_new_obio_device(const char *name, const char *type) { push_str("/obio"); @@ -96,13 +97,13 @@ return 0; } -static unsigned long +unsigned long ob_reg(uint64_t base, uint64_t offset, unsigned long size, int map) { return map_reg(base, offset, size, map, 0); } -static void +void ob_intr(int intr) { PUSH(intr); @@ -114,337 +115,7 @@ fword("property"); } -/* ****************************************************************** - * serial console functions - * ****************************************************************** */ - -static volatile unsigned char *kbd_dev, *serial_dev; - -#define CTRL(addr) (*(volatile unsigned char *)(addr)) -#define DATA(addr) (*(volatile unsigned char *)(addr + 2)) - -/* Conversion routines to/from brg time constants from/to bits - * per second. - */ -#define BRG_TO_BPS(brg, freq) ((freq) / 2 / ((brg) + 2)) -#define BPS_TO_BRG(bps, freq) ((((freq) + (bps)) / (2 * (bps))) - 2) - -#define ZS_CLOCK 4915200 /* Zilog input clock rate. */ -#define ZS_CLOCK_DIVISOR 16 /* Divisor this driver uses. */ - -/* Write Register 3 */ -#define RxENAB 0x1 /* Rx Enable */ -#define Rx8 0xc0 /* Rx 8 Bits/Character */ - -/* Write Register 4 */ -#define SB1 0x4 /* 1 stop bit/char */ -#define X16CLK 0x40 /* x16 clock mode */ - -/* Write Register 5 */ -#define RTS 0x2 /* RTS */ -#define TxENAB 0x8 /* Tx Enable */ -#define Tx8 0x60 /* Tx 8 bits/character */ -#define DTR 0x80 /* DTR */ - -/* Write Register 14 (Misc control bits) */ -#define BRENAB 1 /* Baud rate generator enable */ -#define BRSRC 2 /* Baud rate generator source */ - -/* Read Register 0 */ -#define Rx_CH_AV 0x1 /* Rx Character Available */ -#define Tx_BUF_EMP 0x4 /* Tx Buffer empty */ - -int uart_charav(int port) -{ - return (CTRL(port) & Rx_CH_AV) != 0; -} - -char uart_getchar(int port) -{ - while (!uart_charav(port)) - ; - return DATA(port) & 0177; -} - -static void uart_putchar(int port, unsigned char c) -{ - if (!serial_dev) - return; - - if (c == '\n') - uart_putchar(port, '\r'); - while (!(CTRL(port) & Tx_BUF_EMP)) - ; - DATA(port) = c; -} - -static void uart_init_line(volatile unsigned char *port, unsigned long baud) -{ - CTRL(port) = 4; // reg 4 - CTRL(port) = SB1 | X16CLK; // no parity, async, 1 stop bit, 16x - // clock - - baud = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR); - - CTRL(port) = 12; // reg 12 - CTRL(port) = baud & 0xff; - CTRL(port) = 13; // reg 13 - CTRL(port) = (baud >> 8) & 0xff; - CTRL(port) = 14; // reg 14 - CTRL(port) = BRSRC | BRENAB; - - CTRL(port) = 3; // reg 3 - CTRL(port) = RxENAB | Rx8; // enable rx, 8 bits/char - - CTRL(port) = 5; // reg 5 - CTRL(port) = RTS | TxENAB | Tx8 | DTR; // enable tx, 8 bits/char, - // set RTS & DTR - -} - -int uart_init(uint64_t port, unsigned long speed) -{ - serial_dev = map_io(port & ~7ULL, 2 * 4); - serial_dev += port & 7ULL; - uart_init_line(serial_dev, speed); - - return -1; -} - -void serial_putchar(int c) -{ - uart_putchar((int)(serial_dev + CONFIG_SERIAL_PORT), - (unsigned char) (c & 0xff)); -} - -void serial_cls(void) -{ - serial_putchar(27); - serial_putchar('['); - serial_putchar('H'); - serial_putchar(27); - serial_putchar('['); - serial_putchar('J'); -} - -/* ( addr len -- actual ) */ static void -zs_read(unsigned long *address) -{ - char *addr; - int len; - - len = POP(); - addr = (char *)POP(); - - if (len != 1) - printk("zs_read: bad len, addr %x len %x\n", (unsigned int)addr, len); - - if (uart_charav(*address)) { - *addr = (char)uart_getchar(*address); - PUSH(1); - } else { - PUSH(0); - } -} - -void kbd_init(uint64_t base) -{ - kbd_dev = map_io(base, 2 * 4); - kbd_dev += 4; -} - -static const unsigned char sunkbd_keycode[128] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', 0, 8, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, - 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', '\\', 13, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - ' ', -}; - -static const unsigned char sunkbd_keycode_shifted[128] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+', 0, 8, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, - 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '"', '|', 13, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?', - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - ' ', -}; - -static int shiftstate; - -int -keyboard_dataready(void) -{ - return ((kbd_dev[0] & 1) == 1); -} - -unsigned char -keyboard_readdata(void) -{ - unsigned char ch; - - while (!keyboard_dataready()) { } - - do { - ch = kbd_dev[2] & 0xff; - if (ch == 99) - shiftstate |= 1; - else if (ch == 110) - shiftstate |= 2; - else if (ch == 227) - shiftstate &= ~1; - else if (ch == 238) - shiftstate &= ~2; - //printk("getch: %d\n", ch); - } - while ((ch & 0x80) == 0 || ch == 238 || ch == 227); // Wait for key release - //printk("getch rel: %d\n", ch); - ch &= 0x7f; - if (shiftstate) - ch = sunkbd_keycode_shifted[ch]; - else - ch = sunkbd_keycode[ch]; - //printk("getch xlate: %d\n", ch); - - return ch; -} - -/* ( addr len -- actual ) */ -static void -zs_read_keyboard(void) -{ - unsigned char *addr; - int len; - - len = POP(); - addr = (unsigned char *)POP(); - - if (len != 1) - printk("zs_read: bad len, addr %x len %x\n", (unsigned int)addr, len); - - if (keyboard_dataready()) { - *addr = keyboard_readdata(); - PUSH(1); - } else { - PUSH(0); - } -} - -/* ( addr len -- actual ) */ -static void -zs_write(unsigned long *address) -{ - unsigned char *addr; - int i, len; - - len = POP(); - addr = (unsigned char *)POP(); - - for (i = 0; i < len; i++) { - uart_putchar(*address, addr[i]); - } - PUSH(len); -} - -static void -zs_close(void) -{ -} - -static void -zs_open(unsigned long *address) -{ - int len; - phandle_t ph; - unsigned long *prop; - char *args; - - fword("my-self"); - fword("ihandle>phandle"); - ph = (phandle_t)POP(); - prop = (unsigned long *)get_property(ph, "address", &len); - *address = *prop; - fword("my-args"); - args = pop_fstr_copy(); - if (args) { - if (args[0] == 'a') - *address += 4; - //printk("zs_open: address %lx, args %s\n", *address, args); - free(args); - } - - RET ( -1 ); -} - -DECLARE_UNNAMED_NODE(zs, INSTALL_OPEN, sizeof(unsigned long)); - -NODE_METHODS(zs) = { - { "open", zs_open }, - { "close", zs_close }, - { "read", zs_read }, - { "write", zs_write }, -}; - -DECLARE_UNNAMED_NODE(zs_keyboard, INSTALL_OPEN, sizeof(unsigned long)); - -NODE_METHODS(zs_keyboard) = { - { "open", zs_open }, - { "close", zs_close }, - { "read", zs_read_keyboard }, -}; - -static void -ob_zs_init(uint64_t base, uint64_t offset, int intr, int slave, int keyboard) -{ - char nodebuff[256]; - - ob_new_obio_device("zs", "serial"); - - ob_reg(base, offset, ZS_REGS, 1); - - PUSH(slave); - fword("encode-int"); - push_str("slave"); - fword("property"); - - if (keyboard) { - PUSH(-1); - fword("encode-int"); - push_str("keyboard"); - fword("property"); - - PUSH(-1); - fword("encode-int"); - push_str("mouse"); - fword("property"); - } - - ob_intr(intr); - - fword("finish-device"); - - snprintf(nodebuff, sizeof(nodebuff), "/obio/zs@0,%x", - (int)offset & 0xffffffff); - if (keyboard) { - REGISTER_NODE_METHODS(zs_keyboard, nodebuff); - } else { - REGISTER_NODE_METHODS(zs, nodebuff); - } -} - -static void ob_eccmemctl_init(void) { uint32_t version, *regs; Modified: openbios-devel/drivers/obio.h =================================================================== --- openbios-devel/drivers/obio.h 2009-01-11 11:49:00 UTC (rev 390) +++ openbios-devel/drivers/obio.h 2009-01-12 17:46:19 UTC (rev 391) @@ -3,7 +3,6 @@ #define SLAVIO_ZS 0x00000000ULL #define SLAVIO_ZS1 0x00100000ULL #define ZS_INTR 0x2c -#define ZS_REGS 8 #define SLAVIO_NVRAM 0x00200000ULL #define NVRAM_SIZE 0x2000 Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2009-01-11 11:49:00 UTC (rev 390) +++ openbios-devel/include/openbios/drivers.h 2009-01-12 17:46:19 UTC (rev 391) @@ -39,8 +39,6 @@ /* arch/sparc32/console.c */ void tcx_init(uint64_t base); void kbd_init(uint64_t base); -int keyboard_dataready(void); -unsigned char keyboard_readdata(void); #endif #ifdef CONFIG_DRIVER_IDE /* drivers/ide.c */ @@ -59,11 +57,6 @@ unsigned long aux1_offset, unsigned long aux2_offset); int start_cpu(unsigned int pc, unsigned int context_ptr, unsigned int context, int cpu); -void serial_putchar(int c); -int uart_charav(int port); -char uart_getchar(int port); -void serial_cls(void); -int uart_init(uint64_t port, unsigned long speed); /* drivers/iommu.c */ void ob_init_iommu(uint64_t base); @@ -77,6 +70,10 @@ extern volatile unsigned int *reset_reg; extern volatile struct sun4m_timer_regs *counter_regs; +void ob_new_obio_device(const char *name, const char *type); +unsigned long ob_reg(uint64_t base, uint64_t offset, unsigned long size, int map); +void ob_intr(int intr); + /* arch/sparc32/romvec.c */ extern const char *obp_stdin_path, *obp_stdout_path; extern char obp_stdin, obp_stdout; @@ -105,5 +102,15 @@ char uart_getchar(int port); void serial_putchar(int c); #endif - +#ifdef CONFIG_DRIVER_ESCC +int uart_init(uint64_t port, unsigned long speed); +int uart_charav(int port); +char uart_getchar(int port); +void serial_putchar(int c); +void serial_cls(void); +#ifdef CONFIG_DRIVER_ESCC_SUN +int keyboard_dataready(void); +unsigned char keyboard_readdata(void); +#endif +#endif #endif /* OPENBIOS_DRIVERS_H */

1 0

Removing warnings
by Laurent Vivier 11 Jan '09

11 Jan '09

Hi, I don't like to have warnings in build.log, but sometime I don't remember to check the logs. I'm wondering if it is acceptable to add "-Werror" in CCFLAGS ? Regards, Laurent -------------------- laurent(a)lvivier.info -------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

3 8

r390 - openbios-devel/arch/sparc32
by svn＠openbios.org 11 Jan '09

11 Jan '09

Author: blueswirl Date: 2009-01-11 12:49:00 +0100 (Sun, 11 Jan 2009) New Revision: 390 Modified: openbios-devel/arch/sparc32/vectors.S Log: Shave off a few padding bytes Modified: openbios-devel/arch/sparc32/vectors.S =================================================================== --- openbios-devel/arch/sparc32/vectors.S 2009-01-11 08:16:52 UTC (rev 389) +++ openbios-devel/arch/sparc32/vectors.S 2009-01-11 11:49:00 UTC (rev 390) @@ -30,7 +30,7 @@ #define SER_ADDR10 0xf1100004 .section ".text.vectors", "ax" - .align 16384 + .align 4 /* Should be 16384, but alignment is handled by the ldscript */ /* Sparc32 trap table */ .globl trap_table, t_zero, t_wovf, t_wunf, __divide_error trap_table: @@ -95,6 +95,8 @@ BTRAPS(0xe0) BTRAPS(0xe8) BTRAPS(0xf0) BTRAPS(0xf8) + .section ".text", "ax" + .align 4 __divide_error: bug: /* Dump the exception and its context */

1 0

r389 - openbios-devel/arch/sparc64
by svn＠openbios.org 11 Jan '09

11 Jan '09

Author: blueswirl Date: 2009-01-11 09:16:52 +0100 (Sun, 11 Jan 2009) New Revision: 389 Modified: openbios-devel/arch/sparc64/vectors.S Log: Shave off a few padding bytes Modified: openbios-devel/arch/sparc64/vectors.S =================================================================== --- openbios-devel/arch/sparc64/vectors.S 2009-01-11 01:03:16 UTC (rev 388) +++ openbios-devel/arch/sparc64/vectors.S 2009-01-11 08:16:52 UTC (rev 389) @@ -257,6 +257,7 @@ tl1_resv1e0: BTRAPS(0x1e0) BTRAPS(0x1e8) tl1_resv1f0: BTRAPS(0x1f0) BTRAPS(0x1f8) + .section ".text", "ax" spill_32bit: srl %sp, 0, %sp stw %l0, [%sp + 0x00]

1 0

r388 - in openbios-devel: arch/ppc/qemu drivers include/openbios
by svn＠openbios.org 11 Jan '09

11 Jan '09

Author: laurent Date: 2009-01-11 02:03:16 +0100 (Sun, 11 Jan 2009) New Revision: 388 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/tree.fs openbios-devel/drivers/cuda.c openbios-devel/drivers/pci.c openbios-devel/include/openbios/drivers.h Log: Create properties for an oldworld machine if needed. If arch is ppc and machine arch id is heathrow, we create: - properties in root node for a powermac beige (Linux says "Powermac G3 (Silk)") - "AAPL,interrupts" and "AAPL,address" properties in PCI device tree. Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2009-01-11 00:34:08 UTC (rev 387) +++ openbios-devel/arch/ppc/qemu/init.c 2009-01-11 01:03:16 UTC (rev 388) @@ -24,6 +24,7 @@ #include "openbios/bindings.h" #include "openbios/pci.h" #include "openbios/nvram.h" +#include "openbios/drivers.h" #include "qemu/qemu.h" #include "ofmem.h" #include "openbios-version.h" @@ -46,8 +47,9 @@ void (*initfn)(const struct cpudef *cpu); }; +static uint16_t machine_id = 0; + extern void unexpected_excep( int vector ); -extern void ob_pci_init( void ); extern void setup_timers( void ); void @@ -64,6 +66,16 @@ ARCH_HEATHROW, }; +int is_apple(void) +{ + return 1; +} + +int is_oldworld(void) +{ + return machine_id == ARCH_HEATHROW; +} + static const pci_arch_t known_arch[] = { [ARCH_PREP] = { "PREP", 0x1057, 0x4801, 0x80800000, 0x800c0000, 0x80000000, 0x00100000, 0xf0000000, 0x10000000, @@ -120,7 +132,6 @@ entry( void ) { uint32_t temp = 0; - uint16_t machine_id = 0; char buf[5], qemu_uuid[16]; arch = &known_arch[ARCH_HEATHROW]; @@ -430,6 +441,88 @@ const struct cpudef *cpu; char buf[64]; + /* set device tree root info */ + + push_str("/"); + fword("find-device"); + + switch(machine_id) { + case ARCH_HEATHROW: /* OldWord */ + + /* model */ + + push_str("Power Macintosh"); + fword("model"); + + /* compatible */ + + push_str("AAPL,PowerMac G3"); + fword("encode-string"); + push_str("MacRISC"); + fword("encode-string"); + fword("encode+"); + push_str("compatible"); + fword("property"); + + /* misc */ + + push_str("device-tree"); + fword("encode-string"); + push_str("AAPL,original-name"); + fword("property"); + + PUSH(0); + fword("encode-int"); + push_str("AAPL,cpu-id"); + fword("property"); + + PUSH(66 * 1000 * 1000); + fword("encode-int"); + push_str("clock-frequency"); + fword("property"); + break; + + case ARCH_MAC99: + case ARCH_PREP: + default: + + /* model */ + + push_str("PowerMac1,1"); + fword("model"); + + /* compatible */ + + push_str("PowerMac1,1"); + fword("encode-string"); + push_str("MacRISC"); + fword("encode-string"); + fword("encode+"); + push_str("Power Macintosh"); + fword("encode-string"); + fword("encode+"); + push_str("compatible"); + fword("property"); + + /* misc */ + + push_str("bootrom"); + fword("device-type"); + + PUSH(100 * 1000 * 1000); + fword("encode-int"); + push_str("clock-frequency"); + fword("property"); + break; + } + + /* Perhaps we can store UUID here ? */ + + push_str("0000000000000"); + fword("encode-string"); + push_str("system-id"); + fword("property"); + /* memory info */ push_str("/memory"); Modified: openbios-devel/arch/ppc/qemu/tree.fs =================================================================== --- openbios-devel/arch/ppc/qemu/tree.fs 2009-01-11 00:34:08 UTC (rev 387) +++ openbios-devel/arch/ppc/qemu/tree.fs 2009-01-11 01:03:16 UTC (rev 388) @@ -11,12 +11,6 @@ " /" find-device -" bootrom" device-type -" PowerMac1,1" model -" PowerMac1,1" encode-string -" MacRisc" encode-string encode+ -" Power Macintosh" encode-string encode+ " compatible" property -" 0000000000000" encode-string " system-id" property 1 encode-int " #address-cells" property 1 encode-int " #size-cells" property h# 05f5e100 encode-int " clock-frequency" property Modified: openbios-devel/drivers/cuda.c =================================================================== --- openbios-devel/drivers/cuda.c 2009-01-11 00:34:08 UTC (rev 387) +++ openbios-devel/drivers/cuda.c 2009-01-11 01:03:16 UTC (rev 388) @@ -1,5 +1,6 @@ #include "openbios/config.h" #include "openbios/bindings.h" +#include "openbios/drivers.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" @@ -200,7 +201,7 @@ * non-standard oldworld property (needed by linux 2.6.18) */ - set_int_property(ph, "AAPL,interrupts", 0x12); + OLDWORLD(set_int_property(ph, "AAPL,interrupts", 0x12)); bind_func("ppc32-reset-all", ppc32_reset_all); push_str("' ppc32-reset-all to reset-all"); Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-11 00:34:08 UTC (rev 387) +++ openbios-devel/drivers/pci.c 2009-01-11 01:03:16 UTC (rev 388) @@ -291,6 +291,30 @@ } } +/* + * "Designing PCI Cards and Drivers for Power Macintosh Computers", p. 454 + * + * "AAPL,address" provides an array of 32-bit logical addresses + * Nth entry corresponding to Nth "assigned-address" base address entry. + */ + +static void pci_set_AAPL_address(const pci_config_t *config) +{ + phandle_t dev = get_cur_dev(); + cell props[7]; + int ncells, i; + + ncells = 0; + for (i = 0; i < 6; i++) { + if (!config->assigned[i] || !config->sizes[i]) + continue; + props[ncells++] = config->assigned[i] & ~0x0000000F; + } + if (ncells) + set_property(dev, "AAPL,address", (char *)props, + ncells * sizeof(cell)); +} + static void pci_set_assigned_addresses(const pci_config_t *config) { phandle_t dev = get_cur_dev(); @@ -452,8 +476,11 @@ set_int_property(dev, "revision-id", rev); set_int_property(dev, "class-code", class_code << 8); - if (config->irq_pin) + if (config->irq_pin) { + OLDWORLD(set_int_property(dev, "AAPL,interrupts", + config->irq_line)); set_int_property(dev, "interrupts", config->irq_pin); + } set_int_property(dev, "min-grant", pci_config_read8(addr, PCI_MIN_GNT)); set_int_property(dev, "max-latency", pci_config_read8(addr, PCI_MAX_LAT)); @@ -510,6 +537,7 @@ pci_set_reg(config); pci_set_assigned_addresses(config); + OLDWORLD(pci_set_AAPL_address(config)); #ifdef CONFIG_DEBUG_PCI printk("\n"); Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2009-01-11 00:34:08 UTC (rev 387) +++ openbios-devel/include/openbios/drivers.h 2009-01-11 01:03:16 UTC (rev 388) @@ -16,7 +16,22 @@ #ifdef CONFIG_DRIVER_PCI /* drivers/pci.c */ int ob_pci_init(void); +#ifdef CONFIG_PPC +extern int is_apple(void); +extern int is_oldworld(void); +#else +static inline int is_apple(void) +{ + return 0; +} +static inline int is_oldworld(void) +{ + return 0; +} #endif +#define AAPL(_cmd) do { if (is_apple()) _cmd; } while(0) +#define OLDWORLD(_cmd) do { if (is_oldworld()) _cmd; } while(0) +#endif #ifdef CONFIG_DRIVER_SBUS /* drivers/sbus.c */ int ob_sbus_init(uint64_t base, int machine_id);

1 0

r387 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 11 Jan '09

11 Jan '09

Author: laurent Date: 2009-01-11 01:34:08 +0100 (Sun, 11 Jan 2009) New Revision: 387 Modified: openbios-devel/arch/ppc/qemu/ofmem.c Log: Disable debug printk in ofmem_map() Modified: openbios-devel/arch/ppc/qemu/ofmem.c =================================================================== --- openbios-devel/arch/ppc/qemu/ofmem.c 2009-01-11 00:27:48 UTC (rev 386) +++ openbios-devel/arch/ppc/qemu/ofmem.c 2009-01-11 00:34:08 UTC (rev 387) @@ -545,7 +545,8 @@ virt, phys, size, mode ); */ if( (phys & 0xfff) || (virt & 0xfff) || (size & 0xfff) ) { - printk("ofmem_map: Bad parameters (%08lX %08lX %08lX)\n", phys, virt, size ); + /* printk("ofmem_map: Bad parameters (%08lX %08lX %08lX)\n", + phys, virt, size ); */ phys &= ~0xfff; virt &= ~0xfff; size = (size + 0xfff) & ~0xfff;

1 0

r386 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 11 Jan '09

11 Jan '09

Author: laurent Date: 2009-01-11 01:27:48 +0100 (Sun, 11 Jan 2009) New Revision: 386 Modified: openbios-devel/arch/ppc/qemu/main.c Log: Remove compilation warning Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2009-01-11 00:19:02 UTC (rev 385) +++ openbios-devel/arch/ppc/qemu/main.c 2009-01-11 00:27:48 UTC (rev 386) @@ -293,7 +293,7 @@ if( ofmem_claim( QUIK_FIRST_BASEADDR, len, 0 ) == -1 ) fatal_error("Claim failed!\n"); - memcpy(QUIK_FIRST_BASEADDR, u.buffer, len); + memcpy((char*)QUIK_FIRST_BASEADDR, u.buffer, len); /* quik fist level doesn't claim second level memory */

1 0

r385 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 11 Jan '09

11 Jan '09

Author: laurent Date: 2009-01-11 01:19:02 +0100 (Sun, 11 Jan 2009) New Revision: 385 Modified: openbios-devel/arch/ppc/qemu/main.c Log: Add quik support (oldworld bootloader). Load two first sectors of the partition and check quik signature ('QUIK'). If it is quik, execute it to boot. Currently partition and parameter are hardcoded to "hd:2" and "Linux". Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2009-01-11 00:01:40 UTC (rev 384) +++ openbios-devel/arch/ppc/qemu/main.c 2009-01-11 00:19:02 UTC (rev 385) @@ -234,7 +234,78 @@ return ret; } +#define QUIK_SECOND_BASEADDR 0x3e0000 +#define QUIK_FIRST_BASEADDR 0x3f4000 +#define QUIK_SECOND_SIZE (QUIK_FIRST_BASEADDR - QUIK_SECOND_BASEADDR) +#define QUIK_FIRST_INFO_OFF 0x2c8 + +struct first_info { + char quik_vers[8]; + int nblocks; + int blocksize; + unsigned second_base; + int conf_part; + char conf_file[32]; + unsigned blknos[64]; +}; + + static void +quik_startup( void ) +{ + int fd; + int len; + const char *path = "hd:2"; + union { + char buffer[1024]; + int first_word; + struct { + char pad[QUIK_FIRST_INFO_OFF]; + struct first_info fi; + } fi; + } u; + phandle_t ph; + + if ((fd = open_io(path)) == -1) { + ELF_DPRINTF("Can't open %s\n", path); + return; + } + + seek_io(fd, 0); + len = read_io(fd, u.buffer, sizeof(u)); + close_io( fd ); + + if (len == -1) { + ELF_DPRINTF("Can't read %s\n", path); + return; + } + + /* is it quik ? */ + + if (memcmp(u.fi.fi.quik_vers, "QUIK", 4)) + return; + + ph = find_dev("/options"); + set_property(ph, "boot-device", path, strlen(path) + 1); + ph = find_dev("/chosen"); + set_property(ph, "bootargs", "Linux", 6); + + if( ofmem_claim( QUIK_FIRST_BASEADDR, len, 0 ) == -1 ) + fatal_error("Claim failed!\n"); + + memcpy(QUIK_FIRST_BASEADDR, u.buffer, len); + + /* quik fist level doesn't claim second level memory */ + + if( ofmem_claim( QUIK_SECOND_BASEADDR, QUIK_SECOND_SIZE, 0 ) == -1 ) + fatal_error("Claim failed!\n"); + + call_elf(0, 0, QUIK_FIRST_BASEADDR); + + return; +} + +static void yaboot_startup( void ) { static const char * const paths[] = { "hd:2,\\ofclient", "hd:2,\\yaboot" }; @@ -318,5 +389,6 @@ { fword("update-chosen"); check_preloaded_kernel(); + quik_startup(); yaboot_startup(); }

1 0

r384 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 11 Jan '09

11 Jan '09

Author: laurent Date: 2009-01-11 01:01:40 +0100 (Sun, 11 Jan 2009) New Revision: 384 Modified: openbios-devel/arch/ppc/qemu/start.S Log: According to "PowerPC Processor binding to: IEEE 1275-1994, Standard for Boot (Initialization, Configuration) Firmware Revision: 2.1 (Approved Version), November 6, 1996" 7.1 Calling Convention: Client interface preserves: msr, cr, r1, r2, r13-r31, sprg0-3, fpscr, f0-f31, sr0-sr15, other SPRs. This patch modifies of_client_callback(), to preserve r1, r2, r4-r31. This is needed to be able to execute the first stage of quik which supposes r7 is unmodified. Modified: openbios-devel/arch/ppc/qemu/start.S =================================================================== --- openbios-devel/arch/ppc/qemu/start.S 2009-01-10 23:47:37 UTC (rev 383) +++ openbios-devel/arch/ppc/qemu/start.S 2009-01-11 00:01:40 UTC (rev 384) @@ -279,36 +279,127 @@ // we should not really come here though blr +#define SAVE_SPACE 140 GLOBL(of_client_callback): + + stwu r1, -12(r1) + + /* save r4 */ + + stw r4, 8(r1) + + /* save lr */ + + mflr r4 + stw r4, 4(r1) + + /* restore OF stack */ + lis r4,HA(saved_stack) addi r4,r4,LO(saved_stack) lwz r4,0(r4) - stwu r4,-32(r4) - mflr r5 - stw r5,32+4(r4) + + stwu r4,-SAVE_SPACE(r4) stw r1,8(r4) // save caller stack mr r1,r4 + stw r2,12(r1) stw r0,16(r1) + + /* save ctr, cr and xer */ + mfctr r2 stw r2,20(r1) mfcr r2 stw r2,24(r1) mfxer r2 stw r2,28(r1) - // do we need to save more registers? + + /* save r5 - r31 */ + + stw r5, 32(r1) + stw r6,36(r1) + stw r7,40(r1) + stw r8,44(r1) + stw r9,48(r1) + stw r10,52(r1) + stw r11,56(r1) + stw r12,60(r1) + stw r13,64(r1) + stw r14,68(r1) + stw r15,72(r1) + stw r16,76(r1) + stw r17,80(r1) + stw r18,84(r1) + stw r19,88(r1) + stw r20,92(r1) + stw r21,96(r1) + stw r22,100(r1) + stw r23,104(r1) + stw r24,108(r1) + stw r25,112(r1) + stw r26,116(r1) + stw r27,120(r1) + stw r28,124(r1) + stw r29,128(r1) + stw r30,132(r1) + stw r31,136(r1) + bl of_client_interface - lwz r4,32+4(r1) - mtlr r4 + + /* restore r5 - r31 */ + + lwz r5,32(r1) + lwz r6,36(r1) + lwz r7,40(r1) + lwz r8,44(r1) + lwz r9,48(r1) + lwz r10,52(r1) + lwz r11,56(r1) + lwz r12,60(r1) + lwz r13,64(r1) + lwz r14,68(r1) + lwz r15,72(r1) + lwz r16,76(r1) + lwz r17,80(r1) + lwz r18,84(r1) + lwz r19,88(r1) + lwz r20,92(r1) + lwz r21,96(r1) + lwz r22,100(r1) + lwz r23,104(r1) + lwz r24,108(r1) + lwz r25,112(r1) + lwz r26,116(r1) + lwz r27,120(r1) + lwz r28,124(r1) + lwz r29,128(r1) + lwz r30,132(r1) + lwz r31,136(r1) + + /* restore ctr, cr and xer */ + lwz r2,20(r1) mtctr r2 lwz r2,24(r1) mtcr r2 lwz r2,28(r1) mtxer r2 + + /* restore r0 and r2 */ + lwz r2,12(r1) lwz r0,16(r1) - lwz r1,8(r1) // restore caller stack + + /* restore caller stack */ + + lwz r1,8(r1) + + lwz r4, 4(r1) + mtlr r4 + lwz r4, 8(r1) + lwz r1, 0(r1) + blr /* rtas glue (must be reloctable) */

1 0

r383 - in openbios-devel/arch/ppc: . qemu
by svn＠openbios.org 11 Jan '09

11 Jan '09

Author: laurent Date: 2009-01-11 00:47:37 +0100 (Sun, 11 Jan 2009) New Revision: 383 Modified: openbios-devel/arch/ppc/kernel.c openbios-devel/arch/ppc/qemu/kernel.c Log: Correct comment about dictionnary size (512K) Modified: openbios-devel/arch/ppc/kernel.c =================================================================== --- openbios-devel/arch/ppc/kernel.c 2009-01-10 21:00:46 UTC (rev 382) +++ openbios-devel/arch/ppc/kernel.c 2009-01-10 23:47:37 UTC (rev 383) @@ -26,7 +26,7 @@ #include "kernel.h" #define MEMORY_SIZE (256*1024) /* 256K ram for hosted system */ -#define DICTIONARY_SIZE (512*1024) /* 128K for the dictionary */ +#define DICTIONARY_SIZE (512*1024) /* 512K for the dictionary */ static ucell *memory; Modified: openbios-devel/arch/ppc/qemu/kernel.c =================================================================== --- openbios-devel/arch/ppc/qemu/kernel.c 2009-01-10 21:00:46 UTC (rev 382) +++ openbios-devel/arch/ppc/qemu/kernel.c 2009-01-10 23:47:37 UTC (rev 383) @@ -27,7 +27,7 @@ #include "kernel.h" #define MEMORY_SIZE (256*1024) /* 256K ram for hosted system */ -#define DICTIONARY_SIZE (512*1024) /* 128K for the dictionary */ +#define DICTIONARY_SIZE (512*1024) /* 512K for the dictionary */ static ucell *memory;

1 0

r382 - openbios-devel/arch/x86
by svn＠openbios.org 10 Jan '09

10 Jan '09

Author: blueswirl Date: 2009-01-10 22:00:46 +0100 (Sat, 10 Jan 2009) New Revision: 382 Modified: openbios-devel/arch/x86/init.fs Log: Fix x86 build Modified: openbios-devel/arch/x86/init.fs =================================================================== --- openbios-devel/arch/x86/init.fs 2009-01-10 20:40:11 UTC (rev 381) +++ openbios-devel/arch/x86/init.fs 2009-01-10 21:00:46 UTC (rev 382) @@ -74,66 +74,3 @@ :noname " keyboard" input ; CONSOLE-IN-initializer - - -dev /pci - -\ simple isa bus node -new-device - " isa" device-name - " isa" device-type - 2 encode-int " #address-cells" property - 1 encode-int " #size-cells" property - - external - : open true ; - : close ; - -finish-device - -: ?devalias ( alias-str alias-len device-str device-len -- - \ alias-str alias-len false | true ) - active-package >r - " /aliases" find-device - \ 2dup ." Checking " type - 2dup find-dev if \ check if device exists - drop - 2over find-dev if \ do we already have an alias? - \ ." alias exists" cr - drop 2drop false - else - \ ." device exists" cr - encode-string - 2swap property - true - then - else - \ ." device doesn't exist" cr - 2drop false - then - r> active-package! - ; - -:noname - " hd" - " /pci/isa/ide0/disk@0" ?devalias not if - " /pci/isa/ide0/disk@1" ?devalias not if - " /pci/isa/ide1/disk@0" ?devalias not if - " /pci/isa/ide1/disk@1" ?devalias not if - 2drop ." No disk found." cr - then - then - then - then - - " cdrom" - " /pci/isa/ide0/cdrom@0" ?devalias not if - " /pci/isa/ide0/cdrom@1" ?devalias not if - " /pci/isa/ide1/cdrom@0" ?devalias not if - " /pci/isa/ide1/cdrom@1" ?devalias not if - 2drop ." No cdrom found" cr - then - then - then - then -; SYSTEM-initializer

1 0

r381 - openbios-devel/drivers
by svn＠openbios.org 10 Jan '09

10 Jan '09

Author: blueswirl Date: 2009-01-10 21:40:11 +0100 (Sat, 10 Jan 2009) New Revision: 381 Modified: openbios-devel/drivers/macio.c Log: Fix warning about unused variables Modified: openbios-devel/drivers/macio.c =================================================================== --- openbios-devel/drivers/macio.c 2009-01-10 20:31:21 UTC (rev 380) +++ openbios-devel/drivers/macio.c 2009-01-10 20:40:11 UTC (rev 381) @@ -130,9 +130,7 @@ void ob_macio_init(const char *path, uint32_t addr) { - char buf[64]; - phandle_t ph, chosen, aliases; - cell props[2]; + phandle_t aliases; aliases = find_dev("/aliases"); set_property(aliases, "mac-io", path, strlen(path) + 1);

1 0

r380 - openbios-devel/arch/sparc32
by svn＠openbios.org 10 Jan '09

10 Jan '09

Author: blueswirl Date: 2009-01-10 21:31:21 +0100 (Sat, 10 Jan 2009) New Revision: 380 Modified: openbios-devel/arch/sparc32/pgtsrmmu.h Log: Fix warning Modified: openbios-devel/arch/sparc32/pgtsrmmu.h =================================================================== --- openbios-devel/arch/sparc32/pgtsrmmu.h 2009-01-10 11:49:43 UTC (rev 379) +++ openbios-devel/arch/sparc32/pgtsrmmu.h 2009-01-10 20:31:21 UTC (rev 380) @@ -10,13 +10,6 @@ #ifndef _PGTSRMMU_H #define _PGTSRMMU_H -/* Replacement for <asm/page.h> */ -#define PAGE_SHIFT 12 -#define PAGE_SIZE (1 << PAGE_SHIFT) -#define PAGE_MASK (~(PAGE_SIZE-1)) -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) -/* */ - /* PMD_SHIFT determines the size of the area a second-level page table can map */ #define SRMMU_PMD_SHIFT 18 #define SRMMU_PMD_SIZE (1UL << SRMMU_PMD_SHIFT)

1 0

r379 - openbios-devel/forth/device
by svn＠openbios.org 10 Jan '09

10 Jan '09

Author: blueswirl Date: 2009-01-10 12:49:43 +0100 (Sat, 10 Jan 2009) New Revision: 379 Modified: openbios-devel/forth/device/display.fs openbios-devel/forth/device/font.fs Log: Disable romfont: unused Modified: openbios-devel/forth/device/display.fs =================================================================== --- openbios-devel/forth/device/display.fs 2009-01-10 11:41:04 UTC (rev 378) +++ openbios-devel/forth/device/display.fs 2009-01-10 11:49:43 UTC (rev 379) @@ -68,7 +68,7 @@ \ : default-font ( -- addr width height advance min-char #glyphs ) - (romfont-8x16) 8 10 10 0 100 + \ (romfont-8x16) 8 10 10 0 100 ; : set-font ( addr width height advance min-char #glyphs -- ) Modified: openbios-devel/forth/device/font.fs =================================================================== --- openbios-devel/forth/device/font.fs 2009-01-10 11:41:04 UTC (rev 378) +++ openbios-devel/forth/device/font.fs 2009-01-10 11:49:43 UTC (rev 379) @@ -9,5 +9,5 @@ \ the copyright and warranty status of this work. \ -encode-file romfont.bin -drop value (romfont-8x16) +\ encode-file romfont.bin +\ drop value (romfont-8x16)

1 0

r378 - openbios-devel/drivers
by svn＠openbios.org 10 Jan '09

10 Jan '09

Author: blueswirl Date: 2009-01-10 12:41:04 +0100 (Sat, 10 Jan 2009) New Revision: 378 Modified: openbios-devel/drivers/pci.c Log: Remove accidental debug printk Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-10 11:37:34 UTC (rev 377) +++ openbios-devel/drivers/pci.c 2009-01-10 11:41:04 UTC (rev 378) @@ -417,8 +417,6 @@ int ebus_config_cb(const pci_config_t *config) { - printk("ebus config %s addr %x size %x\n", config->path, - config->assigned[0] & ~0x0000000F, config->sizes[0]); #ifdef CONFIG_DRIVER_EBUS #ifdef CONFIG_DRIVER_FLOPPY ob_floppy_init(config->path, "fdthree");

1 0

r377 - in openbios-devel: arch/sparc64 arch/x86 config/examples drivers include/openbios
by svn＠openbios.org 10 Jan '09

10 Jan '09

Author: blueswirl Date: 2009-01-10 12:37:34 +0100 (Sat, 10 Jan 2009) New Revision: 377 Added: openbios-devel/drivers/pc_kbd.c openbios-devel/drivers/pc_serial.c Modified: openbios-devel/arch/sparc64/console.c openbios-devel/arch/sparc64/openbios.c openbios-devel/arch/sparc64/openbios.h openbios-devel/arch/sparc64/tree.fs openbios-devel/arch/x86/openbios.c openbios-devel/config/examples/cross-sparc64_config.xml openbios-devel/config/examples/sparc64_config.xml openbios-devel/drivers/build.xml openbios-devel/drivers/floppy.c openbios-devel/drivers/pci.c openbios-devel/drivers/pci_database.c openbios-devel/drivers/pci_database.h openbios-devel/include/openbios/drivers.h Log: Add EBUS bridge, refactor PC serial and keyboard, generalize floppy Modified: openbios-devel/arch/sparc64/console.c =================================================================== --- openbios-devel/arch/sparc64/console.c 2009-01-09 21:00:38 UTC (rev 376) +++ openbios-devel/arch/sparc64/console.c 2009-01-10 11:37:34 UTC (rev 377) @@ -17,229 +17,11 @@ #include "boot.h" /* ****************************************************************** - * serial console functions + * simple polling video/keyboard console functions * ****************************************************************** */ -#define SER_SIZE 8 - -#define RBR(x) x==2?0x2f8:0x3f8 -#define THR(x) x==2?0x2f8:0x3f8 -#define IER(x) x==2?0x2f9:0x3f9 -#define IIR(x) x==2?0x2fa:0x3fa -#define LCR(x) x==2?0x2fb:0x3fb -#define MCR(x) x==2?0x2fc:0x3fc -#define LSR(x) x==2?0x2fd:0x3fd -#define MSR(x) x==2?0x2fe:0x3fe -#define SCR(x) x==2?0x2ff:0x3ff -#define DLL(x) x==2?0x2f8:0x3f8 -#define DLM(x) x==2?0x2f9:0x3f9 - -static int uart_charav(int port) -{ - return ((inb(LSR(port)) & 1) != 0); -} - -static char uart_getchar(int port) -{ - while (!uart_charav(port)); - return ((char) inb(RBR(port)) & 0177); -} - -static void uart_putchar(int port, unsigned char c) -{ - if (c == '\n') - uart_putchar(port, '\r'); - while (!(inb(LSR(port)) & 0x20)); - outb(c, THR(port)); -} - -static void uart_init_line(int port, unsigned long baud) -{ - int i, baudconst; - - switch (baud) { - case 115200: - baudconst = 1; - break; - case 57600: - baudconst = 2; - break; - case 38400: - baudconst = 3; - break; - case 19200: - baudconst = 6; - break; - case 9600: - default: - baudconst = 12; - break; - } - - outb(0x87, LCR(port)); - outb(0x00, DLM(port)); - outb(baudconst, DLL(port)); - outb(0x07, LCR(port)); - outb(0x0f, MCR(port)); - - for (i = 10; i > 0; i--) { - if (inb(LSR(port)) == (unsigned int) 0) - break; - inb(RBR(port)); - } -} - #ifdef CONFIG_DEBUG_CONSOLE -#ifdef CONFIG_DEBUG_CONSOLE_SERIAL - -static void serial_cls(void); -static void serial_putchar(int c); - -int uart_init(int port, unsigned long speed) -{ - uart_init_line(port, speed); - return -1; -} - -static void serial_putchar(int c) -{ - uart_putchar(CONFIG_SERIAL_PORT, (unsigned char) (c & 0xff)); -} - -static void serial_cls(void) -{ - serial_putchar(27); - serial_putchar('['); - serial_putchar('H'); - serial_putchar(27); - serial_putchar('['); - serial_putchar('J'); -} - -#endif - /* ****************************************************************** - * simple polling video/keyboard console functions - * ****************************************************************** */ - -/* - * keyboard driver - */ - -static const char normal[] = { - 0x0, 0x1b, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', - '=', '\b', '\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', - 'p', '[', ']', 0xa, 0x0, 'a', 's', 'd', 'f', 'g', 'h', 'j', - 'k', 'l', ';', 0x27, 0x60, 0x0, 0x5c, 'z', 'x', 'c', 'v', 'b', - 'n', 'm', ',', '.', '/', 0x0, '*', 0x0, ' ', 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, '0', 0x7f -}; - -static const char shifted[] = { - 0x0, 0x1b, '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', - '+', '\b', '\t', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', - 'P', '{', '}', 0xa, 0x0, 'A', 'S', 'D', 'F', 'G', 'H', 'J', - 'K', 'L', ':', 0x22, '~', 0x0, '|', 'Z', 'X', 'C', 'V', 'B', - 'N', 'M', '<', '>', '?', 0x0, '*', 0x0, ' ', 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, '7', '8', - '9', 0x0, '4', '5', '6', 0x0, '1', '2', '3', '0', 0x7f -}; - -static int key_ext; -static int key_lshift = 0, key_rshift = 0, key_caps = 0; - -static char last_key; - -static void keyboard_cmd(unsigned char cmd, unsigned char val) -{ - outb(cmd, 0x60); - /* wait until keyboard controller accepts cmds: */ - while (inb(0x64) & 2); - outb(val, 0x60); - while (inb(0x64) & 2); -} - -static void keyboard_controller_cmd(unsigned char cmd, unsigned char val) -{ - outb(cmd, 0x64); - /* wait until keyboard controller accepts cmds: */ - while (inb(0x64) & 2); - outb(val, 0x60); - while (inb(0x64) & 2); -} - -static char keyboard_poll(void) -{ - unsigned int c; - if (inb(0x64) & 1) { - c = inb(0x60); - switch (c) { - case 0xe0: - key_ext = 1; - return 0; - case 0x2a: - key_lshift = 1; - return 0; - case 0x36: - key_rshift = 1; - return 0; - case 0xaa: - key_lshift = 0; - return 0; - case 0xb6: - key_rshift = 0; - return 0; - case 0x3a: - if (key_caps) { - key_caps = 0; - keyboard_cmd(0xed, 0); - } else { - key_caps = 1; - keyboard_cmd(0xed, 4); /* set caps led */ - } - return 0; - } - - if (key_ext) { - // void printk(const char *format, ...); - printk("extended keycode: %x\n", c); - - key_ext = 0; - return 0; - } - - if (c & 0x80) /* unhandled key release */ - return 0; - - if (key_lshift || key_rshift) - return key_caps ? normal[c] : shifted[c]; - else - return key_caps ? shifted[c] : normal[c]; - } - return 0; -} - -static int keyboard_dataready(void) -{ - if (last_key) - return 1; - - last_key = keyboard_poll(); - - return (last_key != 0); -} - -static unsigned char keyboard_readdata(void) -{ - char tmp; - while (!keyboard_dataready()); - tmp = last_key; - last_key = 0; - return tmp; -} - -/* ****************************************************************** * common functions, implementing simple concurrent console * ****************************************************************** */ @@ -258,7 +40,7 @@ return 1; #endif #ifdef CONFIG_DEBUG_CONSOLE_VGA - if (keyboard_dataready()) + if (pc_kbd_dataready()) return 1; #endif return 0; @@ -271,8 +53,8 @@ return (uart_getchar(CONFIG_SERIAL_PORT)); #endif #ifdef CONFIG_DEBUG_CONSOLE_VGA - if (keyboard_dataready()) - return (keyboard_readdata()); + if (pc_kbd_dataready()) + return (pc_kbd_readdata()); #endif return 0; } @@ -280,153 +62,13 @@ void cls(void) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL - serial_cls(); + serial_putchar(27); + serial_putchar('['); + serial_putchar('H'); + serial_putchar(27); + serial_putchar('['); + serial_putchar('J'); #endif } #endif // CONFIG_DEBUG_CONSOLE - -/* ( addr len -- actual ) */ -static void -su_read(unsigned long *address) -{ - char *addr; - int len; - - len = POP(); - addr = (char *)POP(); - - if (len != 1) - printk("su_read: bad len, addr %lx len %x\n", (unsigned long)addr, len); - - if (uart_charav(*address)) { - *addr = (char)uart_getchar(*address); - PUSH(1); - } else { - PUSH(0); - } -} - -/* ( addr len -- actual ) */ -static void -su_read_keyboard(void) -{ - unsigned char *addr; - int len; - - len = POP(); - addr = (unsigned char *)POP(); - - if (len != 1) - printk("su_read: bad len, addr %lx len %x\n", (unsigned long)addr, len); - - if (keyboard_dataready()) { - *addr = keyboard_readdata(); - PUSH(1); - } else { - PUSH(0); - } -} - -/* ( addr len -- actual ) */ -static void -su_write(unsigned long *address) -{ - unsigned char *addr; - int i, len; - - len = POP(); - addr = (unsigned char *)POP(); - - for (i = 0; i < len; i++) { - uart_putchar(*address, addr[i]); - } - PUSH(len); -} - -static void -su_close(void) -{ -} - -static void -su_open(unsigned long *address) -{ - int len; - phandle_t ph; - unsigned long *prop; - char *args; - - fword("my-self"); - fword("ihandle>phandle"); - ph = (phandle_t)POP(); - prop = (unsigned long *)get_property(ph, "address", &len); - *address = *prop; - fword("my-args"); - args = pop_fstr_copy(); - - RET ( -1 ); -} - -DECLARE_UNNAMED_NODE(su, INSTALL_OPEN, sizeof(unsigned long)); - -NODE_METHODS(su) = { - { "open", su_open }, - { "close", su_close }, - { "read", su_read }, - { "write", su_write }, -}; - -DECLARE_UNNAMED_NODE(su_keyboard, INSTALL_OPEN, sizeof(unsigned long)); - -NODE_METHODS(su_keyboard) = { - { "open", su_open }, - { "close", su_close }, - { "read", su_read_keyboard }, -}; - -void -ob_su_init(uint64_t base, uint64_t offset, int intr) -{ - push_str("/pci/isa"); - fword("find-device"); - fword("new-device"); - - push_str("su"); - fword("device-name"); - - push_str("serial"); - fword("device-type"); - - PUSH((base + offset) >> 32); - fword("encode-int"); - PUSH((base + offset) & 0xffffffff); - fword("encode-int"); - fword("encode+"); - PUSH(SER_SIZE); - fword("encode-int"); - fword("encode+"); - push_str("reg"); - fword("property"); - - fword("finish-device"); - - REGISTER_NODE_METHODS(su, "/pci/isa/su"); - - push_str("/chosen"); - fword("find-device"); - - push_str("/pci/isa/su"); - fword("open-dev"); - fword("encode-int"); - push_str("stdin"); - fword("property"); - - push_str("/pci/isa/su"); - fword("open-dev"); - fword("encode-int"); - push_str("stdout"); - fword("property"); - - keyboard_controller_cmd(0x60, 0x40); // Write mode command, translated mode -} Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2009-01-09 21:00:38 UTC (rev 376) +++ openbios-devel/arch/sparc64/openbios.c 2009-01-10 11:37:34 UTC (rev 377) @@ -326,6 +326,7 @@ uint64_t ram_size; uint32_t clock_frequency; uint16_t machine_id; + const char *stdin_path, *stdout_path; nvram_read(0, (char *)&nv_info, sizeof(ohwcfg_v3_t)); @@ -413,9 +414,9 @@ fword("find-device"); if (nv_info.boot_devices[0] == 'c') - bootpath = "/pci/isa/ide0/disk@0,0:a"; + bootpath = "disk:a"; else - bootpath = "/pci/isa/ide1/cdrom@0,0:a"; + bootpath = "cdrom:a"; push_str(bootpath); fword("encode-string"); push_str("bootpath"); @@ -425,6 +426,24 @@ fword("encode-string"); push_str("bootargs"); fword("property"); + + if (fw_cfg_read_i16(FW_CFG_NOGRAPHIC)) { + stdin_path = stdout_path = "/pci/pci/pci/ebus/su"; + } else { + stdin_path = "/pci/pci/pci/ebus/kb_ps2"; + stdout_path = "/pci/pci/pci/QEMU,VGA"; + } + push_str(stdin_path); + fword("open-dev"); + fword("encode-int"); + push_str("stdin"); + fword("property"); + + push_str(stdout_path); + fword("open-dev"); + fword("encode-int"); + push_str("stdout"); + fword("property"); } void arch_nvram_put(char *data) @@ -466,17 +485,11 @@ modules_init(); // XXX use PCI IDE setup_timers(); - ob_ide_init("/pci/isa", 0x1f0, 0x3f4, 0x170, 0x374); + ob_ide_init("/pci/pci/pci/ebus", 0x1f0, 0x3f4, 0x170, 0x374); #ifdef CONFIG_DRIVER_PCI ob_pci_init(); #endif -#ifdef CONFIG_DRIVER_FLOPPY - ob_floppy_init(); -#endif - nvconf_init(); - ob_su_init(0x1fe02000000ULL, 0x3f8ULL, 0); - device_end(); bind_func("platform-boot", boot ); Modified: openbios-devel/arch/sparc64/openbios.h =================================================================== --- openbios-devel/arch/sparc64/openbios.h 2009-01-09 21:00:38 UTC (rev 376) +++ openbios-devel/arch/sparc64/openbios.h 2009-01-10 11:37:34 UTC (rev 377) @@ -21,7 +21,6 @@ /* console.c */ #ifdef CONFIG_DEBUG_CONSOLE -extern int uart_init(int port, unsigned long speed); extern void video_init(void); #endif Modified: openbios-devel/arch/sparc64/tree.fs =================================================================== --- openbios-devel/arch/sparc64/tree.fs 2009-01-09 21:00:38 UTC (rev 376) +++ openbios-devel/arch/sparc64/tree.fs 2009-01-10 11:37:34 UTC (rev 377) @@ -32,17 +32,3 @@ " /openprom" find-device " OBP 3.10.24 1999/01/01 01:01" encode-string " version" property - -dev / - -\ simple pci bus node -new-device - " pci" device-name -finish-device - -dev /pci - -\ simple isa bus node -new-device - " isa" device-name -finish-device Modified: openbios-devel/arch/x86/openbios.c =================================================================== --- openbios-devel/arch/x86/openbios.c 2009-01-09 21:00:38 UTC (rev 376) +++ openbios-devel/arch/x86/openbios.c 2009-01-10 11:37:34 UTC (rev 377) @@ -48,7 +48,7 @@ ob_ide_init("/pci/isa", 0x1f0, 0x3f4, 0x170, 0x374); #endif #ifdef CONFIG_DRIVER_FLOPPY - ob_floppy_init(); + ob_floppy_init("/isa", "floppy0"); #endif #ifdef CONFIG_XBOX init_video(phys_to_virt(0x3C00000), 640, 480, 32, 2560); Modified: openbios-devel/config/examples/cross-sparc64_config.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_config.xml 2009-01-09 21:00:38 UTC (rev 376) +++ openbios-devel/config/examples/cross-sparc64_config.xml 2009-01-10 11:37:34 UTC (rev 377) @@ -74,5 +74,8 @@ <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/> <option name="CONFIG_DEBUG_FLOPPY" type="boolean" value="false"/> <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_EBUS" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_PC_KBD" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_PC_SERIAL" type="boolean" value="true"/> </config> Modified: openbios-devel/config/examples/sparc64_config.xml =================================================================== --- openbios-devel/config/examples/sparc64_config.xml 2009-01-09 21:00:38 UTC (rev 376) +++ openbios-devel/config/examples/sparc64_config.xml 2009-01-10 11:37:34 UTC (rev 377) @@ -74,5 +74,8 @@ <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/> <option name="CONFIG_DEBUG_FLOPPY" type="boolean" value="false"/> <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_EBUS" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_PC_KBD" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_PC_SERIAL" type="boolean" value="true"/> </config> Modified: openbios-devel/drivers/build.xml =================================================================== --- openbios-devel/drivers/build.xml 2009-01-09 21:00:38 UTC (rev 376) +++ openbios-devel/drivers/build.xml 2009-01-10 11:37:34 UTC (rev 377) @@ -19,6 +19,8 @@ <object source="vga_set_mode.c" condition="DRIVER_VGA"/> <object source="vga_vbe.c" condition="DRIVER_VGA"/> <object source="macio.c" condition="DRIVER_MACIO"/> + <object source="pc_kbd.c" condition="DRIVER_PC_KBD"/> + <object source="pc_serial.c" condition="DRIVER_PC_SERIAL"/> </library> <dictionary name="openbios" target="forth"> @@ -26,5 +28,5 @@ <object source="sbus.fs" condition="DRIVER_SBUS"/> <object source="esp.fs" condition="DRIVER_ESP"/> </dictionary> - + </build> Modified: openbios-devel/drivers/floppy.c =================================================================== --- openbios-devel/drivers/floppy.c 2009-01-09 21:00:38 UTC (rev 376) +++ openbios-devel/drivers/floppy.c 2009-01-10 11:37:34 UTC (rev 377) @@ -1112,9 +1112,12 @@ }; -int ob_floppy_init(void) +int ob_floppy_init(const char *path, const char *dev_name) { - REGISTER_NAMED_NODE(ob_floppy, "/isa/floppy0"); + char nodebuff[128]; + + snprintf(nodebuff, sizeof(nodebuff), "%s/%s", path, dev_name); + REGISTER_NAMED_NODE(ob_floppy, nodebuff); floppy_init(); return 0; } Added: openbios-devel/drivers/pc_kbd.c =================================================================== --- openbios-devel/drivers/pc_kbd.c (rev 0) +++ openbios-devel/drivers/pc_kbd.c 2009-01-10 11:37:34 UTC (rev 377) @@ -0,0 +1,216 @@ +/* + * Copyright (C) 2003, 2004 Stefan Reinauer + * + * See the file "COPYING" for further information about + * the copyright and warranty status of this work. + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "openbios/kernel.h" +#include "openbios/drivers.h" +#include "libc/vsprintf.h" + +/* ****************************************************************** + * simple polling video/keyboard console functions + * ****************************************************************** */ + +/* + * keyboard driver + */ + +static const char normal[] = { + 0x0, 0x1b, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', + '=', '\b', '\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', + 'p', '[', ']', 0xa, 0x0, 'a', 's', 'd', 'f', 'g', 'h', 'j', + 'k', 'l', ';', 0x27, 0x60, 0x0, 0x5c, 'z', 'x', 'c', 'v', 'b', + 'n', 'm', ',', '.', '/', 0x0, '*', 0x0, ' ', 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, '0', 0x7f +}; + +static const char shifted[] = { + 0x0, 0x1b, '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', + '+', '\b', '\t', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', + 'P', '{', '}', 0xa, 0x0, 'A', 'S', 'D', 'F', 'G', 'H', 'J', + 'K', 'L', ':', 0x22, '~', 0x0, '|', 'Z', 'X', 'C', 'V', 'B', + 'N', 'M', '<', '>', '?', 0x0, '*', 0x0, ' ', 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, '7', '8', + '9', 0x0, '4', '5', '6', 0x0, '1', '2', '3', '0', 0x7f +}; + +static int key_ext; +static int key_lshift = 0, key_rshift = 0, key_caps = 0; + +static char last_key; + +static void pc_kbd_cmd(unsigned char cmd, unsigned char val) +{ + outb(cmd, 0x60); + /* wait until keyboard controller accepts cmds: */ + while (inb(0x64) & 2); + outb(val, 0x60); + while (inb(0x64) & 2); +} + +static void pc_kbd_controller_cmd(unsigned char cmd, unsigned char val) +{ + outb(cmd, 0x64); + /* wait until keyboard controller accepts cmds: */ + while (inb(0x64) & 2); + outb(val, 0x60); + while (inb(0x64) & 2); +} + +static char pc_kbd_poll(void) +{ + unsigned int c; + if (inb(0x64) & 1) { + c = inb(0x60); + switch (c) { + case 0xe0: + key_ext = 1; + return 0; + case 0x2a: + key_lshift = 1; + return 0; + case 0x36: + key_rshift = 1; + return 0; + case 0xaa: + key_lshift = 0; + return 0; + case 0xb6: + key_rshift = 0; + return 0; + case 0x3a: + if (key_caps) { + key_caps = 0; + pc_kbd_cmd(0xed, 0); + } else { + key_caps = 1; + pc_kbd_cmd(0xed, 4); /* set caps led */ + } + return 0; + } + + if (key_ext) { + // void printk(const char *format, ...); + printk("extended keycode: %x\n", c); + + key_ext = 0; + return 0; + } + + if (c & 0x80) /* unhandled key release */ + return 0; + + if (key_lshift || key_rshift) + return key_caps ? normal[c] : shifted[c]; + else + return key_caps ? shifted[c] : normal[c]; + } + return 0; +} + +int pc_kbd_dataready(void) +{ + if (last_key) + return 1; + + last_key = pc_kbd_poll(); + + return (last_key != 0); +} + +unsigned char pc_kbd_readdata(void) +{ + char tmp; + while (!pc_kbd_dataready()); + tmp = last_key; + last_key = 0; + return tmp; +} + +/* ( addr len -- actual ) */ +static void +pc_kbd_read(void) +{ + unsigned char *addr; + int len; + + len = POP(); + addr = (unsigned char *)POP(); + + if (len != 1) + printk("pc_kbd_read: bad len, addr %lx len %x\n", (unsigned long)addr, len); + + if (pc_kbd_dataready()) { + *addr = pc_kbd_readdata(); + PUSH(1); + } else { + PUSH(0); + } +} + +static void +pc_kbd_close(void) +{ +} + +static void +pc_kbd_open(unsigned long *address) +{ + int len; + phandle_t ph; + unsigned long *prop; + char *args; + + fword("my-self"); + fword("ihandle>phandle"); + ph = (phandle_t)POP(); + prop = (unsigned long *)get_property(ph, "address", &len); + *address = *prop; + fword("my-args"); + args = pop_fstr_copy(); + + RET ( -1 ); +} + +DECLARE_UNNAMED_NODE(pc_kbd, INSTALL_OPEN, sizeof(unsigned long)); + +NODE_METHODS(pc_kbd) = { + { "open", pc_kbd_open }, + { "close", pc_kbd_close }, + { "read", pc_kbd_read }, +}; + +void +ob_pc_kbd_init(const char *path, const char *dev_name, uint64_t base, + uint64_t offset, int intr) +{ + phandle_t chosen, aliases; + char nodebuff[128]; + + snprintf(nodebuff, sizeof(nodebuff), "%s/%s", path, dev_name); + REGISTER_NAMED_NODE(pc_kbd, nodebuff); + + push_str(nodebuff); + fword("find-device"); + + push_str(dev_name); + fword("device-name"); + + push_str("keyboard"); + fword("device-type"); + + chosen = find_dev("/chosen"); + push_str(nodebuff); + fword("open-dev"); + set_int_property(chosen, "keyboard", POP()); + + aliases = find_dev("/aliases"); + set_property(aliases, "keyboard", nodebuff, strlen(nodebuff) + 1); + + pc_kbd_controller_cmd(0x60, 0x40); // Write mode command, translated mode +} Added: openbios-devel/drivers/pc_serial.c =================================================================== --- openbios-devel/drivers/pc_serial.c (rev 0) +++ openbios-devel/drivers/pc_serial.c 2009-01-10 11:37:34 UTC (rev 377) @@ -0,0 +1,195 @@ +/* + * Copyright (C) 2003, 2004 Stefan Reinauer + * + * See the file "COPYING" for further information about + * the copyright and warranty status of this work. + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "openbios/kernel.h" +#include "openbios/drivers.h" +#include "libc/vsprintf.h" + +/* ****************************************************************** + * serial console functions + * ****************************************************************** */ + +#define SER_SIZE 8 + +#define RBR(x) x==2?0x2f8:0x3f8 +#define THR(x) x==2?0x2f8:0x3f8 +#define IER(x) x==2?0x2f9:0x3f9 +#define IIR(x) x==2?0x2fa:0x3fa +#define LCR(x) x==2?0x2fb:0x3fb +#define MCR(x) x==2?0x2fc:0x3fc +#define LSR(x) x==2?0x2fd:0x3fd +#define MSR(x) x==2?0x2fe:0x3fe +#define SCR(x) x==2?0x2ff:0x3ff +#define DLL(x) x==2?0x2f8:0x3f8 +#define DLM(x) x==2?0x2f9:0x3f9 + +int uart_charav(int port) +{ + return ((inb(LSR(port)) & 1) != 0); +} + +char uart_getchar(int port) +{ + while (!uart_charav(port)); + return ((char) inb(RBR(port)) & 0177); +} + +static void uart_putchar(int port, unsigned char c) +{ + if (c == '\n') + uart_putchar(port, '\r'); + while (!(inb(LSR(port)) & 0x20)); + outb(c, THR(port)); +} + +static void uart_init_line(int port, unsigned long baud) +{ + int i, baudconst; + + switch (baud) { + case 115200: + baudconst = 1; + break; + case 57600: + baudconst = 2; + break; + case 38400: + baudconst = 3; + break; + case 19200: + baudconst = 6; + break; + case 9600: + default: + baudconst = 12; + break; + } + + outb(0x87, LCR(port)); + outb(0x00, DLM(port)); + outb(baudconst, DLL(port)); + outb(0x07, LCR(port)); + outb(0x0f, MCR(port)); + + for (i = 10; i > 0; i--) { + if (inb(LSR(port)) == (unsigned int) 0) + break; + inb(RBR(port)); + } +} + +#ifdef CONFIG_DEBUG_CONSOLE_SERIAL +int uart_init(int port, unsigned long speed) +{ + uart_init_line(port, speed); + return -1; +} + +void serial_putchar(int c) +{ + uart_putchar(CONFIG_SERIAL_PORT, (unsigned char) (c & 0xff)); +} +#endif + +/* ( addr len -- actual ) */ +static void +pc_serial_read(unsigned long *address) +{ + char *addr; + int len; + + len = POP(); + addr = (char *)POP(); + + if (len != 1) + printk("pc_serial_read: bad len, addr %lx len %x\n", (unsigned long)addr, len); + + if (uart_charav(*address)) { + *addr = (char)uart_getchar(*address); + PUSH(1); + } else { + PUSH(0); + } +} + +/* ( addr len -- actual ) */ +static void +pc_serial_write(unsigned long *address) +{ + unsigned char *addr; + int i, len; + + len = POP(); + addr = (unsigned char *)POP(); + + for (i = 0; i < len; i++) { + uart_putchar(*address, addr[i]); + } + PUSH(len); +} + +static void +pc_serial_close(void) +{ +} + +static void +pc_serial_open(unsigned long *address) +{ + int len; + phandle_t ph; + unsigned long *prop; + char *args; + + fword("my-self"); + fword("ihandle>phandle"); + ph = (phandle_t)POP(); + prop = (unsigned long *)get_property(ph, "address", &len); + *address = *prop; + fword("my-args"); + args = pop_fstr_copy(); + + RET ( -1 ); +} + +DECLARE_UNNAMED_NODE(pc_serial, INSTALL_OPEN, sizeof(unsigned long)); + +NODE_METHODS(pc_serial) = { + { "open", pc_serial_open }, + { "close", pc_serial_close }, + { "read", pc_serial_read }, + { "write", pc_serial_write }, +}; + +void +ob_pc_serial_init(const char *path, const char *dev_name, uint64_t base, + uint64_t offset, int intr) +{ + char nodebuff[128]; + + snprintf(nodebuff, sizeof(nodebuff), "%s/%s", path, dev_name); + REGISTER_NAMED_NODE(pc_serial, nodebuff); + + push_str(nodebuff); + fword("find-device"); + + push_str("serial"); + fword("device-type"); + + PUSH((base + offset) >> 32); + fword("encode-int"); + PUSH((base + offset) & 0xffffffff); + fword("encode-int"); + fword("encode+"); + PUSH(SER_SIZE); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); +} Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-09 21:00:38 UTC (rev 376) +++ openbios-devel/drivers/pci.c 2009-01-10 11:37:34 UTC (rev 377) @@ -415,6 +415,24 @@ return 0; } +int ebus_config_cb(const pci_config_t *config) +{ + printk("ebus config %s addr %x size %x\n", config->path, + config->assigned[0] & ~0x0000000F, config->sizes[0]); +#ifdef CONFIG_DRIVER_EBUS +#ifdef CONFIG_DRIVER_FLOPPY + ob_floppy_init(config->path, "fdthree"); +#endif +#ifdef CONFIG_DRIVER_PC_SERIAL + ob_pc_serial_init(config->path, "su", arch->io_base, 0x3f8ULL, 0); +#endif +#ifdef CONFIG_DRIVER_PC_KBD + ob_pc_kbd_init(config->path, "kb_ps2", arch->io_base, 0x60ULL, 0); +#endif +#endif + return 0; +} + static void ob_pci_add_properties(pci_addr addr, const pci_dev_t *pci_dev, const pci_config_t *config) { Modified: openbios-devel/drivers/pci_database.c =================================================================== --- openbios-devel/drivers/pci_database.c 2009-01-09 21:00:38 UTC (rev 376) +++ openbios-devel/drivers/pci_database.c 2009-01-10 11:37:34 UTC (rev 377) @@ -312,6 +312,21 @@ }, }; +static const pci_dev_t miscbrg_devices[] = { + { + 0x108e, 0x1000, NULL, + "ebus", "ebus", "pci108e,1000\0pciclass,068000\0", + 3, 2, 1, + ebus_config_cb, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + static const pci_subclass_t bridg_subclass[] = { { 0x00, "PCI host bridge", NULL, hbrg_devices, NULL, @@ -358,7 +373,7 @@ NULL, NULL, }, { - 0x80, "misc PCI bridge", NULL, NULL, NULL, + 0x80, "misc PCI bridge", NULL, miscbrg_devices, NULL, NULL, NULL, }, { Modified: openbios-devel/drivers/pci_database.h =================================================================== --- openbios-devel/drivers/pci_database.h 2009-01-09 21:00:38 UTC (rev 376) +++ openbios-devel/drivers/pci_database.h 2009-01-10 11:37:34 UTC (rev 377) @@ -31,6 +31,7 @@ extern int vga_config_cb(const pci_config_t *config); extern int host_config_cb(const pci_config_t *config); extern int bridge_config_cb(const pci_config_t *config); +extern int ebus_config_cb(const pci_config_t *config); static inline int pci_compat_len(const pci_dev_t *dev) { Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2009-01-09 21:00:38 UTC (rev 376) +++ openbios-devel/include/openbios/drivers.h 2009-01-10 11:37:34 UTC (rev 377) @@ -74,7 +74,21 @@ extern char boot_device; #endif #ifdef CONFIG_DRIVER_FLOPPY -int ob_floppy_init(void); +int ob_floppy_init(const char *path, const char *dev_name); #endif +#ifdef CONFIG_DRIVER_PC_KBD +void ob_pc_kbd_init(const char *path, const char *dev_name, uint64_t base, + uint64_t offset, int intr); +int pc_kbd_dataready(void); +unsigned char pc_kbd_readdata(void); +#endif +#ifdef CONFIG_DRIVER_PC_SERIAL +void ob_pc_serial_init(const char *path, const char *dev_name, uint64_t base, + uint64_t offset, int intr); +int uart_init(int port, unsigned long speed); +int uart_charav(int port); +char uart_getchar(int port); +void serial_putchar(int c); +#endif #endif /* OPENBIOS_DRIVERS_H */

1 0

r376 - in openbios-devel: arch/sparc64 config/examples include/sparc64
by svn＠openbios.org 09 Jan '09

09 Jan '09

Author: blueswirl Date: 2009-01-09 22:00:38 +0100 (Fri, 09 Jan 2009) New Revision: 376 Modified: openbios-devel/arch/sparc64/build.xml openbios-devel/arch/sparc64/console.c openbios-devel/arch/sparc64/init.fs openbios-devel/arch/sparc64/openbios.c openbios-devel/arch/sparc64/tree.fs openbios-devel/config/examples/cross-sparc64_config.xml openbios-devel/config/examples/sparc64_config.xml openbios-devel/include/sparc64/io.h Log: Enable Sparc64 PCI probing, use probed display but not IDE Modified: openbios-devel/arch/sparc64/build.xml =================================================================== --- openbios-devel/arch/sparc64/build.xml 2009-01-09 20:58:23 UTC (rev 375) +++ openbios-devel/arch/sparc64/build.xml 2009-01-09 21:00:38 UTC (rev 376) @@ -41,8 +41,9 @@ <external-object source="target/arch/sparc64/entry.o"/> <external-object source="libsparc64.a"/> <external-object source="libbootstrap.a"/> + <external-object source="libdrivers.a"/> +  <external-object source="libmodules.a"/> - <external-object source="libdrivers.a"/> <external-object source="liblibc.a"/> <external-object source="libfs.a"/> <external-object source="libgcc.a"/> @@ -78,8 +79,9 @@ <external-object source="target/arch/sparc64/builtin.o"/> <external-object source="libsparc64.a"/> <external-object source="libbootstrap.a"/> + <external-object source="libdrivers.a"/> +  <external-object source="libmodules.a"/> - <external-object source="libdrivers.a"/> <external-object source="liblibc.a"/> <external-object source="libfs.a"/> <external-object source="libgcc.a"/> Modified: openbios-devel/arch/sparc64/console.c =================================================================== --- openbios-devel/arch/sparc64/console.c 2009-01-09 20:58:23 UTC (rev 375) +++ openbios-devel/arch/sparc64/console.c 2009-01-09 21:00:38 UTC (rev 376) @@ -122,141 +122,6 @@ * simple polling video/keyboard console functions * ****************************************************************** */ -#ifdef CONFIG_DEBUG_CONSOLE_VGA - -/* raw vga text mode */ -#define COLUMNS 80 /* The number of columns. */ -#define LINES 25 /* The number of lines. */ -#define ATTRIBUTE 7 /* The attribute of an character. */ - -#define APB_MEM_BASE 0x1ff00000000ULL -#define VGA_BASE (APB_MEM_BASE + 0x4a0000ULL) /* Beginning of video memory address. */ -#define TEXT_BASE (VGA_BASE + 0x18000ULL) /* The text memory address. */ - -/* VGA Index and Data Registers */ -#define VGA_REG_INDEX 0x03D4 /* VGA index register */ -#define VGA_REG_DATA 0x03D5 /* VGA data register */ - -#define VGA_IDX_CURMSL 0x09 /* cursor maximum scan line */ -#define VGA_IDX_CURSTART 0x0A /* cursor start */ -#define VGA_IDX_CUREND 0x0B /* cursor end */ -#define VGA_IDX_CURLO 0x0F /* cursor position (low 8 bits) */ -#define VGA_IDX_CURHI 0x0E /* cursor position (high 8 bits) */ - -/* Save the X and Y position. */ -static int xpos, ypos; -/* Point to the video memory. */ -static unsigned char *video = (unsigned char *) TEXT_BASE; - -static void video_initcursor(void) -{ - u8 val; - outb(VGA_IDX_CURMSL, VGA_REG_INDEX); - val = inb(VGA_REG_DATA) & 0x1f; /* maximum scan line -1 */ - - outb(VGA_IDX_CURSTART, VGA_REG_INDEX); - outb(0, VGA_REG_DATA); - - outb(VGA_IDX_CUREND, VGA_REG_INDEX); - outb(val, VGA_REG_DATA); -} - - - -static void video_poscursor(unsigned int x, unsigned int y) -{ - unsigned short pos; - - /* Calculate new cursor position as a function of x and y */ - pos = (y * COLUMNS) + x; - - /* Output the new position to VGA card */ - outb(VGA_IDX_CURLO, VGA_REG_INDEX); /* output low 8 bits */ - outb((u8) (pos), VGA_REG_DATA); - outb(VGA_IDX_CURHI, VGA_REG_INDEX); /* output high 8 bits */ - outb((u8) (pos >> 8), VGA_REG_DATA); - -}; - - -static void video_newline(void) -{ - xpos = 0; - - if (ypos < LINES - 1) { - ypos++; - } else { - int i; - memmove((void *) video, (void *) (video + 2 * COLUMNS), - (LINES - 1) * COLUMNS * 2); - - for (i = ((LINES - 1) * 2 * COLUMNS); - i < 2 * COLUMNS * LINES;) { - video[i++] = 0; - video[i++] = ATTRIBUTE; - } - } - -} - -/* Put the character C on the screen. */ -static void video_putchar(int c) -{ - int p=1; - - if (c == '\n' || c == '\r') { - video_newline(); - return; - } - - if (c == '\b') { - if (xpos) xpos--; - c=' '; - p=0; - } - - - if (xpos >= COLUMNS) - video_newline(); - - *(video + (xpos + ypos * COLUMNS) * 2) = c & 0xFF; - *(video + (xpos + ypos * COLUMNS) * 2 + 1) = ATTRIBUTE; - - if (p) - xpos++; - - video_poscursor(xpos, ypos); -} - -static void video_cls(void) -{ - int i; - - for (i = 0; i < 2 * COLUMNS * LINES;) { - video[i++] = 0; - video[i++] = ATTRIBUTE; - } - - - xpos = 0; - ypos = 0; - - video_initcursor(); - video_poscursor(xpos, ypos); -} - -void video_init(void) -{ - video=(unsigned char *)TEXT_BASE; - -#ifdef CONFIG_DRIVER_VGA - vga_load_regs(); - vga_font_load((unsigned char *)VGA_BASE, fontdata_8x16, - FONT_HEIGHT_8X16, 256); - vga_set_amode(); -#endif -} - /* * keyboard driver */ @@ -373,9 +238,7 @@ last_key = 0; return tmp; } -#endif - /* ****************************************************************** * common functions, implementing simple concurrent console * ****************************************************************** */ @@ -385,9 +248,6 @@ #ifdef CONFIG_DEBUG_CONSOLE_SERIAL serial_putchar(c); #endif -#ifdef CONFIG_DEBUG_CONSOLE_VGA - video_putchar(c); -#endif return c; } @@ -422,9 +282,6 @@ #ifdef CONFIG_DEBUG_CONSOLE_SERIAL serial_cls(); #endif -#ifdef CONFIG_DEBUG_CONSOLE_VGA - video_cls(); -#endif } #endif // CONFIG_DEBUG_CONSOLE Modified: openbios-devel/arch/sparc64/init.fs =================================================================== --- openbios-devel/arch/sparc64/init.fs 2009-01-09 20:58:23 UTC (rev 375) +++ openbios-devel/arch/sparc64/init.fs 2009-01-09 21:00:38 UTC (rev 376) @@ -36,12 +36,12 @@ ; SYSTEM-initializer \ use the tty interface if available -:noname - " /builtin/console" find-dev if drop - " /builtin/console" " input-device" $setenv - " /builtin/console" " output-device" $setenv +: activate-tty-interface + " /packages/terminal-emulator" find-dev if drop + " keyboard" " input-device" $setenv + " screen" " output-device" $setenv then -; SYSTEM-initializer +; :noname " keyboard" input Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2009-01-09 20:58:23 UTC (rev 375) +++ openbios-devel/arch/sparc64/openbios.c 2009-01-09 21:00:38 UTC (rev 376) @@ -34,7 +34,6 @@ #define NVRAM_DATA 0x77 #define APB_SPECIAL_BASE 0x1fe00000000ULL -#define PCI_CONFIG (APB_SPECIAL_BASE + 0x1000000ULL) #define APB_MEM_BASE 0x1ff00000000ULL #define MEMORY_SIZE (512*1024) /* 512K ram for hosted system */ @@ -64,11 +63,18 @@ static const struct hwdef hwdefs[] = { { .pci = { - .cfg_addr = PCI_CONFIG, - .cfg_data = 0, + .name = "SUNW,sabre", + .vendor_id = 0x108e, + .device_id = 0xa000, + .cfg_addr = APB_SPECIAL_BASE + 0x1000000ULL, + .cfg_data = APB_MEM_BASE, .cfg_base = 0x80000000ULL, .cfg_len = 0, - .irqs = { 1, 2, 3, 4 }, + .mem_base = APB_MEM_BASE + 0x400000ULL, + .mem_len = 0x10000000, + .io_base = APB_SPECIAL_BASE + 0x2000000ULL, + .io_len = 0x10000, + .irqs = { 0, 1, 2, 3 }, }, .machine_id_low = 0, .machine_id_high = 255, @@ -243,7 +249,7 @@ { unsigned int i; - outw(__cpu_to_le16(cmd), BIOS_CFG_CMD); + outw(cmd, BIOS_CFG_CMD); for (i = 0; i < nbytes; i++) buf[i] = inb(BIOS_CFG_DATA); } @@ -457,36 +463,16 @@ static void arch_init( void ) { - unsigned int i; - uint16_t machine_id; - const struct hwdef *hwdef = NULL; - - machine_id = fw_cfg_read_i16(FW_CFG_MACHINE_ID); - - for (i = 0; i < sizeof(hwdefs) / sizeof(struct hwdef); i++) { - if (hwdefs[i].machine_id_low <= machine_id && - hwdefs[i].machine_id_high >= machine_id) { - hwdef = &hwdefs[i]; - break; - } - } - if (!hwdef) - for(;;); // Internal inconsistency, hang - modules_init(); -#ifdef CONFIG_DRIVER_PCI - //ob_pci_init(); -#endif -#ifdef CONFIG_DRIVER_IDE + // XXX use PCI IDE setup_timers(); ob_ide_init("/pci/isa", 0x1f0, 0x3f4, 0x170, 0x374); +#ifdef CONFIG_DRIVER_PCI + ob_pci_init(); #endif #ifdef CONFIG_DRIVER_FLOPPY ob_floppy_init(); #endif -#ifdef CONFIG_DEBUG_CONSOLE_VIDEO - init_video(); -#endif nvconf_init(); ob_su_init(0x1fe02000000ULL, 0x3f8ULL, 0); @@ -494,18 +480,34 @@ device_end(); bind_func("platform-boot", boot ); - printk("\n"); // XXX needed for boot, why? } +unsigned long isa_io_base; + int openbios(void) { + unsigned int i; + uint16_t machine_id; + const struct hwdef *hwdef = NULL; + + + for (i = 0; i < sizeof(hwdefs) / sizeof(struct hwdef); i++) { + isa_io_base = hwdefs[i].pci.io_base; + machine_id = fw_cfg_read_i16(FW_CFG_MACHINE_ID); + if (hwdefs[i].machine_id_low <= machine_id && + hwdefs[i].machine_id_high >= machine_id) { + hwdef = &hwdefs[i]; + arch = &hwdefs[i].pci; + break; + } + } + if (!hwdef) + for(;;); // Internal inconsistency, hang + #ifdef CONFIG_DEBUG_CONSOLE #ifdef CONFIG_DEBUG_CONSOLE_SERIAL uart_init(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED); #endif -#ifdef CONFIG_DEBUG_CONSOLE_VGA - video_init(); -#endif /* Clear the screen. */ cls(); printk("OpenBIOS for Sparc64\n"); Modified: openbios-devel/arch/sparc64/tree.fs =================================================================== --- openbios-devel/arch/sparc64/tree.fs 2009-01-09 20:58:23 UTC (rev 375) +++ openbios-devel/arch/sparc64/tree.fs 2009-01-09 21:00:38 UTC (rev 376) @@ -33,54 +33,16 @@ " /openprom" find-device " OBP 3.10.24 1999/01/01 01:01" encode-string " version" property -device-end - -\ we only implement DD and DD,F -: encode-unit-pci ( phys.lo phy.mid phys.hi -- str len ) - nip nip ff00 and 8 >> dup 3 >> - swap 7 and - ( ddddd fff ) - - ?dup if - pocket tohexstr - " ," pocket tmpstrcat - else - 0 0 pocket tmpstrcpy - then - >r - rot pocket tohexstr r> tmpstrcat drop -; - dev / \ simple pci bus node new-device " pci" device-name - 3 encode-int " #address-cells" property - 2 encode-int " #size-cells" property - 0 encode-int 0 encode-int encode+ " bus-range" property - " pci" encode-string " device_type" property - - external - : open ( cr ." opening PCI" cr ) true ; - : close ; - : decode-unit 0 decode-unit-pci-bus ; - : encode-unit encode-unit-pci ; finish-device -device-end - dev /pci \ simple isa bus node new-device " isa" device-name - " isa" device-type - 2 encode-int " #address-cells" property - 1 encode-int " #size-cells" property - - external - : open true ; - : close ; - finish-device Modified: openbios-devel/config/examples/cross-sparc64_config.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_config.xml 2009-01-09 20:58:23 UTC (rev 375) +++ openbios-devel/config/examples/cross-sparc64_config.xml 2009-01-09 21:00:38 UTC (rev 376) @@ -35,8 +35,8 @@  <option name="CONFIG_CMDLINE" type="boolean" value="true"/> <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> - <option name="CONFIG_FONT_8X8" type="boolean" value="false"/> - <option name="CONFIG_FONT_8X16" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X16" type="boolean" value="false"/>  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> @@ -67,7 +67,7 @@  <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/> - <option name="CONFIG_DEBUG_PCI" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_PCI" type="boolean" value="false"/> <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> Modified: openbios-devel/config/examples/sparc64_config.xml =================================================================== --- openbios-devel/config/examples/sparc64_config.xml 2009-01-09 20:58:23 UTC (rev 375) +++ openbios-devel/config/examples/sparc64_config.xml 2009-01-09 21:00:38 UTC (rev 376) @@ -35,8 +35,8 @@  <option name="CONFIG_CMDLINE" type="boolean" value="true"/> <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> - <option name="CONFIG_FONT_8X8" type="boolean" value="false"/> - <option name="CONFIG_FONT_8X16" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X16" type="boolean" value="false"/>  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> @@ -67,7 +67,7 @@  <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/> - <option name="CONFIG_DEBUG_PCI" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_PCI" type="boolean" value="false"/> <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> Modified: openbios-devel/include/sparc64/io.h =================================================================== --- openbios-devel/include/sparc64/io.h 2009-01-09 20:58:23 UTC (rev 375) +++ openbios-devel/include/sparc64/io.h 2009-01-09 21:00:38 UTC (rev 376) @@ -33,9 +33,7 @@ #ifndef BOOTSTRAP -#ifndef _IO_BASE -#define _IO_BASE 0x1fe02000000ULL -#endif +extern unsigned long isa_io_base; /* * The insw/outsw/insl/outsl macros don't do byte-swapping. @@ -43,15 +41,15 @@ * are arrays of bytes, and byte-swapping is not appropriate in * that case. - paulus */ -#define insw(port, buf, ns) _insw_ns((uint16_t *)((port)+_IO_BASE), (buf), (ns)) -#define outsw(port, buf, ns) _outsw_ns((uint16_t *)((port)+_IO_BASE), (buf), (ns)) +#define insw(port, buf, ns) _insw_ns((uint16_t *)((port)+isa_io_base), (buf), (ns)) +#define outsw(port, buf, ns) _outsw_ns((uint16_t *)((port)+isa_io_base), (buf), (ns)) -#define inb(port) in_8((uint8_t *)((port)+_IO_BASE)) -#define outb(val, port) out_8((uint8_t *)((port)+_IO_BASE), (val)) -#define inw(port) in_le16((uint16_t *)((port)+_IO_BASE)) -#define outw(val, port) out_le16((uint16_t *)((port)+_IO_BASE), (val)) -#define inl(port) in_le32((uint32_t *)((port)+_IO_BASE)) -#define outl(val, port) out_le32((uint32_t *)((port)+_IO_BASE), (val)) +#define inb(port) in_8((uint8_t *)((port)+isa_io_base)) +#define outb(val, port) out_8((uint8_t *)((port)+isa_io_base), (val)) +#define inw(port) in_be16((uint16_t *)((port)+isa_io_base)) +#define outw(val, port) out_be16((uint16_t *)((port)+isa_io_base), (val)) +#define inl(port) in_be32((uint32_t *)((port)+isa_io_base)) +#define outl(val, port) out_be32((uint32_t *)((port)+isa_io_base), (val)) /* * 8, 16 and 32 bit, big and little endian I/O operations, with barrier.

1 0

r375 - openbios-devel/drivers
by svn＠openbios.org 09 Jan '09

09 Jan '09

Author: blueswirl Date: 2009-01-09 21:58:23 +0100 (Fri, 09 Jan 2009) New Revision: 375 Modified: openbios-devel/drivers/pci_database.c Log: Add Sparc64 PCI devices Modified: openbios-devel/drivers/pci_database.c =================================================================== --- openbios-devel/drivers/pci_database.c 2009-01-09 20:55:34 UTC (rev 374) +++ openbios-devel/drivers/pci_database.c 2009-01-09 20:58:23 UTC (rev 375) @@ -278,6 +278,12 @@ NULL, NULL, }, { + 0x108e, 0xa000, NULL, + "pci", "SUNW,simba", "pci108e,a000\0pciclass,0\0", + 3, 2, 1, + host_config_cb, NULL, + }, + { 0xFFFF, 0xFFFF, NULL, NULL, NULL, NULL, -1, -1, -1, @@ -293,6 +299,12 @@ bridge_config_cb, NULL, }, { + 0x108e, 0x5000, NULL, + "pci", "SUNW,sabre", "pci108e,5000\0pciclass,060400\0", + 3, 2, 1, + bridge_config_cb, NULL, + }, + { 0xFFFF, 0xFFFF, NULL, NULL, NULL, NULL, -1, -1, -1,

1 0

r374 - in openbios-devel: drivers include
by svn＠openbios.org 09 Jan '09

09 Jan '09

Author: blueswirl Date: 2009-01-09 21:55:34 +0100 (Fri, 09 Jan 2009) New Revision: 374 Modified: openbios-devel/drivers/vga_vbe.c openbios-devel/include/video_subr.h Log: Fix VBE address on Sparc64 Modified: openbios-devel/drivers/vga_vbe.c =================================================================== --- openbios-devel/drivers/vga_vbe.c 2009-01-09 19:43:39 UTC (rev 373) +++ openbios-devel/drivers/vga_vbe.c 2009-01-09 20:55:34 UTC (rev 374) @@ -101,7 +101,7 @@ vga_build_rgb_palette(); } -void vga_vbe_init(const char *path, uint32_t fb, uint32_t fb_size, +void vga_vbe_init(const char *path, unsigned long fb, uint32_t fb_size, unsigned long rom, uint32_t rom_size) { phandle_t ph, chosen, aliases, options; Modified: openbios-devel/include/video_subr.h =================================================================== --- openbios-devel/include/video_subr.h 2009-01-09 19:43:39 UTC (rev 373) +++ openbios-devel/include/video_subr.h 2009-01-09 20:55:34 UTC (rev 374) @@ -12,7 +12,7 @@ /* drivers/vga_vbe.c */ void vga_set_color(int i, unsigned int r, unsigned int g, unsigned int b); void vga_vbe_set_mode(int width, int height, int depth); -void vga_vbe_init(const char *path, uint32_t fb, uint32_t fb_size, +void vga_vbe_init(const char *path, unsigned long fb, uint32_t fb_size, unsigned long rom, uint32_t rom_size); /* modules/video.c */

1 0

[PATCH] grubfs: don't try to read a file beyond its end
by Aurelien Jarno 09 Jan '09

09 Jan '09

Yaboot relies on the read function from openbios to stop reading at the end of a file. This patch makes sure to not read beyond the end of the file. This fixes the boot of debian-installer using a CD-ROM. Signed-off-by: Aurelien Jarno <aurelien(a)aurel32.net> diff --git a/fs/grubfs/grubfs_fs.c b/fs/grubfs/grubfs_fs.c index f172b75..588d677 100644 --- a/fs/grubfs/grubfs_fs.c +++ b/fs/grubfs/grubfs_fs.c @@ -161,6 +161,9 @@ grubfs_file_read( file_desc_t *fd, void *buf, size_t count ) filepos=file->pos; filemax=file->len; + if (count > filemax - filepos) + count = filemax - filepos; + ret=curfs->fsys->read_func(buf, count); file->pos=filepos; -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32(a)debian.org | aurelien(a)aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net

2 1

r373 - openbios-devel/fs/grubfs
by svn＠openbios.org 09 Jan '09

09 Jan '09

Author: blueswirl Date: 2009-01-09 20:43:39 +0100 (Fri, 09 Jan 2009) New Revision: 373 Modified: openbios-devel/fs/grubfs/grubfs_fs.c Log: grubfs: don't try to read a file beyond its end Yaboot relies on the read function from openbios to stop reading at the end of a file. This patch makes sure to not read beyond the end of the file. This fixes the boot of debian-installer using a CD-ROM. Signed-off-by: Aurelien Jarno <aurelien(a)aurel32.net> Modified: openbios-devel/fs/grubfs/grubfs_fs.c =================================================================== --- openbios-devel/fs/grubfs/grubfs_fs.c 2009-01-08 15:14:33 UTC (rev 372) +++ openbios-devel/fs/grubfs/grubfs_fs.c 2009-01-09 19:43:39 UTC (rev 373) @@ -161,6 +161,9 @@ filepos=file->pos; filemax=file->len; + if (count > filemax - filepos) + count = filemax - filepos; + ret=curfs->fsys->read_func(buf, count); file->pos=filepos;

1 0

r372 - openbios-devel/drivers
by svn＠openbios.org 08 Jan '09

08 Jan '09

Author: blueswirl Date: 2009-01-08 16:14:33 +0100 (Thu, 08 Jan 2009) New Revision: 372 Modified: openbios-devel/drivers/pci_database.c Log: Add Heathrow Mac I/O (Aurelien Jarno) Modified: openbios-devel/drivers/pci_database.c =================================================================== --- openbios-devel/drivers/pci_database.c 2009-01-07 17:54:25 UTC (rev 371) +++ openbios-devel/drivers/pci_database.c 2009-01-08 15:14:33 UTC (rev 372) @@ -927,6 +927,13 @@ }; static const pci_dev_t misc_pci[] = { + /* Heathrow Mac I/O */ + { + 0x106B, 0x0010, + "mac-io", "mac-io", "AAPL,343S1201", "heathrow\0", + 1, 1, 1, + &macio_config_cb, NULL, + }, /* Paddington Mac I/O */ { 0x106B, 0x0017,

1 0

[PATCH] Define oldworld property for oldworld hardware
by Laurent Vivier 07 Jan '09

07 Jan '09

Linux-2.6.18 detects we emulates an oldworld hardware and try to retrieve oldworld properties ("AAPL,"). This patch defines AAPL,interrupts for via-cuda and remove interrupt- controller, interrupt-map and interrupt-map-mask (newworld hardware). With this, linux-2.6.18 correctly detects ADB.

2 1

r371 - openbios-devel/drivers
by svn＠openbios.org 07 Jan '09

07 Jan '09

Author: blueswirl Date: 2009-01-07 18:54:25 +0100 (Wed, 07 Jan 2009) New Revision: 371 Modified: openbios-devel/drivers/cuda.c openbios-devel/drivers/macio.c openbios-devel/drivers/pci.c Log: Define oldworld property for oldworld hardware (Laurent Vivier) Modified: openbios-devel/drivers/cuda.c =================================================================== --- openbios-devel/drivers/cuda.c 2009-01-07 15:58:33 UTC (rev 370) +++ openbios-devel/drivers/cuda.c 2009-01-07 17:54:25 UTC (rev 371) @@ -193,10 +193,15 @@ props[1] = __cpu_to_be32(IO_CUDA_SIZE); set_property(ph, "reg", (char *)&props, sizeof(props)); - set_int_property(ph, "interrupt-parent", pic_handle); - // HEATHROW + set_int_property(ph, "interrupts", 0x12); + /* we emulate an oldworld hardware, so we must use + * non-standard oldworld property (needed by linux 2.6.18) + */ + + set_int_property(ph, "AAPL,interrupts", 0x12); + bind_func("ppc32-reset-all", ppc32_reset_all); push_str("' ppc32-reset-all to reset-all"); fword("eval"); Modified: openbios-devel/drivers/macio.c =================================================================== --- openbios-devel/drivers/macio.c 2009-01-07 15:58:33 UTC (rev 370) +++ openbios-devel/drivers/macio.c 2009-01-07 17:54:25 UTC (rev 371) @@ -137,26 +137,6 @@ aliases = find_dev("/aliases"); set_property(aliases, "mac-io", path, strlen(path) + 1); - snprintf(buf, sizeof(buf), "%s/interrupt-controller", path); - REGISTER_NAMED_NODE(ob_intctrl_node, buf); - - ph = find_dev(buf); - set_property(ph, "device_type", "interrupt-controller", 21); - set_property(ph, "compatible", "heathrow\0mac-risc", 18); - set_int_property(ph, "#interrupt-cells", 1); - props[0]= 0x00000010; - props[1]= 0x00000020; - set_property(ph, "reg", (char *)&props, 2 * sizeof(props)); - set_property(ph, "interrupt-controller", NULL, 0); - - chosen = find_dev("/chosen"); - push_str(buf); - fword("open-dev"); - ph = POP(); - set_int_property(chosen, "interrupt-controller", ph); - - pic_handle = ph; - cuda_init(path, addr); macio_nvram_init(path, addr); } Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-07 15:58:33 UTC (rev 370) +++ openbios-devel/drivers/pci.c 2009-01-07 17:54:25 UTC (rev 371) @@ -267,52 +267,6 @@ return 0; } -static void pci_set_interrupt_map(const pci_config_t *config) -{ - phandle_t parent, dev; - cell props[4]; - cell *old_props, *new_props; - int ncells; - int retlen; - - if (config->irq_line != -1) { - dev = get_cur_dev(); - activate_device(config->path); - activate_device(".."); - parent = get_cur_dev(); - - ncells = 0; - if (get_property(parent, "interrupt-map-mask", NULL) == 0) { - props[ncells++] = 0xF800; - props[ncells++] = 0; - props[ncells++] = 0; - props[ncells++] = 0; - set_property(parent, "interrupt-map-mask", - (char*)props, ncells * sizeof(cell)); - } - - old_props = (cell*)get_property(parent, "interrupt-map", &retlen); - if (old_props) { - new_props = malloc(retlen + 6 * 4); - memcpy(new_props, old_props, retlen); - } else { - retlen = 0; - new_props = malloc(6 * 4); - } - ncells = retlen / 4; - new_props[ncells++] = config->dev & 0xf800; /* devfn */ - new_props[ncells++] = 0; - new_props[ncells++] = 0; - new_props[ncells++] = 0; - new_props[ncells++] = 0; - new_props[ncells++] = config->irq_line; - set_property(parent, "interrupt-map", - (char*)new_props, ncells * sizeof(cell)); - free(new_props); - activate_dev(dev); - } -} - static inline void pci_decode_pci_addr(pci_addr addr, int *flags, int *space_code, uint32_t *mask) { @@ -540,7 +494,6 @@ pci_set_reg(config); pci_set_assigned_addresses(config); - pci_set_interrupt_map(config); #ifdef CONFIG_DEBUG_PCI printk("\n");

1 0

Re: [OpenBIOS] [PATCH 8/8] store opened "mmu" in "/chosen"
by laurent＠lvivier.info 07 Jan '09

07 Jan '09

>On 1/6/09, Laurent Vivier <laurent(a)lvivier.info> wrote: >> "/chosen","mmu" must store the result of "open-dev" instead of the result >of >> "find-dev". This value is used later by linux. > >Thanks, applied. Thank you for all. BTW, an openBIOS is now able to boot a Linux: - 2.6.8 (from sarge), works fully - 2.6.18-6 (from etch), cannot detect ADB. I have a little patch to correct this. - 2.6.24 (from etch) disables IDE (I don't know why). Regards, Laurent

1 0

[PATCH 8/8] store opened "mmu" in "/chosen"
by Laurent Vivier 07 Jan '09

07 Jan '09

"/chosen","mmu" must store the result of "open-dev" instead of the result of "find-dev". This value is used later by linux.

2 1

r370 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 07 Jan '09

07 Jan '09

Author: blueswirl Date: 2009-01-07 16:58:33 +0100 (Wed, 07 Jan 2009) New Revision: 370 Modified: openbios-devel/arch/ppc/qemu/methods.c Log: Store opened "mmu" in "/chosen" (Laurent Vivier) Modified: openbios-devel/arch/ppc/qemu/methods.c =================================================================== --- openbios-devel/arch/ppc/qemu/methods.c 2009-01-07 15:57:07 UTC (rev 369) +++ openbios-devel/arch/ppc/qemu/methods.c 2009-01-07 15:58:33 UTC (rev 370) @@ -305,7 +305,9 @@ chosen = find_dev("/chosen"); if (chosen) { - ph = find_dev(cpuname); + push_str(cpuname); + fword("open-dev"); + ph = POP(); set_int_property(chosen, "mmu", ph); } }

1 0

[PATCH 7/8] Don't hang if we discover an unknown device
by Laurent Vivier 07 Jan '09

07 Jan '09

Don't hang when a PCI device is not in the list of the known ones. Found by using qemu with "-usb".

2 1

r369 - openbios-devel/drivers
by svn＠openbios.org 07 Jan '09

07 Jan '09

Author: blueswirl Date: 2009-01-07 16:57:07 +0100 (Wed, 07 Jan 2009) New Revision: 369 Modified: openbios-devel/drivers/pci.c openbios-devel/drivers/pci_database.c Log: Don't hang if we discover an unknown device (Laurent Vivier) Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-07 15:55:19 UTC (rev 368) +++ openbios-devel/drivers/pci.c 2009-01-07 15:57:07 UTC (rev 369) @@ -510,38 +510,43 @@ set_int_property(dev, "cache-line-size", pci_config_read16(addr, PCI_CACHE_LINE_SIZE)); - if (pci_dev->type) { - push_str(pci_dev->type); - fword("encode-string"); - push_str("device_type"); - fword("property"); + if (pci_dev) { + if (pci_dev->type) { + push_str(pci_dev->type); + fword("encode-string"); + push_str("device_type"); + fword("property"); + } + if (pci_dev->model) { + push_str(pci_dev->model); + fword("encode-string"); + push_str("model"); + fword("property"); + } + if (pci_dev->compat) + set_property(dev, "compatible", + pci_dev->compat, pci_compat_len(pci_dev)); + + if (pci_dev->acells) + set_int_property(dev, "#address-cells", + pci_dev->acells); + if (pci_dev->scells) + set_int_property(dev, "#size-cells", + pci_dev->scells); + if (pci_dev->icells) + set_int_property(dev, "#interrupt-cells", + pci_dev->icells); } - if (pci_dev->model) { - push_str(pci_dev->model); - fword("encode-string"); - push_str("model"); - fword("property"); - } - if (pci_dev->compat) - set_property(dev, "compatible", - pci_dev->compat, pci_compat_len(pci_dev)); pci_set_reg(config); pci_set_assigned_addresses(config); pci_set_interrupt_map(config); - if (pci_dev->acells) - set_int_property(dev, "#address-cells", pci_dev->acells); - if (pci_dev->scells) - set_int_property(dev, "#size-cells", pci_dev->scells); - if (pci_dev->icells) - set_int_property(dev, "#interrupt-cells", pci_dev->icells); - #ifdef CONFIG_DEBUG_PCI printk("\n"); #endif - if (pci_dev->config_cb) + if (pci_dev && pci_dev->config_cb) pci_dev->config_cb(config); } Modified: openbios-devel/drivers/pci_database.c =================================================================== --- openbios-devel/drivers/pci_database.c 2009-01-07 15:55:19 UTC (rev 368) +++ openbios-devel/drivers/pci_database.c 2009-01-07 15:57:07 UTC (rev 369) @@ -1022,7 +1022,9 @@ break; } } - find_device: +find_device: + if (dev == NULL) + goto bad_device; for (;; dev++) { if (dev->vendor == 0xFFFF && dev->product == 0xFFFF) { goto bad_device; @@ -1055,7 +1057,7 @@ return new; } } - bad_device: +bad_device: printk("Cannot manage '%s' PCI device type '%s':\n %x %x (%x %x %x)\n", name, type, vendor, product, class, subclass, iface);

1 0

[PATCH 6/8] Create special properties for host and bridge
by Laurent Vivier 07 Jan '09

07 Jan '09

Create properties "ranges", "bus-ranges" and "reg" for PCI host and bridge. Create aliases "pci" and "bridge".

2 1

r368 - openbios-devel/drivers
by svn＠openbios.org 07 Jan '09

07 Jan '09

Author: blueswirl Date: 2009-01-07 16:55:19 +0100 (Wed, 07 Jan 2009) New Revision: 368 Modified: openbios-devel/drivers/pci.c openbios-devel/drivers/pci_database.c openbios-devel/drivers/pci_database.h Log: Create special properties for host and bridge (Laurent Vivier) Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-07 15:53:14 UTC (rev 367) +++ openbios-devel/drivers/pci.c 2009-01-07 15:55:19 UTC (rev 368) @@ -164,6 +164,88 @@ { "encode-unit", ob_pci_encode_unit }, }; +static void pci_set_bus_range(const pci_config_t *config) +{ + phandle_t dev = get_cur_dev(); + cell props[2]; + + props[0] = (config->dev >> 16) & 0xFF; + props[1] = 1; + set_property(dev, "bus-range", (char *)props, 2 * sizeof(cell)); +} + +static void pci_host_set_reg(const pci_config_t *config) +{ + phandle_t dev = get_cur_dev(); + cell props[2]; + + props[0] = arch->cfg_base; + props[1] = arch->cfg_len; + set_property(dev, "reg", (char *)props, 2 * sizeof(cell)); +} + +static void pci_host_set_ranges(const pci_config_t *config) +{ + phandle_t dev = get_cur_dev(); + cell props[32]; + int ncells; + + ncells = 0; + if (arch->io_base) { + pci_encode_phys_addr(props + ncells, 0, IO_SPACE, + config->dev, 0, 0); + ncells += 3; + props[ncells++] = arch->io_base; + props[ncells++] = 0x00000000; + props[ncells++] = arch->io_len; + } + if (arch->rbase) { + pci_encode_phys_addr(props + ncells, 0, MEMORY_SPACE_32, + config->dev, 0, 0); + ncells += 3; + props[ncells++] = arch->rbase; + props[ncells++] = 0x00000000; + props[ncells++] = arch->rlen; + } + if (arch->mem_base) { + pci_encode_phys_addr(props + ncells, 0, MEMORY_SPACE_32, + config->dev, 0, arch->mem_base); + ncells += 3; + props[ncells++] = arch->mem_base; + props[ncells++] = 0x00000000; + props[ncells++] = arch->mem_len; + } + set_property(dev, "ranges", (char *)props, ncells * sizeof(cell)); +} + +int host_config_cb(const pci_config_t *config) +{ + phandle_t aliases; + + aliases = find_dev("/aliases"); + if (aliases) + set_property(aliases, "pci", + config->path, strlen(config->path) + 1); + + pci_host_set_reg(config); + pci_host_set_ranges(config); + pci_set_bus_range(config); + + return 0; +} + +int bridge_config_cb(const pci_config_t *config) +{ + phandle_t aliases; + + aliases = find_dev("/aliases"); + set_property(aliases, "bridge", config->path, strlen(config->path) + 1); + + pci_set_bus_range(config); + + return 0; +} + int ide_config_cb2 (const pci_config_t *config) { ob_ide_init(config->path, Modified: openbios-devel/drivers/pci_database.c =================================================================== --- openbios-devel/drivers/pci_database.c 2009-01-07 15:53:14 UTC (rev 367) +++ openbios-devel/drivers/pci_database.c 2009-01-07 15:55:19 UTC (rev 368) @@ -269,7 +269,7 @@ 0x1057, 0x0002, "pci", "pci", "MOT,MPC106", "grackle\0", 3, 2, 1, - NULL, NULL + host_config_cb, NULL }, { 0x1057, 0x4801, NULL, @@ -290,7 +290,7 @@ 0x1011, 0x0026, NULL, "pci-bridge", "DEV,21154", "DEV,21154\0pci-bridge\0", 3, 2, 1, - NULL, NULL, + bridge_config_cb, NULL, }, { 0xFFFF, 0xFFFF, Modified: openbios-devel/drivers/pci_database.h =================================================================== --- openbios-devel/drivers/pci_database.h 2009-01-07 15:53:14 UTC (rev 367) +++ openbios-devel/drivers/pci_database.h 2009-01-07 15:55:19 UTC (rev 368) @@ -29,6 +29,8 @@ extern int eth_config_cb(const pci_config_t *config); extern int macio_config_cb(const pci_config_t *config); extern int vga_config_cb(const pci_config_t *config); +extern int host_config_cb(const pci_config_t *config); +extern int bridge_config_cb(const pci_config_t *config); static inline int pci_compat_len(const pci_dev_t *dev) {

1 0

[PATCH 5/8] Create "ranges" property
by Laurent Vivier 07 Jan '09

07 Jan '09

Create "ranges" property for mac-io.

2 1

r367 - openbios-devel/drivers
by svn＠openbios.org 07 Jan '09

07 Jan '09

Author: blueswirl Date: 2009-01-07 16:53:14 +0100 (Wed, 07 Jan 2009) New Revision: 367 Modified: openbios-devel/drivers/pci.c Log: Create "ranges" property (Laurent Vivier) Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-07 15:51:40 UTC (rev 366) +++ openbios-devel/drivers/pci.c 2009-01-07 15:53:14 UTC (rev 367) @@ -323,8 +323,46 @@ set_property(dev, "reg", (char *)props, ncells * sizeof(cell)); } + +static void pci_set_ranges(const pci_config_t *config) +{ + phandle_t dev = get_cur_dev(); + cell props[32]; + int ncells; + int i; + uint32_t mask; + int flags; + int space_code; + + ncells = 0; + for (i = 0; i < 6; i++) { + if (!config->assigned[i] || !config->sizes[i]) + continue; + + /* child address */ + + props[ncells++] = 0x00000000; + + /* parent address */ + + pci_decode_pci_addr(config->assigned[i], + &flags, &space_code, &mask); + pci_encode_phys_addr(props + ncells, flags, space_code, + config->dev, 0x10 + i * 4, + config->assigned[i] & ~mask); + ncells += 3; + + /* size */ + + props[ncells++] = config->sizes[i]; + } + set_property(dev, "ranges", (char *)props, ncells * sizeof(cell)); +} + int macio_config_cb (const pci_config_t *config) { + pci_set_ranges(config); + #ifdef CONFIG_DRIVER_MACIO ob_macio_init(config->path, config->assigned[0] & ~0x0000000F); #endif

1 0

[PATCH 4/8] Correctly create "reg" property for PCI devices
by Laurent Vivier 07 Jan '09

07 Jan '09

Create "reg" property according to "PCI Bus Binding to: IEEE Std 1275-1994 Standard for Boot (Initialization Configuration) Firmware Revision 2.1"

2 1

r366 - openbios-devel/drivers
by svn＠openbios.org 07 Jan '09

07 Jan '09

Author: blueswirl Date: 2009-01-07 16:51:40 +0100 (Wed, 07 Jan 2009) New Revision: 366 Modified: openbios-devel/drivers/pci.c openbios-devel/drivers/pci_database.h Log: Correctly create "reg" property for PCI devices (Laurent Vivier) Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-07 15:50:03 UTC (rev 365) +++ openbios-devel/drivers/pci.c 2009-01-07 15:51:40 UTC (rev 366) @@ -176,22 +176,12 @@ int eth_config_cb (const pci_config_t *config) { - phandle_t ph; - cell props[12]; - int i; + phandle_t ph = get_cur_dev();; - ph = find_dev(config->path); - set_property(ph, "network-type", "ethernet", 9); set_property(ph, "removable", "network", 8); set_property(ph, "category", "net", 4); - for (i = 0; i < 7; i++) - { - props[i*2] = config->assigned[i] & ~0x0000000F; - props[i*2 + 1] = config->sizes[i]; - } - set_property(ph, "reg", (char *)props, i * 2 * sizeof(cell)); return 0; } @@ -295,6 +285,44 @@ ncells * sizeof(cell)); } +static void pci_set_reg(const pci_config_t *config) +{ + phandle_t dev = get_cur_dev(); + cell props[38]; + int ncells; + int i; + uint32_t mask; + int space_code, flags; + + ncells = 0; + pci_encode_phys_addr(props + ncells, 0, CONFIGURATION_SPACE, + config->dev, 0, 0); + ncells += 3; + + props[ncells++] = 0x00000000; + props[ncells++] = 0x00000000; + + for (i = 0; i < 6; i++) { + if (!config->assigned[i] || !config->sizes[i]) + continue; + + pci_decode_pci_addr(config->regions[i], + &flags, &space_code, &mask); + + pci_encode_phys_addr(props + ncells, + flags, space_code, config->dev, + PCI_BASE_ADDR_0 + (i * sizeof(uint32_t)), + config->regions[i] & ~mask); + ncells += 3; + + /* set size */ + + props[ncells++] = 0x00000000; + props[ncells++] = config->sizes[i]; + } + set_property(dev, "reg", (char *)props, ncells * sizeof(cell)); +} + int macio_config_cb (const pci_config_t *config) { #ifdef CONFIG_DRIVER_MACIO @@ -378,6 +406,7 @@ set_property(dev, "compatible", pci_dev->compat, pci_compat_len(pci_dev)); + pci_set_reg(config); pci_set_assigned_addresses(config); pci_set_interrupt_map(config); @@ -396,20 +425,6 @@ pci_dev->config_cb(config); } -static void ob_pci_add_reg(pci_addr addr) -{ - PUSH(0); - PUSH(0); - PUSH(addr&(~arch->cfg_base)); - fword("pci-addr-encode"); - PUSH(0); - PUSH(0); - fword("pci-len-encode"); - fword("encode+"); - push_str("reg"); - fword("property"); -} - #ifdef CONFIG_XBOX static char pci_xbox_blacklisted (int bus, int devnum, int fn) { @@ -486,6 +501,8 @@ else config_addr = PCI_BASE_ADDR_0 + reg * 4; + config->regions[reg] = pci_config_read32(addr, config_addr); + /* get region size */ pci_config_write32(addr, config_addr, 0xffffffff); @@ -594,7 +611,6 @@ ob_pci_configure(addr, &config, mem_base, io_base); ob_pci_add_properties(addr, pci_dev, &config); - ob_pci_add_reg(addr); if (ccode == 0x0600 || ccode == 0x0604) { /* host or bridge */ Modified: openbios-devel/drivers/pci_database.h =================================================================== --- openbios-devel/drivers/pci_database.h 2009-01-07 15:50:03 UTC (rev 365) +++ openbios-devel/drivers/pci_database.h 2009-01-07 15:51:40 UTC (rev 366) @@ -3,6 +3,7 @@ struct pci_config_t { char path[256]; uint32_t dev; /* bus, dev, fn */ + uint32_t regions[7]; uint32_t assigned[7]; uint32_t sizes[7]; int irq_pin;

1 0

[PATCH 3/8] Create "assigned-addresses" property
by Laurent Vivier 07 Jan '09

07 Jan '09

Create "assigned-addesses" property.

2 1

r365 - openbios-devel/drivers
by svn＠openbios.org 07 Jan '09

07 Jan '09

Author: blueswirl Date: 2009-01-07 16:50:03 +0100 (Wed, 07 Jan 2009) New Revision: 365 Modified: openbios-devel/drivers/pci.c openbios-devel/drivers/pci_database.h Log: Create "assigned-addresses" property (Laurent Vivier) Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-07 15:46:49 UTC (rev 364) +++ openbios-devel/drivers/pci.c 2009-01-07 15:50:03 UTC (rev 365) @@ -167,10 +167,10 @@ int ide_config_cb2 (const pci_config_t *config) { ob_ide_init(config->path, - config->regions[0] & ~0x0000000F, - config->regions[1] & ~0x0000000F, - config->regions[2] & ~0x0000000F, - config->regions[3] & ~0x0000000F); + config->assigned[0] & ~0x0000000F, + config->assigned[1] & ~0x0000000F, + config->assigned[2] & ~0x0000000F, + config->assigned[3] & ~0x0000000F); return 0; } @@ -188,7 +188,7 @@ for (i = 0; i < 7; i++) { - props[i*2] = config->regions[i]; + props[i*2] = config->assigned[i] & ~0x0000000F; props[i*2 + 1] = config->sizes[i]; } set_property(ph, "reg", (char *)props, i * 2 * sizeof(cell)); @@ -241,19 +241,75 @@ } } +static inline void pci_decode_pci_addr(pci_addr addr, int *flags, + int *space_code, uint32_t *mask) +{ + if (addr & 0x01) { + + *space_code = IO_SPACE; + *flags = 0; + *mask = 0x00000001; + + } else if (addr & 0x04) { + + *flags = IS_NOT_RELOCATABLE; + *space_code = MEMORY_SPACE_64; + *mask = 0x0000000F; + + } else { + + *space_code = MEMORY_SPACE_32; + *flags = IS_NOT_RELOCATABLE; + *mask = 0x0000000F; + + } +} + +static void pci_set_assigned_addresses(const pci_config_t *config) +{ + phandle_t dev = get_cur_dev(); + cell props[32]; + int ncells; + int i; + uint32_t mask; + int flags, space_code; + + ncells = 0; + for (i = 0; i < 6; i++) { + if (!config->assigned[i] || !config->sizes[i]) + continue; + pci_decode_pci_addr(config->assigned[i], + &flags, &space_code, &mask); + + pci_encode_phys_addr(props + ncells, + flags, space_code, config->dev, + PCI_BASE_ADDR_0 + (i * sizeof(uint32_t)), + config->assigned[i] & ~mask); + ncells += 3; + + props[ncells++] = 0x00000000; + props[ncells++] = config->sizes[i]; + } + if (ncells) + set_property(dev, "assigned-addresses", (char *)props, + ncells * sizeof(cell)); +} + int macio_config_cb (const pci_config_t *config) { #ifdef CONFIG_DRIVER_MACIO - ob_macio_init(config->path, config->regions[0] & ~0x0000000F); + ob_macio_init(config->path, config->assigned[0] & ~0x0000000F); #endif return 0; } int vga_config_cb (const pci_config_t *config) { - if (config->regions[0] != 0x00000000) - vga_vbe_init(config->path, config->regions[0], config->sizes[0], - config->regions[1], config->sizes[1]); + if (config->assigned[0] != 0x00000000) + vga_vbe_init(config->path, config->assigned[0] & ~0x0000000F, + config->sizes[0], + config->assigned[1] & ~0x0000000F, + config->sizes[1]); return 0; } @@ -322,6 +378,7 @@ set_property(dev, "compatible", pci_dev->compat, pci_compat_len(pci_dev)); + pci_set_assigned_addresses(config); pci_set_interrupt_map(config); if (pci_dev->acells) @@ -416,7 +473,7 @@ omask = 0x00000000; for (reg = 0; reg < 7; reg++) { - config->regions[reg] = 0x00000000; + config->assigned[reg] = 0x00000000; config->sizes[reg] = 0x00000000; if ((omask & 0x0000000f) == 0x4) { @@ -473,7 +530,7 @@ *mem_base = reloc + size; } pci_config_write32(addr, config_addr, reloc | omask); - config->regions[reg] = reloc; + config->assigned[reg] = reloc | omask; } } Modified: openbios-devel/drivers/pci_database.h =================================================================== --- openbios-devel/drivers/pci_database.h 2009-01-07 15:46:49 UTC (rev 364) +++ openbios-devel/drivers/pci_database.h 2009-01-07 15:50:03 UTC (rev 365) @@ -3,7 +3,7 @@ struct pci_config_t { char path[256]; uint32_t dev; /* bus, dev, fn */ - uint32_t regions[7]; + uint32_t assigned[7]; uint32_t sizes[7]; int irq_pin; int irq_line;

1 0

[PATCH 2/8] Create PCI properties "interrupts", "interrupt-map" and "interrupt-map-mask"
by Laurent Vivier 07 Jan '09

07 Jan '09

This patch configures PCI IRQ PIN and LINE. It adds properties "interrupts", "interrupt-map" and "interrupt-map- mask" in the device tree. I've added dummy IRQ LINE values (1, 2, 3, 4) for sparc64 to allow to compile it, but I don't know what are real values. This is not an issue as PCI probing is disabled on this architecture.

2 1

r364 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 07 Jan '09

07 Jan '09

Author: blueswirl Date: 2009-01-07 16:46:49 +0100 (Wed, 07 Jan 2009) New Revision: 364 Removed: openbios-devel/arch/ppc/qemu/tree.c Log: Delete tree.c, accidentally left from r362 Deleted: openbios-devel/arch/ppc/qemu/tree.c =================================================================== --- openbios-devel/arch/ppc/qemu/tree.c 2009-01-07 15:45:26 UTC (rev 363) +++ openbios-devel/arch/ppc/qemu/tree.c 2009-01-07 15:46:49 UTC (rev 364) @@ -1,24 +0,0 @@ -/* - * Creation Date: <2004/08/28 18:38:22 greg> - * Time-stamp: <2004/08/28 18:38:22 greg> - * - * <tree.c> - * - * device tree setup - * - * Copyright (C) 2004 Greg Watson - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 - * - */ - -#include "openbios/config.h" -#include "openbios/bindings.h" -#include "qemu.h" - -void devtree_init( void ) -{ - fword("init-qemu-tree"); -}

1 0

r363 - in openbios-devel: arch/ppc/qemu arch/sparc64 drivers include/openbios
by svn＠openbios.org 07 Jan '09

07 Jan '09

Author: blueswirl Date: 2009-01-07 16:45:26 +0100 (Wed, 07 Jan 2009) New Revision: 363 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/sparc64/openbios.c openbios-devel/drivers/pci.c openbios-devel/drivers/pci_database.h openbios-devel/include/openbios/pci.h Log: Create PCI properties "interrupts", "interrupt-map" and "interrupt-map-mask" (Laurent Vivier) Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2009-01-07 15:43:10 UTC (rev 362) +++ openbios-devel/arch/ppc/qemu/init.c 2009-01-07 15:45:26 UTC (rev 363) @@ -68,14 +68,17 @@ [ARCH_PREP] = { "PREP", 0x1057, 0x4801, 0x80800000, 0x800c0000, 0x80000000, 0x00100000, 0xf0000000, 0x10000000, 0x80000000, 0x00010000, 0x00000000, 0x00400000, + { 9, 11, 9, 11 } }, [ARCH_MAC99] = { "MAC99", 0x106b, 0x001F, 0xf2800000, 0xf2c00000, 0xf2000000, 0x02000000, 0x80000000, 0x10000000, 0xf2000000, 0x00800000, 0x00000000, 0x01000000, + { 8, 9, 10, 11 } }, [ARCH_HEATHROW] = { "HEATHROW", 0x1057, 0x0002, 0xfec00000, 0xfee00000, 0x80000000, 0x7f000000, 0x80000000, 0x01000000, 0xfe000000, 0x00800000, 0xfd000000, 0x01000000, + { 21, 22, 23, 24 } }, }; uint32_t isa_io_base; Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2009-01-07 15:43:10 UTC (rev 362) +++ openbios-devel/arch/sparc64/openbios.c 2009-01-07 15:45:26 UTC (rev 363) @@ -68,6 +68,7 @@ .cfg_data = 0, .cfg_base = 0x80000000ULL, .cfg_len = 0, + .irqs = { 1, 2, 3, 4 }, }, .machine_id_low = 0, .machine_id_high = 255, Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-07 15:43:10 UTC (rev 362) +++ openbios-devel/drivers/pci.c 2009-01-07 15:45:26 UTC (rev 363) @@ -195,6 +195,52 @@ return 0; } +static void pci_set_interrupt_map(const pci_config_t *config) +{ + phandle_t parent, dev; + cell props[4]; + cell *old_props, *new_props; + int ncells; + int retlen; + + if (config->irq_line != -1) { + dev = get_cur_dev(); + activate_device(config->path); + activate_device(".."); + parent = get_cur_dev(); + + ncells = 0; + if (get_property(parent, "interrupt-map-mask", NULL) == 0) { + props[ncells++] = 0xF800; + props[ncells++] = 0; + props[ncells++] = 0; + props[ncells++] = 0; + set_property(parent, "interrupt-map-mask", + (char*)props, ncells * sizeof(cell)); + } + + old_props = (cell*)get_property(parent, "interrupt-map", &retlen); + if (old_props) { + new_props = malloc(retlen + 6 * 4); + memcpy(new_props, old_props, retlen); + } else { + retlen = 0; + new_props = malloc(6 * 4); + } + ncells = retlen / 4; + new_props[ncells++] = config->dev & 0xf800; /* devfn */ + new_props[ncells++] = 0; + new_props[ncells++] = 0; + new_props[ncells++] = 0; + new_props[ncells++] = 0; + new_props[ncells++] = config->irq_line; + set_property(parent, "interrupt-map", + (char*)new_props, ncells * sizeof(cell)); + free(new_props); + activate_dev(dev); + } +} + int macio_config_cb (const pci_config_t *config) { #ifdef CONFIG_DRIVER_MACIO @@ -232,8 +278,8 @@ set_int_property(dev, "revision-id", rev); set_int_property(dev, "class-code", class_code << 8); - set_int_property(dev, "interrupts", - pci_config_read8(addr, PCI_INTERRUPT_LINE)); + if (config->irq_pin) + set_int_property(dev, "interrupts", config->irq_pin); set_int_property(dev, "min-grant", pci_config_read8(addr, PCI_MIN_GNT)); set_int_property(dev, "max-latency", pci_config_read8(addr, PCI_MAX_LAT)); @@ -275,11 +321,24 @@ if (pci_dev->compat) set_property(dev, "compatible", pci_dev->compat, pci_compat_len(pci_dev)); + + pci_set_interrupt_map(config); + + if (pci_dev->acells) + set_int_property(dev, "#address-cells", pci_dev->acells); + if (pci_dev->scells) + set_int_property(dev, "#size-cells", pci_dev->scells); + if (pci_dev->icells) + set_int_property(dev, "#interrupt-cells", pci_dev->icells); + +#ifdef CONFIG_DEBUG_PCI + printk("\n"); +#endif + if (pci_dev->config_cb) pci_dev->config_cb(config); } - static void ob_pci_add_reg(pci_addr addr) { PUSH(0); @@ -342,7 +401,18 @@ unsigned long base; pci_addr config_addr; int reg; + uint8_t irq_pin, irq_line; + irq_pin = pci_config_read8(addr, PCI_INTERRUPT_PIN); + if (irq_pin) { + config->irq_pin = irq_pin; + irq_pin = (((config->dev >> 11) & 0x1F) + irq_pin - 1) & 3; + irq_line = arch->irqs[irq_pin]; + pci_config_write8(addr, PCI_INTERRUPT_LINE, irq_line); + config->irq_line = irq_line; + } else + config->irq_line = -1; + omask = 0x00000000; for (reg = 0; reg < 7; reg++) { Modified: openbios-devel/drivers/pci_database.h =================================================================== --- openbios-devel/drivers/pci_database.h 2009-01-07 15:43:10 UTC (rev 362) +++ openbios-devel/drivers/pci_database.h 2009-01-07 15:45:26 UTC (rev 363) @@ -5,6 +5,8 @@ uint32_t dev; /* bus, dev, fn */ uint32_t regions[7]; uint32_t sizes[7]; + int irq_pin; + int irq_line; }; typedef struct pci_dev_t pci_dev_t; Modified: openbios-devel/include/openbios/pci.h =================================================================== --- openbios-devel/include/openbios/pci.h 2009-01-07 15:43:10 UTC (rev 362) +++ openbios-devel/include/openbios/pci.h 2009-01-07 15:45:26 UTC (rev 363) @@ -6,19 +6,20 @@ typedef struct pci_arch_t pci_arch_t; struct pci_arch_t { - const char * name; - uint16_t vendor_id; - uint16_t device_id; - unsigned long cfg_addr; - unsigned long cfg_data; - unsigned long cfg_base; - unsigned long cfg_len; - unsigned long mem_base; - unsigned long mem_len; - unsigned long io_base; - unsigned long io_len; - unsigned long rbase; - unsigned long rlen; + const char * name; + uint16_t vendor_id; + uint16_t device_id; + unsigned long cfg_addr; + unsigned long cfg_data; + unsigned long cfg_base; + unsigned long cfg_len; + unsigned long mem_base; + unsigned long mem_len; + unsigned long io_base; + unsigned long io_len; + unsigned long rbase; + unsigned long rlen; + uint8_t irqs[4]; }; extern const pci_arch_t *arch;

1 0

[PATCH 1/8][RESEND] Really create a tree for PCI devices
by Laurent Vivier 07 Jan '09

07 Jan '09

As it is part of this series I resend this patch. This patch really creates a tree for PCI devices: all PCI devices are leafs under the last PCI host found. This is not the "perfect" solution, but a step in the good direction. v2: on sparc64, as PCI probing is disabled, move forth pci definitions removed from common part to sparc64 directories.

2 1

r362 - in openbios-devel: arch/ppc arch/ppc/qemu arch/sparc64 drivers forth/util
by svn＠openbios.org 07 Jan '09

07 Jan '09

Author: blueswirl Date: 2009-01-07 16:43:10 +0100 (Wed, 07 Jan 2009) New Revision: 362 Modified: openbios-devel/arch/ppc/build.xml openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/qemu.fs openbios-devel/arch/sparc64/tree.fs openbios-devel/drivers/ide.c openbios-devel/drivers/pci.c openbios-devel/drivers/pci.fs openbios-devel/drivers/pci_database.h openbios-devel/forth/util/pci.fs Log: Really create a tree for PCI devices (Laurent Vivier) Modified: openbios-devel/arch/ppc/build.xml =================================================================== --- openbios-devel/arch/ppc/build.xml 2009-01-06 20:27:01 UTC (rev 361) +++ openbios-devel/arch/ppc/build.xml 2009-01-07 15:43:10 UTC (rev 362) @@ -142,7 +142,6 @@ <external-object source="target/arch/ppc/qemu/kernel.o"/> <object source="qemu/main.c" flags="-Iarch/ppc"/> <object source="qemu/methods.c" flags="-Iarch/ppc"/> - <object source="qemu/tree.c" flags="-Iarch/ppc"/> <object source="qemu/vfd.c" flags="-Iarch/ppc"/> <object source="qemu/console.c" flags="-Iarch/ppc"/> </library> Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2009-01-06 20:27:01 UTC (rev 361) +++ openbios-devel/arch/ppc/qemu/init.c 2009-01-07 15:43:10 UTC (rev 362) @@ -427,18 +427,6 @@ const struct cpudef *cpu; char buf[64]; - devtree_init(); - - /* ISA BASE */ - - push_str("/"); - fword("find-device"); - - PUSH(isa_io_base); - fword("encode-int"); - push_str("isa-io-base"); - fword("property"); - /* memory info */ push_str("/memory"); Modified: openbios-devel/arch/ppc/qemu/qemu.fs =================================================================== --- openbios-devel/arch/ppc/qemu/qemu.fs 2009-01-06 20:27:01 UTC (rev 361) +++ openbios-devel/arch/ppc/qemu/qemu.fs 2009-01-07 15:43:10 UTC (rev 362) @@ -44,51 +44,6 @@ ; SYSTEM-initializer -\ ------------------------------------------------------------------------- -\ device tree fixing -\ ------------------------------------------------------------------------- - -\ add decode-address methods -: (make-decodable) ( phandle -- ) - - dup " #address-cells" rot get-package-property 0= if - decode-int nip nip - over " decode-unit" rot find-method if 2drop else - ( save phandle ncells ) - - over active-package! - case - 1 of ['] parse-hex " decode-unit" is-xt-func endof - 3 of - " bus-range" active-package get-package-property 0= if - decode-int nip nip - ['] encode-unit-pci " encode-unit" is-xt-func - " decode-unit" is-func-begin - ['] (lit) , , - ['] decode-unit-pci-bus , - is-func-end - then - endof - endcase - then - then - drop -; - -: init-qemu-tree ( -- ) - active-package - - iterate-tree-begin - begin ?dup while - - dup (make-decodable) - - iterate-tree - repeat - - active-package! -; - \ use the tty interface if available : activate-tty-interface " /packages/terminal-emulator" find-dev if drop Modified: openbios-devel/arch/sparc64/tree.fs =================================================================== --- openbios-devel/arch/sparc64/tree.fs 2009-01-06 20:27:01 UTC (rev 361) +++ openbios-devel/arch/sparc64/tree.fs 2009-01-07 15:43:10 UTC (rev 362) @@ -33,6 +33,43 @@ " /openprom" find-device " OBP 3.10.24 1999/01/01 01:01" encode-string " version" property +device-end + +\ we only implement DD and DD,F +: encode-unit-pci ( phys.lo phy.mid phys.hi -- str len ) + nip nip ff00 and 8 >> dup 3 >> + swap 7 and + ( ddddd fff ) + + ?dup if + pocket tohexstr + " ," pocket tmpstrcat + else + 0 0 pocket tmpstrcpy + then + >r + rot pocket tohexstr r> tmpstrcat drop +; + +dev / + +\ simple pci bus node +new-device + " pci" device-name + 3 encode-int " #address-cells" property + 2 encode-int " #size-cells" property + 0 encode-int 0 encode-int encode+ " bus-range" property + " pci" encode-string " device_type" property + + external + : open ( cr ." opening PCI" cr ) true ; + : close ; + : decode-unit 0 decode-unit-pci-bus ; + : encode-unit encode-unit-pci ; +finish-device + +device-end + dev /pci \ simple isa bus node Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2009-01-06 20:27:01 UTC (rev 361) +++ openbios-devel/drivers/ide.c 2009-01-07 15:43:10 UTC (rev 362) @@ -1312,7 +1312,7 @@ uint32_t io_port1, uint32_t ctl_port1) { int i, j; - char nodebuff[32]; + char nodebuff[128]; phandle_t dnode, aliases; int hd_found, cd_found; Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-06 20:27:01 UTC (rev 361) +++ openbios-devel/drivers/pci.c 2009-01-07 15:43:10 UTC (rev 362) @@ -40,6 +40,34 @@ const pci_arch_t *arch; +#define IS_NOT_RELOCATABLE 0x80000000 +#define IS_PREFETCHABLE 0x40000000 +#define IS_ALIASED 0x20000000 + +enum { + CONFIGURATION_SPACE = 0, + IO_SPACE = 1, + MEMORY_SPACE_32 = 2, + MEMORY_SPACE_64 = 3, +}; + +static inline void pci_encode_phys_addr(cell *phys, int flags, int space_code, + pci_addr dev, uint8_t reg, uint64_t addr) +{ + + /* phys.hi */ + + phys[0] = flags | (space_code << 24) | dev | reg; + + /* phys.mid */ + + phys[1] = addr >> 32; + + /* phys.lo */ + + phys[2] = addr; +} + static void ob_pci_open(int *idx) { @@ -58,11 +86,82 @@ { } +/* ( str len -- phys.lo phys.mid phys.hi ) */ +static void +ob_pci_decode_unit(int *idx) +{ + PUSH(0); + fword("decode-unit-pci-bus"); +} + +/* ( phys.lo phy.mid phys.hi -- str len ) */ + +static void +ob_pci_encode_unit(int *idx) +{ + char buf[28]; + cell hi = POP(); + cell mid = POP(); + cell lo = POP(); + int n, p, t, ss, bus, dev, fn, reg; + + n = hi & IS_NOT_RELOCATABLE; + p = hi & IS_PREFETCHABLE; + t = hi & IS_ALIASED; + ss = (hi >> 24) && 0x03; + + bus = (hi >> 16) & 0xFF; + dev = (hi >> 11) & 0x1F; + fn = (hi >> 8) & 0x07; + reg = hi & 0xFF; + + switch(ss) { + case CONFIGURATION_SPACE: + + if (fn == 0) /* DD */ + snprintf(buf, sizeof(buf), "%x", dev); + else /* DD,F */ + snprintf(buf, sizeof(buf), "%x,%d", dev, fn); + break; + + case IO_SPACE: + + /* [n]i[t]DD,F,RR,NNNNNNNN */ + snprintf(buf, sizeof(buf), "%si%s%x,%x,%x,%x", + n ? "n" : "", /* relocatable */ + t ? "t" : "", /* aliased */ + dev, fn, reg, t ? lo & 0x03FF : lo); + break; + + case MEMORY_SPACE_32: + + /* [n]m[t][p]DD,F,RR,NNNNNNNN */ + snprintf(buf, sizeof(buf), "%sm%s%s%x,%x,%x,%x", + n ? "n" : "", /* relocatable */ + t ? "t" : "", /* aliased */ + p ? "p" : "", /* prefetchable */ + dev, fn, reg, lo ); + break; + + case MEMORY_SPACE_64: + + /* [n]x[p]DD,F,RR,NNNNNNNNNNNNNNNN */ + snprintf(buf, sizeof(buf), "%sx%s%x,%x,%x,%llx", + n ? "n" : "", /* relocatable */ + p ? "p" : "", /* prefetchable */ + dev, fn, reg, ((uint64_t)mid << 32) | (uint64_t)lo ); + break; + } + push_str(buf); +} + NODE_METHODS(ob_pci_node) = { { NULL, ob_pci_initialize }, { "open", ob_pci_open }, { "close", ob_pci_close }, + { "decode-unit", ob_pci_decode_unit }, + { "encode-unit", ob_pci_encode_unit }, }; int ide_config_cb2 (const pci_config_t *config) @@ -119,16 +218,19 @@ int status,id; uint16_t vendor_id, device_id; uint8_t rev; + uint32_t class_code; vendor_id = pci_config_read16(addr, PCI_VENDOR_ID); device_id = pci_config_read16(addr, PCI_DEVICE_ID); rev = pci_config_read8(addr, PCI_REVISION_ID); + class_code = pci_config_read16(addr, PCI_CLASS_DEVICE); /* create properties as described in 2.5 */ set_int_property(dev, "vendor-id", vendor_id); set_int_property(dev, "device-id", device_id); set_int_property(dev, "revision-id", rev); + set_int_property(dev, "class-code", class_code << 8); set_int_property(dev, "interrupts", pci_config_read8(addr, PCI_INTERRUPT_LINE)); @@ -173,10 +275,6 @@ if (pci_dev->compat) set_property(dev, "compatible", pci_dev->compat, pci_compat_len(pci_dev)); - push_str(pci_dev->name); - fword("encode-string"); - push_str("class"); - fword("property"); if (pci_dev->config_cb) pci_dev->config_cb(config); } @@ -310,17 +408,17 @@ } static void ob_scan_pci_bus(int bus, unsigned long *mem_base, - unsigned long *io_base, const char *path) + unsigned long *io_base, char **path) { int devnum, fn, is_multi, vid, did; unsigned int htype; pci_addr addr; - phandle_t dnode, dbus; pci_config_t config; const pci_dev_t *pci_dev; uint32_t ccode; uint8_t class, subclass, iface, rev; + activate_device("/"); for (devnum = 0; devnum < 32; devnum++) { is_multi = 0; for (fn = 0; fn==0 || (is_multi && fn<8); fn++) { @@ -341,7 +439,8 @@ iface = pci_config_read8(addr, PCI_CLASS_PROG); rev = pci_config_read8(addr, PCI_REVISION_ID); - pci_dev = pci_find_device(class, subclass, iface, vid, did); + pci_dev = pci_find_device(class, subclass, iface, + vid, did); #ifdef CONFIG_DEBUG_PCI printk("%x:%x.%x - %x:%x - ", bus, devnum, fn, @@ -351,43 +450,41 @@ if (fn == 0) is_multi = htype & 0x80; - activate_device(path); - - dbus=get_cur_dev(); if (pci_dev == NULL || pci_dev->name == NULL) snprintf(config.path, sizeof(config.path), - "%s/pci%x,%x", path, vid, did); + "%s/pci%x,%x", *path, vid, did); else snprintf(config.path, sizeof(config.path), - "%s/%s", path, pci_dev->name); + "%s/%s", *path, pci_dev->name); #ifdef CONFIG_DEBUG_PCI printk("%s - ", config.path); #endif + config.dev = addr & 0x00FFFFFF; + REGISTER_NAMED_NODE(ob_pci_node, config.path); - dnode=find_dev(config.path); - activate_dev( dnode ); + + activate_device(config.path); + ob_pci_configure(addr, &config, mem_base, io_base); -{ - int irq_pin, irq_line; - static const uint8_t heathrow_pci_irqs[4] = { 0x15, 0x16, 0x17, 0x18 }; - irq_pin = pci_config_read8(addr, PCI_INTERRUPT_PIN); - if (irq_pin > 0) { - irq_pin = (devnum + irq_pin - 1) & 3; - irq_line = heathrow_pci_irqs[irq_pin]; - } -} ob_pci_add_properties(addr, pci_dev, &config); ob_pci_add_reg(addr); - device_end(); + if (ccode == 0x0600 || ccode == 0x0604) { + /* host or bridge */ + free(*path); + *path = strdup(config.path); + } + } } + device_end(); } int ob_pci_init(void) { int bus; unsigned long mem_base, io_base; + char *path; #ifdef CONFIG_DEBUG_PCI printk("Initializing PCI devices...\n"); @@ -399,8 +496,10 @@ mem_base = arch->mem_base; io_base = arch->io_base; + path = strdup(""); for (bus = 0; bus<0x100; bus++) { - ob_scan_pci_bus(bus, &mem_base, &io_base, "/pci"); + ob_scan_pci_bus(bus, &mem_base, &io_base, &path); } + free(path); return 0; } Modified: openbios-devel/drivers/pci.fs =================================================================== --- openbios-devel/drivers/pci.fs 2009-01-06 20:27:01 UTC (rev 361) +++ openbios-devel/drivers/pci.fs 2009-01-07 15:43:10 UTC (rev 362) @@ -1,24 +1,5 @@ [IFDEF] CONFIG_DRIVER_PCI -dev / - -\ simple pci bus node -new-device - " pci" device-name - 3 encode-int " #address-cells" property - 2 encode-int " #size-cells" property - 0 encode-int 0 encode-int encode+ " bus-range" property - " pci" encode-string " device_type" property - - external - : open ( cr ." opening PCI" cr ) true ; - : close ; - : decode-unit 0 decode-unit-pci-bus ; - : encode-unit encode-unit-pci ; -finish-device - -device-end - : pci-addr-encode ( addr.lo addr.mi addr.hi ) rot >r swap >r encode-int @@ -31,6 +12,4 @@ rot encode-int encode+ ; - - [THEN] Modified: openbios-devel/drivers/pci_database.h =================================================================== --- openbios-devel/drivers/pci_database.h 2009-01-06 20:27:01 UTC (rev 361) +++ openbios-devel/drivers/pci_database.h 2009-01-07 15:43:10 UTC (rev 362) @@ -2,6 +2,7 @@ struct pci_config_t { char path[256]; + uint32_t dev; /* bus, dev, fn */ uint32_t regions[7]; uint32_t sizes[7]; }; Modified: openbios-devel/forth/util/pci.fs =================================================================== --- openbios-devel/forth/util/pci.fs 2009-01-06 20:27:01 UTC (rev 361) +++ openbios-devel/forth/util/pci.fs 2009-01-07 15:43:10 UTC (rev 362) @@ -93,27 +93,6 @@ \ only forth - -\ ------------------------------------------------------------------------- -\ PCI encode/decode unit -\ ------------------------------------------------------------------------- - -\ we only implement DD and DD,F -: encode-unit-pci ( phys.lo phy.mid phys.hi -- str len ) - nip nip ff00 and 8 >> dup 3 >> - swap 7 and - ( ddddd fff ) - - ?dup if - pocket tohexstr - " ," pocket tmpstrcat - else - 0 0 pocket tmpstrcpy - then - >r - rot pocket tohexstr r> tmpstrcat drop -; - : decode-unit-pci-bus ( str len bus -- phys.lo phys.mid phys.hi ) -rot ascii , left-split ( addr-R len-R addr-L len-L )

1 0

[PATCH 0/8] Boot Linux/PPC using openBIOS and Qemu
by Laurent Vivier 06 Jan '09

06 Jan '09

Hi, This series of patches modifies PCI probing/configuration/registering and allows me to boot a linux 2.6.8 (sarge) with qemu. [PATCH 1/8][RESEND] Really create a tree for PCI devices [PATCH 2/8] Create PCI properties "interrupts", "interrupt-map" and "interrupt-map-mask" [PATCH 3/8] Create "assigned-addresses" property [PATCH 4/8] Correctly create "reg" property for PCI devices [PATCH 5/8] Create "ranges" property [PATCH 6/8] Create special properties for host and bridge [PATCH 7/8] Don't hang if we discover an unknown device [PATCH 8/8] store opened "mmu" in "/chosen" Have fun, Laurent

1 0

[PATCH][v2] Really create a tree for PCI devices
by Laurent Vivier 06 Jan '09

06 Jan '09

This patch really creates a tree for PCI devices: all PCI devices are leafs under the last PCI host found. This is not the "perfect" solution, but a step in the good direction. v2: on sparc64, as PCI probing is disabled, move forth pci definitions removed from common part to sparc64 directories. This part is not compiled & not tested.

2 7

r361 - in openbios-devel: arch/sparc64 drivers
by svn＠openbios.org 06 Jan '09

06 Jan '09

Author: blueswirl Date: 2009-01-06 21:27:01 +0100 (Tue, 06 Jan 2009) New Revision: 361 Modified: openbios-devel/arch/sparc64/tree.fs openbios-devel/drivers/esp.c openbios-devel/drivers/ide.c Log: Support cd/cdrom and hd/disk aliases on all architectures Modified: openbios-devel/arch/sparc64/tree.fs =================================================================== --- openbios-devel/arch/sparc64/tree.fs 2009-01-06 19:06:58 UTC (rev 360) +++ openbios-devel/arch/sparc64/tree.fs 2009-01-06 20:27:01 UTC (rev 361) @@ -47,50 +47,3 @@ : close ; finish-device - -: ?devalias ( alias-str alias-len device-str device-len -- - \ alias-str alias-len false | true ) - active-package >r - " /aliases" find-device - \ 2dup ." Checking " type - 2dup find-dev if \ check if device exists - drop - 2over find-dev if \ do we already have an alias? - \ ." alias exists" cr - drop 2drop false - else - \ ." device exists" cr - encode-string - 2swap property - true - then - else - \ ." device doesn't exist" cr - 2drop false - then - r> active-package! - ; - -:noname - " hd" - " /pci/isa/ide0/disk@0" ?devalias not if - " /pci/isa/ide0/disk@1" ?devalias not if - " /pci/isa/ide1/disk@0" ?devalias not if - " /pci/isa/ide1/disk@1" ?devalias not if - 2drop ." No disk found." cr - then - then - then - then - - " cdrom" - " /pci/isa/ide0/cdrom@0" ?devalias not if - " /pci/isa/ide0/cdrom@1" ?devalias not if - " /pci/isa/ide1/cdrom@0" ?devalias not if - " /pci/isa/ide1/cdrom@1" ?devalias not if - 2drop ." No cdrom found" cr - then - then - then - then -; SYSTEM-initializer Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2009-01-06 19:06:58 UTC (rev 360) +++ openbios-devel/drivers/esp.c 2009-01-06 20:27:01 UTC (rev 361) @@ -42,7 +42,7 @@ typedef struct sd_private { unsigned int bs; - const char *media_str; + const char *media_str[2]; uint32_t sectors; uint8_t media; uint8_t id; @@ -74,7 +74,8 @@ { printk("SCSI DRIVE @%lx:\n", (unsigned long)drive); printk("id: %d\n", drive->id); - printk("media: %s\n", drive->media_str); + printk("media: %s\n", drive->media_str[0]); + printk("media: %s\n", drive->media_str[1]); printk("model: %s\n", drive->model); printk("sectors: %d\n", drive->sectors); printk("present: %d\n", drive->present); @@ -183,7 +184,7 @@ static unsigned int inquiry(esp_private_t *esp, sd_private_t *sd) { - const char *media = "UNKNOWN"; + const char *media[2] = { "UNKNOWN", "UNKNOWN"}; // Setup command = Inquiry memset(esp->buffer, 0, 7); @@ -202,13 +203,16 @@ switch (sd->media) { case TYPE_DISK: - media = "disk"; + media[0] = "disk"; + media[1] = "hd"; break; case TYPE_ROM: - media = "cdrom"; + media[0] = "cdrom"; + media[1] = "cd"; break; } - sd->media_str = media; + sd->media_str[0] = media[0]; + sd->media_str[1] = media[1]; memcpy(sd->model, &esp->buffer[16], 16); sd->model[17] = '\0'; @@ -406,6 +410,7 @@ static void add_alias(const char *device, const char *alias) { + DPRINTF("add_alias dev \"%s\" = alias \"%s\"\n", device, alias); push_str("/aliases"); fword("find-device"); push_str(device); @@ -517,11 +522,15 @@ counter_ptr = &diskcount; } if (*counter_ptr == 0) { - add_alias(nodebuff, esp->sd[id].media_str); + add_alias(nodebuff, esp->sd[id].media_str[0]); + add_alias(nodebuff, esp->sd[id].media_str[1]); } - snprintf(aliasbuff, sizeof(aliasbuff), "%s%d", esp->sd[id].media_str, - *counter_ptr); + snprintf(aliasbuff, sizeof(aliasbuff), "%s%d", + esp->sd[id].media_str[0], *counter_ptr); add_alias(nodebuff, aliasbuff); + snprintf(aliasbuff, sizeof(aliasbuff), "%s%d", + esp->sd[id].media_str[1], *counter_ptr); + add_alias(nodebuff, aliasbuff); snprintf(aliasbuff, sizeof(aliasbuff), "sd(0,%d,0)", id); add_alias(nodebuff, aliasbuff); snprintf(aliasbuff, sizeof(aliasbuff), "sd(0,%d,0)@0,0", id); Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2009-01-06 19:06:58 UTC (rev 360) +++ openbios-devel/drivers/ide.c 2009-01-06 20:27:01 UTC (rev 361) @@ -1415,11 +1415,15 @@ cd_found = 1; set_property(aliases, "cd", nodebuff, strlen(nodebuff) + 1); + set_property(aliases, "cdrom", + nodebuff, strlen(nodebuff) + 1); } if (drive->media == ide_media_disk && !hd_found) { hd_found = 1; set_property(aliases, "hd", nodebuff, strlen(nodebuff) + 1); + set_property(aliases, "disk", + nodebuff, strlen(nodebuff) + 1); } } }

1 0

[PATCH]sparc64: remove static definition of cdrom alias
by Laurent Vivier 06 Jan '09

06 Jan '09

remove static definition of cdrom alias and define alias name in config.xml. NOT COMPILED & NOT TESTED

2 3

r360 - in openbios-devel: arch/unix config/examples include/amd64 modules
by svn＠openbios.org 06 Jan '09

06 Jan '09

Author: blueswirl Date: 2009-01-06 20:06:58 +0100 (Tue, 06 Jan 2009) New Revision: 360 Added: openbios-devel/include/amd64/pci.h Modified: openbios-devel/arch/unix/boot.c openbios-devel/config/examples/amd64_rules.xml openbios-devel/modules/linuxbios.c Log: Fix amd64 warnings, enable more warnings Modified: openbios-devel/arch/unix/boot.c =================================================================== --- openbios-devel/arch/unix/boot.c 2009-01-06 18:46:22 UTC (rev 359) +++ openbios-devel/arch/unix/boot.c 2009-01-06 19:06:58 UTC (rev 360) @@ -74,7 +74,7 @@ printk("[unix] Booting '%s'\n",path); entry=load_elf(path); if(entry) - printk("successfully loaded client at %x.\n", (ucell)entry); + printk("successfully loaded client at %llx.\n", (unsigned long long)(ucell)entry); else printk("failed.\n"); } Modified: openbios-devel/config/examples/amd64_rules.xml =================================================================== --- openbios-devel/config/examples/amd64_rules.xml 2009-01-06 18:46:22 UTC (rev 359) +++ openbios-devel/config/examples/amd64_rules.xml 2009-01-06 19:06:58 UTC (rev 360) @@ -10,6 +10,8 @@ ODIR := obj-$(ARCH) HOSTCC := gcc HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) +HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations +HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include CC := gcc @@ -22,6 +24,8 @@ INSTALL := install CFLAGS := -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g +CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations +CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include # Added: openbios-devel/include/amd64/pci.h =================================================================== --- openbios-devel/include/amd64/pci.h (rev 0) +++ openbios-devel/include/amd64/pci.h 2009-01-06 19:06:58 UTC (rev 360) @@ -0,0 +1,66 @@ +#ifndef AMD64_PCI_H +#define AMD64_PCI_H + +#include "asm/io.h" + +#if !(defined(PCI_CONFIG_1) || defined(PCI_CONFIG_2)) +#define PCI_CONFIG_1 1 /* default */ +#endif + +#ifdef PCI_CONFIG_1 + +/* PCI Configuration Mechanism #1 */ + +/* Have pci_addr in the same format as the values written to 0xcf8 + * so register accesses can be made easy. */ +#define PCI_ADDR(bus, dev, fn) \ + ((pci_addr) (0x80000000u \ + | (uint32_t) (bus) << 16 \ + | (uint32_t) (dev) << 11 \ + | (uint32_t) (fn) << 8)) + +#define PCI_BUS(pcidev) ((uint8_t) ((pcidev) >> 16)) +#define PCI_DEV(pcidev) ((uint8_t) ((pcidev) >> 11) & 0x1f) +#define PCI_FN(pcidev) ((uint8_t) ((pcidev) >> 8) & 7) + +static inline uint8_t pci_config_read8(pci_addr dev, uint8_t reg) +{ + outl(dev | (reg & ~3), 0xcf8); + return inb(0xcfc | (reg & 3)); +} + +static inline uint16_t pci_config_read16(pci_addr dev, uint8_t reg) +{ + outl(dev | (reg & ~3), 0xcf8); + return inw(0xcfc | (reg & 2)); +} + +static inline uint32_t pci_config_read32(pci_addr dev, uint8_t reg) +{ + outl(dev | reg, 0xcf8); + return inl(0xcfc | reg); +} + +static inline void pci_config_write8(pci_addr dev, uint8_t reg, uint8_t val) +{ + outl(dev | (reg & ~3), 0xcf8); + outb(val, 0xcfc | (reg & 3)); +} + +static inline void pci_config_write16(pci_addr dev, uint8_t reg, uint16_t val) +{ + outl(dev | (reg & ~3), 0xcf8); + outw(val, 0xcfc | (reg & 2)); +} + +static inline void pci_config_write32(pci_addr dev, uint8_t reg, uint32_t val) +{ + outl(dev | reg, 0xcf8); + outl(val, 0xcfc); +} + +#else /* !PCI_CONFIG_1 */ +#error PCI Configuration Mechanism is not specified or implemented +#endif + +#endif /* AMD64_PCI_H */ Modified: openbios-devel/modules/linuxbios.c =================================================================== --- openbios-devel/modules/linuxbios.c 2009-01-06 18:46:22 UTC (rev 359) +++ openbios-devel/modules/linuxbios.c 2009-01-06 19:06:58 UTC (rev 360) @@ -30,9 +30,9 @@ info->memrange = malloc(lbcount * sizeof(struct memrange)); info->n_memranges = 0; for (i = 0; i < lbcount; i++) { - debug("%#016Lx %#016Lx %d\n", - lbmem->map[i].start, lbmem->map[i].size, - (int) lbmem->map[i].type); + debug("%#016llx %#016llx %d\n", + (long long)lbmem->map[i].start, (long long)lbmem->map[i].size, + (int) lbmem->map[i].type); if (lbmem->map[i].type != LB_MEM_RAM) continue; info->memrange[info->n_memranges].base = lbmem->map[i].start;

1 0

r359 - in openbios-devel: arch/x86 config/examples include include/x86 modules
by svn＠openbios.org 06 Jan '09

06 Jan '09

Author: blueswirl Date: 2009-01-06 19:46:22 +0100 (Tue, 06 Jan 2009) New Revision: 359 Modified: openbios-devel/arch/x86/boot.c openbios-devel/arch/x86/boot.h openbios-devel/arch/x86/elfload.c openbios-devel/arch/x86/exception.c openbios-devel/arch/x86/lib.c openbios-devel/arch/x86/multiboot.c openbios-devel/arch/x86/openbios.c openbios-devel/config/examples/cross-x86_rules.xml openbios-devel/config/examples/x86_rules.xml openbios-devel/include/sys_info.h openbios-devel/include/x86/io.h openbios-devel/include/x86/pci.h openbios-devel/modules/linuxbios.c Log: Fix x86 warnings, enable more warnings Modified: openbios-devel/arch/x86/boot.c =================================================================== --- openbios-devel/arch/x86/boot.c 2009-01-06 18:09:22 UTC (rev 358) +++ openbios-devel/arch/x86/boot.c 2009-01-06 18:46:22 UTC (rev 359) @@ -15,11 +15,6 @@ #include "sys_info.h" #include "boot.h" -int elf_load(struct sys_info *, const char *filename, const char *cmdline); -int linux_load(struct sys_info *, const char *filename, const char *cmdline); - -void boot(void); - struct sys_info sys_info; void boot(void) Modified: openbios-devel/arch/x86/boot.h =================================================================== --- openbios-devel/arch/x86/boot.h 2009-01-06 18:09:22 UTC (rev 358) +++ openbios-devel/arch/x86/boot.h 2009-01-06 18:46:22 UTC (rev 359) @@ -11,3 +11,4 @@ int linux_load(struct sys_info *info, const char *file, const char *cmdline); unsigned int start_elf(unsigned long entry_point, unsigned long param); +void boot(void); Modified: openbios-devel/arch/x86/elfload.c =================================================================== --- openbios-devel/arch/x86/elfload.c 2009-01-06 18:09:22 UTC (rev 358) +++ openbios-devel/arch/x86/elfload.c 2009-01-06 18:46:22 UTC (rev 359) @@ -19,7 +19,6 @@ #define ADDRMASK 0x00ffffff /* #define ADDRMASK 0xffffffff // old behavior */ -extern unsigned int start_elf(unsigned long entry_point, unsigned long param); extern char _start, _end; static char *image_name, *image_version; @@ -212,7 +211,7 @@ return 1; } -static inline unsigned const padded(unsigned s) +static inline unsigned padded(unsigned s) { return (s + 3) & ~3; } @@ -310,7 +309,7 @@ Elf_phdr *phdr = NULL; unsigned long phdr_size; unsigned long checksum_offset; - unsigned short checksum; + unsigned short checksum = 0; Elf_Bhdr *boot_notes = NULL; int retval = -1; int image_retval; Modified: openbios-devel/arch/x86/exception.c =================================================================== --- openbios-devel/arch/x86/exception.c 2009-01-06 18:09:22 UTC (rev 358) +++ openbios-devel/arch/x86/exception.c 2009-01-06 18:46:22 UTC (rev 359) @@ -22,7 +22,7 @@ uint32_t eflags; }; -static char *exception_names[]= { +static const char * const exception_names[]= { "division by zero", "single step", "NMI", Modified: openbios-devel/arch/x86/lib.c =================================================================== --- openbios-devel/arch/x86/lib.c 2009-01-06 18:09:22 UTC (rev 358) +++ openbios-devel/arch/x86/lib.c 2009-01-06 18:46:22 UTC (rev 359) @@ -45,7 +45,7 @@ if(memsize>=size) { memsize-=size; ret=memptr; - memptr+=size; + memptr = (void *)((unsigned long)memptr + size); } return ret; } Modified: openbios-devel/arch/x86/multiboot.c =================================================================== --- openbios-devel/arch/x86/multiboot.c 2009-01-06 18:09:22 UTC (rev 358) +++ openbios-devel/arch/x86/multiboot.c 2009-01-06 18:46:22 UTC (rev 359) @@ -65,7 +65,7 @@ mod = (module_t *) mbinfo->mods_addr; info->dict_start=(unsigned long *)mod->mod_start; info->dict_end=(unsigned long *)mod->mod_end; - debug("multiboot: dictionary at %x-%x\n", + debug("multiboot: dictionary at %p-%p\n", info->dict_start, info->dict_end); if (mbinfo->flags & MULTIBOOT_MMAP_VALID) { Modified: openbios-devel/arch/x86/openbios.c =================================================================== --- openbios-devel/arch/x86/openbios.c 2009-01-06 18:09:22 UTC (rev 358) +++ openbios-devel/arch/x86/openbios.c 2009-01-06 18:46:22 UTC (rev 359) @@ -19,7 +19,7 @@ void boot(void); -static char intdict[256 * 1024]; +static unsigned char intdict[256 * 1024]; static void init_memory(void) { Modified: openbios-devel/config/examples/cross-x86_rules.xml =================================================================== --- openbios-devel/config/examples/cross-x86_rules.xml 2009-01-06 18:09:22 UTC (rev 358) +++ openbios-devel/config/examples/cross-x86_rules.xml 2009-01-06 18:46:22 UTC (rev 359) @@ -10,6 +10,8 @@ ODIR := obj-$(ARCH) HOSTCC := gcc HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) +HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations +HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include #TARGET=i386-elf- @@ -21,13 +23,12 @@ NM := $(TARGET)nm STRIP := $(TARGET)strip RANLIB := $(TARGET)ranlib - -ifeq ($(shell uname), Linux) - LIBDL_LDFLAGS=-ldl -endif - -CFLAGS := -m32 -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin +CFLAGS := -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g +CFLAGS+= -m32 +CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations +CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +AS_FLAGS := -Wa,-32 -g # # pre rules @@ -37,15 +38,20 @@ VERSION := "1.0RC1" -versions: $(ODIR)/forth/version.fs +versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs $(ODIR)/forth/version.fs: - @test -d $(dir $@) || $(INSTALL) -d $(dir $@) @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ echo ": version \" $(VERSION)\" ; " ; ) \ > $(dir $(a))/version.fs +$(ODIR)/target/include/openbios-version.h: + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ + ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ + echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ + echo "#define OPENBIOS_RELEASE \"$(VERSION)\"" ; ) \ + > $(dir $(a))/openbios-version.h ]]></pre>  Modified: openbios-devel/config/examples/x86_rules.xml =================================================================== --- openbios-devel/config/examples/x86_rules.xml 2009-01-06 18:09:22 UTC (rev 358) +++ openbios-devel/config/examples/x86_rules.xml 2009-01-06 18:46:22 UTC (rev 359) @@ -10,6 +10,8 @@ ODIR := obj-$(ARCH) HOSTCC := gcc HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) +HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations +HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include CC := gcc @@ -23,8 +25,12 @@ LIBDL_LDFLAGS=-ldl endif -CFLAGS := -m32 -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin +CFLAGS := -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g +CFLAGS+= -m32 +CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations +CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +AS_FLAGS := -Wa,-32 -g # # pre rules @@ -34,15 +40,20 @@ VERSION := "1.0RC1" -versions: $(ODIR)/forth/version.fs +versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs $(ODIR)/forth/version.fs: - @test -d $(dir $@) || $(INSTALL) -d $(dir $@) @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ echo ": version \" $(VERSION)\" ; " ; ) \ > $(dir $(a))/version.fs +$(ODIR)/target/include/openbios-version.h: + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ + ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ + echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ + echo "#define OPENBIOS_RELEASE \"$(VERSION)\"" ; ) \ + > $(dir $(a))/openbios-version.h ]]></pre>  Modified: openbios-devel/include/sys_info.h =================================================================== --- openbios-devel/include/sys_info.h 2009-01-06 18:09:22 UTC (rev 358) +++ openbios-devel/include/sys_info.h 2009-01-06 18:46:22 UTC (rev 359) @@ -9,8 +9,8 @@ unsigned long boot_data; unsigned long boot_arg; - char *firmware; /* "PCBIOS", "LinuxBIOS", etc. */ - char *command_line; /* command line given to us */ + const char *firmware; /* "PCBIOS", "LinuxBIOS", etc. */ + const char *command_line; /* command line given to us */ /* memory map */ int n_memranges; Modified: openbios-devel/include/x86/io.h =================================================================== --- openbios-devel/include/x86/io.h 2009-01-06 18:09:22 UTC (rev 358) +++ openbios-devel/include/x86/io.h 2009-01-06 18:46:22 UTC (rev 359) @@ -8,6 +8,7 @@ #define phys_to_virt(phys) ((void *) ((unsigned long) (phys) - virt_offset)) #define virt_to_phys(virt) ((unsigned long) (virt) + virt_offset) +#ifndef BOOTSTRAP #define __SLOW_DOWN_IO "outb %%al,$0x80;" static inline void slow_down_io(void) { @@ -50,4 +51,23 @@ BUILDIO(l,,int) #endif +#else /* BOOTSTRAP */ +#ifdef FCOMPILER +#define inb(reg) ((u8)0xff) +#define inw(reg) ((u16)0xffff) +#define inl(reg) ((u32)0xffffffff) +#define outb(reg, val) do{} while(0) +#define outw(reg, val) do{} while(0) +#define outl(reg, val) do{} while(0) +#else +extern u8 inb(u32 reg); +extern u16 inw(u32 reg); +extern u32 inl(u32 reg); +extern void insw(u32 reg, void *addr, unsigned long count); +extern void outb(u32 reg, u8 val); +extern void outw(u32 reg, u16 val); +extern void outl(u32 reg, u32 val); +extern void outsw(u32 reg, const void *addr, unsigned long count); #endif +#endif +#endif Modified: openbios-devel/include/x86/pci.h =================================================================== --- openbios-devel/include/x86/pci.h 2009-01-06 18:09:22 UTC (rev 358) +++ openbios-devel/include/x86/pci.h 2009-01-06 18:46:22 UTC (rev 359) @@ -3,7 +3,7 @@ #include "asm/io.h" -#if !(PCI_CONFIG_1 || PCI_CONFIG_2) +#if !(defined(PCI_CONFIG_1) || defined(PCI_CONFIG_2)) #define PCI_CONFIG_1 1 /* default */ #endif Modified: openbios-devel/modules/linuxbios.c =================================================================== --- openbios-devel/modules/linuxbios.c 2009-01-06 18:09:22 UTC (rev 358) +++ openbios-devel/modules/linuxbios.c 2009-01-06 18:46:22 UTC (rev 359) @@ -67,7 +67,8 @@ count = 0; end = ((char *)start) + length; for(rec = start; ((void *)rec < end) && - ((signed long)rec->size <= (end - (void *)rec)); + ((signed long)rec->size <= + ((signed long)end - (signed long)rec)); rec = (void *)(((char *)rec) + rec->size)) { count++; }

1 0

r358 - in openbios-devel: config/examples fs/hfsplus include/amd64
by svn＠openbios.org 06 Jan '09

06 Jan '09

Author: blueswirl Date: 2009-01-06 19:09:22 +0100 (Tue, 06 Jan 2009) New Revision: 358 Modified: openbios-devel/config/examples/amd64_config.xml openbios-devel/config/examples/amd64_rules.xml openbios-devel/fs/hfsplus/btree.c openbios-devel/include/amd64/io.h Log: Fix amd64 build Modified: openbios-devel/config/examples/amd64_config.xml =================================================================== --- openbios-devel/config/examples/amd64_config.xml 2009-01-06 17:18:46 UTC (rev 357) +++ openbios-devel/config/examples/amd64_config.xml 2009-01-06 18:09:22 UTC (rev 358) @@ -33,8 +33,9 @@  <option name="CONFIG_CMDLINE" type="boolean" value="true"/> <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> -  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> Modified: openbios-devel/config/examples/amd64_rules.xml =================================================================== --- openbios-devel/config/examples/amd64_rules.xml 2009-01-06 17:18:46 UTC (rev 357) +++ openbios-devel/config/examples/amd64_rules.xml 2009-01-06 18:09:22 UTC (rev 358) @@ -9,17 +9,19 @@ ARCH := amd64 ODIR := obj-$(ARCH) HOSTCC := gcc -HOSTCFLAGS := -O -g -fprofile-arcs -ftest-coverage -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) +HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include CC := gcc +AS := as AR := ar +LD := ld NM := nm STRIP := strip RANLIB := ranlib INSTALL := install -CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin-bcopy -fno-builtin-log2 +CFLAGS := -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include # @@ -30,15 +32,20 @@ VERSION := "1.0RC1" -versions: $(ODIR)/forth/version.fs +versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs $(ODIR)/forth/version.fs: - @test -d $(dir $@) || $(INSTALL) -d $(dir $@) @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ echo ": version \" $(VERSION)\" ; " ; ) \ > $(dir $(a))/version.fs +$(ODIR)/target/include/openbios-version.h: + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ + ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ + echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ + echo "#define OPENBIOS_RELEASE \"$(VERSION)\"" ; ) \ + > $(dir $(a))/openbios-version.h ]]></pre>  Modified: openbios-devel/fs/hfsplus/btree.c =================================================================== --- openbios-devel/fs/hfsplus/btree.c 2009-01-06 17:18:46 UTC (rev 357) +++ openbios-devel/fs/hfsplus/btree.c 2009-01-06 18:09:22 UTC (rev 358) @@ -293,7 +293,7 @@ // now we have the offset and can read the key ... #ifdef CONFIG_LITTLE_ENDIAN - return buf->node + bswap_16(*offset); + return buf->node + bswabU16(*offset); #else return buf->node + *offset; #endif Modified: openbios-devel/include/amd64/io.h =================================================================== --- openbios-devel/include/amd64/io.h 2009-01-06 17:18:46 UTC (rev 357) +++ openbios-devel/include/amd64/io.h 2009-01-06 18:09:22 UTC (rev 358) @@ -6,6 +6,8 @@ #define phys_to_virt(phys) ((void *) ((unsigned long) (phys) - virt_offset)) #define virt_to_phys(virt) ((unsigned long) (virt) + virt_offset) +#ifndef BOOTSTRAP + #define __SLOW_DOWN_IO "outb %%al,$0x80;" static inline void slow_down_io(void) { @@ -46,4 +48,23 @@ BUILDIO(w,w,short) BUILDIO(l,,int) +#else /* BOOTSTRAP */ +#ifdef FCOMPILER +#define inb(reg) ((u8)0xff) +#define inw(reg) ((u16)0xffff) +#define inl(reg) ((u32)0xffffffff) +#define outb(reg, val) do{} while(0) +#define outw(reg, val) do{} while(0) +#define outl(reg, val) do{} while(0) +#else +extern u8 inb(u32 reg); +extern u16 inw(u32 reg); +extern u32 inl(u32 reg); +extern void insw(u32 reg, void *addr, unsigned long count); +extern void outb(u32 reg, u8 val); +extern void outw(u32 reg, u16 val); +extern void outl(u32 reg, u32 val); +extern void outsw(u32 reg, const void *addr, unsigned long count); #endif +#endif +#endif

1 0

r357 - in openbios-devel: arch/x86 config/examples include/x86
by svn＠openbios.org 06 Jan '09

06 Jan '09

Author: blueswirl Date: 2009-01-06 18:18:46 +0100 (Tue, 06 Jan 2009) New Revision: 357 Added: openbios-devel/config/examples/cross-x86_config.xml openbios-devel/config/examples/cross-x86_rules.xml Modified: openbios-devel/arch/x86/build.xml openbios-devel/arch/x86/entry.S openbios-devel/config/examples/x86_config.xml openbios-devel/config/examples/x86_rules.xml openbios-devel/include/x86/io.h Log: Fix x86 build Modified: openbios-devel/arch/x86/build.xml =================================================================== --- openbios-devel/arch/x86/build.xml 2009-01-05 20:30:39 UTC (rev 356) +++ openbios-devel/arch/x86/build.xml 2009-01-06 17:18:46 UTC (rev 357) @@ -20,41 +20,48 @@ <object source="xbox/console.c" condition="XBOX"/> <object source="xbox/methods.c" condition="XBOX"/> </library> - + + <executable name="target/arch/x86/entry.o" target="target"> + <rule><![CDATA[ arch/x86/entry.S + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> + </executable> + <executable name="openbios.multiboot" target="target" condition="IMAGE_ELF_MULTIBOOT"> <rule> - $(LD) -N -T arch/x86/ldscript -o $@.nostrip $^ \ - $(shell $(CC) -print-libgcc-file-name) + $(LD) --warn-common -N -T arch/x86/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-multiboot.syms cp $@.nostrip $@ $(STRIP) $@ </rule> - <object source="entry.S"/> + <external-object source="target/arch/x86/entry.o"/> <object source="multiboot.c"/> <external-object source="libx86.a"/> <external-object source="libbootstrap.a"/> + <external-object source="libdrivers.a"/> +  <external-object source="libmodules.a"/> - <external-object source="libdrivers.a"/> <external-object source="liblibc.a"/> <external-object source="libfs.a"/> + <external-object source="libgcc.a"/> </executable> <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF"> <rule> - $(LD) -N -T arch/x86/ldscript -o $@.nostrip $^ \ - $(shell $(CC) -print-libgcc-file-name) + $(LD) --warn-common -N -T arch/x86/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms cp $@.nostrip $@ $(STRIP) $@ </rule> - <object source="entry.S"/> + <external-object source="target/arch/x86/entry.o"/> <object source="plainboot.c"/> <external-object source="libx86.a"/> <external-object source="libbootstrap.a"/> + <external-object source="libdrivers.a"/> +  <external-object source="libmodules.a"/> - <external-object source="libdrivers.a"/> <external-object source="liblibc.a"/> <external-object source="libfs.a"/> + <external-object source="libgcc.a"/> </executable>  @@ -80,20 +87,20 @@ <executable name="openbios-builtin.elf" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule> - $(LD) -N -T arch/x86/ldscript -o $@.nostrip $^ \ - $(shell $(CC) -print-libgcc-file-name) + $(LD) --warn-common -N -T arch/x86/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms cp $@.nostrip $@ - $(STRIP) $@ - </rule> - <object source="entry.S"/> + $(STRIP) $@</rule> + <external-object source="target/arch/x86/entry.o"/> <external-object source="target/arch/x86/builtin.o"/> <external-object source="libx86.a"/> <external-object source="libbootstrap.a"/> + <external-object source="libdrivers.a"/> +  <external-object source="libmodules.a"/> - <external-object source="libdrivers.a"/> <external-object source="liblibc.a"/> <external-object source="libfs.a"/> + <external-object source="libgcc.a"/> </executable> </build> Modified: openbios-devel/arch/x86/entry.S =================================================================== --- openbios-devel/arch/x86/entry.S 2009-01-05 20:30:39 UTC (rev 356) +++ openbios-devel/arch/x86/entry.S 2009-01-06 17:18:46 UTC (rev 357) @@ -252,6 +252,12 @@ pushl $19 /* vector */ jmp int_hand +__divide_error: + pushl $0 /* error code */ + pushl $20 /* vector */ + jmp int_hand + .global __divide_error + int_hand: /* At this point on the stack there is: * 0(%esp) vector Added: openbios-devel/config/examples/cross-x86_config.xml =================================================================== --- openbios-devel/config/examples/cross-x86_config.xml (rev 0) +++ openbios-devel/config/examples/cross-x86_config.xml 2009-01-06 17:18:46 UTC (rev 357) @@ -0,0 +1,75 @@ +<?xml version="1.0"?> +<config> + +  + <option name="CONFIG_X86" type="boolean" value="true"/> + <option name="CONFIG_LITTLE_ENDIAN" type="boolean" value="true"/> + <option name="CONFIG_XBOX" type="boolean" value="false"/> + +  + <option name="CONFIG_IMAGE_ELF" type="boolean" value="true"/> + <option name="CONFIG_IMAGE_ELF_EMBEDDED" type="boolean" value="true"/> + <option name="CONFIG_IMAGE_ELF_MULTIBOOT" type="boolean" value="true"/> + +  + <option name="CONFIG_HOST_UNIX" type="boolean" value="false"/> + <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> + <option name="CONFIG_PLUGINS" type="boolean" value="false"/> + +  + <option name="CONFIG_DEBUG" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_BOOT" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_DSTACK" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_RSTACK" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_DICTIONARY" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_INTERNAL" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_INTERPRETER" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_CONSOLE" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_CONSOLE_SERIAL" type="boolean" value="true"/> + <option name="CONFIG_SERIAL_PORT" type="boolean" value="true"/> + <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> + <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/> + + +  + <option name="CONFIG_CMDLINE" type="boolean" value="true"/> + <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> + +  + <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> + <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> + <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> + <option name="CONFIG_FS" type="boolean" value="true"/> + <option name="CONFIG_HFS" type="boolean" value="false"/> + <option name="CONFIG_HFSP" type="boolean" value="false"/> + <option name="CONFIG_GRUBFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> + <option name="CONFIG_FSYS_JFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/> + <option name="CONFIG_FSYS_REISERFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_UFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/> + <option name="CONFIG_FSYS_FFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_AFFS" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/> + +  + <option name="CONFIG_LINUXBIOS" type="boolean" value="true"/> + +  + <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_PCI" type="boolean" value="false"/> + <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> + <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> + <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> + <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_FLOPPY" type="boolean" value="false"/> + +</config> Added: openbios-devel/config/examples/cross-x86_rules.xml =================================================================== --- openbios-devel/config/examples/cross-x86_rules.xml (rev 0) +++ openbios-devel/config/examples/cross-x86_rules.xml 2009-01-06 17:18:46 UTC (rev 357) @@ -0,0 +1,79 @@ +<rules> + +<pre><![CDATA[ +# +# Autogenerated OpenBIOS Makefile +# (C) 2004-2005 by the OpenBIOS team +# + +ARCH := x86 +ODIR := obj-$(ARCH) +HOSTCC := gcc +HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) +HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include + +#TARGET=i386-elf- +TARGET= +CC := $(TARGET)gcc +AS := $(TARGET)as +AR := $(TARGET)ar +LD := $(TARGET)ld +NM := $(TARGET)nm +STRIP := $(TARGET)strip +RANLIB := $(TARGET)ranlib + +ifeq ($(shell uname), Linux) + LIBDL_LDFLAGS=-ldl +endif + +CFLAGS := -m32 -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin +INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include + +# +# pre rules +# + +all: versions dictionaries host-libraries target-libraries host-executables target-executables + +VERSION := "1.0RC1" + +versions: $(ODIR)/forth/version.fs + +$(ODIR)/forth/version.fs: + @test -d $(dir $@) || $(INSTALL) -d $(dir $@) + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ + ( echo ": builddate \" $$DATE\" ; " ; \ + echo ": version \" $(VERSION)\" ; " ; ) \ + > $(dir $(a))/version.fs + +]]></pre> + +  + +<rule target="host" entity="executable"> + $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ +</rule> + +<rule target="host" entity="object"> + $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ +</rule> + +<rule target="host" entity="library"> + $(AR) cru $@ $^; $(RANLIB) $@ +</rule> + +  + +<rule target="target" entity="executable"> + $(CC) $(CFLAGS) -o $@ $^ +</rule> + +<rule target="target" entity="object"> + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ +</rule> + +<rule target="target" entity="library"> + $(AR) cru $@ $^; $(RANLIB) $@ +</rule> + +</rules> Modified: openbios-devel/config/examples/x86_config.xml =================================================================== --- openbios-devel/config/examples/x86_config.xml 2009-01-05 20:30:39 UTC (rev 356) +++ openbios-devel/config/examples/x86_config.xml 2009-01-06 17:18:46 UTC (rev 357) @@ -34,8 +34,9 @@  <option name="CONFIG_CMDLINE" type="boolean" value="true"/> <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> -  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> @@ -67,6 +68,7 @@ <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> + <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="false"/> <option name="CONFIG_DEBUG_FLOPPY" type="boolean" value="false"/> Modified: openbios-devel/config/examples/x86_rules.xml =================================================================== --- openbios-devel/config/examples/x86_rules.xml 2009-01-05 20:30:39 UTC (rev 356) +++ openbios-devel/config/examples/x86_rules.xml 2009-01-06 17:18:46 UTC (rev 357) @@ -9,10 +9,10 @@ ARCH := x86 ODIR := obj-$(ARCH) HOSTCC := gcc -HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) -Wno-unused +HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include -CC := gcc -m32 +CC := gcc AR := ar NM := nm STRIP := strip @@ -23,7 +23,7 @@ LIBDL_LDFLAGS=-ldl endif -CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin-bcopy -fno-builtin-log2 +CFLAGS := -m32 -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include # Modified: openbios-devel/include/x86/io.h =================================================================== --- openbios-devel/include/x86/io.h 2009-01-05 20:30:39 UTC (rev 356) +++ openbios-devel/include/x86/io.h 2009-01-06 17:18:46 UTC (rev 357) @@ -1,6 +1,8 @@ #ifndef _ASM_IO_H #define _ASM_IO_H +#include "asm/types.h" + extern unsigned long virt_offset; #define phys_to_virt(phys) ((void *) ((unsigned long) (phys) - virt_offset))

1 0

x86 arch broken?
by Markus Dahms 06 Jan '09

06 Jan '09

Hi, I'm unable to build the x86 version of OpenBIOS (ia32, gcc 4.3.2), cross-ppc and cross-sparc(32|64) work fine. | Building OpenBIOS on x86 for x86 | Cleaning up... ok | Initializing build tree...ok. | Creating target Makefile...ok. | Creating config files...ok. | Building...error: | modules/console_common.c:124: error: ‘FONT_HEIGHT’ undeclared (first use in | this function) | modules/console_common.c: In function ‘rec_char’: | modules/console_common.c:144: warning: comparison between signed and unsigned | modules/console_common.c:144: warning: comparison between signed and unsigned | modules/console_common.c: In function ‘scroll1’: | modules/console_common.c:155: error: ‘FONT_HEIGHT’ undeclared (first use in | this function) | modules/console_common.c: In function ‘do_con_trol’: | modules/console_common.c:238: warning: comparison between signed and unsigned | modules/console_common.c:241: warning: comparison between signed and unsigned | modules/console_common.c:242: warning: comparison between signed and unsigned | modules/console_common.c:251: warning: comparison between signed and unsigned | modules/console_common.c:256: warning: comparison between signed and unsigned | modules/console_common.c:261: warning: comparison between signed and unsigned | make[1]: *** [obj-x86/target/modules/console_common.o] Fehler 1 | make[1]: Leaving directory `/home/mad/src/svn/openbios-devel' Markus

3 4

[PATCH] Really create a tree for PCI devices
by Laurent Vivier 05 Jan '09

05 Jan '09

This patch really creates a tree for PCI devices: all PCI devices are leafs under the last PCI host found. This is not the "perfect" solution, but a step in the good direction.

2 1

[PATCH][RFC] Define "screen-#columns" and "screen-#rows"
by Laurent Vivier 05 Jan '09

05 Jan '09

Define "screen-#columns" and "screen-#rows" in /options

2 4

[PATCH] mac-io cleanup
by Laurent Vivier 05 Jan '09

05 Jan '09

mac-io cleanup. Create drivers/macio.c

2 2

r356 - in openbios-devel: arch/ppc/qemu config/examples drivers include/openbios
by svn＠openbios.org 05 Jan '09

05 Jan '09

Author: blueswirl Date: 2009-01-05 21:30:39 +0100 (Mon, 05 Jan 2009) New Revision: 356 Added: openbios-devel/drivers/macio.c openbios-devel/drivers/macio.h Modified: openbios-devel/arch/ppc/qemu/qemu.c openbios-devel/config/examples/cross-ppc_config.xml openbios-devel/config/examples/ppc_config.xml openbios-devel/drivers/build.xml openbios-devel/drivers/cuda.c openbios-devel/drivers/cuda.h openbios-devel/drivers/pci.c openbios-devel/include/openbios/drivers.h Log: Mac-io cleanup (Laurent Vivier) Modified: openbios-devel/arch/ppc/qemu/qemu.c =================================================================== --- openbios-devel/arch/ppc/qemu/qemu.c 2009-01-05 20:20:45 UTC (rev 355) +++ openbios-devel/arch/ppc/qemu/qemu.c 2009-01-05 20:30:39 UTC (rev 356) @@ -27,9 +27,6 @@ #include "qemu/qemu.h" #include <stdarg.h> -// FIXME -unsigned long virt_offset = 0; - //#define DUMP_NVRAM void @@ -52,11 +49,6 @@ exit(0); } - -/************************************************************************/ -/* print using OSI interface */ -/************************************************************************/ - static int do_indent; int @@ -82,94 +74,3 @@ } return i; } - - -/************************************************************************/ -/* TTY iface */ -/************************************************************************/ - -/************************************************************************/ -/* briQ specific stuff */ -/************************************************************************/ - -#define IO_NVRAM_SIZE 0x00020000 -#define IO_NVRAM_OFFSET 0x00060000 - -static char *nvram; - -void macio_nvram_init(const char *path, uint32_t addr) -{ - phandle_t chosen, aliases; - phandle_t dnode; - int props[2]; - char buf[64]; - - nvram = (char*)addr + IO_NVRAM_OFFSET; - snprintf(buf, sizeof(buf), "%s/nvram", path); - nvram_init(buf); - dnode = find_dev(buf); - set_int_property(dnode, "#bytes", IO_NVRAM_SIZE >> 4); - set_property(dnode, "compatible", "nvram,flash", 12); - props[0] = __cpu_to_be32(IO_NVRAM_OFFSET); - props[1] = __cpu_to_be32(IO_NVRAM_SIZE); - set_property(dnode, "reg", (char *)&props, sizeof(props)); - set_property(dnode, "device_type", "nvram", 6); - - chosen = find_dev("/chosen"); - set_int_property(chosen, "nvram", dnode); - - aliases = find_dev("/aliases"); - set_property(aliases, "nvram", buf, strlen(buf) + 1); -} - -#ifdef DUMP_NVRAM -static void -dump_nvram(void) -{ - int i, j; - for (i = 0; i < 10; i++) - { - for (j = 0; j < 16; j++) - printk ("%02x ", nvram[(i*16+j)<<4]); - printk (" "); - for (j = 0; j < 16; j++) - if (isprint(nvram[(i*16+j)<<4])) - printk("%c", nvram[(i*16+j)<<4]); - else - printk("."); - printk ("\n"); - } -} -#endif - - -int -arch_nvram_size( void ) -{ - return IO_NVRAM_SIZE>>4; -} - -void -arch_nvram_put( char *buf ) -{ - int i; - for (i=0; i<IO_NVRAM_SIZE>>4; i++) - nvram[i<<4]=buf[i]; -#ifdef DUMP_NVRAM - printk("new nvram:\n"); - dump_nvram(); -#endif -} - -void -arch_nvram_get( char *buf ) -{ - int i; - for (i=0; i<IO_NVRAM_SIZE>>4; i++) - buf[i]=nvram[i<<4]; - -#ifdef DUMP_NVRAM - printk("current nvram:\n"); - dump_nvram(); -#endif -} Modified: openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_config.xml 2009-01-05 20:20:45 UTC (rev 355) +++ openbios-devel/config/examples/cross-ppc_config.xml 2009-01-05 20:30:39 UTC (rev 356) @@ -73,5 +73,6 @@ <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> <option name="CONFIG_DRIVER_ADB" type="boolean" value="true"/> <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_MACIO" type="boolean" value="true"/> </config> Modified: openbios-devel/config/examples/ppc_config.xml =================================================================== --- openbios-devel/config/examples/ppc_config.xml 2009-01-05 20:20:45 UTC (rev 355) +++ openbios-devel/config/examples/ppc_config.xml 2009-01-05 20:30:39 UTC (rev 356) @@ -73,5 +73,6 @@ <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> <option name="CONFIG_DRIVER_ADB" type="boolean" value="true"/> <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_MACIO" type="boolean" value="true"/> </config> Modified: openbios-devel/drivers/build.xml =================================================================== --- openbios-devel/drivers/build.xml 2009-01-05 20:20:45 UTC (rev 355) +++ openbios-devel/drivers/build.xml 2009-01-05 20:30:39 UTC (rev 356) @@ -18,6 +18,7 @@ <object source="vga_load_regs.c" condition="DRIVER_VGA"/> <object source="vga_set_mode.c" condition="DRIVER_VGA"/> <object source="vga_vbe.c" condition="DRIVER_VGA"/> + <object source="macio.c" condition="DRIVER_MACIO"/> </library> <dictionary name="openbios" target="forth"> Modified: openbios-devel/drivers/cuda.c =================================================================== --- openbios-devel/drivers/cuda.c 2009-01-05 20:20:45 UTC (rev 355) +++ openbios-devel/drivers/cuda.c 2009-01-05 20:30:39 UTC (rev 356) @@ -3,7 +3,9 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" +#include "macio.h" #include "cuda.h" + //#define DEBUG_CUDA #ifdef DEBUG_CUDA #define CUDA_DPRINTF(fmt, args...) \ Modified: openbios-devel/drivers/cuda.h =================================================================== --- openbios-devel/drivers/cuda.h 2009-01-05 20:20:45 UTC (rev 355) +++ openbios-devel/drivers/cuda.h 2009-01-05 20:30:39 UTC (rev 356) @@ -14,6 +14,4 @@ CHARDEV_LAST, }; -extern phandle_t pic_handle; - cuda_t *cuda_init (const char *path, uint32_t base); Added: openbios-devel/drivers/macio.c =================================================================== --- openbios-devel/drivers/macio.c (rev 0) +++ openbios-devel/drivers/macio.c 2009-01-05 20:30:39 UTC (rev 356) @@ -0,0 +1,162 @@ +/* + * derived from mol/mol.c, + * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#include "openbios/config.h" +#include "openbios/nvram.h" +#include "openbios/bindings.h" +#include "libc/byteorder.h" +#include "libc/vsprintf.h" + +#include "macio.h" +#include "cuda.h" + +#define IO_NVRAM_SIZE 0x00020000 +#define IO_NVRAM_OFFSET 0x00060000 + +static char *nvram; + +int +arch_nvram_size( void ) +{ + return IO_NVRAM_SIZE>>4; +} + +void macio_nvram_init(const char *path, uint32_t addr) +{ + phandle_t chosen, aliases; + phandle_t dnode; + int props[2]; + char buf[64]; + + nvram = (char*)addr + IO_NVRAM_OFFSET; + snprintf(buf, sizeof(buf), "%s/nvram", path); + nvram_init(buf); + dnode = find_dev(buf); + set_int_property(dnode, "#bytes", arch_nvram_size() ); + props[0] = __cpu_to_be32(IO_NVRAM_OFFSET); + props[1] = __cpu_to_be32(IO_NVRAM_SIZE); + set_property(dnode, "reg", (char *)&props, sizeof(props)); + set_property(dnode, "device_type", "nvram", 6); + + chosen = find_dev("/chosen"); + push_str(buf); + fword("open-dev"); + set_int_property(chosen, "nvram", POP()); + + aliases = find_dev("/aliases"); + set_property(aliases, "nvram", buf, strlen(buf) + 1); +} + +#ifdef DUMP_NVRAM +static void +dump_nvram(void) +{ + int i, j; + for (i = 0; i < 10; i++) + { + for (j = 0; j < 16; j++) + printk ("%02x ", nvram[(i*16+j)<<4]); + printk (" "); + for (j = 0; j < 16; j++) + if (isprint(nvram[(i*16+j)<<4])) + printk("%c", nvram[(i*16+j)<<4]); + else + printk("."); + printk ("\n"); + } +} +#endif + + +void +arch_nvram_put( char *buf ) +{ + int i; + for (i=0; i< arch_nvram_size() ; i++) + nvram[i<<4]=buf[i]; +#ifdef DUMP_NVRAM + printk("new nvram:\n"); + dump_nvram(); +#endif +} + +void +arch_nvram_get( char *buf ) +{ + int i; + for (i=0; i< arch_nvram_size(); i++) + buf[i]=nvram[i<<4]; + +#ifdef DUMP_NVRAM + printk("current nvram:\n"); + dump_nvram(); +#endif +} + +DECLARE_UNNAMED_NODE( ob_intctrl_node, INSTALL_OPEN, 2*sizeof(int) ); + +static void +ob_intctrl_open(int *idx) +{ + int ret=1; + RET ( -ret ); +} + +static void +ob_intctrl_close(int *idx) +{ +} + +static void +ob_intctrl_initialize(int *idx) +{ +} + +NODE_METHODS(ob_intctrl_node) = { + { NULL, ob_intctrl_initialize }, + { "open", ob_intctrl_open }, + { "close", ob_intctrl_close }, +}; + +phandle_t pic_handle; + +void +ob_macio_init(const char *path, uint32_t addr) +{ + char buf[64]; + phandle_t ph, chosen, aliases; + cell props[2]; + + aliases = find_dev("/aliases"); + set_property(aliases, "mac-io", path, strlen(path) + 1); + + snprintf(buf, sizeof(buf), "%s/interrupt-controller", path); + REGISTER_NAMED_NODE(ob_intctrl_node, buf); + + ph = find_dev(buf); + set_property(ph, "device_type", "interrupt-controller", 21); + set_property(ph, "compatible", "heathrow\0mac-risc", 18); + set_int_property(ph, "#interrupt-cells", 1); + props[0]= 0x00000010; + props[1]= 0x00000020; + set_property(ph, "reg", (char *)&props, 2 * sizeof(props)); + set_property(ph, "interrupt-controller", NULL, 0); + + chosen = find_dev("/chosen"); + push_str(buf); + fword("open-dev"); + ph = POP(); + set_int_property(chosen, "interrupt-controller", ph); + + pic_handle = ph; + + cuda_init(path, addr); + macio_nvram_init(path, addr); +} Added: openbios-devel/drivers/macio.h =================================================================== --- openbios-devel/drivers/macio.h (rev 0) +++ openbios-devel/drivers/macio.h 2009-01-05 20:30:39 UTC (rev 356) @@ -0,0 +1,4 @@ +extern phandle_t pic_handle; + +void ob_macio_init(const char *path, uint32_t addr); +void macio_nvram_init(const char *path, uint32_t addr); Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-05 20:20:45 UTC (rev 355) +++ openbios-devel/drivers/pci.c 2009-01-05 20:30:39 UTC (rev 356) @@ -27,7 +27,10 @@ #include "timer.h" #include "pci.h" #include "pci_database.h" +#ifdef CONFIG_DRIVER_MACIO #include "cuda.h" +#include "macio.h" +#endif #define set_bool_property(ph, name) set_property(ph, name, NULL, 0); @@ -93,28 +96,10 @@ return 0; } -phandle_t pic_handle; int macio_config_cb (const pci_config_t *config) { -#ifdef CONFIG_PPC - char buf[64]; - phandle_t ph; - cell props[2]; - - snprintf(buf, sizeof(buf), "%s/interrupt-controller", config->path); - REGISTER_NAMED_NODE(ob_pci_node, buf); - - ph = find_dev(buf); - set_property(ph, "device_type", "interrupt-controller", 21); - set_property(ph, "compatible", "heathrow\0mac-risc", 18); - set_int_property(ph, "#interrupt-cells", 1); - props[0]= 0x10; - props[1]= 0x20; - set_property(ph, "reg", (char *)&props, sizeof(props)); - pic_handle = ph; - - cuda_init(config->path, config->regions[0]); - macio_nvram_init(config->path, config->regions[0]); +#ifdef CONFIG_DRIVER_MACIO + ob_macio_init(config->path, config->regions[0] & ~0x0000000F); #endif return 0; } Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2009-01-05 20:20:45 UTC (rev 355) +++ openbios-devel/include/openbios/drivers.h 2009-01-05 20:30:39 UTC (rev 356) @@ -16,9 +16,6 @@ #ifdef CONFIG_DRIVER_PCI /* drivers/pci.c */ int ob_pci_init(void); - -/* arch/ppc/qemu/qemu.c */ -void macio_nvram_init(const char *path, uint32_t addr); #endif #ifdef CONFIG_DRIVER_SBUS /* drivers/sbus.c */

1 0

r355 - in openbios-devel: drivers include/openbios modules
by svn＠openbios.org 05 Jan '09

05 Jan '09

Author: blueswirl Date: 2009-01-05 21:20:45 +0100 (Mon, 05 Jan 2009) New Revision: 355 Modified: openbios-devel/drivers/vga_vbe.c openbios-devel/include/openbios/fontdata.h openbios-devel/modules/console_common.c Log: Define "screen-#columns" and "screen-#rows" in /options (Laurent Vivier) Modified: openbios-devel/drivers/vga_vbe.c =================================================================== --- openbios-devel/drivers/vga_vbe.c 2009-01-05 20:16:31 UTC (rev 354) +++ openbios-devel/drivers/vga_vbe.c 2009-01-05 20:20:45 UTC (rev 355) @@ -21,7 +21,9 @@ #include "openbios/bindings.h" #include "openbios/pci.h" #include "openbios/drivers.h" +#include "openbios/fontdata.h" #include "asm/io.h" +#include "libc/vsprintf.h" #include "video_subr.h" /* VGA init. We use the Bochs VESA VBE extensions */ @@ -102,7 +104,8 @@ void vga_vbe_init(const char *path, uint32_t fb, uint32_t fb_size, unsigned long rom, uint32_t rom_size) { - phandle_t ph, chosen, aliases; + phandle_t ph, chosen, aliases, options; + char buf[6]; vga_vbe_set_mode(800, 600, 8); @@ -122,6 +125,12 @@ aliases = find_dev("/aliases"); set_property(aliases, "screen", path, strlen(path) + 1); + options = find_dev("/options"); + snprintf(buf, sizeof(buf), "%d", 800 / FONT_WIDTH); + set_property(options, "screen-#columns", buf, strlen(buf) + 1); + snprintf(buf, sizeof(buf), "%d", 600 / FONT_HEIGHT); + set_property(options, "screen-#rows", buf, strlen(buf) + 1); + if (rom_size >= 8) { const char *p; int size; Modified: openbios-devel/include/openbios/fontdata.h =================================================================== --- openbios-devel/include/openbios/fontdata.h 2009-01-05 20:16:31 UTC (rev 354) +++ openbios-devel/include/openbios/fontdata.h 2009-01-05 20:20:45 UTC (rev 355) @@ -15,4 +15,14 @@ extern const unsigned char fontdata_8x16[FONTDATAMAX_8X16]; +#if defined(CONFIG_FONT_8X8) +#define fontdata fontdata_8x8 +#define FONT_HEIGHT FONT_HEIGHT_8X8 +#define FONT_WIDTH FONT_WIDTH_8X8 +#elif defined(CONFIG_FONT_8X16) +#define fontdata fontdata_8x16 +#define FONT_HEIGHT FONT_HEIGHT_8X16 +#define FONT_WIDTH FONT_WIDTH_8X16 +#endif + #endif /* OPENBIOS_FONTDATA_H */ Modified: openbios-devel/modules/console_common.c =================================================================== --- openbios-devel/modules/console_common.c 2009-01-05 20:16:31 UTC (rev 354) +++ openbios-devel/modules/console_common.c 2009-01-05 20:20:45 UTC (rev 355) @@ -17,20 +17,6 @@ #include "openbios/fontdata.h" #include "video_subr.h" -#if !defined(fontdata) -#if defined(CONFIG_FONT_8X8) -#define fontdata fontdata_8x8 -#define FONT_HEIGHT FONT_HEIGHT_8X8 -#define FONT_WIDTH FONT_WIDTH_8X8 -#elif defined(CONFIG_FONT_8X16) -#define fontdata fontdata_8x16 -#define FONT_HEIGHT FONT_HEIGHT_8X16 -#define FONT_WIDTH FONT_WIDTH_8X16 -#else -#error no font selected -#endif -#endif - #define FONT_ADJ_HEIGHT (FONT_HEIGHT + 2) #define NCOLS 80 #define NROWS 48

1 0

[PATCH] preopen display and store result in /chosen
by Laurent Vivier 05 Jan '09

05 Jan '09

Store in property "display" of /chosen the result handler of "open- dev" of VGA controller.

2 1

r354 - openbios-devel/drivers
by svn＠openbios.org 05 Jan '09

05 Jan '09

Author: blueswirl Date: 2009-01-05 21:16:31 +0100 (Mon, 05 Jan 2009) New Revision: 354 Modified: openbios-devel/drivers/vga_vbe.c Log: Preopen display and store result in /chosen (Laurent Vivier) Modified: openbios-devel/drivers/vga_vbe.c =================================================================== --- openbios-devel/drivers/vga_vbe.c 2009-01-05 20:14:07 UTC (rev 353) +++ openbios-devel/drivers/vga_vbe.c 2009-01-05 20:16:31 UTC (rev 354) @@ -115,10 +115,13 @@ set_int_property(ph, "address", fb & ~0x0000000F); chosen = find_dev("/chosen"); - set_int_property(chosen, "display", ph); + push_str(path); + fword("open-dev"); + set_int_property(chosen, "display", POP()); aliases = find_dev("/aliases"); set_property(aliases, "screen", path, strlen(path) + 1); + if (rom_size >= 8) { const char *p; int size;

1 0

[PATCH] Use compat value from pci_dev_t
by Laurent Vivier 05 Jan '09

05 Jan '09

Use field compat from pci_dev_t to fill "compatible" property.

2 1

r353 - openbios-devel/drivers
by svn＠openbios.org 05 Jan '09

05 Jan '09

Author: blueswirl Date: 2009-01-05 21:14:07 +0100 (Mon, 05 Jan 2009) New Revision: 353 Modified: openbios-devel/drivers/ide.c openbios-devel/drivers/pci.c openbios-devel/drivers/pci_database.h Log: Use field compat from pci_dev_t to fill "compatible" property. (Laurent Vivier) Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2009-01-05 20:08:04 UTC (rev 352) +++ openbios-devel/drivers/ide.c 2009-01-05 20:14:07 UTC (rev 353) @@ -1287,7 +1287,6 @@ props[0]=14; props[1]=0; set_property(ph, "interrupts", (char *)&props, 2*sizeof(int)); - set_property(ph, "compatible", "pci1095,646\0pci1095,646\0pciclass,01018f", 40); set_int_property(ph, "#address-cells", 1); set_int_property(ph, "#size-cells", 0); Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-01-05 20:08:04 UTC (rev 352) +++ openbios-devel/drivers/pci.c 2009-01-05 20:14:07 UTC (rev 353) @@ -185,6 +185,9 @@ push_str("model"); fword("property"); } + if (pci_dev->compat) + set_property(dev, "compatible", + pci_dev->compat, pci_compat_len(pci_dev)); push_str(pci_dev->name); fword("encode-string"); push_str("class"); Modified: openbios-devel/drivers/pci_database.h =================================================================== --- openbios-devel/drivers/pci_database.h 2009-01-05 20:08:04 UTC (rev 352) +++ openbios-devel/drivers/pci_database.h 2009-01-05 20:14:07 UTC (rev 353) @@ -26,7 +26,7 @@ extern int macio_config_cb(const pci_config_t *config); extern int vga_config_cb(const pci_config_t *config); -static inline int pci_compat_len(pci_dev_t *dev) +static inline int pci_compat_len(const pci_dev_t *dev) { int len, ret; const char *path = dev->compat;

1 0

[PATCH] Correct typo
by Laurent Vivier 05 Jan '09

05 Jan '09

Correct typo in qemu/tree.fs

2 1

r352 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 05 Jan '09

05 Jan '09

Author: blueswirl Date: 2009-01-05 21:08:04 +0100 (Mon, 05 Jan 2009) New Revision: 352 Modified: openbios-devel/arch/ppc/qemu/tree.fs Log: Correct a typo (Laurent Vivier) Modified: openbios-devel/arch/ppc/qemu/tree.fs =================================================================== --- openbios-devel/arch/ppc/qemu/tree.fs 2009-01-05 18:50:53 UTC (rev 351) +++ openbios-devel/arch/ppc/qemu/tree.fs 2009-01-05 20:08:04 UTC (rev 352) @@ -19,7 +19,7 @@ " 0000000000000" encode-string " system-id" property 1 encode-int " #address-cells" property 1 encode-int " #size-cells" property -h# 0x05f5e100 encode-int " clock-frequency" property +h# 05f5e100 encode-int " clock-frequency" property new-device " cpus" device-name

1 0

r351 - in openbios-devel: drivers fs fs/grubfs fs/hfs fs/hfs/include fs/hfsplus fs/hfsplus/include libgcc
by svn＠openbios.org 05 Jan '09

05 Jan '09

Author: blueswirl Date: 2009-01-05 19:50:53 +0100 (Mon, 05 Jan 2009) New Revision: 351 Modified: openbios-devel/drivers/vga_vbe.c openbios-devel/fs/grubfs/fat.h openbios-devel/fs/grubfs/filesys.h openbios-devel/fs/grubfs/fsys_ext2fs.c openbios-devel/fs/grubfs/fsys_fat.c openbios-devel/fs/grubfs/fsys_ffs.c openbios-devel/fs/grubfs/fsys_iso9660.c openbios-devel/fs/grubfs/fsys_jfs.c openbios-devel/fs/grubfs/fsys_minix.c openbios-devel/fs/grubfs/fsys_ntfs.c openbios-devel/fs/grubfs/fsys_reiserfs.c openbios-devel/fs/grubfs/fsys_vstafs.c openbios-devel/fs/grubfs/fsys_xfs.c openbios-devel/fs/grubfs/iso9660.h openbios-devel/fs/grubfs/vstafs.h openbios-devel/fs/hfs/block.c openbios-devel/fs/hfs/btree.c openbios-devel/fs/hfs/data.c openbios-devel/fs/hfs/file.c openbios-devel/fs/hfs/hfs.c openbios-devel/fs/hfs/include/apple.h openbios-devel/fs/hfs/include/block.h openbios-devel/fs/hfs/include/btree.h openbios-devel/fs/hfs/include/data.h openbios-devel/fs/hfs/include/file.h openbios-devel/fs/hfs/include/hfs.h openbios-devel/fs/hfs/include/libhfs.h openbios-devel/fs/hfs/include/low.h openbios-devel/fs/hfs/include/medium.h openbios-devel/fs/hfs/include/node.h openbios-devel/fs/hfs/include/record.h openbios-devel/fs/hfs/include/volume.h openbios-devel/fs/hfs/low.c openbios-devel/fs/hfs/medium.c openbios-devel/fs/hfs/node.c openbios-devel/fs/hfs/record.c openbios-devel/fs/hfs/volume.c openbios-devel/fs/hfsplus/blockiter.c openbios-devel/fs/hfsplus/btree.c openbios-devel/fs/hfsplus/include/apple.h openbios-devel/fs/hfsplus/include/blockiter.h openbios-devel/fs/hfsplus/include/btree.h openbios-devel/fs/hfsplus/include/hfs.h openbios-devel/fs/hfsplus/include/hfsp.h openbios-devel/fs/hfsplus/include/hfstime.h openbios-devel/fs/hfsplus/include/libhfsp.h openbios-devel/fs/hfsplus/include/record.h openbios-devel/fs/hfsplus/include/swab.h openbios-devel/fs/hfsplus/include/volume.h openbios-devel/fs/hfsplus/libhfsp.c openbios-devel/fs/hfsplus/record.c openbios-devel/fs/hfsplus/volume.c openbios-devel/fs/os.h openbios-devel/libgcc/__lshrdi3.c openbios-devel/libgcc/ashldi3.c openbios-devel/libgcc/ashrdi3.c openbios-devel/libgcc/multi3.c Log: Update FSF addresses Modified: openbios-devel/drivers/vga_vbe.c =================================================================== --- openbios-devel/drivers/vga_vbe.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/drivers/vga_vbe.c 2009-01-05 18:50:53 UTC (rev 351) @@ -12,7 +12,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301, USA. */ #include "openbios/config.h" Modified: openbios-devel/fs/grubfs/fat.h =================================================================== --- openbios-devel/fs/grubfs/fat.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/grubfs/fat.h 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. */ Modified: openbios-devel/fs/grubfs/filesys.h =================================================================== --- openbios-devel/fs/grubfs/filesys.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/grubfs/filesys.h 2009-01-05 18:50:53 UTC (rev 351) @@ -19,7 +19,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. */ /* This disables some portion of code */ Modified: openbios-devel/fs/grubfs/fsys_ext2fs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_ext2fs.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/grubfs/fsys_ext2fs.c 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. */ #ifdef FSYS_EXT2FS Modified: openbios-devel/fs/grubfs/fsys_fat.c =================================================================== --- openbios-devel/fs/grubfs/fsys_fat.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/grubfs/fsys_fat.c 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. */ #ifdef FSYS_FAT Modified: openbios-devel/fs/grubfs/fsys_ffs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_ffs.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/grubfs/fsys_ffs.c 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. */ /* Modified: openbios-devel/fs/grubfs/fsys_iso9660.c =================================================================== --- openbios-devel/fs/grubfs/fsys_iso9660.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/grubfs/fsys_iso9660.c 2009-01-05 18:50:53 UTC (rev 351) @@ -16,7 +16,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. */ /* * References: Modified: openbios-devel/fs/grubfs/fsys_jfs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_jfs.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/grubfs/fsys_jfs.c 2009-01-05 18:50:53 UTC (rev 351) @@ -15,7 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. */ #ifdef FSYS_JFS Modified: openbios-devel/fs/grubfs/fsys_minix.c =================================================================== --- openbios-devel/fs/grubfs/fsys_minix.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/grubfs/fsys_minix.c 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. */ /* Restrictions: Modified: openbios-devel/fs/grubfs/fsys_ntfs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_ntfs.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/grubfs/fsys_ntfs.c 2009-01-05 18:50:53 UTC (rev 351) @@ -15,7 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. */ /* Modified: openbios-devel/fs/grubfs/fsys_reiserfs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_reiserfs.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/grubfs/fsys_reiserfs.c 2009-01-05 18:50:53 UTC (rev 351) @@ -15,7 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. */ #ifdef FSYS_REISERFS Modified: openbios-devel/fs/grubfs/fsys_vstafs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_vstafs.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/grubfs/fsys_vstafs.c 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. */ #ifdef FSYS_VSTAFS Modified: openbios-devel/fs/grubfs/fsys_xfs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_xfs.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/grubfs/fsys_xfs.c 2009-01-05 18:50:53 UTC (rev 351) @@ -15,7 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. */ #ifdef FSYS_XFS Modified: openbios-devel/fs/grubfs/iso9660.h =================================================================== --- openbios-devel/fs/grubfs/iso9660.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/grubfs/iso9660.h 2009-01-05 18:50:53 UTC (rev 351) @@ -16,7 +16,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. */ /* * References: Modified: openbios-devel/fs/grubfs/vstafs.h =================================================================== --- openbios-devel/fs/grubfs/vstafs.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/grubfs/vstafs.h 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. */ Modified: openbios-devel/fs/hfs/block.c =================================================================== --- openbios-devel/fs/hfs/block.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/block.c 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, +* MA 02110-1301, USA. * * $Id: block.c,v 1.11 1998/11/02 22:08:52 rob Exp $ */ Modified: openbios-devel/fs/hfs/btree.c =================================================================== --- openbios-devel/fs/hfs/btree.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/btree.c 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: btree.c,v 1.10 1998/11/02 22:08:54 rob Exp $ */ Modified: openbios-devel/fs/hfs/data.c =================================================================== --- openbios-devel/fs/hfs/data.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/data.c 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: data.c,v 1.7 1998/11/02 22:08:57 rob Exp $ */ Modified: openbios-devel/fs/hfs/file.c =================================================================== --- openbios-devel/fs/hfs/file.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/file.c 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: file.c,v 1.9 1998/11/02 22:08:59 rob Exp $ */ Modified: openbios-devel/fs/hfs/hfs.c =================================================================== --- openbios-devel/fs/hfs/hfs.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/hfs.c 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: hfs.c,v 1.15 1998/11/02 22:09:00 rob Exp $ */ Modified: openbios-devel/fs/hfs/include/apple.h =================================================================== --- openbios-devel/fs/hfs/include/apple.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/include/apple.h 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: apple.h,v 1.1 1998/04/11 08:27:11 rob Exp $ */ Modified: openbios-devel/fs/hfs/include/block.h =================================================================== --- openbios-devel/fs/hfs/include/block.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/include/block.h 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: block.h,v 1.10 1998/11/02 22:08:53 rob Exp $ */ Modified: openbios-devel/fs/hfs/include/btree.h =================================================================== --- openbios-devel/fs/hfs/include/btree.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/include/btree.h 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: btree.h,v 1.8 1998/11/02 22:08:55 rob Exp $ */ Modified: openbios-devel/fs/hfs/include/data.h =================================================================== --- openbios-devel/fs/hfs/include/data.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/include/data.h 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: data.h,v 1.7 1998/11/02 22:08:58 rob Exp $ */ Modified: openbios-devel/fs/hfs/include/file.h =================================================================== --- openbios-devel/fs/hfs/include/file.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/include/file.h 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: file.h,v 1.6 1998/04/11 08:27:12 rob Exp $ */ Modified: openbios-devel/fs/hfs/include/hfs.h =================================================================== --- openbios-devel/fs/hfs/include/hfs.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/include/hfs.h 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: hfs.h,v 1.11 1998/11/02 22:09:01 rob Exp $ */ Modified: openbios-devel/fs/hfs/include/libhfs.h =================================================================== --- openbios-devel/fs/hfs/include/libhfs.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/include/libhfs.h 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: libhfs.h,v 1.7 1998/11/02 22:09:02 rob Exp $ */ Modified: openbios-devel/fs/hfs/include/low.h =================================================================== --- openbios-devel/fs/hfs/include/low.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/include/low.h 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: low.h,v 1.6 1998/04/11 08:27:13 rob Exp $ */ Modified: openbios-devel/fs/hfs/include/medium.h =================================================================== --- openbios-devel/fs/hfs/include/medium.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/include/medium.h 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: medium.h,v 1.3 1998/04/11 08:27:13 rob Exp $ */ Modified: openbios-devel/fs/hfs/include/node.h =================================================================== --- openbios-devel/fs/hfs/include/node.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/include/node.h 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: node.h,v 1.7 1998/11/02 22:09:06 rob Exp $ */ Modified: openbios-devel/fs/hfs/include/record.h =================================================================== --- openbios-devel/fs/hfs/include/record.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/include/record.h 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: record.h,v 1.7 1998/11/02 22:09:08 rob Exp $ */ Modified: openbios-devel/fs/hfs/include/volume.h =================================================================== --- openbios-devel/fs/hfs/include/volume.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/include/volume.h 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: volume.h,v 1.7 1998/11/02 22:09:12 rob Exp $ */ Modified: openbios-devel/fs/hfs/low.c =================================================================== --- openbios-devel/fs/hfs/low.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/low.c 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: low.c,v 1.8 1998/11/02 22:09:03 rob Exp $ */ Modified: openbios-devel/fs/hfs/medium.c =================================================================== --- openbios-devel/fs/hfs/medium.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/medium.c 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: medium.c,v 1.4 1998/11/02 22:09:04 rob Exp $ */ Modified: openbios-devel/fs/hfs/node.c =================================================================== --- openbios-devel/fs/hfs/node.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/node.c 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: node.c,v 1.9 1998/11/02 22:09:05 rob Exp $ */ Modified: openbios-devel/fs/hfs/record.c =================================================================== --- openbios-devel/fs/hfs/record.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/record.c 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: record.c,v 1.9 1998/11/02 22:09:07 rob Exp $ */ Modified: openbios-devel/fs/hfs/volume.c =================================================================== --- openbios-devel/fs/hfs/volume.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfs/volume.c 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: volume.c,v 1.12 1998/11/02 22:09:10 rob Exp $ */ Modified: openbios-devel/fs/hfsplus/blockiter.c =================================================================== --- openbios-devel/fs/hfsplus/blockiter.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfsplus/blockiter.c 2009-01-05 18:50:53 UTC (rev 351) @@ -19,7 +19,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: blockiter.c,v 1.2 2000/10/17 05:58:46 hasi Exp $ */ Modified: openbios-devel/fs/hfsplus/btree.c =================================================================== --- openbios-devel/fs/hfsplus/btree.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfsplus/btree.c 2009-01-05 18:50:53 UTC (rev 351) @@ -22,7 +22,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: btree.c,v 1.14 2000/10/25 05:43:04 hasi Exp $ */ Modified: openbios-devel/fs/hfsplus/include/apple.h =================================================================== --- openbios-devel/fs/hfsplus/include/apple.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfsplus/include/apple.h 2009-01-05 18:50:53 UTC (rev 351) @@ -20,7 +20,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: apple.h,v 1.2 2000/09/08 14:55:08 hasi Exp $ */ Modified: openbios-devel/fs/hfsplus/include/blockiter.h =================================================================== --- openbios-devel/fs/hfsplus/include/blockiter.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfsplus/include/blockiter.h 2009-01-05 18:50:53 UTC (rev 351) @@ -19,7 +19,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: blockiter.h,v 1.1 2000/10/10 11:14:05 hasi Exp $ */ Modified: openbios-devel/fs/hfsplus/include/btree.h =================================================================== --- openbios-devel/fs/hfsplus/include/btree.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfsplus/include/btree.h 2009-01-05 18:50:53 UTC (rev 351) @@ -20,7 +20,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: btree.h,v 1.10 2000/10/25 05:43:04 hasi Exp $ */ Modified: openbios-devel/fs/hfsplus/include/hfs.h =================================================================== --- openbios-devel/fs/hfsplus/include/hfs.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfsplus/include/hfs.h 2009-01-05 18:50:53 UTC (rev 351) @@ -19,7 +19,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: hfs.h,v 1.1.1.1 2000/07/25 10:33:40 kkaempf Exp $ */ Modified: openbios-devel/fs/hfsplus/include/hfsp.h =================================================================== --- openbios-devel/fs/hfsplus/include/hfsp.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfsplus/include/hfsp.h 2009-01-05 18:50:53 UTC (rev 351) @@ -22,7 +22,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: hfsp.h,v 1.17 2000/10/20 06:16:52 hasi Exp $ */ Modified: openbios-devel/fs/hfsplus/include/hfstime.h =================================================================== --- openbios-devel/fs/hfsplus/include/hfstime.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfsplus/include/hfstime.h 2009-01-05 18:50:53 UTC (rev 351) @@ -21,7 +21,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: hfstime.h,v 1.2 2000/10/19 13:33:38 hasi Exp $ */ Modified: openbios-devel/fs/hfsplus/include/libhfsp.h =================================================================== --- openbios-devel/fs/hfsplus/include/libhfsp.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfsplus/include/libhfsp.h 2009-01-05 18:50:53 UTC (rev 351) @@ -18,7 +18,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: libhfsp.h,v 1.17 2000/10/20 06:16:52 hasi Exp $ */ Modified: openbios-devel/fs/hfsplus/include/record.h =================================================================== --- openbios-devel/fs/hfsplus/include/record.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfsplus/include/record.h 2009-01-05 18:50:53 UTC (rev 351) @@ -20,7 +20,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: record.h,v 1.10 2000/10/01 17:08:05 hasi Exp $ */ Modified: openbios-devel/fs/hfsplus/include/swab.h =================================================================== --- openbios-devel/fs/hfsplus/include/swab.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfsplus/include/swab.h 2009-01-05 18:50:53 UTC (rev 351) @@ -19,7 +19,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: swab.h,v 1.1.1.1 2002/03/05 19:50:29 klaus Exp $ */ Modified: openbios-devel/fs/hfsplus/include/volume.h =================================================================== --- openbios-devel/fs/hfsplus/include/volume.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfsplus/include/volume.h 2009-01-05 18:50:53 UTC (rev 351) @@ -15,7 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: volume.h,v 1.11 2000/10/17 05:58:46 hasi Exp $ */ Modified: openbios-devel/fs/hfsplus/libhfsp.c =================================================================== --- openbios-devel/fs/hfsplus/libhfsp.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfsplus/libhfsp.c 2009-01-05 18:50:53 UTC (rev 351) @@ -17,7 +17,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: libhfsp.c,v 1.1.1.1 2000/07/25 10:33:40 kkaempf Exp $ */ Modified: openbios-devel/fs/hfsplus/record.c =================================================================== --- openbios-devel/fs/hfsplus/record.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfsplus/record.c 2009-01-05 18:50:53 UTC (rev 351) @@ -20,7 +20,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: record.c,v 1.24 2000/10/17 05:58:46 hasi Exp $ */ Modified: openbios-devel/fs/hfsplus/volume.c =================================================================== --- openbios-devel/fs/hfsplus/volume.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/hfsplus/volume.c 2009-01-05 18:50:53 UTC (rev 351) @@ -19,7 +19,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: volume.c,v 1.21 2000/10/25 05:43:04 hasi Exp $ */ Modified: openbios-devel/fs/os.h =================================================================== --- openbios-devel/fs/os.h 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/fs/os.h 2009-01-05 18:50:53 UTC (rev 351) @@ -14,7 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + * MA 02110-1301, USA. * * $Id: os.h,v 1.1.1.1 2000/07/25 10:33:40 kkaempf Exp $ */ Modified: openbios-devel/libgcc/__lshrdi3.c =================================================================== --- openbios-devel/libgcc/__lshrdi3.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/libgcc/__lshrdi3.c 2009-01-05 18:50:53 UTC (rev 351) @@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License along with GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, 51 Franklin St, Fifth Floor, Boston, +MA 02110-1301, USA. */ #include "libgcc.h" Modified: openbios-devel/libgcc/ashldi3.c =================================================================== --- openbios-devel/libgcc/ashldi3.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/libgcc/ashldi3.c 2009-01-05 18:50:53 UTC (rev 351) @@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License along with GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, 51 Franklin St, Fifth Floor, Boston, +MA 02110-1301, USA. */ #include "libgcc.h" Modified: openbios-devel/libgcc/ashrdi3.c =================================================================== --- openbios-devel/libgcc/ashrdi3.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/libgcc/ashrdi3.c 2009-01-05 18:50:53 UTC (rev 351) @@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License along with GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, 51 Franklin St, Fifth Floor, Boston, +MA 02110-1301, USA. */ #include "libgcc.h" Modified: openbios-devel/libgcc/multi3.c =================================================================== --- openbios-devel/libgcc/multi3.c 2009-01-04 20:39:50 UTC (rev 350) +++ openbios-devel/libgcc/multi3.c 2009-01-05 18:50:53 UTC (rev 351) @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +the Free Software Foundation, 51 Franklin St, Fifth Floor, Boston, +MA 02110-1301, USA. */ #include "libgcc.h"

1 0

r350 - openbios-devel/drivers
by svn＠openbios.org 04 Jan '09

04 Jan '09

Author: blueswirl Date: 2009-01-04 21:39:50 +0100 (Sun, 04 Jan 2009) New Revision: 350 Added: openbios-devel/drivers/adb_bus.c openbios-devel/drivers/adb_bus.h openbios-devel/drivers/adb_kbd.c openbios-devel/drivers/adb_kbd.h openbios-devel/drivers/adb_mouse.c openbios-devel/drivers/adb_mouse.h Removed: openbios-devel/drivers/adb.c openbios-devel/drivers/adb.h Modified: openbios-devel/drivers/build.xml openbios-devel/drivers/cuda.c openbios-devel/drivers/cuda.h Log: ADB cleanup (Laurent Vivier) Split adb.[ch] and part of cuda.c to adb_bus.[ch], adb_kbd.[ch] and adb_mouse.[ch]. Deleted: openbios-devel/drivers/adb.c =================================================================== --- openbios-devel/drivers/adb.c 2009-01-04 19:25:41 UTC (rev 349) +++ openbios-devel/drivers/adb.c 2009-01-04 20:39:50 UTC (rev 350) @@ -1,631 +0,0 @@ -/* - * <adbkbd.c> - * - * Open Hack'Ware BIOS ADB keyboard support, ported to OpenBIOS - * - * Copyright (c) 2005 Jocelyn Mayer - * Copyright (c) 2005 Stefan Reinauer - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License V2 - * as published by the Free Software Foundation - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA - */ - - -#include "openbios/config.h" -#include "openbios/bindings.h" -#include "asm/types.h" -#include "adb.h" -#include "kbd.h" -#include "cuda.h" -#include "libc/byteorder.h" -#include "libc/vsprintf.h" - -//#define DEBUG_ADB 1 - -#ifdef DEBUG_ADB -#define ADB_DPRINTF(fmt, args...) \ -do { printk("ADB - %s: " fmt, __func__ , ##args); } while (0) -#else -#define ADB_DPRINTF(fmt, args...) do { } while (0) -#endif - -DECLARE_UNNAMED_NODE( keyboard, INSTALL_OPEN, sizeof(int)); - -static void -keyboard_open(int *idx) -{ - RET(-1); -} - -static void -keyboard_close(int *idx) -{ -} - -static void keyboard_read(void); - -NODE_METHODS( keyboard ) = { - { "open", keyboard_open }, - { "close", keyboard_close }, - { "read", keyboard_read }, -}; - -/* ADB US keyboard translation map - * XXX: for now, only shift modifier is defined - */ - - -static const keymap_t ADB_kbd_us[] = { - /* 0x00 */ - { KBD_SH_CAPS, { 0x61, 0x41, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x73, 0x53, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x64, 0x44, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x66, 0x46, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x68, 0x48, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x67, 0x47, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x7A, 0x5A, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x78, 0x58, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - /* 0x08 */ - { KBD_SH_CAPS, { 0x63, 0x43, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x76, 0x56, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x60, 0x40, -1, -1, -1, -1, -1, -1, /* ? */ - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x62, 0x42, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x71, 0x51, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x77, 0x57, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x65, 0x45, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x72, 0x52, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - /* 0x10 */ - { KBD_SH_CAPS, { 0x79, 0x59, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x74, 0x54, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x31, 0x21, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x32, 0x40, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x33, 0x23, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x34, 0x24, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x36, 0x5E, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x35, 0x25, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - /* 0x18 */ - { KBD_SH_CAPS, { 0x3D, 0x2B, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x39, 0x28, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x37, 0x26, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x2D, 0x5F, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x38, 0x2A, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x30, 0x29, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x5D, 0x7D, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x6F, 0x4F, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - /* 0x20 */ - { KBD_SH_CAPS, { 0x75, 0x55, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x5B, 0x7B, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x69, 0x49, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x70, 0x50, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_MOD_MAP(0x0D), }, - { KBD_SH_CAPS, { 0x6C, 0x4C, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x6A, 0x4A, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x27, 0x22, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - /* 0x28 */ - { KBD_SH_CAPS, { 0x6B, 0x4B, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x3B, 0x3A, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x5C, 0x7C, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x2C, 0x3C, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x2F, 0x3F, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x6E, 0x4E, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x6D, 0x4D, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_CAPS, { 0x2E, 0x3E, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - /* 0x30 : tab */ - { KBD_MOD_MAP(0x09), }, - /* 0x31 : space */ - { KBD_MOD_MAP(0x20), }, - /* 0x32 : '<' '>' */ - { KBD_SH_CAPS, { 0x3C, 0x3E, -1, -1, -1, -1, -1, -1, /* ? */ - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - /* 0x33 : backspace */ - { KBD_MOD_MAP(0x08), }, - { KBD_MAP_NONE, }, - /* 0x35 : ESC */ - { KBD_MOD_MAP(0x1B), }, - /* 0x36 : control */ - { KBD_MOD_MAP_LCTRL, }, - /* 0x37 : command */ - { KBD_MOD_MAP_LCMD, }, - /* 0x38 : left shift */ - { KBD_MOD_MAP_LSHIFT, }, - /* 0x39 : caps-lock */ - { KBD_MOD_MAP_CAPS, }, - /* 0x3A : option */ - { KBD_MOD_MAP_LOPT, }, - /* 0x3B : left */ - { KBD_MAP_NONE, }, - /* 0x3C : right */ - { KBD_MAP_NONE, }, - /* 0x3D : down */ - { KBD_MAP_NONE, }, - /* 0x3E : up */ - { KBD_MAP_NONE, }, - { KBD_MAP_NONE, }, - /* 0x40 */ - { KBD_MAP_NONE, }, - { KBD_SH_NUML, { 0x7F, 0x2E, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_MAP_NONE, }, - { KBD_SH_NONE, { 0x2A, 0x2A, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_MAP_NONE, }, - { KBD_SH_NONE, { 0x2B, 0x2B, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_MAP_NONE, }, - { KBD_MOD_MAP(0x7F), }, - /* 0x48 */ - { KBD_MAP_NONE, }, - { KBD_MAP_NONE, }, - { KBD_MAP_NONE, }, - { KBD_SH_NONE, { 0x2F, 0x2F, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_MOD_MAP(0x0D), }, - { KBD_MAP_NONE, }, - { KBD_SH_NONE, { 0x2D, 0x2D, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_MAP_NONE, }, - /* 0x50 */ - { KBD_MAP_NONE, }, - { KBD_SH_NONE, { 0x3D, 0x3D, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_NUML, { -1, 0x30, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_NUML, { -1, 0x31, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_NUML, { -1, 0x32, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_NUML, { -1, 0x33, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_NUML, { -1, 0x34, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_NUML, { -1, 0x35, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - /* 0x58 */ - { KBD_SH_NUML, { -1, 0x36, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_NUML, { -1, 0x37, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_MAP_NONE, }, - { KBD_SH_NUML, { -1, 0x38, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_SH_NUML, { -1, 0x39, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, }, }, - { KBD_MAP_NONE, }, - { KBD_MOD_MAP(0x2F), }, - { KBD_MAP_NONE, }, - /* 0x60 : F5 */ - { KBD_MAP_NONE, }, - /* 0x61 : F6 */ - { KBD_MAP_NONE, }, - /* 0x62 : F7 */ - { KBD_MAP_NONE, }, - /* 0x63 : F3 */ - { KBD_MAP_NONE, }, - /* 0x64 : F8 */ - { KBD_MAP_NONE, }, - /* 0x65 : F9 */ - { KBD_MAP_NONE, }, - { KBD_MAP_NONE, }, - /* 0x67 : F11 */ - { KBD_MAP_NONE, }, - /* 0x68 */ - { KBD_MAP_NONE, }, - /* 0x69 : F13 */ - { KBD_MAP_NONE, }, - { KBD_MAP_NONE, }, - /* 0x6B : F14 */ - { KBD_MAP_NONE, }, - { KBD_MAP_NONE, }, - /* 0x6D : F10 */ - { KBD_MAP_NONE, }, - { KBD_MAP_NONE, }, - /* 0x6F : F12 */ - { KBD_MAP_NONE, }, - /* 0x70 */ - { KBD_MAP_NONE, }, - /* 0x71 : F15 */ - { KBD_MAP_NONE, }, - /* 0x72 : help */ - { KBD_MAP_NONE, }, - /* 0x73 : home */ - { KBD_MAP_NONE, }, - /* 0x74 : page up */ - { KBD_MAP_NONE, }, - /* 0x75 : del */ - { KBD_MAP_NONE, }, - /* 0x76 : F4 */ - { KBD_MAP_NONE, }, - /* 0x77 : end */ - { KBD_MAP_NONE, }, - /* 0x78 : F2 */ - { KBD_MAP_NONE, }, - /* 0x79 : page down */ - { KBD_MAP_NONE, }, - /* 0x7A : F1 */ - { KBD_MAP_NONE, }, - /* 0x7B : right shift */ - { KBD_MOD_MAP_RSHIFT, }, - /* 0x7C : right option */ - { KBD_MOD_MAP_ROPT, }, - /* 0x7D : right control */ - { KBD_MOD_MAP_RCTRL, }, - { KBD_MAP_NONE, }, - /* 0x7F : power */ - { KBD_MAP_NONE, }, -}; - -typedef struct adb_kbd_t adb_kbd_t; -struct adb_kbd_t { - kbd_t kbd; - int next_key; -}; - -static adb_dev_t *my_adb_dev = NULL; - -static int adb_kbd_read (void *private) -{ - uint8_t buffer[ADB_BUF_SIZE]; - adb_dev_t *dev = private; - adb_kbd_t *kbd; - int key; - int ret; - - kbd = (void *)dev->state; - /* Get saved state */ - ret = -1; - for (key = -1; key == -1; ) { - if (kbd->next_key != -1) { - key = kbd->next_key; - kbd->next_key = -1; - } else { - if (adb_reg_get(dev, 0, buffer) != 2) - break; - kbd->next_key = buffer[1] == 0xFF ? -1 : buffer[1]; - key = buffer[0]; - } - ret = kbd_translate_key(&kbd->kbd, key & 0x7F, key >> 7); - ADB_DPRINTF("Translated %d (%02x) into %d (%02x)\n", - key, key, ret, ret); - } - - return ret; -} - - -void *adb_kbd_new (char *path, void *private) -{ - char buf[64]; - int props[1]; - phandle_t ph, aliases; - adb_kbd_t *kbd; - adb_dev_t *dev = private; - kbd = (adb_kbd_t*)malloc(sizeof(adb_kbd_t)); - if (kbd != NULL) { - memset(kbd, 0, sizeof(adb_kbd_t)); - kbd_set_keymap(&kbd->kbd, sizeof(ADB_kbd_us) / sizeof(keymap_t), - ADB_kbd_us); - kbd->next_key = -1; - dev->state = (int32_t)kbd; - my_adb_dev = dev; - } - - snprintf(buf, sizeof(buf), "%s/keyboard", path); - REGISTER_NAMED_NODE( keyboard, buf); - - ph = find_dev(buf); - - set_property(ph, "device_type", "keyboard", 9); - props[0] = __cpu_to_be32(dev->addr); - set_property(ph, "reg", (char *)&props, sizeof(props)); - - aliases = find_dev("/aliases"); - set_property(aliases, "adb-keyboard", buf, strlen(buf) + 1); - - return kbd; -} - -/* ( addr len -- actual ) */ -static void keyboard_read(void) -{ - char *addr; - int len, key, i; - len=POP(); - addr=(char *)POP(); - - for (i = 0; i < len; i++) { - key = adb_kbd_read(my_adb_dev); - if (key == -1 || key == -2) - break; - *addr++ = (char)key; - } - PUSH(i); -} - -DECLARE_UNNAMED_NODE( mouse, INSTALL_OPEN, sizeof(int)); - -static void -mouse_open(int *idx) -{ - RET(-1); -} - -static void -mouse_close(int *idx) -{ -} - -NODE_METHODS( mouse ) = { - { "open", mouse_open }, - { "close", mouse_close }, -}; - -void adb_mouse_new (char *path, void *private) -{ - char buf[64]; - int props[1]; - phandle_t ph, aliases; - adb_dev_t *dev = private; - - snprintf(buf, sizeof(buf), "%s/mouse", path); - REGISTER_NAMED_NODE( mouse, buf); - - ph = find_dev(buf); - - set_property(ph, "device_type", "mouse", 6); - props[0] = __cpu_to_be32(dev->addr); - set_property(ph, "reg", (char *)&props, sizeof(props)); - set_int_property(ph, "#buttons", 3); - - aliases = find_dev("/aliases"); - set_property(aliases, "adb-mouse", buf, strlen(buf) + 1); -} - - -int adb_cmd (adb_dev_t *dev, uint8_t cmd, uint8_t reg, - uint8_t *buf, int len) -{ - uint8_t adb_send[ADB_BUF_SIZE], adb_rcv[ADB_BUF_SIZE]; - - //ADB_DPRINTF("cmd: %d reg: %d len: %d\n", cmd, reg, len); - if (dev->bus == NULL || dev->bus->req == NULL) { - ADB_DPRINTF("ERROR: invalid bus !\n"); - for (;;); - } - /* Sanity checks */ - if (cmd != ADB_LISTEN && len != 0) { - /* No buffer transmitted but for LISTEN command */ - ADB_DPRINTF("in buffer for cmd %d\n", cmd); - return -1; - } - if (cmd == ADB_LISTEN && ((len < 2 || len > 8) || buf == NULL)) { - /* Need a buffer with a regular register size for LISTEN command */ - ADB_DPRINTF("no/invalid buffer for ADB_LISTEN (%d)\n", len); - return -1; - } - if ((cmd == ADB_TALK || cmd == ADB_LISTEN) && reg > 3) { - /* Need a valid register number for LISTEN and TALK commands */ - ADB_DPRINTF("invalid reg for TALK/LISTEN command (%d %d)\n", cmd, reg); - return -1; - } - switch (cmd) { - case ADB_SEND_RESET: - adb_send[0] = ADB_SEND_RESET; - break; - case ADB_FLUSH: - adb_send[0] = (dev->addr << 4) | ADB_FLUSH; - break; - case ADB_LISTEN: - memcpy(adb_send + 1, buf, len); - /* No break here */ - case ADB_TALK: - adb_send[0] = (dev->addr << 4) | cmd | reg; - break; - } - memset(adb_rcv, 0, ADB_BUF_SIZE); - len = (*dev->bus->req)(dev->bus->host, adb_send, len + 1, adb_rcv); -#ifdef DEBUG_ADB - //printk("%x %x %x %x\n", adb_rcv[0], adb_rcv[1], adb_rcv[2], adb_rcv[3]); -#endif - switch (len) { - case 0: - /* No data */ - break; - case 2 ... 8: - /* Register transmitted */ - if (buf != NULL) - memcpy(buf, adb_rcv, len); - break; - default: - /* Should never happen */ - //ADB_DPRINTF("Cmd %d returned %d bytes !\n", cmd, len); - return -1; - } - //ADB_DPRINTF("retlen: %d\n", len); - - return len; -} Deleted: openbios-devel/drivers/adb.h =================================================================== --- openbios-devel/drivers/adb.h 2009-01-04 19:25:41 UTC (rev 349) +++ openbios-devel/drivers/adb.h 2009-01-04 20:39:50 UTC (rev 350) @@ -1,106 +0,0 @@ -/* - * ADB bus definitions for Open Hack'Ware - * - * Copyright (c) 2004-2005 Jocelyn Mayer - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License V2 - * as published by the Free Software Foundation - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA - */ - -#if !defined(__OHW_ADB_H__) -#define __OHW_ADB_H__ - -typedef struct adb_bus_t adb_bus_t; -typedef struct adb_dev_t adb_dev_t; - -#define ADB_BUF_SIZE 8 -struct adb_bus_t { - void *host; - int (*req)(void *host, const uint8_t *snd_buf, int len, uint8_t *rcv_buf); - adb_dev_t *devices; -}; - -struct adb_dev_t { - adb_dev_t *next; - adb_bus_t *bus; - uint8_t addr; - uint8_t type; - uint32_t state; -}; - -#define ADB_BUF_SIZE 8 - -/* ADB commands */ -enum { - ADB_SEND_RESET = 0x00, - ADB_FLUSH = 0x01, - ADB_LISTEN = 0x08, - ADB_TALK = 0x0C, -}; -/* ADB default IDs before relocation */ -enum { - ADB_PROTECT = 0x01, - ADB_KEYBD = 0x02, - ADB_MOUSE = 0x03, - ADB_ABS = 0x04, - ADB_MODEM = 0x05, - ADB_RES = 0x06, - ADB_MISC = 0x07, -}; -/* ADB special device handlers IDs */ -enum { - ADB_CHADDR = 0x00, - ADB_CHADDR_ACTIV = 0xFD, - ADB_CHADDR_NOCOLL = 0xFE, - ADB_SELF_TEST = 0xFF, -}; - -int adb_cmd (adb_dev_t *dev, uint8_t cmd, uint8_t reg, - uint8_t *buf, int len); -void adb_bus_reset (adb_bus_t *bus); -adb_bus_t *adb_bus_new (void *host, - int (*req)(void *host, const uint8_t *snd_buf, - int len, uint8_t *rcv_buf)); -int adb_bus_init (char *path, adb_bus_t *bus); - -static inline int adb_reset (adb_bus_t *bus) -{ - adb_dev_t fake_device; - - memset(&fake_device, 0, sizeof(adb_dev_t)); - fake_device.bus = bus; - - return adb_cmd(&fake_device, ADB_SEND_RESET, 0, NULL, 0); -} - -static inline int adb_flush (adb_dev_t *dev) -{ - return adb_cmd(dev, ADB_FLUSH, 0, NULL, 0); -} - -static inline int adb_reg_get (adb_dev_t *dev, uint8_t reg, uint8_t *buf) -{ - return adb_cmd(dev, ADB_TALK, reg, buf, 0); -} - -static inline int adb_reg_set (adb_dev_t *dev, uint8_t reg, - uint8_t *buf, int len) -{ - return adb_cmd(dev, ADB_LISTEN, reg, buf, len); -} - -void *adb_kbd_new (char *path, void *private); - -void adb_mouse_new (char *path, void *private); - -#endif /* !defined(__OHW_ADB_H__) */ Added: openbios-devel/drivers/adb_bus.c =================================================================== --- openbios-devel/drivers/adb_bus.c (rev 0) +++ openbios-devel/drivers/adb_bus.c 2009-01-04 20:39:50 UTC (rev 350) @@ -0,0 +1,257 @@ +/* + * + * Open Hack'Ware BIOS ADB bus support, ported to OpenBIOS + * + * Copyright (c) 2005 Jocelyn Mayer + * Copyright (c) 2005 Stefan Reinauer + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License V2 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "libc/vsprintf.h" + +#include "adb_bus.h" +#include "adb_kbd.h" +#include "adb_mouse.h" + +DECLARE_UNNAMED_NODE( adb, INSTALL_OPEN, sizeof(int)); + +static void +adb_initialize (int *idx) +{ + phandle_t ph=get_cur_dev(); + + push_str("adb"); + fword("device-type"); + + set_property(ph, "compatible", "adb", 4); + set_int_property(ph, "#address-cells", 1); + set_int_property(ph, "#size-cells", 0); +} + +static void +adb_open(int *idx) +{ + RET(-1); +} + +static void +adb_close(int *idx) +{ +} + +NODE_METHODS( adb ) = { + { NULL, adb_initialize }, + { "open", adb_open }, + { "close", adb_close }, +}; + +adb_bus_t *adb_bus_new (void *host, + int (*req)(void *host, const uint8_t *snd_buf, + int len, uint8_t *rcv_buf)) +{ + adb_bus_t *new; + + new = malloc(sizeof(adb_bus_t)); + if (new == NULL) + return NULL; + new->host = host; + new->req = req; + + return new; +} + +/* Check and relocate all ADB devices as suggested in + * ADB_manager Apple documentation + */ + +int adb_bus_init (char *path, adb_bus_t *bus) +{ + char buf[64]; + uint8_t buffer[ADB_BUF_SIZE]; + uint8_t adb_addresses[16] = + { 8, 9, 10, 11, 12, 13, 14, -1, -1, -1, -1, -1, -1, -1, 0, }; + adb_dev_t tmp_device, **cur; + int address; + int reloc = 0, next_free = 7; + int keep; + + snprintf(buf, sizeof(buf), "%s/adb", path); + REGISTER_NAMED_NODE( adb, buf); + /* Reset the bus */ + // ADB_DPRINTF("\n"); + adb_reset(bus); + cur = &bus->devices; + memset(&tmp_device, 0, sizeof(adb_dev_t)); + tmp_device.bus = bus; + for (address = 1; address < 8 && adb_addresses[reloc] > 0;) { + if (address == ADB_RES) { + /* Reserved */ + address++; + continue; + } + //ADB_DPRINTF("Check device on ADB address %d\n", address); + tmp_device.addr = address; + switch (adb_reg_get(&tmp_device, 3, buffer)) { + case 0: + //ADB_DPRINTF("No device on ADB address %d\n", address); + /* Register this address as free */ + if (adb_addresses[next_free] != 0) + adb_addresses[next_free++] = address; + /* Check next ADB address */ + address++; + break; + case 2: + /* One device answered : + * make it available and relocate it to a free address + */ + if (buffer[0] == ADB_CHADDR) { + /* device self test failed */ + ADB_DPRINTF("device on ADB address %d self-test failed " + "%02x %02x %02x\n", address, + buffer[0], buffer[1], buffer[2]); + keep = 0; + } else { + //ADB_DPRINTF("device on ADB address %d self-test OK\n", + // address); + keep = 1; + } + ADB_DPRINTF("Relocate device on ADB address %d to %d (%d)\n", + address, adb_addresses[reloc], reloc); + buffer[0] = ((buffer[0] & 0x40) & ~0x90) | adb_addresses[reloc]; + if (keep == 1) + buffer[0] |= 0x20; + buffer[1] = ADB_CHADDR_NOCOLL; + if (adb_reg_set(&tmp_device, 3, buffer, 2) < 0) { + ADB_DPRINTF("ADB device relocation failed\n"); + return -1; + } + if (keep == 1) { + *cur = malloc(sizeof(adb_dev_t)); + if (*cur == NULL) { + return -1; + } + (*cur)->type = address; + (*cur)->bus = bus; + (*cur)->addr = adb_addresses[reloc++]; + /* Flush buffers */ + adb_flush(*cur); + switch ((*cur)->type) { + case ADB_PROTECT: + ADB_DPRINTF("Found one protected device\n"); + break; + case ADB_KEYBD: + ADB_DPRINTF("Found one keyboard on address %d\n", address); + adb_kbd_new(buf, *cur); + break; + case ADB_MOUSE: + ADB_DPRINTF("Found one mouse on address %d\n", address); + adb_mouse_new(buf, *cur); + break; + case ADB_ABS: + ADB_DPRINTF("Found one absolute positioning device\n"); + break; + case ADB_MODEM: + ADB_DPRINTF("Found one modem\n"); + break; + case ADB_RES: + ADB_DPRINTF("Found one ADB res device\n"); + break; + case ADB_MISC: + ADB_DPRINTF("Found one ADB misc device\n"); + break; + } + cur = &((*cur)->next); + } + break; + case 1: + case 3 ... 7: + /* SHOULD NOT HAPPEN : register 3 is always two bytes long */ + ADB_DPRINTF("Invalid returned len for ADB register 3\n"); + return -1; + case -1: + /* ADB ERROR */ + ADB_DPRINTF("error gettting ADB register 3\n"); + return -1; + } + } + + return 0; +} + +int adb_cmd (adb_dev_t *dev, uint8_t cmd, uint8_t reg, + uint8_t *buf, int len) +{ + uint8_t adb_send[ADB_BUF_SIZE], adb_rcv[ADB_BUF_SIZE]; + + //ADB_DPRINTF("cmd: %d reg: %d len: %d\n", cmd, reg, len); + if (dev->bus == NULL || dev->bus->req == NULL) { + ADB_DPRINTF("ERROR: invalid bus !\n"); + for (;;); + } + /* Sanity checks */ + if (cmd != ADB_LISTEN && len != 0) { + /* No buffer transmitted but for LISTEN command */ + ADB_DPRINTF("in buffer for cmd %d\n", cmd); + return -1; + } + if (cmd == ADB_LISTEN && ((len < 2 || len > 8) || buf == NULL)) { + /* Need a buffer with a regular register size for LISTEN command */ + ADB_DPRINTF("no/invalid buffer for ADB_LISTEN (%d)\n", len); + return -1; + } + if ((cmd == ADB_TALK || cmd == ADB_LISTEN) && reg > 3) { + /* Need a valid register number for LISTEN and TALK commands */ + ADB_DPRINTF("invalid reg for TALK/LISTEN command (%d %d)\n", cmd, reg); + return -1; + } + switch (cmd) { + case ADB_SEND_RESET: + adb_send[0] = ADB_SEND_RESET; + break; + case ADB_FLUSH: + adb_send[0] = (dev->addr << 4) | ADB_FLUSH; + break; + case ADB_LISTEN: + memcpy(adb_send + 1, buf, len); + /* No break here */ + case ADB_TALK: + adb_send[0] = (dev->addr << 4) | cmd | reg; + break; + } + memset(adb_rcv, 0, ADB_BUF_SIZE); + len = (*dev->bus->req)(dev->bus->host, adb_send, len + 1, adb_rcv); +#ifdef DEBUG_ADB + //printk("%x %x %x %x\n", adb_rcv[0], adb_rcv[1], adb_rcv[2], adb_rcv[3]); +#endif + switch (len) { + case 0: + /* No data */ + break; + case 2 ... 8: + /* Register transmitted */ + if (buf != NULL) + memcpy(buf, adb_rcv, len); + break; + default: + /* Should never happen */ + //ADB_DPRINTF("Cmd %d returned %d bytes !\n", cmd, len); + return -1; + } + //ADB_DPRINTF("retlen: %d\n", len); + + return len; +} Added: openbios-devel/drivers/adb_bus.h =================================================================== --- openbios-devel/drivers/adb_bus.h (rev 0) +++ openbios-devel/drivers/adb_bus.h 2009-01-04 20:39:50 UTC (rev 350) @@ -0,0 +1,104 @@ +/* + * ADB bus definitions for Open Hack'Ware + * + * Copyright (c) 2004-2005 Jocelyn Mayer + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License V2 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ + +typedef struct adb_bus_t adb_bus_t; +typedef struct adb_dev_t adb_dev_t; + +#define ADB_BUF_SIZE 8 +struct adb_bus_t { + void *host; + int (*req)(void *host, const uint8_t *snd_buf, int len, uint8_t *rcv_buf); + adb_dev_t *devices; +}; + +struct adb_dev_t { + adb_dev_t *next; + adb_bus_t *bus; + uint8_t addr; + uint8_t type; + uint32_t state; +}; + +#define ADB_BUF_SIZE 8 + +/* ADB commands */ +enum { + ADB_SEND_RESET = 0x00, + ADB_FLUSH = 0x01, + ADB_LISTEN = 0x08, + ADB_TALK = 0x0C, +}; +/* ADB default IDs before relocation */ +enum { + ADB_PROTECT = 0x01, + ADB_KEYBD = 0x02, + ADB_MOUSE = 0x03, + ADB_ABS = 0x04, + ADB_MODEM = 0x05, + ADB_RES = 0x06, + ADB_MISC = 0x07, +}; +/* ADB special device handlers IDs */ +enum { + ADB_CHADDR = 0x00, + ADB_CHADDR_ACTIV = 0xFD, + ADB_CHADDR_NOCOLL = 0xFE, + ADB_SELF_TEST = 0xFF, +}; + +int adb_cmd (adb_dev_t *dev, uint8_t cmd, uint8_t reg, + uint8_t *buf, int len); +void adb_bus_reset (adb_bus_t *bus); +adb_bus_t *adb_bus_new (void *host, + int (*req)(void *host, const uint8_t *snd_buf, + int len, uint8_t *rcv_buf)); +int adb_bus_init (char *path, adb_bus_t *bus); + +static inline int adb_reset (adb_bus_t *bus) +{ + adb_dev_t fake_device; + + memset(&fake_device, 0, sizeof(adb_dev_t)); + fake_device.bus = bus; + + return adb_cmd(&fake_device, ADB_SEND_RESET, 0, NULL, 0); +} + +static inline int adb_flush (adb_dev_t *dev) +{ + return adb_cmd(dev, ADB_FLUSH, 0, NULL, 0); +} + +static inline int adb_reg_get (adb_dev_t *dev, uint8_t reg, uint8_t *buf) +{ + return adb_cmd(dev, ADB_TALK, reg, buf, 0); +} + +static inline int adb_reg_set (adb_dev_t *dev, uint8_t reg, + uint8_t *buf, int len) +{ + return adb_cmd(dev, ADB_LISTEN, reg, buf, len); +} + +#ifdef DEBUG_ADB +#define ADB_DPRINTF(fmt, args...) \ +do { printk("ADB - %s: " fmt, __func__ , ##args); } while (0) +#else +#define ADB_DPRINTF(fmt, args...) do { } while (0) +#endif Added: openbios-devel/drivers/adb_kbd.c =================================================================== --- openbios-devel/drivers/adb_kbd.c (rev 0) +++ openbios-devel/drivers/adb_kbd.c 2009-01-04 20:39:50 UTC (rev 350) @@ -0,0 +1,516 @@ +/* + * + * Open Hack'Ware BIOS ADB keyboard support, ported to OpenBIOS + * + * Copyright (c) 2005 Jocelyn Mayer + * Copyright (c) 2005 Stefan Reinauer + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License V2 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "libc/byteorder.h" +#include "libc/vsprintf.h" +#include "kbd.h" + +#include "adb_bus.h" +#include "adb_kbd.h" + +DECLARE_UNNAMED_NODE( keyboard, INSTALL_OPEN, sizeof(int)); + +static void +keyboard_open(int *idx) +{ + RET(-1); +} + +static void +keyboard_close(int *idx) +{ +} + +static void keyboard_read(void); + +NODE_METHODS( keyboard ) = { + { "open", keyboard_open }, + { "close", keyboard_close }, + { "read", keyboard_read }, +}; + +/* ADB US keyboard translation map + * XXX: for now, only shift modifier is defined + */ + + +static const keymap_t ADB_kbd_us[] = { + /* 0x00 */ + { KBD_SH_CAPS, { 0x61, 0x41, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x73, 0x53, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x64, 0x44, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x66, 0x46, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x68, 0x48, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x67, 0x47, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x7A, 0x5A, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x78, 0x58, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + /* 0x08 */ + { KBD_SH_CAPS, { 0x63, 0x43, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x76, 0x56, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x60, 0x40, -1, -1, -1, -1, -1, -1, /* ? */ + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x62, 0x42, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x71, 0x51, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x77, 0x57, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x65, 0x45, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x72, 0x52, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + /* 0x10 */ + { KBD_SH_CAPS, { 0x79, 0x59, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x74, 0x54, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x31, 0x21, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x32, 0x40, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x33, 0x23, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x34, 0x24, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x36, 0x5E, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x35, 0x25, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + /* 0x18 */ + { KBD_SH_CAPS, { 0x3D, 0x2B, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x39, 0x28, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x37, 0x26, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x2D, 0x5F, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x38, 0x2A, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x30, 0x29, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x5D, 0x7D, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x6F, 0x4F, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + /* 0x20 */ + { KBD_SH_CAPS, { 0x75, 0x55, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x5B, 0x7B, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x69, 0x49, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x70, 0x50, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_MOD_MAP(0x0D), }, + { KBD_SH_CAPS, { 0x6C, 0x4C, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x6A, 0x4A, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x27, 0x22, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + /* 0x28 */ + { KBD_SH_CAPS, { 0x6B, 0x4B, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x3B, 0x3A, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x5C, 0x7C, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x2C, 0x3C, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x2F, 0x3F, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x6E, 0x4E, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x6D, 0x4D, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_CAPS, { 0x2E, 0x3E, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + /* 0x30 : tab */ + { KBD_MOD_MAP(0x09), }, + /* 0x31 : space */ + { KBD_MOD_MAP(0x20), }, + /* 0x32 : '<' '>' */ + { KBD_SH_CAPS, { 0x3C, 0x3E, -1, -1, -1, -1, -1, -1, /* ? */ + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + /* 0x33 : backspace */ + { KBD_MOD_MAP(0x08), }, + { KBD_MAP_NONE, }, + /* 0x35 : ESC */ + { KBD_MOD_MAP(0x1B), }, + /* 0x36 : control */ + { KBD_MOD_MAP_LCTRL, }, + /* 0x37 : command */ + { KBD_MOD_MAP_LCMD, }, + /* 0x38 : left shift */ + { KBD_MOD_MAP_LSHIFT, }, + /* 0x39 : caps-lock */ + { KBD_MOD_MAP_CAPS, }, + /* 0x3A : option */ + { KBD_MOD_MAP_LOPT, }, + /* 0x3B : left */ + { KBD_MAP_NONE, }, + /* 0x3C : right */ + { KBD_MAP_NONE, }, + /* 0x3D : down */ + { KBD_MAP_NONE, }, + /* 0x3E : up */ + { KBD_MAP_NONE, }, + { KBD_MAP_NONE, }, + /* 0x40 */ + { KBD_MAP_NONE, }, + { KBD_SH_NUML, { 0x7F, 0x2E, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_MAP_NONE, }, + { KBD_SH_NONE, { 0x2A, 0x2A, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_MAP_NONE, }, + { KBD_SH_NONE, { 0x2B, 0x2B, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_MAP_NONE, }, + { KBD_MOD_MAP(0x7F), }, + /* 0x48 */ + { KBD_MAP_NONE, }, + { KBD_MAP_NONE, }, + { KBD_MAP_NONE, }, + { KBD_SH_NONE, { 0x2F, 0x2F, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_MOD_MAP(0x0D), }, + { KBD_MAP_NONE, }, + { KBD_SH_NONE, { 0x2D, 0x2D, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_MAP_NONE, }, + /* 0x50 */ + { KBD_MAP_NONE, }, + { KBD_SH_NONE, { 0x3D, 0x3D, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_NUML, { -1, 0x30, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_NUML, { -1, 0x31, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_NUML, { -1, 0x32, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_NUML, { -1, 0x33, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_NUML, { -1, 0x34, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_NUML, { -1, 0x35, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + /* 0x58 */ + { KBD_SH_NUML, { -1, 0x36, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_NUML, { -1, 0x37, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_MAP_NONE, }, + { KBD_SH_NUML, { -1, 0x38, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_SH_NUML, { -1, 0x39, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, }, }, + { KBD_MAP_NONE, }, + { KBD_MOD_MAP(0x2F), }, + { KBD_MAP_NONE, }, + /* 0x60 : F5 */ + { KBD_MAP_NONE, }, + /* 0x61 : F6 */ + { KBD_MAP_NONE, }, + /* 0x62 : F7 */ + { KBD_MAP_NONE, }, + /* 0x63 : F3 */ + { KBD_MAP_NONE, }, + /* 0x64 : F8 */ + { KBD_MAP_NONE, }, + /* 0x65 : F9 */ + { KBD_MAP_NONE, }, + { KBD_MAP_NONE, }, + /* 0x67 : F11 */ + { KBD_MAP_NONE, }, + /* 0x68 */ + { KBD_MAP_NONE, }, + /* 0x69 : F13 */ + { KBD_MAP_NONE, }, + { KBD_MAP_NONE, }, + /* 0x6B : F14 */ + { KBD_MAP_NONE, }, + { KBD_MAP_NONE, }, + /* 0x6D : F10 */ + { KBD_MAP_NONE, }, + { KBD_MAP_NONE, }, + /* 0x6F : F12 */ + { KBD_MAP_NONE, }, + /* 0x70 */ + { KBD_MAP_NONE, }, + /* 0x71 : F15 */ + { KBD_MAP_NONE, }, + /* 0x72 : help */ + { KBD_MAP_NONE, }, + /* 0x73 : home */ + { KBD_MAP_NONE, }, + /* 0x74 : page up */ + { KBD_MAP_NONE, }, + /* 0x75 : del */ + { KBD_MAP_NONE, }, + /* 0x76 : F4 */ + { KBD_MAP_NONE, }, + /* 0x77 : end */ + { KBD_MAP_NONE, }, + /* 0x78 : F2 */ + { KBD_MAP_NONE, }, + /* 0x79 : page down */ + { KBD_MAP_NONE, }, + /* 0x7A : F1 */ + { KBD_MAP_NONE, }, + /* 0x7B : right shift */ + { KBD_MOD_MAP_RSHIFT, }, + /* 0x7C : right option */ + { KBD_MOD_MAP_ROPT, }, + /* 0x7D : right control */ + { KBD_MOD_MAP_RCTRL, }, + { KBD_MAP_NONE, }, + /* 0x7F : power */ + { KBD_MAP_NONE, }, +}; + +typedef struct adb_kbd_t adb_kbd_t; +struct adb_kbd_t { + kbd_t kbd; + int next_key; +}; + +static adb_dev_t *my_adb_dev = NULL; + +static int adb_kbd_read (void *private) +{ + uint8_t buffer[ADB_BUF_SIZE]; + adb_dev_t *dev = private; + adb_kbd_t *kbd; + int key; + int ret; + + kbd = (void *)dev->state; + /* Get saved state */ + ret = -1; + for (key = -1; key == -1; ) { + if (kbd->next_key != -1) { + key = kbd->next_key; + kbd->next_key = -1; + } else { + if (adb_reg_get(dev, 0, buffer) != 2) + break; + kbd->next_key = buffer[1] == 0xFF ? -1 : buffer[1]; + key = buffer[0]; + } + ret = kbd_translate_key(&kbd->kbd, key & 0x7F, key >> 7); + ADB_DPRINTF("Translated %d (%02x) into %d (%02x)\n", + key, key, ret, ret); + } + + return ret; +} + + +void *adb_kbd_new (char *path, void *private) +{ + char buf[64]; + int props[1]; + phandle_t ph, aliases; + adb_kbd_t *kbd; + adb_dev_t *dev = private; + kbd = (adb_kbd_t*)malloc(sizeof(adb_kbd_t)); + if (kbd != NULL) { + memset(kbd, 0, sizeof(adb_kbd_t)); + kbd_set_keymap(&kbd->kbd, sizeof(ADB_kbd_us) / sizeof(keymap_t), + ADB_kbd_us); + kbd->next_key = -1; + dev->state = (int32_t)kbd; + my_adb_dev = dev; + } + + snprintf(buf, sizeof(buf), "%s/keyboard", path); + REGISTER_NAMED_NODE( keyboard, buf); + + ph = find_dev(buf); + + set_property(ph, "device_type", "keyboard", 9); + props[0] = __cpu_to_be32(dev->addr); + set_property(ph, "reg", (char *)&props, sizeof(props)); + + aliases = find_dev("/aliases"); + set_property(aliases, "adb-keyboard", buf, strlen(buf) + 1); + + return kbd; +} + +/* ( addr len -- actual ) */ +static void keyboard_read(void) +{ + char *addr; + int len, key, i; + len=POP(); + addr=(char *)POP(); + + for (i = 0; i < len; i++) { + key = adb_kbd_read(my_adb_dev); + if (key == -1 || key == -2) + break; + *addr++ = (char)key; + } + PUSH(i); +} Added: openbios-devel/drivers/adb_kbd.h =================================================================== --- openbios-devel/drivers/adb_kbd.h (rev 0) +++ openbios-devel/drivers/adb_kbd.h 2009-01-04 20:39:50 UTC (rev 350) @@ -0,0 +1,22 @@ +/* + * + * Open Hack'Ware BIOS ADB keyboard support, ported to OpenBIOS + * + * Copyright (c) 2005 Jocelyn Mayer + * Copyright (c) 2005 Stefan Reinauer + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License V2 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ + +void *adb_kbd_new (char *path, void *private); Added: openbios-devel/drivers/adb_mouse.c =================================================================== --- openbios-devel/drivers/adb_mouse.c (rev 0) +++ openbios-devel/drivers/adb_mouse.c 2009-01-04 20:39:50 UTC (rev 350) @@ -0,0 +1,67 @@ +/* + * + * Open Hack'Ware BIOS ADB mouse support, ported to OpenBIOS + * + * Copyright (c) 2005 Jocelyn Mayer + * Copyright (c) 2005 Stefan Reinauer + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License V2 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "libc/byteorder.h" +#include "libc/vsprintf.h" + +#include "adb_bus.h" +#include "adb_mouse.h" + +DECLARE_UNNAMED_NODE( mouse, INSTALL_OPEN, sizeof(int)); + +static void +mouse_open(int *idx) +{ + RET(-1); +} + +static void +mouse_close(int *idx) +{ +} + +NODE_METHODS( mouse ) = { + { "open", mouse_open }, + { "close", mouse_close }, +}; + +void adb_mouse_new (char *path, void *private) +{ + char buf[64]; + int props[1]; + phandle_t ph, aliases; + adb_dev_t *dev = private; + + snprintf(buf, sizeof(buf), "%s/mouse", path); + REGISTER_NAMED_NODE( mouse, buf); + + ph = find_dev(buf); + + set_property(ph, "device_type", "mouse", 6); + props[0] = __cpu_to_be32(dev->addr); + set_property(ph, "reg", (char *)&props, sizeof(props)); + set_int_property(ph, "#buttons", 3); + + aliases = find_dev("/aliases"); + set_property(aliases, "adb-mouse", buf, strlen(buf) + 1); +} Added: openbios-devel/drivers/adb_mouse.h =================================================================== --- openbios-devel/drivers/adb_mouse.h (rev 0) +++ openbios-devel/drivers/adb_mouse.h 2009-01-04 20:39:50 UTC (rev 350) @@ -0,0 +1,22 @@ +/* + * + * Open Hack'Ware BIOS ADB mouse support, ported to OpenBIOS + * + * Copyright (c) 2005 Jocelyn Mayer + * Copyright (c) 2005 Stefan Reinauer + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License V2 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ + +void adb_mouse_new (char *path, void *private); Modified: openbios-devel/drivers/build.xml =================================================================== --- openbios-devel/drivers/build.xml 2009-01-04 19:25:41 UTC (rev 349) +++ openbios-devel/drivers/build.xml 2009-01-04 20:39:50 UTC (rev 350) @@ -6,7 +6,9 @@ <object source="ide.c" condition="DRIVER_IDE"/> <object source="timer.c" condition="DRIVER_IDE"/> <object source="kbd.c" condition="DRIVER_ADB"/> - <object source="adb.c" condition="DRIVER_ADB"/> + <object source="adb_bus.c" condition="DRIVER_ADB"/> + <object source="adb_kbd.c" condition="DRIVER_ADB"/> + <object source="adb_mouse.c" condition="DRIVER_ADB"/> <object source="cuda.c" condition="DRIVER_ADB"/> <object source="floppy.c" condition="DRIVER_FLOPPY"/> <object source="iommu.c" condition="DRIVER_SBUS"/> Modified: openbios-devel/drivers/cuda.c =================================================================== --- openbios-devel/drivers/cuda.c 2009-01-04 19:25:41 UTC (rev 349) +++ openbios-devel/drivers/cuda.c 2009-01-04 20:39:50 UTC (rev 350) @@ -3,9 +3,6 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" -#include "adb.h" - - #include "cuda.h" //#define DEBUG_CUDA #ifdef DEBUG_CUDA @@ -14,7 +11,6 @@ #else #define CUDA_DPRINTF(fmt, args...) do { } while (0) #endif -#define ADB_DPRINTF CUDA_DPRINTF #define IO_CUDA_OFFSET 0x00016000 #define IO_CUDA_SIZE 0x00002000 @@ -305,170 +301,3 @@ return cuda; } - -#ifdef CONFIG_DRIVER_ADB - -DECLARE_UNNAMED_NODE( adb, INSTALL_OPEN, sizeof(int)); - -static void -adb_initialize (int *idx) -{ - phandle_t ph=get_cur_dev(); - - push_str("adb"); - fword("device-type"); - - set_property(ph, "compatible", "adb", 4); - set_int_property(ph, "#address-cells", 1); - set_int_property(ph, "#size-cells", 0); -} - -static void -adb_open(int *idx) -{ - RET(-1); -} - -static void -adb_close(int *idx) -{ -} - -NODE_METHODS( adb ) = { - { NULL, adb_initialize }, - { "open", adb_open }, - { "close", adb_close }, -}; - -adb_bus_t *adb_bus_new (void *host, - int (*req)(void *host, const uint8_t *snd_buf, - int len, uint8_t *rcv_buf)) -{ - adb_bus_t *new; - - new = malloc(sizeof(adb_bus_t)); - if (new == NULL) - return NULL; - new->host = host; - new->req = req; - - return new; -} - -/* Check and relocate all ADB devices as suggested in - * * ADB_manager Apple documentation - * */ -int adb_bus_init (char *path, adb_bus_t *bus) -{ - char buf[64]; - uint8_t buffer[ADB_BUF_SIZE]; - uint8_t adb_addresses[16] = - { 8, 9, 10, 11, 12, 13, 14, -1, -1, -1, -1, -1, -1, -1, 0, }; - adb_dev_t tmp_device, **cur; - int address; - int reloc = 0, next_free = 7; - int keep; - - snprintf(buf, sizeof(buf), "%s/adb", path); - REGISTER_NAMED_NODE( adb, buf); - /* Reset the bus */ - // ADB_DPRINTF("\n"); - adb_reset(bus); - cur = &bus->devices; - memset(&tmp_device, 0, sizeof(adb_dev_t)); - tmp_device.bus = bus; - for (address = 1; address < 8 && adb_addresses[reloc] > 0;) { - if (address == ADB_RES) { - /* Reserved */ - address++; - continue; - } - //ADB_DPRINTF("Check device on ADB address %d\n", address); - tmp_device.addr = address; - switch (adb_reg_get(&tmp_device, 3, buffer)) { - case 0: - //ADB_DPRINTF("No device on ADB address %d\n", address); - /* Register this address as free */ - if (adb_addresses[next_free] != 0) - adb_addresses[next_free++] = address; - /* Check next ADB address */ - address++; - break; - case 2: - /* One device answered : - * make it available and relocate it to a free address - */ - if (buffer[0] == ADB_CHADDR) { - /* device self test failed */ - ADB_DPRINTF("device on ADB address %d self-test failed " - "%02x %02x %02x\n", address, - buffer[0], buffer[1], buffer[2]); - keep = 0; - } else { - //ADB_DPRINTF("device on ADB address %d self-test OK\n", - // address); - keep = 1; - } - ADB_DPRINTF("Relocate device on ADB address %d to %d (%d)\n", - address, adb_addresses[reloc], reloc); - buffer[0] = ((buffer[0] & 0x40) & ~0x90) | adb_addresses[reloc]; - if (keep == 1) - buffer[0] |= 0x20; - buffer[1] = ADB_CHADDR_NOCOLL; - if (adb_reg_set(&tmp_device, 3, buffer, 2) < 0) { - ADB_DPRINTF("ADB device relocation failed\n"); - return -1; - } - if (keep == 1) { - *cur = malloc(sizeof(adb_dev_t)); - if (*cur == NULL) { - return -1; - } - (*cur)->type = address; - (*cur)->bus = bus; - (*cur)->addr = adb_addresses[reloc++]; - /* Flush buffers */ - adb_flush(*cur); - switch ((*cur)->type) { - case ADB_PROTECT: - ADB_DPRINTF("Found one protected device\n"); - break; - case ADB_KEYBD: - ADB_DPRINTF("Found one keyboard on address %d\n", address); - adb_kbd_new(buf, *cur); - break; - case ADB_MOUSE: - ADB_DPRINTF("Found one mouse on address %d\n", address); - adb_mouse_new(buf, *cur); - break; - case ADB_ABS: - ADB_DPRINTF("Found one absolute positioning device\n"); - break; - case ADB_MODEM: - ADB_DPRINTF("Found one modem\n"); - break; - case ADB_RES: - ADB_DPRINTF("Found one ADB res device\n"); - break; - case ADB_MISC: - ADB_DPRINTF("Found one ADB misc device\n"); - break; - } - cur = &((*cur)->next); - } - break; - case 1: - case 3 ... 7: - /* SHOULD NOT HAPPEN : register 3 is always two bytes long */ - ADB_DPRINTF("Invalid returned len for ADB register 3\n"); - return -1; - case -1: - /* ADB ERROR */ - ADB_DPRINTF("error gettting ADB register 3\n"); - return -1; - } - } - - return 0; -} -#endif Modified: openbios-devel/drivers/cuda.h =================================================================== --- openbios-devel/drivers/cuda.h 2009-01-04 19:25:41 UTC (rev 349) +++ openbios-devel/drivers/cuda.h 2009-01-04 20:39:50 UTC (rev 350) @@ -1,4 +1,4 @@ -#include "adb.h" +#include "adb_bus.h" struct cuda_t { uint32_t base;

1 0

r349 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 04 Jan '09

04 Jan '09

Author: blueswirl Date: 2009-01-04 20:25:41 +0100 (Sun, 04 Jan 2009) New Revision: 349 Modified: openbios-devel/arch/ppc/qemu/kernel.h openbios-devel/arch/ppc/qemu/main.c openbios-devel/arch/ppc/qemu/start.S Log: Pass initrd parameters to preloaded Linux kernel like Yaboot does Modified: openbios-devel/arch/ppc/qemu/kernel.h =================================================================== --- openbios-devel/arch/ppc/qemu/kernel.h 2009-01-04 16:01:50 UTC (rev 348) +++ openbios-devel/arch/ppc/qemu/kernel.h 2009-01-04 19:25:41 UTC (rev 349) @@ -22,7 +22,7 @@ /* start.S */ extern void flush_icache_range( char *start, char *stop ); extern char of_rtas_start[], of_rtas_end[]; -extern void call_elf( ulong elf_entry ); +extern void call_elf( ulong arg1, ulong arg2, ulong elf_entry ); /* methods.c */ extern void node_methods_init( const char *cpuname ); Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2009-01-04 16:01:50 UTC (rev 348) +++ openbios-devel/arch/ppc/qemu/main.c 2009-01-04 19:25:41 UTC (rev 349) @@ -41,7 +41,7 @@ transfer_control_to_elf( ulong elf_entry ) { ELF_DPRINTF("Starting ELF boot loader\n"); - call_elf( elf_entry ); + call_elf( 0, 0, elf_entry ); fatal_error("call_elf returned unexpectedly\n"); } @@ -302,9 +302,10 @@ cmdline = nvram_read_be32(0x40); initrd_image = nvram_read_be32(0x48); initrd_size = nvram_read_be32(0x4c); - printk("[ppc] Kernel already loaded (0x%8.8lx + 0x%8.8lx)\n", - kernel_image, kernel_size); - call_elf(kernel_image); + printk("[ppc] Kernel already loaded (0x%8.8lx + 0x%8.8lx) " + "(initrd 0x%8.8lx + 0x%8.8lx)\n", + kernel_image, kernel_size, initrd_image, initrd_size); + call_elf(initrd_image, initrd_size, kernel_image); } } Modified: openbios-devel/arch/ppc/qemu/start.S =================================================================== --- openbios-devel/arch/ppc/qemu/start.S 2009-01-04 16:01:50 UTC (rev 348) +++ openbios-devel/arch/ppc/qemu/start.S 2009-01-04 19:25:41 UTC (rev 349) @@ -243,17 +243,19 @@ * r5 = clint interface handler * r6 = address of client program arguments (unused) * r7 = length of client program arguments (unsed) + * + * Yaboot and Linux use r3 and r4 for initrd address and size */ .data saved_stack: .long 0 .previous - /* void call_elf( entry ) */ + /* void call_elf( arg1, arg2, entry ) */ GLOBL(call_elf): mflr r0 stwu r1,-16(r1) stw r0,20(r1) - mtlr r3 + mtlr r5 lis r8,HA(saved_stack) addi r8,r8,LO(saved_stack) // save our stack pointer stw r1,0(r8)

1 0

r348 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 04 Jan '09

04 Jan '09

Author: blueswirl Date: 2009-01-04 17:01:50 +0100 (Sun, 04 Jan 2009) New Revision: 348 Modified: openbios-devel/arch/ppc/qemu/start.S Log: Fix reset vector 0xfff00100 Move non-vector code to higher memory addresses to free vector area. Rename entry point _start to _entry so that it will not conflict with ldscript _start. Modified: openbios-devel/arch/ppc/qemu/start.S =================================================================== --- openbios-devel/arch/ppc/qemu/start.S 2009-01-04 14:47:11 UTC (rev 347) +++ openbios-devel/arch/ppc/qemu/start.S 2009-01-04 16:01:50 UTC (rev 348) @@ -58,13 +58,105 @@ /************************************************************************/ -/* entry */ +/* vectors */ /************************************************************************/ - .section .text.vectors, "ax" - .space 0x0100 -GLOBL(_start): +GLOBL(__vectors): + nop // NULL-jmp trap +1: nop // + b 1b + +exception_return: + addi r1,r1,16 // pop ABI frame + + lwz r0,52(r1) + mtlr r0 + lwz r0,56(r1) + mtcr r0 + lwz r0,60(r1) + mtctr r0 + lwz r0,64(r1) + mtxer r0 + + lwz r0,0(r1) // restore r0 + lwz r2,8(r1) // restore r2 + lwz r3,12(r1) // restore r3 + lwz r4,16(r1) + lwz r5,20(r1) + lwz r6,24(r1) + lwz r7,28(r1) + lwz r8,32(r1) + lwz r9,36(r1) + lwz r10,40(r1) + lwz r11,44(r1) + lwz r12,48(r1) + lwz r1,4(r1) // restore r1 + rfi + + .globl __divide_error +__divide_error: +trap_error: + mflr r3 + b unexpected_excep + +VECTOR( 0x100, "SRE" ): + b _entry + +ILLEGAL_VECTOR( 0x200 ) + +VECTOR( 0x300, "DSI" ): + EXCEPTION_PREAMBLE + lis r3,HA(dsi_exception) + addi r3,r3,LO(dsi_exception) + mtctr r3 + bctrl + ba exception_return + +VECTOR( 0x400, "ISI" ): + EXCEPTION_PREAMBLE + lis r3,HA(isi_exception) + addi r3,r3,LO(isi_exception) + mtctr r3 + bctrl + ba exception_return + + ILLEGAL_VECTOR( 0x500 ) + ILLEGAL_VECTOR( 0x600 ) + ILLEGAL_VECTOR( 0x700 ) + +VECTOR( 0x800, "FPU" ): + mtsprg1 r3 + mfsrr1 r3 + ori r3,r3,0x2000 + mtsrr1 r3 + mfsprg1 r3 + rfi + +ILLEGAL_VECTOR( 0x900 ) +ILLEGAL_VECTOR( 0xa00 ) +ILLEGAL_VECTOR( 0xb00 ) +ILLEGAL_VECTOR( 0xc00 ) +ILLEGAL_VECTOR( 0xd00 ) +ILLEGAL_VECTOR( 0xe00 ) +ILLEGAL_VECTOR( 0xf00 ) +ILLEGAL_VECTOR( 0xf20 ) +ILLEGAL_VECTOR( 0x1000 ) +ILLEGAL_VECTOR( 0x1100 ) +ILLEGAL_VECTOR( 0x1200 ) +ILLEGAL_VECTOR( 0x1300 ) +ILLEGAL_VECTOR( 0x1400 ) +ILLEGAL_VECTOR( 0x1500 ) +ILLEGAL_VECTOR( 0x1600 ) +ILLEGAL_VECTOR( 0x1700 ) + +GLOBL(__vectors_end): + +/************************************************************************/ +/* entry */ +/************************************************************************/ + +GLOBL(_entry): /* clear MSR, disable MMU */ li r0,0 @@ -235,102 +327,6 @@ blr GLOBL(timer_calib_end): - -/************************************************************************/ -/* vectors */ -/************************************************************************/ - -GLOBL(__vectors): - nop // NULL-jmp trap -1: nop // - b 1b - -exception_return: - addi r1,r1,16 // pop ABI frame - - lwz r0,52(r1) - mtlr r0 - lwz r0,56(r1) - mtcr r0 - lwz r0,60(r1) - mtctr r0 - lwz r0,64(r1) - mtxer r0 - - lwz r0,0(r1) // restore r0 - lwz r2,8(r1) // restore r2 - lwz r3,12(r1) // restore r3 - lwz r4,16(r1) - lwz r5,20(r1) - lwz r6,24(r1) - lwz r7,28(r1) - lwz r8,32(r1) - lwz r9,36(r1) - lwz r10,40(r1) - lwz r11,44(r1) - lwz r12,48(r1) - lwz r1,4(r1) // restore r1 - rfi - - .globl __divide_error -__divide_error: -trap_error: - mflr r3 - b unexpected_excep - -VECTOR( 0x100, "SRE" ): - b _start - -ILLEGAL_VECTOR( 0x200 ) - -VECTOR( 0x300, "DSI" ): - EXCEPTION_PREAMBLE - lis r3,HA(dsi_exception) - addi r3,r3,LO(dsi_exception) - mtctr r3 - bctrl - ba exception_return - -VECTOR( 0x400, "ISI" ): - EXCEPTION_PREAMBLE - lis r3,HA(isi_exception) - addi r3,r3,LO(isi_exception) - mtctr r3 - bctrl - ba exception_return - - ILLEGAL_VECTOR( 0x500 ) - ILLEGAL_VECTOR( 0x600 ) - ILLEGAL_VECTOR( 0x700 ) - -VECTOR( 0x800, "FPU" ): - mtsprg1 r3 - mfsrr1 r3 - ori r3,r3,0x2000 - mtsrr1 r3 - mfsprg1 r3 - rfi - -ILLEGAL_VECTOR( 0x900 ) -ILLEGAL_VECTOR( 0xa00 ) -ILLEGAL_VECTOR( 0xb00 ) -ILLEGAL_VECTOR( 0xc00 ) -ILLEGAL_VECTOR( 0xd00 ) -ILLEGAL_VECTOR( 0xe00 ) -ILLEGAL_VECTOR( 0xf00 ) -ILLEGAL_VECTOR( 0xf20 ) -ILLEGAL_VECTOR( 0x1000 ) -ILLEGAL_VECTOR( 0x1100 ) -ILLEGAL_VECTOR( 0x1200 ) -ILLEGAL_VECTOR( 0x1300 ) -ILLEGAL_VECTOR( 0x1400 ) -ILLEGAL_VECTOR( 0x1500 ) -ILLEGAL_VECTOR( 0x1600 ) -ILLEGAL_VECTOR( 0x1700 ) - -GLOBL(__vectors_end): - - #define CACHE_LINE_SIZE 32 #define LG_CACHE_LINE_SIZE 5 @@ -382,4 +378,4 @@ /* Hard reset vector */ .section .romentry,"ax" - bl _start + bl _entry

1 0

r347 - in openbios-devel: arch/sparc64 include/sparc64
by svn＠openbios.org 04 Jan '09

04 Jan '09

Author: blueswirl Date: 2009-01-04 15:47:11 +0100 (Sun, 04 Jan 2009) New Revision: 347 Modified: openbios-devel/arch/sparc64/ldscript openbios-devel/arch/sparc64/lib.c openbios-devel/arch/sparc64/openbios.c openbios-devel/include/sparc64/io.h Log: Allocate Forth memory and dictionary using malloc like PPC (cf. r345) Modified: openbios-devel/arch/sparc64/ldscript =================================================================== --- openbios-devel/arch/sparc64/ldscript 2009-01-04 12:53:26 UTC (rev 346) +++ openbios-devel/arch/sparc64/ldscript 2009-01-04 14:47:11 UTC (rev 347) @@ -10,8 +10,7 @@ */ BASE_ADDR = 0x00000000ffd00000; -/* 512KB heap and 16KB stack */ -HEAP_SIZE = 512 * 1024; +/* 16KB stack */ STACK_SIZE = 16384; VMEM_SIZE = 128 * 1024; IOMEM_SIZE = 256 * 1024 + 768 * 1024; @@ -52,15 +51,6 @@ *(.bss.*) *(COMMON) - /* Put heap and stack here, so they are included in PT_LOAD segment - * and the bootloader is aware of it. */ - - . = ALIGN(16); - _heap = .; - . += HEAP_SIZE; - . = ALIGN(16); - _eheap = .; - . = ALIGN(4096); _vmem = .; . += VMEM_SIZE; Modified: openbios-devel/arch/sparc64/lib.c =================================================================== --- openbios-devel/arch/sparc64/lib.c 2009-01-04 12:53:26 UTC (rev 346) +++ openbios-devel/arch/sparc64/lib.c 2009-01-04 14:47:11 UTC (rev 347) @@ -32,7 +32,7 @@ return i; } -#define MEMSIZE 128*1024 +#define MEMSIZE ((128 + 256 + 512) * 1024) static char memory[MEMSIZE]; static void *memptr=memory; static int memsize=MEMSIZE; Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2009-01-04 12:53:26 UTC (rev 346) +++ openbios-devel/arch/sparc64/openbios.c 2009-01-04 14:47:11 UTC (rev 347) @@ -37,8 +37,11 @@ #define PCI_CONFIG (APB_SPECIAL_BASE + 0x1000000ULL) #define APB_MEM_BASE 0x1ff00000000ULL -static unsigned char intdict[256 * 1024]; +#define MEMORY_SIZE (512*1024) /* 512K ram for hosted system */ +#define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ +static ucell *memory; + // XXX #define NVRAM_SIZE 0x2000 #define NVRAM_IDPROM 0x1fd8 @@ -437,16 +440,17 @@ static void init_memory(void) { + memory = malloc(MEMORY_SIZE); + if (!memory) + printk("panic: not enough memory on host system.\n"); - /* push start and end of available memory to the stack - * so that the forth word QUIT can initialize memory - * management. For now we use hardcoded memory between - * 0x10000 and 0x9ffff (576k). If we need more memory - * than that we have serious bloat. - */ + /* we push start and end of memory to the stack + * so that it can be used by the forth word QUIT + * to initialize the memory allocator + */ - PUSH((ucell)&_heap); - PUSH((ucell)&_eheap); + PUSH((ucell)memory); + PUSH((ucell)memory + (ucell)MEMORY_SIZE); } static void @@ -508,7 +512,7 @@ collect_sys_info(&sys_info); - dict=intdict; + dict = malloc(DICTIONARY_SIZE); load_dictionary((char *)sys_info.dict_start, (unsigned long)sys_info.dict_end - (unsigned long)sys_info.dict_start); @@ -540,5 +544,6 @@ enterforth((xt_t)PC); printk("falling off...\n"); + free(dict); return 0; } Modified: openbios-devel/include/sparc64/io.h =================================================================== --- openbios-devel/include/sparc64/io.h 2009-01-04 12:53:26 UTC (rev 346) +++ openbios-devel/include/sparc64/io.h 2009-01-04 14:47:11 UTC (rev 347) @@ -4,8 +4,8 @@ #include "asm/types.h" extern unsigned long va_shift; // Set in entry.S -extern char _start, _data, _heap, _eheap, _stack, _estack, _end, - _vmem, _evmem,_iomem; // Defined in ldscript +// Defined in ldscript +extern char _start, _data, _stack, _estack, _end, _vmem, _evmem, _iomem; static inline unsigned long va2pa(unsigned long va)

1 0

r346 - openbios-devel/arch/sparc64
by svn＠openbios.org 04 Jan '09

04 Jan '09

Author: blueswirl Date: 2009-01-04 13:53:26 +0100 (Sun, 04 Jan 2009) New Revision: 346 Modified: openbios-devel/arch/sparc64/boot.h openbios-devel/arch/sparc64/lib.c openbios-devel/arch/sparc64/openbios.c Log: Clean up Sparc64 memory management Concentrate memory and MMU management (lib.c malloc, OF /memory) to lib.c. Modified: openbios-devel/arch/sparc64/boot.h =================================================================== --- openbios-devel/arch/sparc64/boot.h 2009-01-03 13:46:15 UTC (rev 345) +++ openbios-devel/arch/sparc64/boot.h 2009-01-04 12:53:26 UTC (rev 346) @@ -39,3 +39,6 @@ // console.c void ob_su_init(uint64_t base, uint64_t offset, int intr); + +// lib.c +void ob_mmu_init(const char *cpuname, uint64_t ram_size); Modified: openbios-devel/arch/sparc64/lib.c =================================================================== --- openbios-devel/arch/sparc64/lib.c 2009-01-03 13:46:15 UTC (rev 345) +++ openbios-devel/arch/sparc64/lib.c 2009-01-04 12:53:26 UTC (rev 346) @@ -8,11 +8,11 @@ */ #include "openbios/config.h" -#include "asm/types.h" -#include <stdarg.h> -#include "libc/stdlib.h" #include "libc/vsprintf.h" -#include "openbios/kernel.h" +#include "openbios/bindings.h" +#include "spitfire.h" +#include "sys_info.h" +#include "boot.h" /* Format a string and print it on the screen, just like the libc * function printf. @@ -59,3 +59,449 @@ { /* Nothing yet */ } + +#define PAGE_SIZE_4M (4 * 1024 * 1024) +#define PAGE_SIZE_512K (512 * 1024) +#define PAGE_SIZE_64K (64 * 1024) +#define PAGE_SIZE_8K (8 * 1024) +#define PAGE_MASK_4M (4 * 1024 * 1024 - 1) +#define PAGE_MASK_512K (512 * 1024 - 1) +#define PAGE_MASK_64K (64 * 1024 - 1) +#define PAGE_MASK_8K (8 * 1024 - 1) + +static void +mmu_open(void) +{ + RET(-1); +} + +static void +mmu_close(void) +{ +} + +static int +spitfire_translate(unsigned long virt, unsigned long *p_phys, + unsigned long *p_data, unsigned long *p_size) +{ + unsigned long phys, tag, data, mask, size; + unsigned int i; + + for (i = 0; i < 64; i++) { + data = spitfire_get_dtlb_data(i); + if (data & 0x8000000000000000ULL) { // Valid entry? + switch ((data >> 61) & 3) { + default: + case 0x0: // 8k + mask = 0xffffffffffffe000ULL; + size = PAGE_SIZE_8K; + break; + case 0x1: // 64k + mask = 0xffffffffffff0000ULL; + size = PAGE_SIZE_64K; + break; + case 0x2: // 512k + mask = 0xfffffffffff80000ULL; + size = PAGE_SIZE_512K; + break; + case 0x3: // 4M + mask = 0xffffffffffc00000ULL; + size = PAGE_SIZE_4M; + break; + } + tag = spitfire_get_dtlb_tag(i); + if ((virt & mask) == (tag & mask)) { + phys = data & mask & 0x000001fffffff000ULL; + phys |= virt & ~mask; + *p_phys = phys; + *p_data = data & 0xfff; + *p_size = size; + return -1; + } + } + } + + return 0; +} + +/* + 3.6.5 translate + ( virt -- false | phys.lo ... phys.hi mode true ) +*/ +static void +mmu_translate(void) +{ + unsigned long virt, phys, data, size; + + virt = POP(); + + if (spitfire_translate(virt, &phys, &data, &size)) { + PUSH(phys & 0xffffffff); + PUSH(phys >> 32); + PUSH(data); + PUSH(-1); + return; + } + PUSH(0); +} + +static void +dtlb_load2(unsigned long vaddr, unsigned long tte_data) +{ + asm("stxa %0, [%1] %2\n" + "stxa %3, [%%g0] %4\n" + : : "r" (vaddr), "r" (48), "i" (ASI_DMMU), + "r" (tte_data), "i" (ASI_DTLB_DATA_IN)); +} + +static void +dtlb_load3(unsigned long vaddr, unsigned long tte_data, + unsigned long tte_index) +{ + asm("stxa %0, [%1] %2\n" + "stxa %3, [%4] %5\n" + : : "r" (vaddr), "r" (48), "i" (ASI_DMMU), + "r" (tte_data), "r" (tte_index << 3), "i" (ASI_DTLB_DATA_ACCESS)); +} + +/* + ( index tte_data vaddr -- ? ) +*/ +static void +dtlb_load(void) +{ + unsigned long vaddr, tte_data, idx; + + vaddr = POP(); + tte_data = POP(); + idx = POP(); + dtlb_load3(vaddr, tte_data, idx); +} + +static void +itlb_load2(unsigned long vaddr, unsigned long tte_data) +{ + asm("stxa %0, [%1] %2\n" + "stxa %3, [%%g0] %4\n" + : : "r" (vaddr), "r" (48), "i" (ASI_IMMU), + "r" (tte_data), "i" (ASI_ITLB_DATA_IN)); +} + +static void +itlb_load3(unsigned long vaddr, unsigned long tte_data, + unsigned long tte_index) +{ + asm("stxa %0, [%1] %2\n" + "stxa %3, [%4] %5\n" + : : "r" (vaddr), "r" (48), "i" (ASI_IMMU), + "r" (tte_data), "r" (tte_index << 3), "i" (ASI_ITLB_DATA_ACCESS)); +} + +/* + ( index tte_data vaddr -- ? ) +*/ +static void +itlb_load(void) +{ + unsigned long vaddr, tte_data, idx; + + vaddr = POP(); + tte_data = POP(); + idx = POP(); + itlb_load3(vaddr, tte_data, idx); +} + +static void +map_pages(unsigned long virt, unsigned long size, unsigned long phys) +{ + unsigned long tte_data, currsize; + + size = (size + PAGE_MASK_8K) & ~PAGE_MASK_8K; + while (size >= PAGE_SIZE_8K) { + currsize = size; + if (currsize >= PAGE_SIZE_4M && + (virt & PAGE_MASK_4M) == 0 && + (phys & PAGE_MASK_4M) == 0) { + currsize = PAGE_SIZE_4M; + tte_data = 6ULL << 60; + } else if (currsize >= PAGE_SIZE_512K && + (virt & PAGE_MASK_512K) == 0 && + (phys & PAGE_MASK_512K) == 0) { + currsize = PAGE_SIZE_512K; + tte_data = 4ULL << 60; + } else if (currsize >= PAGE_SIZE_64K && + (virt & PAGE_MASK_64K) == 0 && + (phys & PAGE_MASK_64K) == 0) { + currsize = PAGE_SIZE_64K; + tte_data = 2ULL << 60; + } else { + currsize = PAGE_SIZE_8K; + tte_data = 0; + } + tte_data |= phys | 0x8000000000000036ULL; + dtlb_load2(virt, tte_data); + itlb_load2(virt, tte_data); + size -= currsize; + phys += currsize; + virt += currsize; + } +} + +/* + 3.6.5 map + ( phys.lo ... phys.hi virt size mode -- ) +*/ +static void +mmu_map(void) +{ + unsigned long virt, size, mode, phys; + + mode = POP(); + size = POP(); + virt = POP(); + phys = POP(); + phys <<= 32; + phys |= POP(); + map_pages(virt, size, phys); +} + +static void +itlb_demap(unsigned long vaddr) +{ + asm("stxa %0, [%0] %1\n" + : : "r" (vaddr), "i" (ASI_IMMU_DEMAP)); +} + +static void +dtlb_demap(unsigned long vaddr) +{ + asm("stxa %0, [%0] %1\n" + : : "r" (vaddr), "i" (ASI_DMMU_DEMAP)); +} + +static void +unmap_pages(unsigned long virt, unsigned long size) +{ + unsigned long phys, data; + + unsigned long currsize; + + // align size + size = (size + PAGE_MASK_8K) & ~PAGE_MASK_8K; + + while (spitfire_translate(virt, &phys, &data, &currsize)) { + + itlb_demap(virt & ~0x1fffULL); + dtlb_demap(virt & ~0x1fffULL); + + size -= currsize; + virt += currsize; + } +} + +/* + 3.6.5 unmap + ( virt size -- ) +*/ +static void +mmu_unmap(void) +{ + unsigned long virt, size; + + size = POP(); + virt = POP(); + unmap_pages(virt, size); +} + +/* + 3.6.5 claim + ( virt size align -- base ) +*/ +static void +mmu_claim(void) +{ + unsigned long virt, size, align; + + align = POP(); + size = POP(); + virt = POP(); + PUSH(virt); // XXX +} + +/* + 3.6.5 release + ( virt size -- ) +*/ +static void +mmu_release(void) +{ + unsigned long virt, size; + + size = POP(); + virt = POP(); + // XXX +} + +DECLARE_UNNAMED_NODE(mmu, INSTALL_OPEN, 0); + +NODE_METHODS(mmu) = { + { "open", mmu_open }, + { "close", mmu_close }, + { "translate", mmu_translate }, + { "SUNW,dtlb-load", dtlb_load }, + { "SUNW,itlb-load", itlb_load }, + { "map", mmu_map }, + { "unmap", mmu_unmap }, + { "claim", mmu_claim }, + { "release", mmu_release }, +}; + +void ob_mmu_init(const char *cpuname, uint64_t ram_size) +{ + char nodebuff[256]; + + // MMU node + snprintf(nodebuff, sizeof(nodebuff), "/%s", cpuname); + push_str(nodebuff); + fword("find-device"); + + fword("new-device"); + + push_str("mmu"); + fword("device-name"); + + fword("finish-device"); + + snprintf(nodebuff, sizeof(nodebuff), "/%s/mmu", cpuname); + + REGISTER_NODE_METHODS(mmu, nodebuff); + + push_str("/chosen"); + fword("find-device"); + + push_str(nodebuff); + fword("open-dev"); + fword("encode-int"); + push_str("mmu"); + fword("property"); + + push_str("/memory"); + fword("find-device"); + + // All memory: 0 to RAM_size + PUSH(0); + fword("encode-int"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH((int)(ram_size >> 32)); + fword("encode-int"); + fword("encode+"); + PUSH((int)(ram_size & 0xffffffff)); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); + + // Available memory: 0 to va2pa(_start) + PUSH(0); + fword("encode-int"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH((va2pa((unsigned long)&_data) - 8192) >> 32); + fword("encode-int"); + fword("encode+"); + PUSH((va2pa((unsigned long)&_data) - 8192) & 0xffffffff); + fword("encode-int"); + fword("encode+"); + push_str("available"); + fword("property"); + + // XXX + // Translations + push_str("/virtual-memory"); + fword("find-device"); + + // 0 to 16M: 1:1 + PUSH(0); + fword("encode-int"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(16 * 1024 * 1024); + fword("encode-int"); + fword("encode+"); + PUSH(0x80000000); + fword("encode-int"); + fword("encode+"); + PUSH(0x00000036); + fword("encode-int"); + fword("encode+"); + + // _start to _data: ROM used + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH((unsigned long)&_start); + fword("encode-int"); + fword("encode+"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH((unsigned long)&_data - (unsigned long)&_start); + fword("encode-int"); + fword("encode+"); + PUSH(0x800001ff); + fword("encode-int"); + fword("encode+"); + PUSH(0xf0000074); + fword("encode-int"); + fword("encode+"); + + // _data to _end: end of RAM + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH((unsigned long)&_data); + fword("encode-int"); + fword("encode+"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH((unsigned long)&_data - (unsigned long)&_start); + fword("encode-int"); + fword("encode+"); + PUSH(((va2pa((unsigned long)&_data) - 8192) >> 32) | 0x80000000); + fword("encode-int"); + fword("encode+"); + PUSH(((va2pa((unsigned long)&_data) - 8192) & 0xffffffff) | 0x36); + fword("encode-int"); + fword("encode+"); + + // VGA buffer (128k): 1:1 + PUSH(0x1ff); + fword("encode-int"); + fword("encode+"); + PUSH(0x004a0000); + fword("encode-int"); + fword("encode+"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(128 * 1024); + fword("encode-int"); + fword("encode+"); + PUSH(0x800001ff); + fword("encode-int"); + fword("encode+"); + PUSH(0x004a0076); + fword("encode-int"); + fword("encode+"); + + push_str("translations"); + fword("property"); +} Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2009-01-03 13:46:15 UTC (rev 345) +++ openbios-devel/arch/sparc64/openbios.c 2009-01-04 12:53:26 UTC (rev 346) @@ -9,10 +9,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" #include "openbios/drivers.h" -#include "asm/types.h" #include "dict.h" -#include "openbios/kernel.h" -#include "openbios/stack.h" #include "openbios/nvram.h" #include "sys_info.h" #include "openbios.h" @@ -23,9 +20,6 @@ #include "openbios/firmware_abi.h" #include "boot.h" #include "../../drivers/timer.h" // XXX -#include "asi.h" -#include "spitfire.h" -#include "libc/vsprintf.h" #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" #include "video_subr.h" @@ -33,6 +27,8 @@ #define BIOS_CFG_CMD 0x510 #define BIOS_CFG_DATA 0x511 +#define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" + #define NVRAM_ADDR_LO 0x74 #define NVRAM_ADDR_HI 0x75 #define NVRAM_DATA 0x77 @@ -80,305 +76,7 @@ const char *name; }; -#define PAGE_SIZE_4M (4 * 1024 * 1024) -#define PAGE_SIZE_512K (512 * 1024) -#define PAGE_SIZE_64K (64 * 1024) -#define PAGE_SIZE_8K (8 * 1024) -#define PAGE_MASK_4M (4 * 1024 * 1024 - 1) -#define PAGE_MASK_512K (512 * 1024 - 1) -#define PAGE_MASK_64K (64 * 1024 - 1) -#define PAGE_MASK_8K (8 * 1024 - 1) - -#define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" - -static void -mmu_open(void) -{ - RET(-1); -} - -static void -mmu_close(void) -{ -} - -static int -spitfire_translate(unsigned long virt, unsigned long *p_phys, - unsigned long *p_data, unsigned long *p_size) -{ - unsigned long phys, tag, data, mask, size; - unsigned int i; - - for (i = 0; i < 64; i++) { - data = spitfire_get_dtlb_data(i); - if (data & 0x8000000000000000ULL) { // Valid entry? - switch ((data >> 61) & 3) { - default: - case 0x0: // 8k - mask = 0xffffffffffffe000ULL; - size = PAGE_SIZE_8K; - break; - case 0x1: // 64k - mask = 0xffffffffffff0000ULL; - size = PAGE_SIZE_64K; - break; - case 0x2: // 512k - mask = 0xfffffffffff80000ULL; - size = PAGE_SIZE_512K; - break; - case 0x3: // 4M - mask = 0xffffffffffc00000ULL; - size = PAGE_SIZE_4M; - break; - } - tag = spitfire_get_dtlb_tag(i); - if ((virt & mask) == (tag & mask)) { - phys = data & mask & 0x000001fffffff000ULL; - phys |= virt & ~mask; - *p_phys = phys; - *p_data = data & 0xfff; - *p_size = size; - return -1; - } - } - } - - return 0; -} - /* - 3.6.5 translate - ( virt -- false | phys.lo ... phys.hi mode true ) -*/ -static void -mmu_translate(void) -{ - unsigned long virt, phys, data, size; - - virt = POP(); - - if (spitfire_translate(virt, &phys, &data, &size)) { - PUSH(phys & 0xffffffff); - PUSH(phys >> 32); - PUSH(data); - PUSH(-1); - return; - } - PUSH(0); -} - -static void -dtlb_load2(unsigned long vaddr, unsigned long tte_data) -{ - asm("stxa %0, [%1] %2\n" - "stxa %3, [%%g0] %4\n" - : : "r" (vaddr), "r" (48), "i" (ASI_DMMU), - "r" (tte_data), "i" (ASI_DTLB_DATA_IN)); -} - -static void -dtlb_load3(unsigned long vaddr, unsigned long tte_data, - unsigned long tte_index) -{ - asm("stxa %0, [%1] %2\n" - "stxa %3, [%4] %5\n" - : : "r" (vaddr), "r" (48), "i" (ASI_DMMU), - "r" (tte_data), "r" (tte_index << 3), "i" (ASI_DTLB_DATA_ACCESS)); -} - -/* - ( index tte_data vaddr -- ? ) -*/ -static void -dtlb_load(void) -{ - unsigned long vaddr, tte_data, idx; - - vaddr = POP(); - tte_data = POP(); - idx = POP(); - dtlb_load3(vaddr, tte_data, idx); -} - -static void -itlb_load2(unsigned long vaddr, unsigned long tte_data) -{ - asm("stxa %0, [%1] %2\n" - "stxa %3, [%%g0] %4\n" - : : "r" (vaddr), "r" (48), "i" (ASI_IMMU), - "r" (tte_data), "i" (ASI_ITLB_DATA_IN)); -} - -static void -itlb_load3(unsigned long vaddr, unsigned long tte_data, - unsigned long tte_index) -{ - asm("stxa %0, [%1] %2\n" - "stxa %3, [%4] %5\n" - : : "r" (vaddr), "r" (48), "i" (ASI_IMMU), - "r" (tte_data), "r" (tte_index << 3), "i" (ASI_ITLB_DATA_ACCESS)); -} - -/* - ( index tte_data vaddr -- ? ) -*/ -static void -itlb_load(void) -{ - unsigned long vaddr, tte_data, idx; - - vaddr = POP(); - tte_data = POP(); - idx = POP(); - itlb_load3(vaddr, tte_data, idx); -} - -static void -map_pages(unsigned long virt, unsigned long size, unsigned long phys) -{ - unsigned long tte_data, currsize; - - size = (size + PAGE_MASK_8K) & ~PAGE_MASK_8K; - while (size >= PAGE_SIZE_8K) { - currsize = size; - if (currsize >= PAGE_SIZE_4M && - (virt & PAGE_MASK_4M) == 0 && - (phys & PAGE_MASK_4M) == 0) { - currsize = PAGE_SIZE_4M; - tte_data = 6ULL << 60; - } else if (currsize >= PAGE_SIZE_512K && - (virt & PAGE_MASK_512K) == 0 && - (phys & PAGE_MASK_512K) == 0) { - currsize = PAGE_SIZE_512K; - tte_data = 4ULL << 60; - } else if (currsize >= PAGE_SIZE_64K && - (virt & PAGE_MASK_64K) == 0 && - (phys & PAGE_MASK_64K) == 0) { - currsize = PAGE_SIZE_64K; - tte_data = 2ULL << 60; - } else { - currsize = PAGE_SIZE_8K; - tte_data = 0; - } - tte_data |= phys | 0x8000000000000036ULL; - dtlb_load2(virt, tte_data); - itlb_load2(virt, tte_data); - size -= currsize; - phys += currsize; - virt += currsize; - } -} - -/* - 3.6.5 map - ( phys.lo ... phys.hi virt size mode -- ) -*/ -static void -mmu_map(void) -{ - unsigned long virt, size, mode, phys; - - mode = POP(); - size = POP(); - virt = POP(); - phys = POP(); - phys <<= 32; - phys |= POP(); - map_pages(virt, size, phys); -} - -static void -itlb_demap(unsigned long vaddr) -{ - asm("stxa %0, [%0] %1\n" - : : "r" (vaddr), "i" (ASI_IMMU_DEMAP)); -} - -static void -dtlb_demap(unsigned long vaddr) -{ - asm("stxa %0, [%0] %1\n" - : : "r" (vaddr), "i" (ASI_DMMU_DEMAP)); -} - -static void -unmap_pages(unsigned long virt, unsigned long size) -{ - unsigned long phys, data; - - unsigned long currsize; - - // align size - size = (size + PAGE_MASK_8K) & ~PAGE_MASK_8K; - - while (spitfire_translate(virt, &phys, &data, &currsize)) { - - itlb_demap(virt & ~0x1fffULL); - dtlb_demap(virt & ~0x1fffULL); - - size -= currsize; - virt += currsize; - } -} - -/* - 3.6.5 unmap - ( virt size -- ) -*/ -static void -mmu_unmap(void) -{ - unsigned long virt, size; - - size = POP(); - virt = POP(); - unmap_pages(virt, size); -} - -/* - 3.6.5 claim - ( virt size align -- base ) -*/ -static void -mmu_claim(void) -{ - unsigned long virt, size, align; - - align = POP(); - size = POP(); - virt = POP(); - PUSH(virt); // XXX -} - -/* - 3.6.5 release - ( virt size -- ) -*/ -static void -mmu_release(void) -{ - unsigned long virt, size; - - size = POP(); - virt = POP(); - // XXX -} - -DECLARE_UNNAMED_NODE(mmu, INSTALL_OPEN, 0); - -NODE_METHODS(mmu) = { - { "open", mmu_open }, - { "close", mmu_close }, - { "translate", mmu_translate }, - { "SUNW,dtlb-load", dtlb_load }, - { "SUNW,itlb-load", itlb_load }, - { "map", mmu_map }, - { "unmap", mmu_unmap }, - { "claim", mmu_claim }, - { "release", mmu_release }, -}; - -/* ( addr -- ? ) */ static void @@ -394,7 +92,6 @@ static void cpu_generic_init(const struct cpudef *cpu, uint32_t clock_frequency) { unsigned long iu_version; - char nodebuff[256]; push_str("/"); fword("find-device"); @@ -442,31 +139,6 @@ fword("finish-device"); - // MMU node - snprintf(nodebuff, sizeof(nodebuff), "/%s", cpu->name); - push_str(nodebuff); - fword("find-device"); - - fword("new-device"); - - push_str("mmu"); - fword("device-name"); - - fword("finish-device"); - - snprintf(nodebuff, sizeof(nodebuff), "/%s/mmu", cpu->name); - - REGISTER_NODE_METHODS(mmu, nodebuff); - - push_str("/chosen"); - fword("find-device"); - - push_str(nodebuff); - fword("open-dev"); - fword("encode-int"); - push_str("mmu"); - fword("property"); - // Trap table push_str("/openprom/client-services"); fword("find-device"); @@ -723,128 +395,10 @@ push_str("clock-frequency"); fword("property"); - push_str("/memory"); - fword("find-device"); - ram_size = fw_cfg_read_i64(FW_CFG_RAM_SIZE); - // All memory: 0 to RAM_size - PUSH(0); - fword("encode-int"); - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH((int)(ram_size >> 32)); - fword("encode-int"); - fword("encode+"); - PUSH((int)(ram_size & 0xffffffff)); - fword("encode-int"); - fword("encode+"); - push_str("reg"); - fword("property"); + ob_mmu_init(cpu->name, ram_size); - // Available memory: 0 to va2pa(_start) - PUSH(0); - fword("encode-int"); - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH((va2pa((unsigned long)&_data) - 8192) >> 32); - fword("encode-int"); - fword("encode+"); - PUSH((va2pa((unsigned long)&_data) - 8192) & 0xffffffff); - fword("encode-int"); - fword("encode+"); - push_str("available"); - fword("property"); - - // XXX - // Translations - push_str("/virtual-memory"); - fword("find-device"); - - // 0 to 16M: 1:1 - PUSH(0); - fword("encode-int"); - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH(16 * 1024 * 1024); - fword("encode-int"); - fword("encode+"); - PUSH(0x80000000); - fword("encode-int"); - fword("encode+"); - PUSH(0x00000036); - fword("encode-int"); - fword("encode+"); - - // _start to _data: ROM used - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH((unsigned long)&_start); - fword("encode-int"); - fword("encode+"); - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH((unsigned long)&_data - (unsigned long)&_start); - fword("encode-int"); - fword("encode+"); - PUSH(0x800001ff); - fword("encode-int"); - fword("encode+"); - PUSH(0xf0000074); - fword("encode-int"); - fword("encode+"); - - // _data to _end: end of RAM - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH((unsigned long)&_data); - fword("encode-int"); - fword("encode+"); - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH((unsigned long)&_data - (unsigned long)&_start); - fword("encode-int"); - fword("encode+"); - PUSH(((va2pa((unsigned long)&_data) - 8192) >> 32) | 0x80000000); - fword("encode-int"); - fword("encode+"); - PUSH(((va2pa((unsigned long)&_data) - 8192) & 0xffffffff) | 0x36); - fword("encode-int"); - fword("encode+"); - - // VGA buffer (128k): 1:1 - PUSH(0x1ff); - fword("encode-int"); - fword("encode+"); - PUSH(0x004a0000); - fword("encode-int"); - fword("encode+"); - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH(128 * 1024); - fword("encode-int"); - fword("encode+"); - PUSH(0x800001ff); - fword("encode-int"); - fword("encode+"); - PUSH(0x004a0076); - fword("encode-int"); - fword("encode+"); - - push_str("translations"); - fword("property"); - push_str("/chosen"); fword("find-device");

1 0

r345 - in openbios-devel: arch/sparc32 include/sparc32
by svn＠openbios.org 03 Jan '09

03 Jan '09

Author: blueswirl Date: 2009-01-03 14:46:15 +0100 (Sat, 03 Jan 2009) New Revision: 345 Modified: openbios-devel/arch/sparc32/ldscript openbios-devel/arch/sparc32/openbios.c openbios-devel/include/sparc32/io.h Log: Allocate Forth memory and dictionary using malloc like PPC Modified: openbios-devel/arch/sparc32/ldscript =================================================================== --- openbios-devel/arch/sparc32/ldscript 2009-01-03 13:45:02 UTC (rev 344) +++ openbios-devel/arch/sparc32/ldscript 2009-01-03 13:46:15 UTC (rev 345) @@ -10,10 +10,9 @@ */ BASE_ADDR = 0xffd00000; -/* 16KB heap and stack */ -HEAP_SIZE = 16384; +/* 16KB stack */ STACK_SIZE = 16384; -VMEM_SIZE = 256 * 1024; +VMEM_SIZE = (256 + 256 + 16) * 1024; IOMEM_SIZE = 256 * 1024 + 768 * 1024; SECTIONS @@ -52,15 +51,6 @@ *(.bss.*) *(COMMON) - /* Put heap and stack here, so they are included in PT_LOAD segment - * and the bootloader is aware of it. */ - - . = ALIGN(16); - _heap = .; - . += HEAP_SIZE; - . = ALIGN(16); - _eheap = .; - . = ALIGN(4096); _vmem = .; . += VMEM_SIZE; Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2009-01-03 13:45:02 UTC (rev 344) +++ openbios-devel/arch/sparc32/openbios.c 2009-01-03 13:46:15 UTC (rev 345) @@ -19,6 +19,11 @@ #include "boot.h" #include "video_subr.h" +#define MEMORY_SIZE (16*1024) /* 16K ram for hosted system */ +#define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ + +static ucell *memory; + int qemu_machine_type; struct hwdef { @@ -92,20 +97,20 @@ }; static const struct hwdef *hwdef; -static unsigned char intdict[256 * 1024]; static void init_memory(void) { + memory = malloc(MEMORY_SIZE); + if (!memory) + printk("panic: not enough memory on host system.\n"); - /* push start and end of available memory to the stack - * so that the forth word QUIT can initialize memory - * management. For now we use hardcoded memory between - * 0x10000 and 0x9ffff (576k). If we need more memory - * than that we have serious bloat. - */ + /* we push start and end of memory to the stack + * so that it can be used by the forth word QUIT + * to initialize the memory allocator + */ - PUSH((unsigned int)&_heap); - PUSH((unsigned int)&_eheap); + PUSH((ucell)memory); + PUSH((ucell)memory + MEMORY_SIZE); } static void @@ -163,7 +168,7 @@ collect_sys_info(&sys_info); - dict=intdict; + dict = malloc(DICTIONARY_SIZE); load_dictionary((char *)sys_info.dict_start, (unsigned long)sys_info.dict_end - (unsigned long)sys_info.dict_start); @@ -195,5 +200,6 @@ enterforth((xt_t)PC); + free(dict); return 0; } Modified: openbios-devel/include/sparc32/io.h =================================================================== --- openbios-devel/include/sparc32/io.h 2009-01-03 13:45:02 UTC (rev 344) +++ openbios-devel/include/sparc32/io.h 2009-01-03 13:46:15 UTC (rev 345) @@ -4,9 +4,10 @@ #include "asm/types.h" extern unsigned int va_shift; // Set in entry.S -extern char _start, _data, _heap, _eheap, _stack, _estack, _end, - _vmem, _evmem,_iomem; // Defined in ldscript +// Defined in ldscript +extern char _start, _data, _stack, _estack, _end, _vmem, _evmem, _iomem; + static inline unsigned long va2pa(unsigned long va) {

1 0

r344 - in openbios-devel: arch/sparc32 drivers include include/libc include/openbios include/sparc32
by svn＠openbios.org 03 Jan '09

03 Jan '09

Author: blueswirl Date: 2009-01-03 14:45:02 +0100 (Sat, 03 Jan 2009) New Revision: 344 Added: openbios-devel/arch/sparc32/pgtsrmmu.h Removed: openbios-devel/drivers/pgtsrmmu.h Modified: openbios-devel/arch/sparc32/boot.c openbios-devel/arch/sparc32/boot.h openbios-devel/arch/sparc32/console.c openbios-devel/arch/sparc32/lib.c openbios-devel/arch/sparc32/openbios.c openbios-devel/arch/sparc32/romvec.c openbios-devel/drivers/esp.c openbios-devel/drivers/iommu.c openbios-devel/drivers/iommu.h openbios-devel/drivers/obio.c openbios-devel/drivers/obio.h openbios-devel/drivers/sbus.c openbios-devel/include/libc/stdlib.h openbios-devel/include/ofmem.h openbios-devel/include/openbios/drivers.h openbios-devel/include/sparc32/io.h Log: Clean up Sparc32 memory management Concentrate memory and MMU management (lib.c malloc, romvec opb_, iommu, OF /memory) to lib.c. Modified: openbios-devel/arch/sparc32/boot.c =================================================================== --- openbios-devel/arch/sparc32/boot.c 2009-01-02 14:53:33 UTC (rev 343) +++ openbios-devel/arch/sparc32/boot.c 2009-01-03 13:45:02 UTC (rev 344) @@ -99,7 +99,7 @@ obp_arg.argv[1] = param; } - romvec = init_openprom(qemu_mem_size); + romvec = init_openprom(); if (kernel_size) { int (*entry)(const void *romvec_ptr, int p2, int p3, int p4, int p5); Modified: openbios-devel/arch/sparc32/boot.h =================================================================== --- openbios-devel/arch/sparc32/boot.h 2009-01-02 14:53:33 UTC (rev 343) +++ openbios-devel/arch/sparc32/boot.h 2009-01-03 13:45:02 UTC (rev 344) @@ -24,7 +24,7 @@ unsigned int start_elf(unsigned long entry_point, unsigned long param); // romvec.c -void *init_openprom(unsigned long memsize); +void *init_openprom(void); // boot.c extern struct sys_info sys_info; @@ -39,3 +39,19 @@ // openbios.c extern int qemu_machine_type; + +// arch/sparc32/lib.c +struct linux_mlist_v0; +extern struct linux_mlist_v0 *ptphys; +extern struct linux_mlist_v0 *ptmap; +extern struct linux_mlist_v0 *ptavail; + +void ob_init_mmu(void); +void init_mmu_swift(void); +char *obp_dumb_mmap(char *va, int which_io, unsigned int pa, + unsigned int size); +void obp_dumb_munmap(__attribute__((unused)) char *va, + __attribute__((unused)) unsigned int size); +char *obp_dumb_memalloc(char *va, unsigned int size); +void obp_dumb_memfree(__attribute__((unused))char *va, + __attribute__((unused))unsigned sz); Modified: openbios-devel/arch/sparc32/console.c =================================================================== --- openbios-devel/arch/sparc32/console.c 2009-01-02 14:53:33 UTC (rev 343) +++ openbios-devel/arch/sparc32/console.c 2009-01-03 13:45:02 UTC (rev 344) @@ -10,6 +10,7 @@ #include "openbios/drivers.h" #include "openbios.h" #include "video_subr.h" +#include "ofmem.h" #ifdef CONFIG_DEBUG_CONSOLE Modified: openbios-devel/arch/sparc32/lib.c =================================================================== --- openbios-devel/arch/sparc32/lib.c 2009-01-02 14:53:33 UTC (rev 343) +++ openbios-devel/arch/sparc32/lib.c 2009-01-03 13:45:02 UTC (rev 344) @@ -7,13 +7,25 @@ * the copyright and warranty status of this work. */ -#include "openbios/config.h" -#include "asm/types.h" -#include <stdarg.h> -#include "libc/stdlib.h" #include "libc/vsprintf.h" -#include "openbios/kernel.h" +#include "openbios/bindings.h" +#include "ofmem.h" +#include "asm/asi.h" +#include "pgtsrmmu.h" +#include "openprom.h" +#include "sys_info.h" +#include "boot.h" +#define NCTX_SWIFT 0x100 +#define LOWMEMSZ 32 * 1024 * 1024 + +#ifdef CONFIG_DEBUG_MEM +#define DPRINTF(fmt, args...) \ + do { printk(fmt , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) +#endif + /* Format a string and print it on the screen, just like the libc * function printf. */ @@ -32,6 +44,30 @@ return i; } +/* + * Allocatable memory chunk. + */ +struct mem { + char *start, *uplim; + char *curp; +}; + +static struct mem cmem; /* Current memory, virtual */ +static struct mem cio; /* Current I/O space */ +struct mem cdvmem; /* Current device virtual memory space */ + +unsigned int va_shift; +static unsigned long *context_table; +static unsigned long *l1; + +static struct linux_mlist_v0 totphys[1]; +static struct linux_mlist_v0 totmap[1]; +static struct linux_mlist_v0 totavail[1]; + +struct linux_mlist_v0 *ptphys; +struct linux_mlist_v0 *ptmap; +struct linux_mlist_v0 *ptavail; + typedef struct alloc_desc { struct alloc_desc *next; int size; /* size (including) this struct */ @@ -63,16 +99,17 @@ } ofmem; #define ALLOC_BLOCK (64 * 1024) -void *malloc(int size) +// XXX should be posix_memalign +static int +posix_memalign2(void **memptr, size_t alignment, size_t size) { alloc_desc_t *d, **pp; char *ret; - extern struct mem cmem; if( !size ) - return NULL; + return -1; - size = (size + 7) & ~7; + size = (size + (alignment - 1)) & ~(alignment - 1); size += sizeof(alloc_desc_t); /* look in the freelist */ @@ -84,7 +121,8 @@ ret = (char*)*pp + sizeof(alloc_desc_t); memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) ); *pp = (**pp).next; - return ret; + *memptr = ret; + return 0; } if( !ofmem.next_malloc || ofmem.left < size) { @@ -101,13 +139,13 @@ sizeof(alloc_desc_t))); } - ofmem.next_malloc = mem_alloc(&cmem, alloc_size, 4); + ofmem.next_malloc = mem_alloc(&cmem, alloc_size, 8); ofmem.left = alloc_size; } if( ofmem.left < size) { printk("out of malloc memory (%x)!\n", size ); - return NULL; + return -1; } d = (alloc_desc_t*) ofmem.next_malloc; ofmem.next_malloc += size; @@ -118,9 +156,21 @@ ret = (char*)d + sizeof(alloc_desc_t); memset( ret, 0, size - sizeof(alloc_desc_t) ); - return ret; + *memptr = ret; + return 0; } +void *malloc(int size) +{ + int ret; + void *mem; + + ret = posix_memalign2(&mem, 8, size); + if (ret != 0) + return NULL; + return mem; +} + void free(void *ptr) { alloc_desc_t **pp, *d; @@ -156,3 +206,406 @@ free( ptr ); return p; } + +// XXX should be removed +int +posix_memalign(void **memptr, size_t alignment, size_t size) +{ + void *block; + + block = mem_alloc(&cmem, size, alignment); + + if (!block) + return -1; + + *memptr = block; + return 0; +} + +/* + * Allocate memory. This is reusable. + */ +void +mem_init(struct mem *t, char *begin, char *limit) +{ + t->start = begin; + t->uplim = limit; + t->curp = begin; +} + +void * +mem_alloc(struct mem *t, int size, int align) +{ + char *p; + unsigned long pa; + + // The alignment restrictions refer to physical, not virtual + // addresses + pa = va2pa((unsigned long)t->curp) + (align - 1); + pa &= ~(align - 1); + p = (char *)pa2va(pa); + + if ((unsigned long)p >= (unsigned long)t->uplim || + (unsigned long)p + size > (unsigned long)t->uplim) + return NULL; + t->curp = p + size; + + return p; +} + +static unsigned long +find_pte(unsigned long va, int alloc) +{ + uint32_t pte; + void *p; + unsigned long pa; + int ret; + + pte = l1[(va >> SRMMU_PGDIR_SHIFT) & (SRMMU_PTRS_PER_PGD - 1)]; + if ((pte & SRMMU_ET_MASK) == SRMMU_ET_INVALID) { + if (alloc) { + ret = posix_memalign(&p, SRMMU_PTRS_PER_PMD * sizeof(int), + SRMMU_PTRS_PER_PMD * sizeof(int)); + if (ret != 0) + return ret; + pte = SRMMU_ET_PTD | ((va2pa((unsigned long)p)) >> 4); + l1[(va >> SRMMU_PGDIR_SHIFT) & (SRMMU_PTRS_PER_PGD - 1)] = pte; + /* barrier() */ + } else { + return -1; + } + } + + pa = (pte & 0xFFFFFFF0) << 4; + pa += ((va >> SRMMU_PMD_SHIFT) & (SRMMU_PTRS_PER_PMD - 1)) << 2; + pte = *(uint32_t *)pa2va(pa); + if ((pte & SRMMU_ET_MASK) == SRMMU_ET_INVALID) { + if (alloc) { + ret = posix_memalign(&p, SRMMU_PTRS_PER_PTE * sizeof(void *), + SRMMU_PTRS_PER_PTE * sizeof(void *)); + if (ret != 0) + return ret; + pte = SRMMU_ET_PTD | ((va2pa((unsigned int)p)) >> 4); + *(uint32_t *)pa2va(pa) = pte; + } else { + return -2; + } + } + + pa = (pte & 0xFFFFFFF0) << 4; + pa += ((va >> PAGE_SHIFT) & (SRMMU_PTRS_PER_PTE - 1)) << 2; + + return pa2va(pa); +} + +/* + * Create a memory mapping from va to epa. + */ +int +map_page(unsigned long va, uint64_t epa, int type) +{ + uint32_t pte; + unsigned long pa; + + pa = find_pte(va, 1); + + pte = SRMMU_ET_PTE | ((epa & PAGE_MASK) >> 4); + if (type) { /* I/O */ + pte |= SRMMU_REF; + /* SRMMU cannot make Supervisor-only, but not exectutable */ + pte |= SRMMU_PRIV; + } else { /* memory */ + pte |= SRMMU_REF | SRMMU_CACHE; + pte |= SRMMU_PRIV; /* Supervisor only access */ + } + *(uint32_t *)pa = pte; + DPRINTF("map_page: va 0x%lx pa 0x%llx pte 0x%x\n", va, epa, pte); + + return 0; +} + +static void map_pages(unsigned long va, uint64_t pa, int type, + unsigned long size) +{ + unsigned long npages, off; + + DPRINTF("map_pages: va 0x%lx, pa 0x%llx, size 0x%lx\n", va, pa, size); + + off = pa & (PAGE_SIZE - 1); + npages = (off + (size - 1) + (PAGE_SIZE - 1)) / PAGE_SIZE; + pa &= ~(uint64_t)(PAGE_SIZE - 1); + + while (npages-- != 0) { + map_page(va, pa, type); + va += PAGE_SIZE; + pa += PAGE_SIZE; + } +} +/* + * Create an I/O mapping to pa[size]. + * Returns va of the mapping or 0 if unsuccessful. + */ +void * +map_io(uint64_t pa, int size) +{ + unsigned long va; + unsigned int npages; + unsigned int off; + + off = pa & (PAGE_SIZE - 1); + npages = (off + size - 1) / PAGE_SIZE + 1; + pa &= ~(PAGE_SIZE - 1); + + va = (unsigned long)mem_alloc(&cio, npages * PAGE_SIZE, PAGE_SIZE); + if (va == 0) + return NULL; + + map_pages(va, pa, 1, npages * PAGE_SIZE); + return (void *)(va + off); +} + +/* + * D5.3 pgmap@ ( va -- pte ) + */ +static void +pgmap_fetch(void) +{ + uint32_t pte; + unsigned long va, pa; + + va = POP(); + + pa = find_pte(va, 0); + if (pa == 1 || pa == 2) + goto error; + pte = *(uint32_t *)pa; + DPRINTF("pgmap@: va 0x%lx pa 0x%lx pte 0x%x\n", va, pa, pte); + + PUSH(pte); + return; + error: + PUSH(0); +} + +/* + * D5.3 pgmap! ( pte va -- ) + */ +static void +pgmap_store(void) +{ + uint32_t pte; + unsigned long va, pa; + + va = POP(); + pte = POP(); + + pa = find_pte(va, 1); + *(uint32_t *)pa = pte; + DPRINTF("pgmap!: va 0x%lx pa 0x%lx pte 0x%x\n", va, pa, pte); +} + +/* + * D5.3 map-pages ( pa space va size -- ) + */ +static void +ob_map_pages(void) +{ + unsigned long va; + int size; + uint64_t pa; + + size = POP(); + va = POP(); + pa = POP(); + pa <<= 32; + pa |= POP() & 0xffffffff; + + map_pages(va, pa, 0, size); + DPRINTF("map-page: va 0x%lx pa 0x%llx size 0x%x\n", va, pa, size); +} + +static void +init_romvec_mem(void) +{ + ptphys = totphys; + ptmap = totmap; + ptavail = totavail; + + /* + * Form memory descriptors. + */ + totphys[0].theres_more = NULL; + totphys[0].start_adr = (char *) 0; + totphys[0].num_bytes = qemu_mem_size; + + totavail[0].theres_more = NULL; + totavail[0].start_adr = (char *) 0; + totavail[0].num_bytes = va2pa((int)&_start) - PAGE_SIZE; + + totmap[0].theres_more = NULL; + totmap[0].start_adr = &_start; + totmap[0].num_bytes = (unsigned long) &_iomem - + (unsigned long) &_start + PAGE_SIZE; +} + +char *obp_dumb_mmap(char *va, int which_io, unsigned int pa, + unsigned int size) +{ + uint64_t mpa = ((uint64_t)which_io << 32) | (uint64_t)pa; + + map_pages((unsigned long)va, mpa, 0, size); + return va; +} + +void obp_dumb_munmap(__attribute__((unused)) char *va, + __attribute__((unused)) unsigned int size) +{ + DPRINTF("obp_dumb_munmap: virta 0x%x, sz %d\n", (unsigned int)va, size); +} + +char *obp_dumb_memalloc(char *va, unsigned int size) +{ + static unsigned int next_free_address = 0xFFEDA000; + + size = (size + 7) & ~7; + // XXX should use normal memory alloc + totmap[0].num_bytes -= size; + DPRINTF("obp_dumb_memalloc va 0x%p size %x at 0x%x\n", va, size, + totmap[0].num_bytes); + + // If va is null, the allocator is supposed to pick a "suitable" address. + // (See OpenSolaric prom_alloc.c) There's not any real guidance as + // to what might be "suitable". So we mimic the behavior of a Sun boot + // ROM. + + if (va == NULL) { + // XXX should register virtual memory allocation + va = (char *)(next_free_address - size); + next_free_address -= size; + DPRINTF("obp_dumb_memalloc req null -> 0x%p\n", va); + } + + map_pages((unsigned long)va, totmap[0].num_bytes, 0, size); + + return va; +} + +void obp_dumb_memfree(__attribute__((unused))char *va, + __attribute__((unused))unsigned sz) +{ + DPRINTF("obp_dumb_memfree 0x%p (size %d)\n", va, sz); +} + +void +ob_init_mmu(void) +{ + push_str("/memory"); + fword("find-device"); + + PUSH(0); + fword("encode-int"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(qemu_mem_size); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); + + PUSH(0); + fword("encode-int"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(va2pa((unsigned long)&_start) - PAGE_SIZE); + fword("encode-int"); + fword("encode+"); + push_str("available"); + fword("property"); + + push_str("/virtual-memory"); + fword("find-device"); + + PUSH(0); + fword("encode-int"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH((unsigned long)&_start - PAGE_SIZE); + fword("encode-int"); + fword("encode+"); + + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(va2pa((unsigned long)&_iomem)); + fword("encode-int"); + fword("encode+"); + PUSH(-va2pa((unsigned long)&_iomem)); + fword("encode-int"); + fword("encode+"); + push_str("available"); + fword("property"); + + PUSH(0); + fword("active-package!"); + bind_func("pgmap@", pgmap_fetch); + bind_func("pgmap!", pgmap_store); + bind_func("map-pages", ob_map_pages); + + init_romvec_mem(); +} + +/* + * Switch page tables. + */ +void +init_mmu_swift(void) +{ + unsigned int addr, i; + unsigned long pa, va; + + mem_init(&cmem, (char *) &_vmem, (char *)&_evmem); + mem_init(&cio, (char *)&_end, (char *)&_iomem); + + posix_memalign((void *)&context_table, NCTX_SWIFT * sizeof(int), + NCTX_SWIFT * sizeof(int)); + posix_memalign((void *)&l1, 256 * sizeof(int), 256 * sizeof(int)); + + context_table[0] = (((unsigned long)va2pa((unsigned long)l1)) >> 4) | + SRMMU_ET_PTD; + + for (i = 1; i < NCTX_SWIFT; i++) { + context_table[i] = SRMMU_ET_INVALID; + } + for (i = 0; i < 256; i += 4) { + l1[i] = SRMMU_ET_INVALID; + } + + // text, rodata, data, and bss mapped to end of RAM + va = (unsigned long)&_start; + for (; va < (unsigned long)&_end; va += PAGE_SIZE) { + pa = va2pa(va); + map_page(va, pa, 0); + } + + // 1:1 mapping for RAM + pa = va = 0; + for (; va < LOWMEMSZ; va += PAGE_SIZE, pa += PAGE_SIZE) { + map_page(va, pa, 0); + } + + /* + * Flush cache + */ + for (addr = 0; addr < 0x2000; addr += 0x10) { + __asm__ __volatile__ ("sta %%g0, [%0] %1\n\t" : : + "r" (addr), "i" (ASI_M_DATAC_TAG)); + __asm__ __volatile__ ("sta %%g0, [%0] %1\n\t" : : + "r" (addr<<1), "i" (ASI_M_TXTC_TAG)); + } + srmmu_set_context(0); + srmmu_set_ctable_ptr(va2pa((unsigned long)context_table)); + srmmu_flush_whole_tlb(); +} Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2009-01-02 14:53:33 UTC (rev 343) +++ openbios-devel/arch/sparc32/openbios.c 2009-01-03 13:45:02 UTC (rev 344) @@ -111,10 +111,9 @@ static void arch_init( void ) { - void setup_timers(void); - modules_init(); - ob_init_mmu(hwdef->iommu_base); + ob_init_mmu(); + ob_init_iommu(hwdef->iommu_base); #ifdef CONFIG_DRIVER_OBIO ob_obio_init(hwdef->slavio_base, hwdef->fd_offset, hwdef->counter_offset, hwdef->intr_offset, @@ -146,9 +145,8 @@ if (!hwdef) for(;;); // Internal inconsistency, hang - mem_init(&cmem, (char *) &_vmem, (char *)&_evmem); #ifdef CONFIG_DRIVER_SBUS - init_mmu_swift(hwdef->iommu_base); + init_mmu_swift(); #endif #ifdef CONFIG_DEBUG_CONSOLE #ifdef CONFIG_DEBUG_CONSOLE_SERIAL Copied: openbios-devel/arch/sparc32/pgtsrmmu.h (from rev 343, openbios-devel/drivers/pgtsrmmu.h) =================================================================== --- openbios-devel/arch/sparc32/pgtsrmmu.h (rev 0) +++ openbios-devel/arch/sparc32/pgtsrmmu.h 2009-01-03 13:45:02 UTC (rev 344) @@ -0,0 +1,230 @@ +/* + * Taken from kernel for decoupling from <asm/page.h>. --zaitcev + * + * $Id: pgtsrmmu.h,v 1.2 1999/04/19 01:04:31 zaitcev Exp $ + * pgtsrmmu.h: SRMMU page table defines and code. + * + * Copyright (C) 1995 David S. Miller (davem(a)caip.rutgers.edu) + */ + +#ifndef _PGTSRMMU_H +#define _PGTSRMMU_H + +/* Replacement for <asm/page.h> */ +#define PAGE_SHIFT 12 +#define PAGE_SIZE (1 << PAGE_SHIFT) +#define PAGE_MASK (~(PAGE_SIZE-1)) +#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) +/* */ + +/* PMD_SHIFT determines the size of the area a second-level page table can map */ +#define SRMMU_PMD_SHIFT 18 +#define SRMMU_PMD_SIZE (1UL << SRMMU_PMD_SHIFT) +#define SRMMU_PMD_MASK (~(SRMMU_PMD_SIZE-1)) +#define SRMMU_PMD_ALIGN(addr) (((addr)+SRMMU_PMD_SIZE-1)&SRMMU_PMD_MASK) + +/* PGDIR_SHIFT determines what a third-level page table entry can map */ +#define SRMMU_PGDIR_SHIFT 24 +#define SRMMU_PGDIR_SIZE (1UL << SRMMU_PGDIR_SHIFT) +#define SRMMU_PGDIR_MASK (~(SRMMU_PGDIR_SIZE-1)) +#define SRMMU_PGDIR_ALIGN(addr) (((addr)+SRMMU_PGDIR_SIZE-1)&SRMMU_PGDIR_MASK) + +#define SRMMU_PTRS_PER_PTE 64 +#define SRMMU_PTRS_PER_PMD 64 +#define SRMMU_PTRS_PER_PGD 256 + +#define SRMMU_PTE_TABLE_SIZE 0x100 /* 64 entries, 4 bytes a piece */ +#define SRMMU_PMD_TABLE_SIZE 0x100 /* 64 entries, 4 bytes a piece */ +#define SRMMU_PGD_TABLE_SIZE 0x400 /* 256 entries, 4 bytes a piece */ + +#define SRMMU_VMALLOC_START (0xfe300000) +#define SRMMU_VMALLOC_END ~0x0UL + +/* Definition of the values in the ET field of PTD's and PTE's */ +#define SRMMU_ET_MASK 0x3 +#define SRMMU_ET_INVALID 0x0 +#define SRMMU_ET_PTD 0x1 +#define SRMMU_ET_PTE 0x2 +#define SRMMU_ET_REPTE 0x3 /* AIEEE, SuperSparc II reverse endian page! */ + +/* Physical page extraction from PTP's and PTE's. */ +#define SRMMU_CTX_PMASK 0xfffffff0 +#define SRMMU_PTD_PMASK 0xfffffff0 +#define SRMMU_PTE_PMASK 0xffffff00 + +/* The pte non-page bits. Some notes: + * 1) cache, dirty, valid, and ref are frobbable + * for both supervisor and user pages. + * 2) exec and write will only give the desired effect + * on user pages + * 3) use priv and priv_readonly for changing the + * characteristics of supervisor ptes + */ +#define SRMMU_CACHE 0x80 +#define SRMMU_DIRTY 0x40 +#define SRMMU_REF 0x20 +#define SRMMU_EXEC 0x08 +#define SRMMU_WRITE 0x04 +#define SRMMU_VALID 0x02 /* SRMMU_ET_PTE */ +#define SRMMU_PRIV 0x1c +#define SRMMU_PRIV_RDONLY 0x18 + +#define SRMMU_CHG_MASK (0xffffff00 | SRMMU_REF | SRMMU_DIRTY) + +/* SRMMU Register addresses in ASI 0x4. These are valid for all + * current SRMMU implementations that exist. + */ +#define SRMMU_CTRL_REG 0x00000000 +#define SRMMU_CTXTBL_PTR 0x00000100 +#define SRMMU_CTX_REG 0x00000200 +#define SRMMU_FAULT_STATUS 0x00000300 +#define SRMMU_FAULT_ADDR 0x00000400 + +#ifndef __ASSEMBLY__ + +/* Accessing the MMU control register. */ +static __inline__ unsigned int srmmu_get_mmureg(void) +{ + unsigned int retval; + __asm__ __volatile__("lda [%%g0] %1, %0\n\t" : + "=r" (retval) : + "i" (ASI_M_MMUREGS)); + return retval; +} + +static __inline__ void srmmu_set_mmureg(unsigned long regval) +{ + __asm__ __volatile__("sta %0, [%%g0] %1\n\t" : : + "r" (regval), "i" (ASI_M_MMUREGS) : "memory"); + +} + +static __inline__ void srmmu_set_ctable_ptr(unsigned long paddr) +{ + paddr = ((paddr >> 4) & SRMMU_CTX_PMASK); + __asm__ __volatile__("sta %0, [%1] %2\n\t" : : + "r" (paddr), "r" (SRMMU_CTXTBL_PTR), + "i" (ASI_M_MMUREGS) : + "memory"); +} + +static __inline__ unsigned long srmmu_get_ctable_ptr(void) +{ + unsigned int retval; + + __asm__ __volatile__("lda [%1] %2, %0\n\t" : + "=r" (retval) : + "r" (SRMMU_CTXTBL_PTR), + "i" (ASI_M_MMUREGS)); + return (retval & SRMMU_CTX_PMASK) << 4; +} + +static __inline__ void srmmu_set_context(int context) +{ + __asm__ __volatile__("sta %0, [%1] %2\n\t" : : + "r" (context), "r" (SRMMU_CTX_REG), + "i" (ASI_M_MMUREGS) : "memory"); +} + +static __inline__ int srmmu_get_context(void) +{ + register int retval; + __asm__ __volatile__("lda [%1] %2, %0\n\t" : + "=r" (retval) : + "r" (SRMMU_CTX_REG), + "i" (ASI_M_MMUREGS)); + return retval; +} + +static __inline__ unsigned int srmmu_get_fstatus(void) +{ + unsigned int retval; + + __asm__ __volatile__("lda [%1] %2, %0\n\t" : + "=r" (retval) : + "r" (SRMMU_FAULT_STATUS), "i" (ASI_M_MMUREGS)); + return retval; +} + +static __inline__ unsigned int srmmu_get_faddr(void) +{ + unsigned int retval; + + __asm__ __volatile__("lda [%1] %2, %0\n\t" : + "=r" (retval) : + "r" (SRMMU_FAULT_ADDR), "i" (ASI_M_MMUREGS)); + return retval; +} + +/* This is guaranteed on all SRMMU's. */ +static __inline__ void srmmu_flush_whole_tlb(void) +{ + __asm__ __volatile__("sta %%g0, [%0] %1\n\t": : + "r" (0x400), /* Flush entire TLB!! */ + "i" (ASI_M_FLUSH_PROBE) : "memory"); + +} + +/* These flush types are not available on all chips... */ +static __inline__ void srmmu_flush_tlb_ctx(void) +{ + __asm__ __volatile__("sta %%g0, [%0] %1\n\t": : + "r" (0x300), /* Flush TLB ctx.. */ + "i" (ASI_M_FLUSH_PROBE) : "memory"); + +} + +static __inline__ void srmmu_flush_tlb_region(unsigned long addr) +{ + addr &= SRMMU_PGDIR_MASK; + __asm__ __volatile__("sta %%g0, [%0] %1\n\t": : + "r" (addr | 0x200), /* Flush TLB region.. */ + "i" (ASI_M_FLUSH_PROBE) : "memory"); + +} + + +static __inline__ void srmmu_flush_tlb_segment(unsigned long addr) +{ + addr &= SRMMU_PMD_MASK; + __asm__ __volatile__("sta %%g0, [%0] %1\n\t": : + "r" (addr | 0x100), /* Flush TLB segment.. */ + "i" (ASI_M_FLUSH_PROBE) : "memory"); + +} + +static __inline__ void srmmu_flush_tlb_page(unsigned long page) +{ + page &= PAGE_MASK; + __asm__ __volatile__("sta %%g0, [%0] %1\n\t": : + "r" (page), /* Flush TLB page.. */ + "i" (ASI_M_FLUSH_PROBE) : "memory"); + +} + +static __inline__ unsigned long srmmu_hwprobe(unsigned long vaddr) +{ + unsigned long retval; + + vaddr &= PAGE_MASK; + __asm__ __volatile__("lda [%1] %2, %0\n\t" : + "=r" (retval) : + "r" (vaddr | 0x400), "i" (ASI_M_FLUSH_PROBE)); + + return retval; +} + +static __inline__ int +srmmu_get_pte (unsigned long addr) +{ + register unsigned long entry; + + __asm__ __volatile__("\n\tlda [%1] %2,%0\n\t" : + "=r" (entry): + "r" ((addr & 0xfffff000) | 0x400), "i" (ASI_M_FLUSH_PROBE)); + return entry; +} + +#endif /* !(__ASSEMBLY__) */ + +#endif /* !(_SPARC_PGTSRMMU_H) */ Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2009-01-02 14:53:33 UTC (rev 343) +++ openbios-devel/arch/sparc32/romvec.c 2009-01-03 13:45:02 UTC (rev 344) @@ -8,14 +8,9 @@ */ #include "openprom.h" -#include "asm/io.h" -#include "asm/types.h" -#include "libc/vsprintf.h" #include "openbios/config.h" #include "openbios/bindings.h" #include "openbios/drivers.h" -#include "openbios/kernel.h" -#include "openbios/sysinclude.h" #include "sys_info.h" #include "boot.h" @@ -26,15 +21,6 @@ #define DPRINTF(fmt, args...) #endif -#define PAGE_SIZE 4096 - -static struct linux_mlist_v0 totphys[1]; -static struct linux_mlist_v0 totmap[1]; -static struct linux_mlist_v0 totavail[1]; - -static struct linux_mlist_v0 *ptphys; -static struct linux_mlist_v0 *ptmap; -static struct linux_mlist_v0 *ptavail; char obp_stdin, obp_stdout; static int obp_fd_stdin, obp_fd_stdout; const char *obp_stdin_path, *obp_stdout_path; @@ -321,37 +307,6 @@ return ret; } -static char *obp_dumb_mmap(char *va, int which_io, unsigned int pa, - unsigned int size) -{ - unsigned int npages; - unsigned int off; - unsigned int mva; - uint64_t mpa = ((uint64_t)which_io << 32) | (uint64_t)pa; - - DPRINTF("obp_dumb_mmap: virta 0x%x, paddr 0x%llx, sz %d\n", - (unsigned int)va, mpa, size); - - off = pa & (PAGE_SIZE-1); - npages = (off + (size - 1) + (PAGE_SIZE-1)) / PAGE_SIZE; - mpa &= ~(uint64_t)(PAGE_SIZE - 1); - - mva = (unsigned int) va; - while (npages-- != 0) { - map_page(mva, mpa, 1); - mva += PAGE_SIZE; - mpa += (uint64_t)PAGE_SIZE; - } - - return va; -} - -static void obp_dumb_munmap(__attribute__((unused)) char *va, - __attribute__((unused)) unsigned int size) -{ - DPRINTF("obp_dumb_munmap: virta 0x%x, sz %d\n", (unsigned int)va, size); -} - static int obp_devread(int dev_desc, char *buf, int nbytes) { int ret; @@ -413,37 +368,6 @@ return ret; } -static void obp_dumb_memfree(__attribute__((unused))char *va, - __attribute__((unused))unsigned sz) -{ - DPRINTF("obp_dumb_memfree 0x%x(%d)\n", va, sz); -} - -static char * obp_dumb_memalloc(char *va, unsigned int size) -{ - static unsigned int next_free_address = 0xFFEDA000; - - size = (size + 7) & ~7; - totmap[0].num_bytes -= size; - DPRINTF("obp_dumb_memalloc req 0x%x of %d at 0x%x\n", va, size, - totmap[0].num_bytes); - - // If va is null, the allocator is supposed to pick a "suitable" address. - // (See OpenSolaric prom_alloc.c) There's not any real guidance as - // to what might be "suitable". So we mimic the behavior of a Sun boot - // ROM. - - if (va == NULL) { - va = (char *)(next_free_address - size); - next_free_address -= size; - DPRINTF("obp_dumb_memalloc req null -> 0x%x\n", va); - } - - obp_dumb_mmap(va, 0, totmap[0].num_bytes, size); - - return va; -} - static int obp_cpustart(__attribute__((unused))unsigned int whichcpu, __attribute__((unused))int ctxtbl_ptr, __attribute__((unused))int thiscontext, @@ -501,27 +425,8 @@ } void * -init_openprom(unsigned long memsize) +init_openprom(void) { - ptphys = totphys; - ptmap = totmap; - ptavail = totavail; - - /* - * Form memory descriptors. - */ - totphys[0].theres_more = NULL; - totphys[0].start_adr = (char *) 0; - totphys[0].num_bytes = memsize; - - totavail[0].theres_more = NULL; - totavail[0].start_adr = (char *) 0; - totavail[0].num_bytes = va2pa((int)&_start) - PAGE_SIZE; - - totmap[0].theres_more = NULL; - totmap[0].start_adr = &_start; - totmap[0].num_bytes = (unsigned long) &_iomem - (unsigned long) &_start + PAGE_SIZE; - // Linux wants a R/W romvec table romvec0.pv_magic_cookie = LINUX_OPPROM_MAGIC; romvec0.pv_romvers = 3; Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2009-01-02 14:53:33 UTC (rev 343) +++ openbios-devel/drivers/esp.c 2009-01-03 13:45:02 UTC (rev 344) @@ -24,6 +24,7 @@ #include "scsi.h" #include "asm/dma.h" #include "esp.h" +#include "ofmem.h" #define BUFSIZE 4096 Modified: openbios-devel/drivers/iommu.c =================================================================== --- openbios-devel/drivers/iommu.c 2009-01-02 14:53:33 UTC (rev 343) +++ openbios-devel/drivers/iommu.c 2009-01-03 13:45:02 UTC (rev 344) @@ -6,25 +6,10 @@ **/ #include "openbios/config.h" #include "openbios/bindings.h" -#include "openbios/kernel.h" -#include "libc/byteorder.h" -#include "libc/vsprintf.h" -#include "libc/string.h" - #include "openbios/drivers.h" -#include "asm/asi.h" -#include "asm/crs.h" -#include "asm/io.h" -#include "pgtsrmmu.h" #include "iommu.h" +#include "ofmem.h" -#define IOMMU_REGS 0x300 -#define NCTX_SWIFT 0x100 - -#define IOPERM (IOPTE_CACHE | IOPTE_WRITE | IOPTE_VALID) -#define MKIOPTE(phys) (((((phys)>>4) & IOPTE_PAGE) | IOPERM) & ~IOPTE_WAZ) -#define LOWMEMSZ 32 * 1024 * 1024 - #ifdef CONFIG_DEBUG_IOMMU #define DPRINTF(fmt, args...) \ do { printk(fmt , ##args); } while (0) @@ -33,37 +18,16 @@ #endif /* - * Allocatable memory chunk. - */ -struct mem { - char *start, *uplim; - char *curp; -}; - -struct mem cmem; /* Current memory, virtual */ -static struct mem cio; /* Current I/O space */ - -unsigned int va_shift; - -static unsigned long *context_table; -static unsigned long *l1; - -/* * IOMMU parameters */ struct iommu { struct iommu_regs *regs; unsigned int *page_table; unsigned long plow; /* Base bus address */ - unsigned long vasize; /* Size of VA region that we manage */ - struct mem bmap; }; static struct iommu ciommu; -static struct iommu_regs *regs; -static void iommu_init(struct iommu *t, uint64_t base); - static void iommu_invalidate(struct iommu_regs *iregs) { @@ -71,352 +35,6 @@ } /* - * Allocate memory. This is reusable. - */ -void -mem_init(struct mem *t, char *begin, char *limit) -{ - t->start = begin; - t->uplim = limit; - t->curp = begin; -} - -void * -mem_alloc(struct mem *t, int size, int align) -{ - char *p; - unsigned long pa; - - // The alignment restrictions refer to physical, not virtual - // addresses - pa = va2pa((unsigned long)t->curp) + (align - 1); - pa &= ~(align - 1); - p = (char *)pa2va(pa); - - if ((unsigned long)p >= (unsigned long)t->uplim || - (unsigned long)p + size > (unsigned long)t->uplim) - return NULL; - t->curp = p + size; - - return p; -} - -void * -mem_zalloc(struct mem *t, int size, int align) -{ - char *p; - - if ((p = mem_alloc(t, size, align)) != NULL) - memset(p, 0, size); - - return p; -} - -static unsigned long -find_pte(unsigned long va, int alloc) -{ - uint32_t pte; - void *p; - unsigned long pa; - - pte = l1[(va >> SRMMU_PGDIR_SHIFT) & (SRMMU_PTRS_PER_PGD - 1)]; - if ((pte & SRMMU_ET_MASK) == SRMMU_ET_INVALID) { - if (alloc) { - p = mem_zalloc(&cmem, SRMMU_PTRS_PER_PMD * sizeof(int), - SRMMU_PTRS_PER_PMD * sizeof(int)); - if (p == NULL) - return -1; - pte = SRMMU_ET_PTD | ((va2pa((unsigned long)p)) >> 4); - l1[(va >> SRMMU_PGDIR_SHIFT) & (SRMMU_PTRS_PER_PGD - 1)] = pte; - /* barrier() */ - } else { - return -1; - } - } - - pa = (pte & 0xFFFFFFF0) << 4; - pa += ((va >> SRMMU_PMD_SHIFT) & (SRMMU_PTRS_PER_PMD - 1)) << 2; - pte = *(uint32_t *)pa2va(pa); - if ((pte & SRMMU_ET_MASK) == SRMMU_ET_INVALID) { - if (alloc) { - p = mem_zalloc(&cmem, SRMMU_PTRS_PER_PTE * sizeof(void *), - SRMMU_PTRS_PER_PTE * sizeof(void *)); - if (p == NULL) - return -2; - pte = SRMMU_ET_PTD | ((va2pa((unsigned int)p)) >> 4); - *(uint32_t *)pa2va(pa) = pte; - } else { - return -2; - } - } - - pa = (pte & 0xFFFFFFF0) << 4; - pa += ((va >> PAGE_SHIFT) & (SRMMU_PTRS_PER_PTE - 1)) << 2; - - return pa2va(pa); -} - -/* - * Create a memory mapping from va to epa. - */ -int -map_page(unsigned long va, uint64_t epa, int type) -{ - uint32_t pte; - unsigned long pa; - - pa = find_pte(va, 1); - - pte = SRMMU_ET_PTE | ((epa & PAGE_MASK) >> 4); - if (type) { /* I/O */ - pte |= SRMMU_REF; - /* SRMMU cannot make Supervisor-only, but not exectutable */ - pte |= SRMMU_PRIV; - } else { /* memory */ - pte |= SRMMU_REF | SRMMU_CACHE; - pte |= SRMMU_PRIV; /* Supervisor only access */ - } - *(uint32_t *)pa = pte; - DPRINTF("map_page: va 0x%lx pa 0x%llx pte 0x%x\n", va, epa, pte); - - return 0; -} - -/* - * Create an I/O mapping to pa[size]. - * Returns va of the mapping or 0 if unsuccessful. - */ -void * -map_io(uint64_t pa, int size) -{ - void *va; - unsigned int npages; - unsigned int off; - unsigned int mva; - - off = pa & (PAGE_SIZE - 1); - npages = (off + size - 1) / PAGE_SIZE + 1; - pa &= ~(PAGE_SIZE - 1); - - va = mem_alloc(&cio, npages * PAGE_SIZE, PAGE_SIZE); - if (va == NULL) - return va; - - mva = (unsigned int) va; - DPRINTF("map_io: va 0x%p pa 0x%llx off 0x%x npages %d\n", va, pa, off, npages); /* P3 */ - while (npages-- != 0) { - map_page(mva, pa, 1); - mva += PAGE_SIZE; - pa += PAGE_SIZE; - } - - return (void *)((unsigned int)va + off); -} - -/* - * D5.3 pgmap@ ( va -- pte ) - */ -static void -pgmap_fetch(void) -{ - uint32_t pte; - unsigned long va, pa; - - va = POP(); - - pa = find_pte(va, 0); - if (pa == 1 || pa == 2) - goto error; - pte = *(uint32_t *)pa; - DPRINTF("pgmap@: va 0x%lx pa 0x%lx pte 0x%x\n", va, pa, pte); - - PUSH(pte); - return; - error: - PUSH(0); -} - -/* - * D5.3 pgmap! ( pte va -- ) - */ -static void -pgmap_store(void) -{ - uint32_t pte; - unsigned long va, pa; - - va = POP(); - pte = POP(); - - pa = find_pte(va, 1); - *(uint32_t *)pa = pte; - DPRINTF("pgmap!: va 0x%lx pa 0x%lx pte 0x%x\n", va, pa, pte); -} - -/* - * D5.3 map-pages ( pa space va size -- ) - */ -static void -map_pages(void) -{ - unsigned long va; - int size; - uint64_t pa; - - size = POP(); - va = POP(); - pa = POP(); - pa <<= 32; - pa |= POP() & 0xffffffff; - - for (; size > 0; size -= PAGE_SIZE, pa += PAGE_SIZE, va += PAGE_SIZE) - map_page(va, pa, 1); - DPRINTF("map-page: va 0x%lx pa 0x%lx size 0x%x\n", va, pa, size); -} - - -void -ob_init_mmu(uint64_t base) -{ - extern unsigned int qemu_mem_size; - - push_str("/memory"); - fword("find-device"); - - PUSH(0); - fword("encode-int"); - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH(qemu_mem_size); - fword("encode-int"); - fword("encode+"); - push_str("reg"); - fword("property"); - - PUSH(0); - fword("encode-int"); - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH(va2pa((unsigned long)&_start) - PAGE_SIZE); - fword("encode-int"); - fword("encode+"); - push_str("available"); - fword("property"); - - push_str("/virtual-memory"); - fword("find-device"); - - PUSH(base >> 32); - fword("encode-int"); - PUSH(base & 0xffffffff); - fword("encode-int"); - fword("encode+"); - PUSH(IOMMU_REGS); - fword("encode-int"); - fword("encode+"); - push_str("reg"); - fword("property"); - - PUSH(0); - fword("encode-int"); - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH((unsigned long)&_start - PAGE_SIZE); - fword("encode-int"); - fword("encode+"); - - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH(va2pa((unsigned long)&_iomem)); - fword("encode-int"); - fword("encode+"); - PUSH(-va2pa((unsigned long)&_iomem)); - fword("encode-int"); - fword("encode+"); - push_str("available"); - fword("property"); - - push_str("/iommu"); - fword("find-device"); - PUSH((unsigned long)regs); - fword("encode-int"); - push_str("address"); - fword("property"); - - PUSH(base >> 32); - fword("encode-int"); - PUSH(base & 0xffffffff); - fword("encode-int"); - fword("encode+"); - PUSH(IOMMU_REGS); - fword("encode-int"); - fword("encode+"); - push_str("reg"); - fword("property"); - - PUSH(0); - fword("active-package!"); - bind_func("pgmap@", pgmap_fetch); - bind_func("pgmap!", pgmap_store); - bind_func("map-pages", map_pages); -} - - -/* - * Switch page tables. - */ -void -init_mmu_swift(uint64_t base) -{ - unsigned int addr, i; - unsigned long pa, va; - - mem_init(&cio, (char *)&_end, (char *)&_iomem); - - context_table = mem_zalloc(&cmem, NCTX_SWIFT * sizeof(int), NCTX_SWIFT * sizeof(int)); - l1 = mem_zalloc(&cmem, 256 * sizeof(int), 256 * sizeof(int)); - - context_table[0] = (((unsigned long)va2pa((unsigned long)l1)) >> 4) | SRMMU_ET_PTD; - - for (i = 1; i < NCTX_SWIFT; i++) { - context_table[i] = SRMMU_ET_INVALID; - } - for (i = 0; i < 256; i += 4) { - l1[i] = SRMMU_ET_INVALID; - } - - // text, rodata, data, and bss mapped to end of RAM - va = (unsigned long)&_start; - for (; va < (unsigned long)&_end; va += PAGE_SIZE) { - pa = va2pa(va); - map_page(va, pa, 0); - } - - // 1:1 mapping for RAM - pa = va = 0; - for (; va < LOWMEMSZ; va += PAGE_SIZE, pa += PAGE_SIZE) { - map_page(va, pa, 0); - } - - /* - * Flush cache - */ - for (addr = 0; addr < 0x2000; addr += 0x10) { - __asm__ __volatile__ ("sta %%g0, [%0] %1\n\t" : : - "r" (addr), "i" (ASI_M_DATAC_TAG)); - __asm__ __volatile__ ("sta %%g0, [%0] %1\n\t" : : - "r" (addr<<1), "i" (ASI_M_TXTC_TAG)); - } - srmmu_set_context(0); - srmmu_set_ctable_ptr(va2pa((unsigned long)context_table)); - srmmu_flush_whole_tlb(); - iommu_init(&ciommu, base); -} -/* * XXX This is a problematic interface. We alloc _memory_ which is uncached. * So if we ever reuse allocations somebody is going to get uncached pages. * Returned address is always aligned by page. @@ -432,13 +50,14 @@ unsigned int i; unsigned int *iopte; struct iommu *t = &ciommu; + int ret; npages = (size + (PAGE_SIZE-1)) / PAGE_SIZE; - va = mem_alloc(&cmem, npages * PAGE_SIZE, PAGE_SIZE); - if (va == NULL) + ret = posix_memalign(&va, npages * PAGE_SIZE, PAGE_SIZE); + if (ret != 0) return NULL; - ba = (unsigned int)mem_alloc(&t->bmap, npages * PAGE_SIZE, PAGE_SIZE); + ba = (unsigned int)mem_alloc(&cdvmem, npages * PAGE_SIZE, PAGE_SIZE); if (ba == 0) return NULL; @@ -475,13 +94,16 @@ * This looks like initialization of CPU MMU but * the routine is higher in food chain. */ -static void +static struct iommu_regs * iommu_init(struct iommu *t, uint64_t base) { unsigned int *ptab; int ptsize; unsigned int impl, vers; unsigned int tmp; + struct iommu_regs *regs; + int ret; + unsigned long vasize; regs = map_io(base, IOMMU_REGS); if (regs == NULL) { @@ -497,15 +119,17 @@ tmp |= (IOMMU_RNGE_32MB | IOMMU_CTRL_ENAB); t->plow = 0xfe000000; /* End - 32 MB */ - t->vasize = 0x2000000; /* 32 MB */ + /* Size of VA region that we manage */ + vasize = 0x2000000; /* 32 MB */ regs->control = tmp; iommu_invalidate(regs); /* Allocate IOMMU page table */ - /* Thremendous alignment causes great waste... */ - ptsize = (t->vasize/PAGE_SIZE) * sizeof(int); - if ((ptab = mem_zalloc(&cmem, ptsize, ptsize)) == NULL) { + /* Tremendous alignment causes great waste... */ + ptsize = (vasize / PAGE_SIZE) * sizeof(int); + ret = posix_memalign((void *)&ptab, ptsize, ptsize); + if (ret != 0) { DPRINTF("Cannot allocate IOMMU table [0x%x]\n", ptsize); for (;;) { } } @@ -520,5 +144,46 @@ DPRINTF("IOMMU: impl %d vers %d page table at 0x%p (pa 0x%x) of size %d bytes\n", impl, vers, t->page_table, tmp, ptsize); - mem_init(&t->bmap, (char*)t->plow, (char *)0xfffff000); + mem_init(&cdvmem, (char*)t->plow, (char *)0xfffff000); + return regs; } + +void +ob_init_iommu(uint64_t base) +{ + struct iommu_regs *regs; + + regs = iommu_init(&ciommu, base); + + push_str("/virtual-memory"); + fword("find-device"); + + PUSH(base >> 32); + fword("encode-int"); + PUSH(base & 0xffffffff); + fword("encode-int"); + fword("encode+"); + PUSH(IOMMU_REGS); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); + + push_str("/iommu"); + fword("find-device"); + PUSH((unsigned long)regs); + fword("encode-int"); + push_str("address"); + fword("property"); + + PUSH(base >> 32); + fword("encode-int"); + PUSH(base & 0xffffffff); + fword("encode-int"); + fword("encode+"); + PUSH(IOMMU_REGS); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); +} Modified: openbios-devel/drivers/iommu.h =================================================================== --- openbios-devel/drivers/iommu.h 2009-01-02 14:53:33 UTC (rev 343) +++ openbios-devel/drivers/iommu.h 2009-01-03 13:45:02 UTC (rev 344) @@ -95,3 +95,8 @@ #define IOPTE_WRITE 0x00000004 /* Writeable */ #define IOPTE_VALID 0x00000002 /* IOPTE is valid */ #define IOPTE_WAZ 0x00000001 /* Write as zeros */ + +#define IOPERM (IOPTE_CACHE | IOPTE_WRITE | IOPTE_VALID) +#define MKIOPTE(phys) (((((phys)>>4) & IOPTE_PAGE) | IOPERM) & ~IOPTE_WAZ) + +#define IOMMU_REGS 0x300 Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2009-01-02 14:53:33 UTC (rev 343) +++ openbios-devel/drivers/obio.c 2009-01-03 13:45:02 UTC (rev 344) @@ -18,6 +18,7 @@ #include "openbios/drivers.h" #include "openbios/nvram.h" +#include "ofmem.h" #include "obio.h" #define cpu_to_be16(x) __cpu_to_be16(x) #include "openbios/firmware_abi.h" Modified: openbios-devel/drivers/obio.h =================================================================== --- openbios-devel/drivers/obio.h 2009-01-02 14:53:33 UTC (rev 343) +++ openbios-devel/drivers/obio.h 2009-01-03 13:45:02 UTC (rev 344) @@ -36,7 +36,6 @@ #define SLAVIO_SIZE 0x01000000 #define SUN4M_NCPUS 16 -#define PAGE_SIZE 4096 #define CFG_ADDR 0xd00000510ULL #define CFG_SIZE 3 Deleted: openbios-devel/drivers/pgtsrmmu.h =================================================================== --- openbios-devel/drivers/pgtsrmmu.h 2009-01-02 14:53:33 UTC (rev 343) +++ openbios-devel/drivers/pgtsrmmu.h 2009-01-03 13:45:02 UTC (rev 344) @@ -1,230 +0,0 @@ -/* - * Taken from kernel for decoupling from <asm/page.h>. --zaitcev - * - * $Id: pgtsrmmu.h,v 1.2 1999/04/19 01:04:31 zaitcev Exp $ - * pgtsrmmu.h: SRMMU page table defines and code. - * - * Copyright (C) 1995 David S. Miller (davem(a)caip.rutgers.edu) - */ - -#ifndef _PGTSRMMU_H -#define _PGTSRMMU_H - -/* Replacement for <asm/page.h> */ -#define PAGE_SHIFT 12 -#define PAGE_SIZE (1 << PAGE_SHIFT) -#define PAGE_MASK (~(PAGE_SIZE-1)) -#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) -/* */ - -/* PMD_SHIFT determines the size of the area a second-level page table can map */ -#define SRMMU_PMD_SHIFT 18 -#define SRMMU_PMD_SIZE (1UL << SRMMU_PMD_SHIFT) -#define SRMMU_PMD_MASK (~(SRMMU_PMD_SIZE-1)) -#define SRMMU_PMD_ALIGN(addr) (((addr)+SRMMU_PMD_SIZE-1)&SRMMU_PMD_MASK) - -/* PGDIR_SHIFT determines what a third-level page table entry can map */ -#define SRMMU_PGDIR_SHIFT 24 -#define SRMMU_PGDIR_SIZE (1UL << SRMMU_PGDIR_SHIFT) -#define SRMMU_PGDIR_MASK (~(SRMMU_PGDIR_SIZE-1)) -#define SRMMU_PGDIR_ALIGN(addr) (((addr)+SRMMU_PGDIR_SIZE-1)&SRMMU_PGDIR_MASK) - -#define SRMMU_PTRS_PER_PTE 64 -#define SRMMU_PTRS_PER_PMD 64 -#define SRMMU_PTRS_PER_PGD 256 - -#define SRMMU_PTE_TABLE_SIZE 0x100 /* 64 entries, 4 bytes a piece */ -#define SRMMU_PMD_TABLE_SIZE 0x100 /* 64 entries, 4 bytes a piece */ -#define SRMMU_PGD_TABLE_SIZE 0x400 /* 256 entries, 4 bytes a piece */ - -#define SRMMU_VMALLOC_START (0xfe300000) -#define SRMMU_VMALLOC_END ~0x0UL - -/* Definition of the values in the ET field of PTD's and PTE's */ -#define SRMMU_ET_MASK 0x3 -#define SRMMU_ET_INVALID 0x0 -#define SRMMU_ET_PTD 0x1 -#define SRMMU_ET_PTE 0x2 -#define SRMMU_ET_REPTE 0x3 /* AIEEE, SuperSparc II reverse endian page! */ - -/* Physical page extraction from PTP's and PTE's. */ -#define SRMMU_CTX_PMASK 0xfffffff0 -#define SRMMU_PTD_PMASK 0xfffffff0 -#define SRMMU_PTE_PMASK 0xffffff00 - -/* The pte non-page bits. Some notes: - * 1) cache, dirty, valid, and ref are frobbable - * for both supervisor and user pages. - * 2) exec and write will only give the desired effect - * on user pages - * 3) use priv and priv_readonly for changing the - * characteristics of supervisor ptes - */ -#define SRMMU_CACHE 0x80 -#define SRMMU_DIRTY 0x40 -#define SRMMU_REF 0x20 -#define SRMMU_EXEC 0x08 -#define SRMMU_WRITE 0x04 -#define SRMMU_VALID 0x02 /* SRMMU_ET_PTE */ -#define SRMMU_PRIV 0x1c -#define SRMMU_PRIV_RDONLY 0x18 - -#define SRMMU_CHG_MASK (0xffffff00 | SRMMU_REF | SRMMU_DIRTY) - -/* SRMMU Register addresses in ASI 0x4. These are valid for all - * current SRMMU implementations that exist. - */ -#define SRMMU_CTRL_REG 0x00000000 -#define SRMMU_CTXTBL_PTR 0x00000100 -#define SRMMU_CTX_REG 0x00000200 -#define SRMMU_FAULT_STATUS 0x00000300 -#define SRMMU_FAULT_ADDR 0x00000400 - -#ifndef __ASSEMBLY__ - -/* Accessing the MMU control register. */ -static __inline__ unsigned int srmmu_get_mmureg(void) -{ - unsigned int retval; - __asm__ __volatile__("lda [%%g0] %1, %0\n\t" : - "=r" (retval) : - "i" (ASI_M_MMUREGS)); - return retval; -} - -static __inline__ void srmmu_set_mmureg(unsigned long regval) -{ - __asm__ __volatile__("sta %0, [%%g0] %1\n\t" : : - "r" (regval), "i" (ASI_M_MMUREGS) : "memory"); - -} - -static __inline__ void srmmu_set_ctable_ptr(unsigned long paddr) -{ - paddr = ((paddr >> 4) & SRMMU_CTX_PMASK); - __asm__ __volatile__("sta %0, [%1] %2\n\t" : : - "r" (paddr), "r" (SRMMU_CTXTBL_PTR), - "i" (ASI_M_MMUREGS) : - "memory"); -} - -static __inline__ unsigned long srmmu_get_ctable_ptr(void) -{ - unsigned int retval; - - __asm__ __volatile__("lda [%1] %2, %0\n\t" : - "=r" (retval) : - "r" (SRMMU_CTXTBL_PTR), - "i" (ASI_M_MMUREGS)); - return (retval & SRMMU_CTX_PMASK) << 4; -} - -static __inline__ void srmmu_set_context(int context) -{ - __asm__ __volatile__("sta %0, [%1] %2\n\t" : : - "r" (context), "r" (SRMMU_CTX_REG), - "i" (ASI_M_MMUREGS) : "memory"); -} - -static __inline__ int srmmu_get_context(void) -{ - register int retval; - __asm__ __volatile__("lda [%1] %2, %0\n\t" : - "=r" (retval) : - "r" (SRMMU_CTX_REG), - "i" (ASI_M_MMUREGS)); - return retval; -} - -static __inline__ unsigned int srmmu_get_fstatus(void) -{ - unsigned int retval; - - __asm__ __volatile__("lda [%1] %2, %0\n\t" : - "=r" (retval) : - "r" (SRMMU_FAULT_STATUS), "i" (ASI_M_MMUREGS)); - return retval; -} - -static __inline__ unsigned int srmmu_get_faddr(void) -{ - unsigned int retval; - - __asm__ __volatile__("lda [%1] %2, %0\n\t" : - "=r" (retval) : - "r" (SRMMU_FAULT_ADDR), "i" (ASI_M_MMUREGS)); - return retval; -} - -/* This is guaranteed on all SRMMU's. */ -static __inline__ void srmmu_flush_whole_tlb(void) -{ - __asm__ __volatile__("sta %%g0, [%0] %1\n\t": : - "r" (0x400), /* Flush entire TLB!! */ - "i" (ASI_M_FLUSH_PROBE) : "memory"); - -} - -/* These flush types are not available on all chips... */ -static __inline__ void srmmu_flush_tlb_ctx(void) -{ - __asm__ __volatile__("sta %%g0, [%0] %1\n\t": : - "r" (0x300), /* Flush TLB ctx.. */ - "i" (ASI_M_FLUSH_PROBE) : "memory"); - -} - -static __inline__ void srmmu_flush_tlb_region(unsigned long addr) -{ - addr &= SRMMU_PGDIR_MASK; - __asm__ __volatile__("sta %%g0, [%0] %1\n\t": : - "r" (addr | 0x200), /* Flush TLB region.. */ - "i" (ASI_M_FLUSH_PROBE) : "memory"); - -} - - -static __inline__ void srmmu_flush_tlb_segment(unsigned long addr) -{ - addr &= SRMMU_PMD_MASK; - __asm__ __volatile__("sta %%g0, [%0] %1\n\t": : - "r" (addr | 0x100), /* Flush TLB segment.. */ - "i" (ASI_M_FLUSH_PROBE) : "memory"); - -} - -static __inline__ void srmmu_flush_tlb_page(unsigned long page) -{ - page &= PAGE_MASK; - __asm__ __volatile__("sta %%g0, [%0] %1\n\t": : - "r" (page), /* Flush TLB page.. */ - "i" (ASI_M_FLUSH_PROBE) : "memory"); - -} - -static __inline__ unsigned long srmmu_hwprobe(unsigned long vaddr) -{ - unsigned long retval; - - vaddr &= PAGE_MASK; - __asm__ __volatile__("lda [%1] %2, %0\n\t" : - "=r" (retval) : - "r" (vaddr | 0x400), "i" (ASI_M_FLUSH_PROBE)); - - return retval; -} - -static __inline__ int -srmmu_get_pte (unsigned long addr) -{ - register unsigned long entry; - - __asm__ __volatile__("\n\tlda [%1] %2,%0\n\t" : - "=r" (entry): - "r" ((addr & 0xfffff000) | 0x400), "i" (ASI_M_FLUSH_PROBE)); - return entry; -} - -#endif /* !(__ASSEMBLY__) */ - -#endif /* !(_SPARC_PGTSRMMU_H) */ Modified: openbios-devel/drivers/sbus.c =================================================================== --- openbios-devel/drivers/sbus.c 2009-01-02 14:53:33 UTC (rev 343) +++ openbios-devel/drivers/sbus.c 2009-01-03 13:45:02 UTC (rev 344) @@ -15,8 +15,8 @@ #include "openbios/kernel.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" - #include "openbios/drivers.h" +#include "ofmem.h" #define SBUS_REGS 0x28 #define SBUS_SLOTS 16 Modified: openbios-devel/include/libc/stdlib.h =================================================================== --- openbios-devel/include/libc/stdlib.h 2009-01-02 14:53:33 UTC (rev 343) +++ openbios-devel/include/libc/stdlib.h 2009-01-03 13:45:02 UTC (rev 344) @@ -19,6 +19,7 @@ extern void *malloc( int size ); extern void free( void *ptr ); extern void *realloc( void *ptr, size_t size ); +extern int posix_memalign(void **memptr, size_t alignment, size_t size); /* should perhaps go somewhere else... */ extern void qsort( void *base, size_t nmemb, size_t size, int (*compar)(const void*, const void*)); Modified: openbios-devel/include/ofmem.h =================================================================== --- openbios-devel/include/ofmem.h 2009-01-02 14:53:33 UTC (rev 343) +++ openbios-devel/include/ofmem.h 2009-01-03 13:45:02 UTC (rev 344) @@ -37,6 +37,20 @@ void isi_exception( void ); void setup_mmu( ulong ramsize ); void ofmem_register( phandle_t ph ); +#elif defined(CONFIG_SPARC32) +#define PAGE_SHIFT 12 +#define PAGE_SIZE (1 << PAGE_SHIFT) +#define PAGE_MASK (~(PAGE_SIZE - 1)) +#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK) + +/* arch/sparc32/lib.c */ +struct mem; +extern struct mem cdvmem; + +void mem_init(struct mem *t, char *begin, char *limit); +void *mem_alloc(struct mem *t, int size, int align); +int map_page(unsigned long va, uint64_t epa, int type); +void *map_io(uint64_t pa, int size); #endif #endif /* _H_OFMEM */ Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2009-01-02 14:53:33 UTC (rev 343) +++ openbios-devel/include/openbios/drivers.h 2009-01-03 13:45:02 UTC (rev 344) @@ -54,7 +54,8 @@ int uart_init(uint64_t port, unsigned long speed); /* drivers/iommu.c */ -extern struct mem cmem; +void ob_init_iommu(uint64_t base); +void *dvma_alloc(int size, unsigned int *pphys); /* drivers/sbus.c */ extern uint16_t graphic_depth; Modified: openbios-devel/include/sparc32/io.h =================================================================== --- openbios-devel/include/sparc32/io.h 2009-01-02 14:53:33 UTC (rev 343) +++ openbios-devel/include/sparc32/io.h 2009-01-03 13:45:02 UTC (rev 344) @@ -31,17 +31,6 @@ #define phys_to_virt(phys) ((void *) ((unsigned long) (phys))) #define virt_to_phys(virt) ((unsigned long) (virt)) -struct mem; - -void mem_init(struct mem *t, char *begin, char *limit); -void *mem_alloc(struct mem *t, int size, int align); -void *mem_zalloc(struct mem *t, int size, int align); -int map_page(unsigned long va, uint64_t epa, int type); -void *map_io(uint64_t pa, int size); -void ob_init_mmu(uint64_t base); -void init_mmu_swift(uint64_t base); -void *dvma_alloc(int size, unsigned int *pphys); - #ifndef BOOTSTRAP #ifndef _IO_BASE

1 0

r343 - in openbios-devel: arch/ppc arch/ppc/qemu arch/sparc32 arch/sparc64 include include/openbios modules
by svn＠openbios.org 02 Jan '09

02 Jan '09

Author: blueswirl Date: 2009-01-02 15:53:33 +0100 (Fri, 02 Jan 2009) New Revision: 343 Added: openbios-devel/modules/console_common.c Removed: openbios-devel/modules/console.c Modified: openbios-devel/arch/ppc/build.xml openbios-devel/arch/ppc/qemu/console.c openbios-devel/arch/sparc32/console.c openbios-devel/arch/sparc32/openbios.c openbios-devel/arch/sparc64/openbios.c openbios-devel/include/openbios/drivers.h openbios-devel/include/video_subr.h openbios-devel/modules/build.xml openbios-devel/modules/video.c Log: Clean up video routines Modified: openbios-devel/arch/ppc/build.xml =================================================================== --- openbios-devel/arch/ppc/build.xml 2009-01-02 13:32:15 UTC (rev 342) +++ openbios-devel/arch/ppc/build.xml 2009-01-02 14:53:33 UTC (rev 343) @@ -231,8 +231,9 @@ </object> <external-object source="libqemu.a"/> <external-object source="libbootstrap.a"/> + <external-object source="libdrivers.a"/> +  <external-object source="libmodules.a"/> - <external-object source="libdrivers.a"/> <external-object source="liblibc.a"/> <external-object source="libfs.a"/> <external-object source="libgcc.a"/> Modified: openbios-devel/arch/ppc/qemu/console.c =================================================================== --- openbios-devel/arch/ppc/qemu/console.c 2009-01-02 13:32:15 UTC (rev 342) +++ openbios-devel/arch/ppc/qemu/console.c 2009-01-02 14:53:33 UTC (rev 343) @@ -17,6 +17,7 @@ #include "libc/diskio.h" #include "ofmem.h" #include "qemu/qemu.h" +#include "video_subr.h" #ifdef CONFIG_DEBUG_CONSOLE @@ -125,14 +126,6 @@ } #endif // CONFIG_DEBUG_CONSOLE_SERIAL -typedef struct osi_fb_info { - unsigned long mphys; - int rb, w, h, depth; -} osi_fb_info_t; - -#include "../../../modules/video.c" -#include "../../../modules/console.c" - /* ****************************************************************** * common functions, implementing simple concurrent console * ****************************************************************** */ Modified: openbios-devel/arch/sparc32/console.c =================================================================== --- openbios-devel/arch/sparc32/console.c 2009-01-02 13:32:15 UTC (rev 342) +++ openbios-devel/arch/sparc32/console.c 2009-01-02 14:53:33 UTC (rev 343) @@ -9,6 +9,7 @@ #include "openbios/kernel.h" #include "openbios/drivers.h" #include "openbios.h" +#include "video_subr.h" #ifdef CONFIG_DEBUG_CONSOLE @@ -24,16 +25,8 @@ #define DAC_SIZE 16 unsigned char *vmem; -static volatile uint32_t *dac; +volatile uint32_t *dac; -typedef struct osi_fb_info { - unsigned long mphys; - int rb, w, h, depth; -} osi_fb_info_t; - -#include "../../modules/video.c" -#include "../../modules/console.c" - static void video_putchar(int c) { char buf[2]; Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2009-01-02 13:32:15 UTC (rev 342) +++ openbios-devel/arch/sparc32/openbios.c 2009-01-02 14:53:33 UTC (rev 343) @@ -17,6 +17,7 @@ #include "sys_info.h" #include "openbios.h" #include "boot.h" +#include "video_subr.h" int qemu_machine_type; Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2009-01-02 13:32:15 UTC (rev 342) +++ openbios-devel/arch/sparc64/openbios.c 2009-01-02 14:53:33 UTC (rev 343) @@ -28,6 +28,7 @@ #include "libc/vsprintf.h" #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" +#include "video_subr.h" #define BIOS_CFG_CMD 0x510 #define BIOS_CFG_DATA 0x511 Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2009-01-02 13:32:15 UTC (rev 342) +++ openbios-devel/include/openbios/drivers.h 2009-01-02 14:53:33 UTC (rev 343) @@ -13,18 +13,6 @@ #include "openbios/config.h" -/* modules/video.c */ -int video_get_res(int *w, int *h); -void draw_pixel(int x, int y, int colind); -void set_color(int ind, ulong color); -void video_scroll(int height); -void init_video(unsigned long fb, int width, int height, int depth, int rb); - -/* modules/console.c */ -int console_draw_str(const char *str); -void console_close(void); -void cls(void); - #ifdef CONFIG_DRIVER_PCI /* drivers/pci.c */ int ob_pci_init(void); Modified: openbios-devel/include/video_subr.h =================================================================== --- openbios-devel/include/video_subr.h 2009-01-02 13:32:15 UTC (rev 342) +++ openbios-devel/include/video_subr.h 2009-01-02 14:53:33 UTC (rev 343) @@ -15,4 +15,19 @@ void vga_vbe_init(const char *path, uint32_t fb, uint32_t fb_size, unsigned long rom, uint32_t rom_size); +/* modules/video.c */ +int video_get_res(int *w, int *h); +void draw_pixel(int x, int y, int colind); +void set_color(int ind, unsigned long color); +void video_scroll(int height); +void init_video(unsigned long fb, int width, int height, int depth, int rb); + +/* modules/console_common.c */ +int console_draw_str(const char *str); +int console_init(void); +void console_close(void); +void cls(void); + +extern volatile uint32_t *dac; + #endif /* VIDEO_SUBR_H */ Modified: openbios-devel/modules/build.xml =================================================================== --- openbios-devel/modules/build.xml 2009-01-02 13:32:15 UTC (rev 342) +++ openbios-devel/modules/build.xml 2009-01-02 14:53:33 UTC (rev 343) @@ -6,6 +6,8 @@ <object source="bindings.c"/> <object source="client.c"/> <object source="ipchecksum.c"/> + <object source="video.c"/> + <object source="console_common.c"/> <object source="elfnote.c" condition="X86"/> <object source="elfnote.c" condition="AMD64"/> <object source="elfnote.c" condition="SPARC32"/> Deleted: openbios-devel/modules/console.c =================================================================== --- openbios-devel/modules/console.c 2009-01-02 13:32:15 UTC (rev 342) +++ openbios-devel/modules/console.c 2009-01-02 14:53:33 UTC (rev 343) @@ -1,329 +0,0 @@ -/* - * <console.c> - * - * Simple text console - * - * Copyright (C) 2002, 2003 Samuel Rydh (samuel(a)ibrium.se) - * Copyright (C) 2005 Stefan Reinauer <stepan(a)openbios.org> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation - * - */ - -#include "openbios/config.h" -#include "openbios/bindings.h" -#include "openbios/fontdata.h" - -#if !defined(fontdata) -#if defined(CONFIG_FONT_8X8) -#define fontdata fontdata_8x8 -#define FONT_HEIGHT FONT_HEIGHT_8X8 -#define FONT_WIDTH FONT_WIDTH_8X8 -#elif defined(CONFIG_FONT_8X16) -#define fontdata fontdata_8x16 -#define FONT_HEIGHT FONT_HEIGHT_8X16 -#define FONT_WIDTH FONT_WIDTH_8X16 -#else -#error no font selected -#endif -#endif - -#define FONT_ADJ_HEIGHT (FONT_HEIGHT + 2) -#define NCOLS 80 -#define NROWS 48 - -typedef enum { - ESnormal, ESesc, ESsquare, ESgetpars, ESgotpars, ESfunckey, - EShash, ESsetG0, ESsetG1, ESpercent, ESignore, ESnonstd, - ESpalette -} vc_state_t; - -#define NPAR 16 -static struct { - int inited; - int physw, physh; - int w,h; - - int x,y; - char *buf; - - int cursor_on; - vc_state_t vc_state; - unsigned int vc_npar,vc_par[NPAR]; /* Parameters of current - escape sequence */ -} cons; - -static int -get_conschar( int x, int y ) -{ - if( (uint)x < cons.w && (uint)y < cons.h ) - return cons.buf[y*cons.w + x]; - return ' '; -} - -static void -draw_char( uint h, uint v ) -{ - const unsigned char *c = fontdata; - int x, y, xx, rskip, m; - int invert = (h==cons.x && v==cons.y && cons.cursor_on); - int ch = get_conschar( h, v ); - - while( h >= cons.w || v >= cons.h ) - return; - - h *= FONT_WIDTH; - v *= FONT_ADJ_HEIGHT; - - rskip = (FONT_WIDTH > 8)? 2 : 1; - c += rskip * (unsigned int)(ch & 0xff) * FONT_HEIGHT; - - for( x=0; x<FONT_WIDTH; x++ ) { - xx = x % 8; - if( x && !xx ) - c++; - m = (1<<(7-xx)); - for( y=0; y<FONT_HEIGHT; y++ ){ - int col = ((!(c[rskip*y] & m)) != invert) ? 254 : 0; - draw_pixel( h+x, v+y+1, col ); - } - draw_pixel( h+x, v, 254 ); - draw_pixel( h+x, v+FONT_HEIGHT+1, 254 ); - } -} - -static void -show_cursor( int show ) -{ - if( cons.cursor_on == show ) - return; - cons.cursor_on = show; - draw_char( cons.x, cons.y ); -} - - -static void -draw_line( int n ) -{ - int i; - - if( n >= cons.h || n < 0 ) - return; - for( i=0; i<cons.w; i++ ) - draw_char( i, n ); -} - -#if 0 -static void -refresh( void ) -{ - int i; - for( i=0; i<cons.h; i++ ) - draw_line(i); -} -#endif - -static int -console_init( void ) -{ - if( video_get_res(&cons.physw,&cons.physh) < 0 ) - return -1; - - set_color( 0, 0 ); - - cons.w = cons.physw/FONT_WIDTH; - cons.h = cons.physh/FONT_ADJ_HEIGHT; - cons.buf = malloc( cons.w * cons.h ); - cons.inited = 1; - cons.x = cons.y = 0; - cons.vc_state = ESnormal; - return 0; -} - -void -console_close( void ) -{ - if( !cons.inited ) - return; - free( cons.buf ); - cons.inited = 0; -} - -static void -rec_char( int ch, int x, int y ) -{ - if( (uint)x < cons.w && (uint)y < cons.h ) { - cons.buf[y*cons.w + x] = ch; - draw_char( x, y ); - } -} - -static void -scroll1( void ) -{ - int x; - - video_scroll( FONT_ADJ_HEIGHT ); - - for( x=0; x<cons.w; x++ ) - cons.buf[(cons.h-1)*cons.w + x] = 0; - draw_line(cons.h-1); -} - -static void -do_con_trol(int ch) -{ - unsigned int i, j; - - switch (ch) { - case 8: - if (cons.x) - cons.x--; - return; - case 10 ... 12: - cons.x = 0; - cons.y++; - return; - case 13: - cons.x = 0; - return; - case 24: - case 26: - cons.vc_state = ESnormal; - return; - case 27: - cons.vc_state = ESesc; - return; - } - - switch (cons.vc_state) { - case ESesc: - cons.vc_state = ESnormal; - switch (ch) { - case '[': - cons.vc_state = ESsquare; - return; - case 'M': - scroll1(); - return; - default: - printk("Unhandled escape code '%c'\n", ch); - return; - } - return; - case ESsquare: - for(cons.vc_npar = 0; cons.vc_npar < NPAR ; cons.vc_npar++) - cons.vc_par[cons.vc_npar] = 0; - cons.vc_npar = 0; - cons.vc_state = ESgetpars; - // Fall through - case ESgetpars: - if (ch == ';' && cons.vc_npar < NPAR - 1) { - cons.vc_npar++; - return; - } else if (ch >= '0' && ch <= '9') { - cons.vc_par[cons.vc_npar] *= 10; - cons.vc_par[cons.vc_npar] += ch - '0'; - return; - } else - cons.vc_state=ESgotpars; - // Fall through - case ESgotpars: - cons.vc_state = ESnormal; - switch(ch) { - case 'H': - case 'f': - if (cons.vc_par[0]) - cons.vc_par[0]--; - - if (cons.vc_par[1]) - cons.vc_par[1]--; - - cons.x = cons.vc_par[1]; - cons.y = cons.vc_par[0]; - return; - case 'J': - if (cons.vc_par[0] == 0 && (uint)cons.y < (uint)cons.h && - (uint)cons.x < (uint)cons.w) { - // erase from cursor to end of display - for (i = cons.x; i < cons.w; i++) - cons.buf[cons.y * cons.w + i] = ' '; - draw_line(cons.y); - for (j = cons.y + 1; j < cons.h; j++) { - for (i = 0; i < cons.w; i++) - cons.buf[j * cons.w + i] = ' '; - draw_line(j); - } - } - return; - case 'K': - switch (cons.vc_par[0]) { - case 0: /* erase from cursor to end of line */ - for (i = cons.x; i < cons.w; i++) - cons.buf[cons.y * cons.w + i] = ' '; - draw_line(cons.y); - return; - case 1: /* erase from start of line to cursor */ - for (i = 0; i <= cons.x; i++) - cons.buf[cons.y * cons.w + i] = ' '; - draw_line(cons.y); - return; - case 2: /* erase whole line */ - for (i = 0; i <= cons.w; i++) - cons.buf[cons.y * cons.w + i] = ' '; - draw_line(cons.y); - return; - default: - return; - } - return; - case 'M': - scroll1(); - return; - case 'm': - return; - case '@': - return; - default: - printk("Unhandled escape code '%c', par[%d, %d, %d, %d, %d]\n", - ch, cons.vc_par[0], cons.vc_par[1], cons.vc_par[2], - cons.vc_par[3], cons.vc_par[4]); - return; - } - return; - default: - cons.vc_state = ESnormal; - rec_char(ch, cons.x++, cons.y); - return; - } -} - -int -console_draw_str( const char *str ) -{ - int ch, y, x; - - if( !cons.inited && console_init() ) - return -1; - - show_cursor(0); - while( (ch=*str++) ) { - do_con_trol(ch); - - if( cons.x >= cons.w ) { - cons.x=0, cons.y++; - } - if( cons.y >= cons.h ) { - for( y=0; y<cons.h-1; y++ ) - for( x=0; x<cons.w; x++ ) - cons.buf[y*cons.w + x] = cons.buf[(y+1)*cons.w + x]; - cons.y = cons.h-1; - cons.x = 0; - scroll1(); - } - } - show_cursor(1); - return 0; -} Copied: openbios-devel/modules/console_common.c (from rev 342, openbios-devel/modules/console.c) =================================================================== --- openbios-devel/modules/console_common.c (rev 0) +++ openbios-devel/modules/console_common.c 2009-01-02 14:53:33 UTC (rev 343) @@ -0,0 +1,330 @@ +/* + * <console.c> + * + * Simple text console + * + * Copyright (C) 2002, 2003 Samuel Rydh (samuel(a)ibrium.se) + * Copyright (C) 2005 Stefan Reinauer <stepan(a)openbios.org> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "openbios/fontdata.h" +#include "video_subr.h" + +#if !defined(fontdata) +#if defined(CONFIG_FONT_8X8) +#define fontdata fontdata_8x8 +#define FONT_HEIGHT FONT_HEIGHT_8X8 +#define FONT_WIDTH FONT_WIDTH_8X8 +#elif defined(CONFIG_FONT_8X16) +#define fontdata fontdata_8x16 +#define FONT_HEIGHT FONT_HEIGHT_8X16 +#define FONT_WIDTH FONT_WIDTH_8X16 +#else +#error no font selected +#endif +#endif + +#define FONT_ADJ_HEIGHT (FONT_HEIGHT + 2) +#define NCOLS 80 +#define NROWS 48 + +typedef enum { + ESnormal, ESesc, ESsquare, ESgetpars, ESgotpars, ESfunckey, + EShash, ESsetG0, ESsetG1, ESpercent, ESignore, ESnonstd, + ESpalette +} vc_state_t; + +#define NPAR 16 +static struct { + int inited; + int physw, physh; + int w,h; + + int x,y; + char *buf; + + int cursor_on; + vc_state_t vc_state; + unsigned int vc_npar,vc_par[NPAR]; /* Parameters of current + escape sequence */ +} cons; + +static int +get_conschar( int x, int y ) +{ + if( (uint)x < cons.w && (uint)y < cons.h ) + return cons.buf[y*cons.w + x]; + return ' '; +} + +static void +draw_char( uint h, uint v ) +{ + const unsigned char *c = fontdata; + int x, y, xx, rskip, m; + int invert = (h==cons.x && v==cons.y && cons.cursor_on); + int ch = get_conschar( h, v ); + + while( h >= cons.w || v >= cons.h ) + return; + + h *= FONT_WIDTH; + v *= FONT_ADJ_HEIGHT; + + rskip = (FONT_WIDTH > 8)? 2 : 1; + c += rskip * (unsigned int)(ch & 0xff) * FONT_HEIGHT; + + for( x=0; x<FONT_WIDTH; x++ ) { + xx = x % 8; + if( x && !xx ) + c++; + m = (1<<(7-xx)); + for( y=0; y<FONT_HEIGHT; y++ ){ + int col = ((!(c[rskip*y] & m)) != invert) ? 254 : 0; + draw_pixel( h+x, v+y+1, col ); + } + draw_pixel( h+x, v, 254 ); + draw_pixel( h+x, v+FONT_HEIGHT+1, 254 ); + } +} + +static void +show_cursor( int show ) +{ + if( cons.cursor_on == show ) + return; + cons.cursor_on = show; + draw_char( cons.x, cons.y ); +} + + +static void +draw_line( int n ) +{ + int i; + + if( n >= cons.h || n < 0 ) + return; + for( i=0; i<cons.w; i++ ) + draw_char( i, n ); +} + +#if 0 +static void +refresh( void ) +{ + int i; + for( i=0; i<cons.h; i++ ) + draw_line(i); +} +#endif + +int +console_init( void ) +{ + if( video_get_res(&cons.physw,&cons.physh) < 0 ) + return -1; + + set_color( 0, 0 ); + + cons.w = cons.physw/FONT_WIDTH; + cons.h = cons.physh/FONT_ADJ_HEIGHT; + cons.buf = malloc( cons.w * cons.h ); + cons.inited = 1; + cons.x = cons.y = 0; + cons.vc_state = ESnormal; + return 0; +} + +void +console_close( void ) +{ + if( !cons.inited ) + return; + free( cons.buf ); + cons.inited = 0; +} + +static void +rec_char( int ch, int x, int y ) +{ + if( (uint)x < cons.w && (uint)y < cons.h ) { + cons.buf[y*cons.w + x] = ch; + draw_char( x, y ); + } +} + +static void +scroll1( void ) +{ + int x; + + video_scroll( FONT_ADJ_HEIGHT ); + + for( x=0; x<cons.w; x++ ) + cons.buf[(cons.h-1)*cons.w + x] = 0; + draw_line(cons.h-1); +} + +static void +do_con_trol(int ch) +{ + unsigned int i, j; + + switch (ch) { + case 8: + if (cons.x) + cons.x--; + return; + case 10 ... 12: + cons.x = 0; + cons.y++; + return; + case 13: + cons.x = 0; + return; + case 24: + case 26: + cons.vc_state = ESnormal; + return; + case 27: + cons.vc_state = ESesc; + return; + } + + switch (cons.vc_state) { + case ESesc: + cons.vc_state = ESnormal; + switch (ch) { + case '[': + cons.vc_state = ESsquare; + return; + case 'M': + scroll1(); + return; + default: + printk("Unhandled escape code '%c'\n", ch); + return; + } + return; + case ESsquare: + for(cons.vc_npar = 0; cons.vc_npar < NPAR ; cons.vc_npar++) + cons.vc_par[cons.vc_npar] = 0; + cons.vc_npar = 0; + cons.vc_state = ESgetpars; + // Fall through + case ESgetpars: + if (ch == ';' && cons.vc_npar < NPAR - 1) { + cons.vc_npar++; + return; + } else if (ch >= '0' && ch <= '9') { + cons.vc_par[cons.vc_npar] *= 10; + cons.vc_par[cons.vc_npar] += ch - '0'; + return; + } else + cons.vc_state=ESgotpars; + // Fall through + case ESgotpars: + cons.vc_state = ESnormal; + switch(ch) { + case 'H': + case 'f': + if (cons.vc_par[0]) + cons.vc_par[0]--; + + if (cons.vc_par[1]) + cons.vc_par[1]--; + + cons.x = cons.vc_par[1]; + cons.y = cons.vc_par[0]; + return; + case 'J': + if (cons.vc_par[0] == 0 && (uint)cons.y < (uint)cons.h && + (uint)cons.x < (uint)cons.w) { + // erase from cursor to end of display + for (i = cons.x; i < cons.w; i++) + cons.buf[cons.y * cons.w + i] = ' '; + draw_line(cons.y); + for (j = cons.y + 1; j < cons.h; j++) { + for (i = 0; i < cons.w; i++) + cons.buf[j * cons.w + i] = ' '; + draw_line(j); + } + } + return; + case 'K': + switch (cons.vc_par[0]) { + case 0: /* erase from cursor to end of line */ + for (i = cons.x; i < cons.w; i++) + cons.buf[cons.y * cons.w + i] = ' '; + draw_line(cons.y); + return; + case 1: /* erase from start of line to cursor */ + for (i = 0; i <= cons.x; i++) + cons.buf[cons.y * cons.w + i] = ' '; + draw_line(cons.y); + return; + case 2: /* erase whole line */ + for (i = 0; i <= cons.w; i++) + cons.buf[cons.y * cons.w + i] = ' '; + draw_line(cons.y); + return; + default: + return; + } + return; + case 'M': + scroll1(); + return; + case 'm': + return; + case '@': + return; + default: + printk("Unhandled escape code '%c', par[%d, %d, %d, %d, %d]\n", + ch, cons.vc_par[0], cons.vc_par[1], cons.vc_par[2], + cons.vc_par[3], cons.vc_par[4]); + return; + } + return; + default: + cons.vc_state = ESnormal; + rec_char(ch, cons.x++, cons.y); + return; + } +} + +int +console_draw_str( const char *str ) +{ + int ch, y, x; + + if( !cons.inited && console_init() ) + return -1; + + show_cursor(0); + while( (ch=*str++) ) { + do_con_trol(ch); + + if( cons.x >= cons.w ) { + cons.x=0, cons.y++; + } + if( cons.y >= cons.h ) { + for( y=0; y<cons.h-1; y++ ) + for( x=0; x<cons.w; x++ ) + cons.buf[y*cons.w + x] = cons.buf[(y+1)*cons.w + x]; + cons.y = cons.h-1; + cons.x = 0; + scroll1(); + } + } + show_cursor(1); + return 0; +} Modified: openbios-devel/modules/video.c =================================================================== --- openbios-devel/modules/video.c 2009-01-02 13:32:15 UTC (rev 342) +++ openbios-devel/modules/video.c 2009-01-02 14:53:33 UTC (rev 343) @@ -21,6 +21,11 @@ #include "openbios/drivers.h" #include "video_subr.h" +typedef struct osi_fb_info { + unsigned long mphys; + int rb, w, h, depth; +} osi_fb_info_t; + static struct { int has_video; osi_fb_info_t fb;

1 0

r342 - in openbios-devel: arch/ppc/qemu arch/sparc64 config/examples include/openbios modules
by svn＠openbios.org 02 Jan '09

02 Jan '09

Author: blueswirl Date: 2009-01-02 14:32:15 +0100 (Fri, 02 Jan 2009) New Revision: 342 Added: openbios-devel/include/openbios/fontdata.h Modified: openbios-devel/arch/ppc/qemu/console.c openbios-devel/arch/sparc64/console.c openbios-devel/config/examples/cross-ppc_config.xml openbios-devel/config/examples/cross-sparc32_config.xml openbios-devel/config/examples/cross-sparc64_config.xml openbios-devel/config/examples/ppc_config.xml openbios-devel/config/examples/sparc32_config.xml openbios-devel/config/examples/sparc64_config.xml openbios-devel/modules/build.xml openbios-devel/modules/console.c openbios-devel/modules/font_8x16.c openbios-devel/modules/font_8x8.c Log: Clean up font handling Modified: openbios-devel/arch/ppc/qemu/console.c =================================================================== --- openbios-devel/arch/ppc/qemu/console.c 2009-01-02 07:41:40 UTC (rev 341) +++ openbios-devel/arch/ppc/qemu/console.c 2009-01-02 13:32:15 UTC (rev 342) @@ -130,8 +130,6 @@ int rb, w, h, depth; } osi_fb_info_t; -#include "../../../modules/font_8x16.c" -#undef FONTDATAMAX #include "../../../modules/video.c" #include "../../../modules/console.c" Modified: openbios-devel/arch/sparc64/console.c =================================================================== --- openbios-devel/arch/sparc64/console.c 2009-01-02 07:41:40 UTC (rev 341) +++ openbios-devel/arch/sparc64/console.c 2009-01-02 13:32:15 UTC (rev 342) @@ -9,6 +9,7 @@ #include "openbios/bindings.h" #include "openbios/kernel.h" #include "openbios/drivers.h" +#include "openbios/fontdata.h" #include "openbios.h" #include "video_subr.h" #include "libc/vsprintf.h" @@ -244,17 +245,14 @@ video_poscursor(xpos, ypos); } -#ifdef CONFIG_DRIVER_VGA -#include "../../modules/font_8x16.c" -#endif - void video_init(void) { video=(unsigned char *)TEXT_BASE; #ifdef CONFIG_DRIVER_VGA vga_load_regs(); - vga_font_load((unsigned char *)VGA_BASE, fontdata_8x16, 16, 256); + vga_font_load((unsigned char *)VGA_BASE, fontdata_8x16, + FONT_HEIGHT_8X16, 256); vga_set_amode(); #endif } Modified: openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_config.xml 2009-01-02 07:41:40 UTC (rev 341) +++ openbios-devel/config/examples/cross-ppc_config.xml 2009-01-02 13:32:15 UTC (rev 342) @@ -32,8 +32,9 @@  <option name="CONFIG_CMDLINE" type="boolean" value="true"/> <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> -  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> Modified: openbios-devel/config/examples/cross-sparc32_config.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_config.xml 2009-01-02 07:41:40 UTC (rev 341) +++ openbios-devel/config/examples/cross-sparc32_config.xml 2009-01-02 13:32:15 UTC (rev 342) @@ -38,8 +38,9 @@  <option name="CONFIG_CMDLINE" type="boolean" value="true"/> <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> -  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> Modified: openbios-devel/config/examples/cross-sparc64_config.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_config.xml 2009-01-02 07:41:40 UTC (rev 341) +++ openbios-devel/config/examples/cross-sparc64_config.xml 2009-01-02 13:32:15 UTC (rev 342) @@ -35,8 +35,9 @@  <option name="CONFIG_CMDLINE" type="boolean" value="true"/> <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X8" type="boolean" value="false"/> + <option name="CONFIG_FONT_8X16" type="boolean" value="true"/> -  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> Modified: openbios-devel/config/examples/ppc_config.xml =================================================================== --- openbios-devel/config/examples/ppc_config.xml 2009-01-02 07:41:40 UTC (rev 341) +++ openbios-devel/config/examples/ppc_config.xml 2009-01-02 13:32:15 UTC (rev 342) @@ -32,8 +32,9 @@  <option name="CONFIG_CMDLINE" type="boolean" value="true"/> <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> -  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> Modified: openbios-devel/config/examples/sparc32_config.xml =================================================================== --- openbios-devel/config/examples/sparc32_config.xml 2009-01-02 07:41:40 UTC (rev 341) +++ openbios-devel/config/examples/sparc32_config.xml 2009-01-02 13:32:15 UTC (rev 342) @@ -38,8 +38,9 @@  <option name="CONFIG_CMDLINE" type="boolean" value="true"/> <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> -  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> Modified: openbios-devel/config/examples/sparc64_config.xml =================================================================== --- openbios-devel/config/examples/sparc64_config.xml 2009-01-02 07:41:40 UTC (rev 341) +++ openbios-devel/config/examples/sparc64_config.xml 2009-01-02 13:32:15 UTC (rev 342) @@ -35,8 +35,9 @@  <option name="CONFIG_CMDLINE" type="boolean" value="true"/> <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X8" type="boolean" value="false"/> + <option name="CONFIG_FONT_8X16" type="boolean" value="true"/> -  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> Added: openbios-devel/include/openbios/fontdata.h =================================================================== --- openbios-devel/include/openbios/fontdata.h (rev 0) +++ openbios-devel/include/openbios/fontdata.h 2009-01-02 13:32:15 UTC (rev 342) @@ -0,0 +1,18 @@ +/* Font definitions */ + +#ifndef OPENBIOS_FONTDATA_H +#define OPENBIOS_FONTDATA_H + +#define FONTDATAMAX_8X8 2048 +#define FONT_WIDTH_8X8 8 +#define FONT_HEIGHT_8X8 8 + +extern const unsigned char fontdata_8x8[FONTDATAMAX_8X8]; + +#define FONTDATAMAX_8X16 4096 +#define FONT_WIDTH_8X16 8 +#define FONT_HEIGHT_8X16 16 + +extern const unsigned char fontdata_8x16[FONTDATAMAX_8X16]; + +#endif /* OPENBIOS_FONTDATA_H */ Modified: openbios-devel/modules/build.xml =================================================================== --- openbios-devel/modules/build.xml 2009-01-02 07:41:40 UTC (rev 341) +++ openbios-devel/modules/build.xml 2009-01-02 13:32:15 UTC (rev 342) @@ -19,6 +19,8 @@ <object source="mac-parts.c" condition="MAC_PARTS"/> <object source="pc-parts.c" condition="PC_PARTS"/> <object source="sun-parts.c" condition="SUN_PARTS"/> + <object source="font_8x8.c" condition="FONT_8X8"/> + <object source="font_8x16.c" condition="FONT_8X16"/> </library> <dictionary name="openbios" target="forth"> @@ -26,5 +28,5 @@ <object source="support.fs"/> <object source="helpers.fs"/> </dictionary> - + </build> Modified: openbios-devel/modules/console.c =================================================================== --- openbios-devel/modules/console.c 2009-01-02 07:41:40 UTC (rev 341) +++ openbios-devel/modules/console.c 2009-01-02 13:32:15 UTC (rev 342) @@ -14,8 +14,21 @@ #include "openbios/config.h" #include "openbios/bindings.h" +#include "openbios/fontdata.h" -#include "font_8x8.c" +#if !defined(fontdata) +#if defined(CONFIG_FONT_8X8) +#define fontdata fontdata_8x8 +#define FONT_HEIGHT FONT_HEIGHT_8X8 +#define FONT_WIDTH FONT_WIDTH_8X8 +#elif defined(CONFIG_FONT_8X16) +#define fontdata fontdata_8x16 +#define FONT_HEIGHT FONT_HEIGHT_8X16 +#define FONT_WIDTH FONT_WIDTH_8X16 +#else +#error no font selected +#endif +#endif #define FONT_ADJ_HEIGHT (FONT_HEIGHT + 2) #define NCOLS 80 Modified: openbios-devel/modules/font_8x16.c =================================================================== --- openbios-devel/modules/font_8x16.c 2009-01-02 07:41:40 UTC (rev 341) +++ openbios-devel/modules/font_8x16.c 2009-01-02 13:32:15 UTC (rev 342) @@ -7,11 +7,10 @@ * * **********************************************/ +#include "openbios/fontdata.h" -#define FONTDATAMAX 4096 +const unsigned char fontdata_8x16[FONTDATAMAX_8X16] = { -static const unsigned char fontdata_8x16[FONTDATAMAX] = { - /* 0 0x00 '^@' */ 0x00, /* 00000000 */ 0x00, /* 00000000 */ Modified: openbios-devel/modules/font_8x8.c =================================================================== --- openbios-devel/modules/font_8x8.c 2009-01-02 07:41:40 UTC (rev 341) +++ openbios-devel/modules/font_8x8.c 2009-01-02 13:32:15 UTC (rev 342) @@ -4,11 +4,9 @@ /* */ /**********************************************/ -#define FONTDATAMAX 2048 -#define FONT_WIDTH 8 -#define FONT_HEIGHT 8 +#include "openbios/fontdata.h" -static const unsigned char fontdata[FONTDATAMAX] = { +const unsigned char fontdata_8x8[FONTDATAMAX_8X8] = { /* 0 0x00 '^@' */ 0x00, /* 00000000 */

1 0

r341 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 02 Jan '09

02 Jan '09

Author: blueswirl Date: 2009-01-02 08:41:40 +0100 (Fri, 02 Jan 2009) New Revision: 341 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/kernel.h openbios-devel/arch/ppc/qemu/methods.c openbios-devel/arch/ppc/qemu/qemu.fs openbios-devel/arch/ppc/qemu/tree.fs Log: Correct duplicate /cpus and more (Laurent Vivier) Correct duplicate /cpus Correct mmu properties in /chosen Add mmu methods to /cpus/<cpu> Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2009-01-01 07:48:12 UTC (rev 340) +++ openbios-devel/arch/ppc/qemu/init.c 2009-01-02 07:41:40 UTC (rev 341) @@ -489,7 +489,7 @@ #endif snprintf(buf, sizeof(buf), "/cpus/%s", cpu->name); ofmem_register(find_dev(buf)); - node_methods_init(); + node_methods_init(buf); #ifdef USE_RTAS if( !(ph=find_dev("/rtas")) ) Modified: openbios-devel/arch/ppc/qemu/kernel.h =================================================================== --- openbios-devel/arch/ppc/qemu/kernel.h 2009-01-01 07:48:12 UTC (rev 340) +++ openbios-devel/arch/ppc/qemu/kernel.h 2009-01-02 07:41:40 UTC (rev 341) @@ -25,7 +25,7 @@ extern void call_elf( ulong elf_entry ); /* methods.c */ -extern void node_methods_init( void ); +extern void node_methods_init( const char *cpuname ); /* main.c */ extern void boot( void ); Modified: openbios-devel/arch/ppc/qemu/methods.c =================================================================== --- openbios-devel/arch/ppc/qemu/methods.c 2009-01-01 07:48:12 UTC (rev 340) +++ openbios-devel/arch/ppc/qemu/methods.c 2009-01-02 07:41:40 UTC (rev 341) @@ -149,7 +149,7 @@ /************************************************************************/ DECLARE_NODE( memory, INSTALL_OPEN, 0, "/memory" ); -DECLARE_NODE( mmu, INSTALL_OPEN, 0, "/cpu@0" ); +DECLARE_UNNAMED_NODE( mmu, INSTALL_OPEN, 0 ); DECLARE_NODE( mmu_ciface, 0, 0, "+/openprom/client-services" ); @@ -291,14 +291,21 @@ /************************************************************************/ void -node_methods_init( void ) +node_methods_init( const char *cpuname ) { + phandle_t chosen, ph; #ifdef USE_RTAS REGISTER_NODE( rtas ); #endif REGISTER_NODE( ciface ); REGISTER_NODE( memory ); - REGISTER_NODE( mmu ); + REGISTER_NODE_METHODS( mmu, cpuname ); REGISTER_NODE( mmu_ciface ); REGISTER_NODE( tty ); + + chosen = find_dev("/chosen"); + if (chosen) { + ph = find_dev(cpuname); + set_int_property(chosen, "mmu", ph); + } } Modified: openbios-devel/arch/ppc/qemu/qemu.fs =================================================================== --- openbios-devel/arch/ppc/qemu/qemu.fs 2009-01-01 07:48:12 UTC (rev 340) +++ openbios-devel/arch/ppc/qemu/qemu.fs 2009-01-02 07:41:40 UTC (rev 341) @@ -37,7 +37,6 @@ :noname " rtc" " rtc" preopen " memory" " /memory" preopen - " mmu" " /cpu@0" preopen \ " stdout" " /packages/terminal-emulator" preopen " stdout" " screen" preopen " stdin" " adb-keyboard" preopen Modified: openbios-devel/arch/ppc/qemu/tree.fs =================================================================== --- openbios-devel/arch/ppc/qemu/tree.fs 2009-01-01 07:48:12 UTC (rev 340) +++ openbios-devel/arch/ppc/qemu/tree.fs 2009-01-02 07:41:40 UTC (rev 341) @@ -35,13 +35,6 @@ : close ; finish-device -new-device - " cpus" device-name - " cpus" device-type - 1 encode-int " #address-cells" property - 0 encode-int " #size-cells" property -finish-device - \ ------------------------------------------------------------- \ /packages \ -------------------------------------------------------------

1 0

r340 - openbios-devel/config/examples
by svn＠openbios.org 01 Jan '09

01 Jan '09

Author: blueswirl Date: 2009-01-01 08:48:12 +0100 (Thu, 01 Jan 2009) New Revision: 340 Modified: openbios-devel/config/examples/amd64_config.xml openbios-devel/config/examples/amd64_rules.xml openbios-devel/config/examples/cross-ppc_config.xml openbios-devel/config/examples/cross-ppc_rules.xml openbios-devel/config/examples/cross-sparc32_config.xml openbios-devel/config/examples/cross-sparc32_rules.xml openbios-devel/config/examples/cross-sparc64_config.xml openbios-devel/config/examples/cross-sparc64_rules.xml openbios-devel/config/examples/ppc_config.xml openbios-devel/config/examples/ppc_rules.xml openbios-devel/config/examples/sparc32_config.xml openbios-devel/config/examples/sparc32_rules.xml openbios-devel/config/examples/sparc64_config.xml openbios-devel/config/examples/sparc64_rules.xml openbios-devel/config/examples/x86_config.xml openbios-devel/config/examples/x86_rules.xml Log: Cleanup white space and unused lines Modified: openbios-devel/config/examples/amd64_config.xml =================================================================== --- openbios-devel/config/examples/amd64_config.xml 2009-01-01 07:34:30 UTC (rev 339) +++ openbios-devel/config/examples/amd64_config.xml 2009-01-01 07:48:12 UTC (rev 340) @@ -3,7 +3,6 @@  <option name="CONFIG_AMD64" type="boolean" value="true"/> -  <option name="CONFIG_LITTLE_ENDIAN" type="boolean" value="true"/>  @@ -15,7 +14,7 @@ <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/> <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> <option name="CONFIG_PLUGINS" type="boolean" value="false"/> - +  <option name="CONFIG_DEBUG" type="boolean" value="true"/> <option name="CONFIG_DEBUG_BOOT" type="boolean" value="true"/> @@ -29,13 +28,13 @@ <option name="CONFIG_SERIAL_PORT" type="boolean" value="true"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/> - - + +  <option name="CONFIG_CMDLINE" type="boolean" value="true"/> <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> - - + +  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> @@ -57,10 +56,10 @@ <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_AFFS" type="boolean" value="false"/> <option name="CONFIG_DEBUG_FS" type="boolean" value="true"/> - +  <option name="CONFIG_LINUXBIOS" type="boolean" value="true"/> - +  <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/> <option name="CONFIG_DEBUG_PCI" type="boolean" value="false"/> Modified: openbios-devel/config/examples/amd64_rules.xml =================================================================== --- openbios-devel/config/examples/amd64_rules.xml 2009-01-01 07:34:30 UTC (rev 339) +++ openbios-devel/config/examples/amd64_rules.xml 2009-01-01 07:48:12 UTC (rev 340) @@ -12,7 +12,7 @@ HOSTCFLAGS := -O -g -fprofile-arcs -ftest-coverage -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include -CC := gcc +CC := gcc AR := ar NM := nm STRIP := strip @@ -50,13 +50,13 @@ <rule target="host" entity="object"> $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ </rule> - + <rule target="host" entity="library"> $(AR) cru $@ $^; $(RANLIB) $@ </rule> - +  - + <rule target="target" entity="executable"> $(CC) $(CFLAGS) -o $@ $^ </rule> @@ -64,7 +64,7 @@ <rule target="target" entity="object"> $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ </rule> - + <rule target="target" entity="library"> $(AR) cru $@ $^; $(RANLIB) $@ </rule> Modified: openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_config.xml 2009-01-01 07:34:30 UTC (rev 339) +++ openbios-devel/config/examples/cross-ppc_config.xml 2009-01-01 07:48:12 UTC (rev 340) @@ -2,7 +2,6 @@ <config>  -  <option name="CONFIG_PPC" type="boolean" value="true"/> <option name="CONFIG_MOL" type="boolean" value="false"/> <option name="CONFIG_BRIQ" type="boolean" value="false"/> @@ -14,7 +13,7 @@ <option name="CONFIG_HOST_UNIX" type="boolean" value="false"/> <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> <option name="CONFIG_PLUGINS" type="boolean" value="false"/> - +  <option name="CONFIG_DEBUG" type="boolean" value="true"/> <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> @@ -28,13 +27,13 @@ <option name="CONFIG_SERIAL_PORT" type="integer" value="1"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/> - - + +  <option name="CONFIG_CMDLINE" type="boolean" value="true"/> <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> - - + +  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> @@ -58,10 +57,10 @@ <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_AFFS" type="boolean" value="false"/> <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/> - +  <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/> - +  <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/> <option name="CONFIG_DEBUG_PCI" type="boolean" value="false"/> Modified: openbios-devel/config/examples/cross-ppc_rules.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_rules.xml 2009-01-01 07:34:30 UTC (rev 339) +++ openbios-devel/config/examples/cross-ppc_rules.xml 2009-01-01 07:48:12 UTC (rev 340) @@ -15,7 +15,7 @@ HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include # # MOLPATH is needed if you want to build openbios-mol.elf -# +# MOLPATH=$(HOME)/mol-0.9.71 TARGET=powerpc-linux-gnu- @@ -79,13 +79,13 @@ <rule target="host" entity="object"> $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ </rule> - + <rule target="host" entity="library"> $(AR) cru $@ $^; ranlib $@ </rule> - +  - + <rule target="target" entity="executable"> $(CC) $(CFLAGS) -o $@ $^ </rule> @@ -93,7 +93,7 @@ <rule target="target" entity="object"> $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ </rule> - + <rule target="target" entity="library"> $(AR) cru $@ $^; $(RANLIB) $@ </rule> Modified: openbios-devel/config/examples/cross-sparc32_config.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_config.xml 2009-01-01 07:34:30 UTC (rev 339) +++ openbios-devel/config/examples/cross-sparc32_config.xml 2009-01-01 07:48:12 UTC (rev 340) @@ -15,7 +15,7 @@ <option name="CONFIG_HOST_UNIX" type="boolean" value="false"/> <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> <option name="CONFIG_PLUGINS" type="boolean" value="false"/> - +  <option name="CONFIG_DEBUG" type="boolean" value="true"/> <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> @@ -33,13 +33,13 @@ <option name="CONFIG_DEBUG_IOMMU" type="boolean" value="false"/> <option name="CONFIG_SERIAL_PORT" type="integer" value="0"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="9600"/> - - + +  <option name="CONFIG_CMDLINE" type="boolean" value="true"/> <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> - - + +  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> @@ -63,10 +63,10 @@ <option name="CONFIG_FSYS_AFFS" type="boolean" value="true"/> <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/> <option name="CONFIG_DEBUG_EXT2FS" type="boolean" value="false"/> - +  <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/> - +  <option name="CONFIG_DRIVER_SBUS" type="boolean" value="true"/> <option name="CONFIG_DRIVER_OBIO" type="boolean" value="true"/> Modified: openbios-devel/config/examples/cross-sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_rules.xml 2009-01-01 07:34:30 UTC (rev 339) +++ openbios-devel/config/examples/cross-sparc32_rules.xml 2009-01-01 07:48:12 UTC (rev 340) @@ -62,13 +62,13 @@ <rule target="host" entity="object"> $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ </rule> - + <rule target="host" entity="library"> $(AR) cru $@ $^; $(RANLIB) $@ </rule> - +  - + <rule target="target" entity="executable"> $(CC) $(CFLAGS) -o $@ $^ </rule> @@ -76,7 +76,7 @@ <rule target="target" entity="object"> $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ </rule> - + <rule target="target" entity="library"> $(AR) cru $@ $^; $(RANLIB) $@ </rule> Modified: openbios-devel/config/examples/cross-sparc64_config.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_config.xml 2009-01-01 07:34:30 UTC (rev 339) +++ openbios-devel/config/examples/cross-sparc64_config.xml 2009-01-01 07:48:12 UTC (rev 340) @@ -15,7 +15,7 @@ <option name="CONFIG_HOST_UNIX" type="boolean" value="false"/> <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> <option name="CONFIG_PLUGINS" type="boolean" value="false"/> - +  <option name="CONFIG_DEBUG" type="boolean" value="true"/> <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> @@ -30,13 +30,13 @@ <option name="CONFIG_SERIAL_PORT" type="integer" value="0"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/> - - + +  <option name="CONFIG_CMDLINE" type="boolean" value="true"/> <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> - - + +  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> @@ -60,10 +60,10 @@ <option name="CONFIG_FSYS_AFFS" type="boolean" value="true"/> <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/> <option name="CONFIG_DEBUG_EXT2FS" type="boolean" value="false"/> - +  <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/> - +  <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/> <option name="CONFIG_DEBUG_PCI" type="boolean" value="true"/> Modified: openbios-devel/config/examples/cross-sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_rules.xml 2009-01-01 07:34:30 UTC (rev 339) +++ openbios-devel/config/examples/cross-sparc64_rules.xml 2009-01-01 07:48:12 UTC (rev 340) @@ -63,13 +63,13 @@ <rule target="host" entity="object"> $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ </rule> - + <rule target="host" entity="library"> $(AR) cru $@ $^; $(RANLIB) $@ </rule> - +  - + <rule target="target" entity="executable"> $(CC) $(CFLAGS) -o $@ $^ </rule> @@ -77,7 +77,7 @@ <rule target="target" entity="object"> $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ </rule> - + <rule target="target" entity="library"> $(AR) cru $@ $^; $(RANLIB) $@ </rule> Modified: openbios-devel/config/examples/ppc_config.xml =================================================================== --- openbios-devel/config/examples/ppc_config.xml 2009-01-01 07:34:30 UTC (rev 339) +++ openbios-devel/config/examples/ppc_config.xml 2009-01-01 07:48:12 UTC (rev 340) @@ -2,7 +2,6 @@ <config>  -  <option name="CONFIG_PPC" type="boolean" value="true"/> <option name="CONFIG_MOL" type="boolean" value="false"/> <option name="CONFIG_BRIQ" type="boolean" value="false"/> @@ -14,7 +13,7 @@ <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/> <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> <option name="CONFIG_PLUGINS" type="boolean" value="false"/> - +  <option name="CONFIG_DEBUG" type="boolean" value="true"/> <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> @@ -28,13 +27,13 @@ <option name="CONFIG_SERIAL_PORT" type="integer" value="1"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/> - - + +  <option name="CONFIG_CMDLINE" type="boolean" value="true"/> <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> - - + +  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> @@ -58,10 +57,10 @@ <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_AFFS" type="boolean" value="false"/> <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/> - +  <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/> - +  <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/> <option name="CONFIG_DEBUG_PCI" type="boolean" value="true"/> Modified: openbios-devel/config/examples/ppc_rules.xml =================================================================== --- openbios-devel/config/examples/ppc_rules.xml 2009-01-01 07:34:30 UTC (rev 339) +++ openbios-devel/config/examples/ppc_rules.xml 2009-01-01 07:48:12 UTC (rev 340) @@ -15,7 +15,7 @@ HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include # # MOLPATH is needed if you want to build openbios-mol.elf -# +# MOLPATH=$(HOME)/mol-0.9.71 CC := gcc @@ -78,13 +78,13 @@ <rule target="host" entity="object"> $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ </rule> - + <rule target="host" entity="library"> $(AR) cru $@ $^; ranlib $@ </rule> - +  - + <rule target="target" entity="executable"> $(CC) $(CFLAGS) -o $@ $^ </rule> @@ -92,7 +92,7 @@ <rule target="target" entity="object"> $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ </rule> - + <rule target="target" entity="library"> $(AR) cru $@ $^; $(RANLIB) $@ </rule> Modified: openbios-devel/config/examples/sparc32_config.xml =================================================================== --- openbios-devel/config/examples/sparc32_config.xml 2009-01-01 07:34:30 UTC (rev 339) +++ openbios-devel/config/examples/sparc32_config.xml 2009-01-01 07:48:12 UTC (rev 340) @@ -15,7 +15,7 @@ <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/> <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> <option name="CONFIG_PLUGINS" type="boolean" value="false"/> - +  <option name="CONFIG_DEBUG" type="boolean" value="true"/> <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> @@ -33,13 +33,13 @@ <option name="CONFIG_DEBUG_IOMMU" type="boolean" value="false"/> <option name="CONFIG_SERIAL_PORT" type="integer" value="0"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="9600"/> - - + +  <option name="CONFIG_CMDLINE" type="boolean" value="true"/> <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> - - + +  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> @@ -63,10 +63,10 @@ <option name="CONFIG_FSYS_AFFS" type="boolean" value="true"/> <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/> <option name="CONFIG_DEBUG_EXT2FS" type="boolean" value="false"/> - +  <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/> - +  <option name="CONFIG_DRIVER_SBUS" type="boolean" value="true"/> <option name="CONFIG_DRIVER_OBIO" type="boolean" value="true"/> Modified: openbios-devel/config/examples/sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/sparc32_rules.xml 2009-01-01 07:34:30 UTC (rev 339) +++ openbios-devel/config/examples/sparc32_rules.xml 2009-01-01 07:48:12 UTC (rev 340) @@ -67,13 +67,13 @@ <rule target="host" entity="object"> $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ </rule> - + <rule target="host" entity="library"> $(AR) cru $@ $^; $(RANLIB) $@ </rule> - +  - + <rule target="target" entity="executable"> $(CC) $(CFLAGS) -o $@ $^ </rule> @@ -81,7 +81,7 @@ <rule target="target" entity="object"> $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ </rule> - + <rule target="target" entity="library"> $(AR) cru $@ $^; $(RANLIB) $@ </rule> Modified: openbios-devel/config/examples/sparc64_config.xml =================================================================== --- openbios-devel/config/examples/sparc64_config.xml 2009-01-01 07:34:30 UTC (rev 339) +++ openbios-devel/config/examples/sparc64_config.xml 2009-01-01 07:48:12 UTC (rev 340) @@ -15,7 +15,7 @@ <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/> <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> <option name="CONFIG_PLUGINS" type="boolean" value="false"/> - +  <option name="CONFIG_DEBUG" type="boolean" value="true"/> <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> @@ -30,13 +30,13 @@ <option name="CONFIG_SERIAL_PORT" type="integer" value="0"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/> - - + +  <option name="CONFIG_CMDLINE" type="boolean" value="true"/> <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> - - + +  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> @@ -60,10 +60,10 @@ <option name="CONFIG_FSYS_AFFS" type="boolean" value="true"/> <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/> <option name="CONFIG_DEBUG_EXT2FS" type="boolean" value="false"/> - +  <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/> - +  <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/> <option name="CONFIG_DEBUG_PCI" type="boolean" value="true"/> Modified: openbios-devel/config/examples/sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/sparc64_rules.xml 2009-01-01 07:34:30 UTC (rev 339) +++ openbios-devel/config/examples/sparc64_rules.xml 2009-01-01 07:48:12 UTC (rev 340) @@ -72,13 +72,13 @@ <rule target="host" entity="object"> $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ </rule> - + <rule target="host" entity="library"> $(AR) cru $@ $^; $(RANLIB) $@ </rule> - +  - + <rule target="target" entity="executable"> $(CC) $(CFLAGS) -o $@ $^ </rule> @@ -86,7 +86,7 @@ <rule target="target" entity="object"> $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ </rule> - + <rule target="target" entity="library"> $(AR) cru $@ $^; $(RANLIB) $@ </rule> Modified: openbios-devel/config/examples/x86_config.xml =================================================================== --- openbios-devel/config/examples/x86_config.xml 2009-01-01 07:34:30 UTC (rev 339) +++ openbios-devel/config/examples/x86_config.xml 2009-01-01 07:48:12 UTC (rev 340) @@ -2,7 +2,6 @@ <config>  -  <option name="CONFIG_X86" type="boolean" value="true"/> <option name="CONFIG_LITTLE_ENDIAN" type="boolean" value="true"/> <option name="CONFIG_XBOX" type="boolean" value="false"/> @@ -16,7 +15,7 @@ <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/> <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> <option name="CONFIG_PLUGINS" type="boolean" value="false"/> - +  <option name="CONFIG_DEBUG" type="boolean" value="true"/> <option name="CONFIG_DEBUG_BOOT" type="boolean" value="true"/> @@ -30,13 +29,13 @@ <option name="CONFIG_SERIAL_PORT" type="boolean" value="true"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/> - - + +  <option name="CONFIG_CMDLINE" type="boolean" value="true"/> <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> - - + +  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> @@ -58,10 +57,10 @@ <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_AFFS" type="boolean" value="false"/> <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/> - +  <option name="CONFIG_LINUXBIOS" type="boolean" value="true"/> - +  <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/> <option name="CONFIG_DEBUG_PCI" type="boolean" value="false"/> Modified: openbios-devel/config/examples/x86_rules.xml =================================================================== --- openbios-devel/config/examples/x86_rules.xml 2009-01-01 07:34:30 UTC (rev 339) +++ openbios-devel/config/examples/x86_rules.xml 2009-01-01 07:48:12 UTC (rev 340) @@ -54,13 +54,13 @@ <rule target="host" entity="object"> $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ </rule> - + <rule target="host" entity="library"> $(AR) cru $@ $^; $(RANLIB) $@ </rule> - +  - + <rule target="target" entity="executable"> $(CC) $(CFLAGS) -o $@ $^ </rule> @@ -68,7 +68,7 @@ <rule target="target" entity="object"> $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ </rule> - + <rule target="target" entity="library"> $(AR) cru $@ $^; $(RANLIB) $@ </rule>

1 0

r339 - in openbios-devel: arch/unix config/examples
by svn＠openbios.org 01 Jan '09

01 Jan '09

Author: blueswirl Date: 2009-01-01 08:34:30 +0100 (Thu, 01 Jan 2009) New Revision: 339 Modified: openbios-devel/arch/unix/unix.c openbios-devel/config/examples/ppc_config.xml Log: Fix Unix host build on PPC Modified: openbios-devel/arch/unix/unix.c =================================================================== --- openbios-devel/arch/unix/unix.c 2008-12-31 20:07:10 UTC (rev 338) +++ openbios-devel/arch/unix/unix.c 2009-01-01 07:34:30 UTC (rev 339) @@ -59,6 +59,10 @@ static int segfault = 0; int verbose = 0; +#ifdef CONFIG_PPC +uint32_t isa_io_base; +#endif + int errno_int; /* implement for fs drivers, needed to build on Mac OS X */ #if 0 Modified: openbios-devel/config/examples/ppc_config.xml =================================================================== --- openbios-devel/config/examples/ppc_config.xml 2008-12-31 20:07:10 UTC (rev 338) +++ openbios-devel/config/examples/ppc_config.xml 2009-01-01 07:34:30 UTC (rev 339) @@ -11,7 +11,7 @@ <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/>  - <option name="CONFIG_HOST_UNIX" type="boolean" value="false"/> + <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/> <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> <option name="CONFIG_PLUGINS" type="boolean" value="false"/>

1 0

Re: [OpenBIOS] PPC: add a native configuration
by Aurelien Jarno 31 Dec '08

31 Dec '08

On Wed, Dec 31, 2008 at 11:05:10PM +0200, Blue Swirl wrote: > On 12/31/08, Aurelien Jarno <aurelien(a)aurel32.net> wrote: > > On Wed, Dec 31, 2008 at 08:00:18PM +0200, Blue Swirl wrote: > > > On 12/31/08, Aurelien Jarno <aurelien(a)aurel32.net> wrote: > > > > On Wed, Dec 31, 2008 at 05:24:13PM +0200, Blue Swirl wrote: > > > > > On 12/31/08, Aurelien Jarno <aurelien(a)aurel32.net> wrote: > > > > > > This patch adds a native configuration for PPC. It is based on the cross > > > > > > configuration files > > > > > > > > > > > > Signed-off-by: Aurelien Jarno <aurelien(a)aurel32.net> > > > > > > > > > > >  > > > > > > - <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/> > > > > > > + <option name="CONFIG_HOST_UNIX" type="boolean" value="false"/> > > > > > > > > > > When compiling natively, we can build a Unix host version too. Is it > > > > > OK if I commit the patch including your sign-off with this change > > > > > removed? > > > > > > > > > > > > > > > > > Yes, I have seen that, but the Unix host version is currently not > > > > building. I think we can enable it when it is fixed. > > > > > > Oh, what's the problem? > > > > > > obj-ppc/libbootstrap.a(primitives.o): In function `iocfetch': > > primitives.c:(.text+0x1416): undefined reference to `isa_io_base' > > primitives.c:(.text+0x141e): undefined reference to `isa_io_base' > > obj-ppc/libbootstrap.a(primitives.o): In function `iowfetch': > > primitives.c:(.text+0x1456): undefined reference to `isa_io_base' > > primitives.c:(.text+0x145e): undefined reference to `isa_io_base' > > obj-ppc/libbootstrap.a(primitives.o): In function `iolfetch': > > primitives.c:(.text+0x148a): undefined reference to `isa_io_base' > > obj-ppc/libbootstrap.a(primitives.o):primitives.c:(.text+0x1492): more undefined references to `isa_io_base' follow > > collect2: ld returned 1 exit status > > make[1]: *** [obj-ppc/openbios-unix] Erreur 1 > > The in/out functions reference isa_io_base, defined in include/ppc/io.h. > > Would this patch fix the build? Yes, it fixes it. Thanks. -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32(a)debian.org | aurelien(a)aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net

1 0

r338 - openbios-devel/arch/sparc64
by svn＠openbios.org 31 Dec '08

31 Dec '08

Author: blueswirl Date: 2008-12-31 21:07:10 +0100 (Wed, 31 Dec 2008) New Revision: 338 Modified: openbios-devel/arch/sparc64/openbios.c Log: Suppress useless printing of kernel address and size Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-12-31 18:49:53 UTC (rev 337) +++ openbios-devel/arch/sparc64/openbios.c 2008-12-31 20:07:10 UTC (rev 338) @@ -672,7 +672,8 @@ cmdline_size = size; boot_device = nv_info.boot_devices[0]; - printk("kernel addr %llx size %llx\n", kernel_image, kernel_size); + if (kernel_size) + printk("kernel addr %llx size %llx\n", kernel_image, kernel_size); if (size) printk("kernel cmdline %s\n", obio_cmdline);

1 0

r337 - openbios-devel/config/examples
by svn＠openbios.org 31 Dec '08

31 Dec '08

Author: blueswirl Date: 2008-12-31 19:49:53 +0100 (Wed, 31 Dec 2008) New Revision: 337 Added: openbios-devel/config/examples/ppc_rules.xml Log: Actually add the rules file Added: openbios-devel/config/examples/ppc_rules.xml =================================================================== --- openbios-devel/config/examples/ppc_rules.xml (rev 0) +++ openbios-devel/config/examples/ppc_rules.xml 2008-12-31 18:49:53 UTC (rev 337) @@ -0,0 +1,100 @@ +<rules> + +<pre><![CDATA[ +# +# Autogenerated OpenBIOS Makefile +# (C) 2004-2005 by the OpenBIOS team +# + +ARCH := ppc +ODIR := obj-$(ARCH) +HOSTCC := gcc +HOSTCFLAGS := -Os -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) +HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations +HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes +HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +# +# MOLPATH is needed if you want to build openbios-mol.elf +# +MOLPATH=$(HOME)/mol-0.9.71 + +CC := gcc +AS := as +AR := ar +LD := ld +NM := nm +STRIP := strip +RANLIB := ranlib +CFLAGS := -Os -Wall -msoft-float -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin-bcopy -fno-builtin-log2 +CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations +CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes +INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include + +M4 := m4 + +# +# pre rules +# + +all: mol versions dictionaries host-libraries target-libraries host-executables target-executables + +VERSION := "1.0RC1" + +versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs + +$(ODIR)/forth/version.fs: + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ + ( echo ": builddate \" $$DATE\" ; " ; \ + echo ": version \" $(VERSION)\" ; " ; ) \ + > $(dir $(a))/version.fs + +$(ODIR)/target/include/openbios-version.h: + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ + ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ + echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ + echo "#define OPENBIOS_RELEASE \"$(VERSION)\"" ; ) \ + > $(dir $(a))/openbios-version.h +mol: + @grep CONFIG_MOL $(ODIR)/forth/config.fs >/dev/null && ( \ + echo "Using MOL path $(MOLPATH)..."; \ + ln -s $(MOLPATH)/src/shared/osi_calls.h $(ODIR)/target/include/; \ + ln -s $(MOLPATH)/src/shared/osi.h $(ODIR)/target/include/; \ + ln -s $(MOLPATH)/src/shared/prom.h $(ODIR)/target/include/; \ + ln -s $(MOLPATH)/src/include/boothelper_sh.h $(ODIR)/target/include/; \ + ln -s $(MOLPATH)/src/include/video_sh.h $(ODIR)/target/include/; \ + ln -s $(MOLPATH)/src/include/pseudofs_sh.h $(ODIR)/target/include/; \ + ln -s $(MOLPATH)/src/include/kbd_sh.h $(ODIR)/target/include/; \ + ln -s $(MOLPATH)/src/drivers/disk/include/scsi_sh.h $(ODIR)/target/include/; \ + ln -s $(MOLPATH)/src/drivers/disk/include/ablk_sh.h $(ODIR)/target/include/ ) || true + +]]></pre> + +  + +<rule target="host" entity="executable"> + $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ +</rule> + +<rule target="host" entity="object"> + $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ +</rule> + +<rule target="host" entity="library"> + $(AR) cru $@ $^; ranlib $@ +</rule> + +  + +<rule target="target" entity="executable"> + $(CC) $(CFLAGS) -o $@ $^ +</rule> + +<rule target="target" entity="object"> + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ +</rule> + +<rule target="target" entity="library"> + $(AR) cru $@ $^; $(RANLIB) $@ +</rule> + +</rules>

1 0

PPC: add a native configuration
by Aurelien Jarno 31 Dec '08

31 Dec '08

This patch adds a native configuration for PPC. It is based on the cross configuration files Signed-off-by: Aurelien Jarno <aurelien(a)aurel32.net> diff --git a/config/examples/ppc_config.xml b/config/examples/ppc_config.xml index 4023cb8..3346357 100644 --- a/config/examples/ppc_config.xml +++ b/config/examples/ppc_config.xml @@ -4,19 +4,20 @@   <option name="CONFIG_PPC" type="boolean" value="true"/> -  -  - <option name="CONFIG_PEARPC" type="boolean" value="true"/> + <option name="CONFIG_MOL" type="boolean" value="false"/> + <option name="CONFIG_BRIQ" type="boolean" value="false"/> + <option name="CONFIG_PEARPC" type="boolean" value="false"/> + <option name="CONFIG_QEMU" type="boolean" value="true"/> <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/>  - <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/> + <option name="CONFIG_HOST_UNIX" type="boolean" value="false"/> <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> <option name="CONFIG_PLUGINS" type="boolean" value="false"/> - +  <option name="CONFIG_DEBUG" type="boolean" value="true"/> - <option name="CONFIG_DEBUG_BOOT" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> <option name="CONFIG_DEBUG_DSTACK" type="boolean" value="false"/> <option name="CONFIG_DEBUG_RSTACK" type="boolean" value="false"/> <option name="CONFIG_DEBUG_DICTIONARY" type="boolean" value="false"/> @@ -24,47 +25,53 @@ <option name="CONFIG_DEBUG_INTERPRETER" type="boolean" value="false"/> <option name="CONFIG_DEBUG_CONSOLE" type="boolean" value="true"/> <option name="CONFIG_DEBUG_CONSOLE_SERIAL" type="boolean" value="true"/> - <option name="CONFIG_SERIAL_PORT" type="boolean" value="true"/> + <option name="CONFIG_SERIAL_PORT" type="integer" value="1"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/> - - + +  <option name="CONFIG_CMDLINE" type="boolean" value="true"/> <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> - - + +  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> + <option name="CONFIG_MAC_PARTS" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_MAC_PARTS" type="boolean" value="false"/> <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> <option name="CONFIG_FS" type="boolean" value="true"/> - <option name="CONFIG_HFS" type="boolean" value="false"/> - <option name="CONFIG_HFSP" type="boolean" value="true"/> + <option name="CONFIG_HFS" type="boolean" value="true"/> + <option name="CONFIG_HFSP" type="boolean" value="false"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> <option name="CONFIG_FSYS_JFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/> - <option name="CONFIG_FSYS_REISERFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_UFS" type="boolean" value="false"/> - <option name="CONFIG_FSYS_ISO9660" type="boolean" value="false"/> + <option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/> <option name="CONFIG_FSYS_FFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_AFFS" type="boolean" value="false"/> - <option name="CONFIG_DEBUG_FS" type="boolean" value="true"/> - + <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/> +  - <option name="CONFIG_LINUXBIOS" type="boolean" value="true"/> - + <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/> +  <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/> <option name="CONFIG_DEBUG_PCI" type="boolean" value="true"/> <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> - <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> + <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="2"/> + <option name="CONFIG_IDE_FIRST_UNIT" type="integer" value="1"/> + <option name="CONFIG_IDE_DEV_NAME" type="string" value="ata-%d"/> + <option name="CONFIG_IDE_DEV_TYPE" type="string" value="ata"/> <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> <option name="CONFIG_DRIVER_ADB" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> </config> diff --git a/config/examples/ppc_rules.xml b/config/examples/ppc_rules.xml new file mode 100644 index 0000000..57f1479 --- /dev/null +++ b/config/examples/ppc_rules.xml @@ -0,0 +1,100 @@ +<rules> + +<pre><![CDATA[ +# +# Autogenerated OpenBIOS Makefile +# (C) 2004-2005 by the OpenBIOS team +# + +ARCH := ppc +ODIR := obj-$(ARCH) +HOSTCC := gcc +HOSTCFLAGS := -Os -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) +HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations +HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes +HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include +# +# MOLPATH is needed if you want to build openbios-mol.elf +# +MOLPATH=$(HOME)/mol-0.9.71 + +CC := gcc +AS := as +AR := ar +LD := ld +NM := nm +STRIP := strip +RANLIB := ranlib +CFLAGS := -Os -Wall -msoft-float -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin-bcopy -fno-builtin-log2 +CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations +CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes +INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include + +M4 := m4 + +# +# pre rules +# + +all: mol versions dictionaries host-libraries target-libraries host-executables target-executables + +VERSION := "1.0RC1" + +versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs + +$(ODIR)/forth/version.fs: + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ + ( echo ": builddate \" $$DATE\" ; " ; \ + echo ": version \" $(VERSION)\" ; " ; ) \ + > $(dir $(a))/version.fs + +$(ODIR)/target/include/openbios-version.h: + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ + ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ + echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ + echo "#define OPENBIOS_RELEASE \"$(VERSION)\"" ; ) \ + > $(dir $(a))/openbios-version.h +mol: + @grep CONFIG_MOL $(ODIR)/forth/config.fs >/dev/null && ( \ + echo "Using MOL path $(MOLPATH)..."; \ + ln -s $(MOLPATH)/src/shared/osi_calls.h $(ODIR)/target/include/; \ + ln -s $(MOLPATH)/src/shared/osi.h $(ODIR)/target/include/; \ + ln -s $(MOLPATH)/src/shared/prom.h $(ODIR)/target/include/; \ + ln -s $(MOLPATH)/src/include/boothelper_sh.h $(ODIR)/target/include/; \ + ln -s $(MOLPATH)/src/include/video_sh.h $(ODIR)/target/include/; \ + ln -s $(MOLPATH)/src/include/pseudofs_sh.h $(ODIR)/target/include/; \ + ln -s $(MOLPATH)/src/include/kbd_sh.h $(ODIR)/target/include/; \ + ln -s $(MOLPATH)/src/drivers/disk/include/scsi_sh.h $(ODIR)/target/include/; \ + ln -s $(MOLPATH)/src/drivers/disk/include/ablk_sh.h $(ODIR)/target/include/ ) || true + +]]></pre> + +  + +<rule target="host" entity="executable"> + $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ +</rule> + +<rule target="host" entity="object"> + $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ +</rule> + +<rule target="host" entity="library"> + $(AR) cru $@ $^; ranlib $@ +</rule> + +  + +<rule target="target" entity="executable"> + $(CC) $(CFLAGS) -o $@ $^ +</rule> + +<rule target="target" entity="object"> + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ +</rule> + +<rule target="target" entity="library"> + $(AR) cru $@ $^; $(RANLIB) $@ +</rule> + +</rules> -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32(a)debian.org | aurelien(a)aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net

2 4

r336 - in openbios-devel: config/examples drivers
by svn＠openbios.org 31 Dec '08

31 Dec '08

Author: blueswirl Date: 2008-12-31 19:16:01 +0100 (Wed, 31 Dec 2008) New Revision: 336 Modified: openbios-devel/config/examples/cross-sparc32_config.xml openbios-devel/config/examples/cross-sparc64_config.xml openbios-devel/config/examples/sparc32_config.xml openbios-devel/config/examples/sparc64_config.xml openbios-devel/config/examples/x86_config.xml openbios-devel/drivers/floppy.c Log: Suppress floppy debug and info messages by default Modified: openbios-devel/config/examples/cross-sparc32_config.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_config.xml 2008-12-31 18:01:53 UTC (rev 335) +++ openbios-devel/config/examples/cross-sparc32_config.xml 2008-12-31 18:16:01 UTC (rev 336) @@ -72,5 +72,6 @@ <option name="CONFIG_DRIVER_OBIO" type="boolean" value="true"/> <option name="CONFIG_DRIVER_ESP" type="boolean" value="true"/> <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_FLOPPY" type="boolean" value="false"/> </config> Modified: openbios-devel/config/examples/cross-sparc64_config.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_config.xml 2008-12-31 18:01:53 UTC (rev 335) +++ openbios-devel/config/examples/cross-sparc64_config.xml 2008-12-31 18:16:01 UTC (rev 336) @@ -71,6 +71,7 @@ <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_FLOPPY" type="boolean" value="false"/> <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> </config> Modified: openbios-devel/config/examples/sparc32_config.xml =================================================================== --- openbios-devel/config/examples/sparc32_config.xml 2008-12-31 18:01:53 UTC (rev 335) +++ openbios-devel/config/examples/sparc32_config.xml 2008-12-31 18:16:01 UTC (rev 336) @@ -72,5 +72,6 @@ <option name="CONFIG_DRIVER_OBIO" type="boolean" value="true"/> <option name="CONFIG_DRIVER_ESP" type="boolean" value="true"/> <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_FLOPPY" type="boolean" value="false"/> </config> Modified: openbios-devel/config/examples/sparc64_config.xml =================================================================== --- openbios-devel/config/examples/sparc64_config.xml 2008-12-31 18:01:53 UTC (rev 335) +++ openbios-devel/config/examples/sparc64_config.xml 2008-12-31 18:16:01 UTC (rev 336) @@ -71,6 +71,7 @@ <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_FLOPPY" type="boolean" value="false"/> <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> </config> Modified: openbios-devel/config/examples/x86_config.xml =================================================================== --- openbios-devel/config/examples/x86_config.xml 2008-12-31 18:01:53 UTC (rev 335) +++ openbios-devel/config/examples/x86_config.xml 2008-12-31 18:16:01 UTC (rev 336) @@ -69,5 +69,6 @@ <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_FLOPPY" type="boolean" value="false"/> </config> Modified: openbios-devel/drivers/floppy.c =================================================================== --- openbios-devel/drivers/floppy.c 2008-12-31 18:01:53 UTC (rev 335) +++ openbios-devel/drivers/floppy.c 2008-12-31 18:16:01 UTC (rev 336) @@ -11,8 +11,13 @@ /* DECLARE data structures for the nodes. */ DECLARE_UNNAMED_NODE( ob_floppy, INSTALL_OPEN, 2*sizeof(int) ); +#ifdef CONFIG_DEBUG_FLOPPY #define printk_info printk #define printk_debug printk +#else +#define printk_info(x ...) +#define printk_debug(x ...) +#endif #define printk_err printk #ifndef FD_BASE

1 0

r335 - openbios-devel/config/examples
by svn＠openbios.org 31 Dec '08

31 Dec '08

Author: blueswirl Date: 2008-12-31 19:01:53 +0100 (Wed, 31 Dec 2008) New Revision: 335 Modified: openbios-devel/config/examples/ppc_config.xml Log: PPC: add a native configuration This patch adds a native configuration for PPC. It is based on the cross configuration files Signed-off-by: Aurelien Jarno <aurelien(a)aurel32.net> Modified: openbios-devel/config/examples/ppc_config.xml =================================================================== --- openbios-devel/config/examples/ppc_config.xml 2008-12-31 16:21:08 UTC (rev 334) +++ openbios-devel/config/examples/ppc_config.xml 2008-12-31 18:01:53 UTC (rev 335) @@ -4,19 +4,20 @@   <option name="CONFIG_PPC" type="boolean" value="true"/> -  -  - <option name="CONFIG_PEARPC" type="boolean" value="true"/> + <option name="CONFIG_MOL" type="boolean" value="false"/> + <option name="CONFIG_BRIQ" type="boolean" value="false"/> + <option name="CONFIG_PEARPC" type="boolean" value="false"/> + <option name="CONFIG_QEMU" type="boolean" value="true"/> <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/>  - <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/> + <option name="CONFIG_HOST_UNIX" type="boolean" value="false"/> <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> <option name="CONFIG_PLUGINS" type="boolean" value="false"/> - +  <option name="CONFIG_DEBUG" type="boolean" value="true"/> - <option name="CONFIG_DEBUG_BOOT" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> <option name="CONFIG_DEBUG_DSTACK" type="boolean" value="false"/> <option name="CONFIG_DEBUG_RSTACK" type="boolean" value="false"/> <option name="CONFIG_DEBUG_DICTIONARY" type="boolean" value="false"/> @@ -24,47 +25,53 @@ <option name="CONFIG_DEBUG_INTERPRETER" type="boolean" value="false"/> <option name="CONFIG_DEBUG_CONSOLE" type="boolean" value="true"/> <option name="CONFIG_DEBUG_CONSOLE_SERIAL" type="boolean" value="true"/> - <option name="CONFIG_SERIAL_PORT" type="boolean" value="true"/> + <option name="CONFIG_SERIAL_PORT" type="integer" value="1"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/> - - + +  <option name="CONFIG_CMDLINE" type="boolean" value="true"/> <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> - - + +  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> + <option name="CONFIG_MAC_PARTS" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_MAC_PARTS" type="boolean" value="false"/> <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> <option name="CONFIG_FS" type="boolean" value="true"/> - <option name="CONFIG_HFS" type="boolean" value="false"/> - <option name="CONFIG_HFSP" type="boolean" value="true"/> + <option name="CONFIG_HFS" type="boolean" value="true"/> + <option name="CONFIG_HFSP" type="boolean" value="false"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> <option name="CONFIG_FSYS_JFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/> - <option name="CONFIG_FSYS_REISERFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_UFS" type="boolean" value="false"/> - <option name="CONFIG_FSYS_ISO9660" type="boolean" value="false"/> + <option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/> <option name="CONFIG_FSYS_FFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_AFFS" type="boolean" value="false"/> - <option name="CONFIG_DEBUG_FS" type="boolean" value="true"/> - + <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/> +  - <option name="CONFIG_LINUXBIOS" type="boolean" value="true"/> - + <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/> +  <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/> <option name="CONFIG_DEBUG_PCI" type="boolean" value="true"/> <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> - <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> + <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="2"/> + <option name="CONFIG_IDE_FIRST_UNIT" type="integer" value="1"/> + <option name="CONFIG_IDE_DEV_NAME" type="string" value="ata-%d"/> + <option name="CONFIG_IDE_DEV_TYPE" type="string" value="ata"/> <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> <option name="CONFIG_DRIVER_ADB" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> </config>

1 0

r334 - openbios-devel/drivers
by svn＠openbios.org 31 Dec '08

31 Dec '08

Author: blueswirl Date: 2008-12-31 17:21:08 +0100 (Wed, 31 Dec 2008) New Revision: 334 Added: openbios-devel/drivers/pci_database.c openbios-devel/drivers/pci_database.h Modified: openbios-devel/drivers/build.xml openbios-devel/drivers/pci.c Log: Move PCI database part from pci.c to its own file pci_database.c (Laurent Vivier) Modified: openbios-devel/drivers/build.xml =================================================================== --- openbios-devel/drivers/build.xml 2008-12-31 16:19:15 UTC (rev 333) +++ openbios-devel/drivers/build.xml 2008-12-31 16:21:08 UTC (rev 334) @@ -2,6 +2,7 @@ <library name="drivers" type="static" target="target"> <object source="pci.c" condition="DRIVER_PCI"/> + <object source="pci_database.c" condition="DRIVER_PCI"/> <object source="ide.c" condition="DRIVER_IDE"/> <object source="timer.c" condition="DRIVER_IDE"/> <object source="kbd.c" condition="DRIVER_ADB"/> Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-12-31 16:19:15 UTC (rev 333) +++ openbios-devel/drivers/pci.c 2008-12-31 16:21:08 UTC (rev 334) @@ -26,11 +26,13 @@ #include "video_subr.h" #include "timer.h" #include "pci.h" +#include "pci_database.h" #include "cuda.h" #define set_bool_property(ph, name) set_property(ph, name, NULL, 0); /* DECLARE data structures for the nodes. */ + DECLARE_UNNAMED_NODE( ob_pci_node, INSTALL_OPEN, 2*sizeof(int) ); const pci_arch_t *arch; @@ -60,96 +62,7 @@ { "close", ob_pci_close }, }; -/* PCI devices database */ -typedef struct pci_class_t pci_class_t; -typedef struct pci_subclass_t pci_subclass_t; -typedef struct pci_iface_t pci_iface_t; -typedef struct pci_dev_t pci_dev_t; - -typedef struct pci_config_t pci_config_t; - -struct pci_config_t { - char path[64]; - uint32_t regions[7]; - uint32_t sizes[7]; -}; - -struct pci_iface_t { - uint8_t iface; - const char *name; - const char *type; - const pci_dev_t *devices; - int (*config_cb)(const pci_config_t *config); - const void *private; -}; - -struct pci_subclass_t { - uint8_t subclass; - const char *name; - const char *type; - const pci_dev_t *devices; - const pci_iface_t *iface; - int (*config_cb)(const pci_config_t *config); - const void *private; -}; - -struct pci_class_t { - const char *name; - const char *type; - const pci_subclass_t *subc; -}; - -struct pci_dev_t { - uint16_t vendor; - uint16_t product; - const char *type; - const char *name; - const char *model; - const char *compat; - int acells; - int scells; - int icells; - int (*config_cb)(const pci_config_t *config); - const void *private; -}; - -/* Current machine description */ - -typedef struct pci_bridge_t pci_bridge_t; - -/* Low level access helpers */ -struct pci_ops_t { - uint8_t (*config_readb)(pci_bridge_t *bridge, - uint8_t bus, uint8_t devfn, uint8_t offset); - void (*config_writeb)(pci_bridge_t *bridge, - uint8_t bus, uint8_t devfn, - uint8_t offset, uint8_t val); - uint16_t (*config_readw)(pci_bridge_t *bridge, - uint8_t bus, uint8_t devfn, uint8_t offset); - void (*config_writew)(pci_bridge_t *bridge, - uint8_t bus, uint8_t devfn, - uint8_t offset, uint16_t val); - uint32_t (*config_readl)(pci_bridge_t *bridge, - uint8_t bus, uint8_t devfn, uint8_t offset); - void (*config_writel)(pci_bridge_t *bridge, - uint8_t bus, uint8_t devfn, - uint8_t offset, uint32_t val); -}; - -static const pci_subclass_t undef_subclass[] = { -#if 0 - { - 0x00, "misc undefined", NULL, NULL, NULL, - NULL, NULL, - }, -#endif - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static int ide_config_cb2 (const pci_config_t *config) +int ide_config_cb2 (const pci_config_t *config) { ob_ide_init(config->path, config->regions[0] & ~0x0000000F, @@ -159,71 +72,7 @@ return 0; } -static const pci_dev_t ide_devices[] = { - { - 0x1095, 0x0646, /* CMD646 IDE controller */ - "pci-ide", "pci-ata", NULL, NULL, - 0, 0, 0, - ide_config_cb2, NULL, - }, - { - 0xFFFF, 0xFFFF, - NULL, NULL, NULL, NULL, - -1, -1, -1, - NULL, NULL, - }, -}; - -static const pci_subclass_t mass_subclass[] = { - { - 0x00, "SCSI bus controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x01, "IDE controller", "ide", ide_devices, NULL, - NULL, NULL, - }, - { - 0x02, "Floppy disk controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x03, "IPI bus controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x04, "RAID controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x05, "ATA controller", "ata", NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc mass-storage controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static const pci_dev_t eth_devices[] = { - { 0x10EC, 0x8029, - NULL, "NE2000", "NE2000 PCI", NULL, - 0, 0, 0, - NULL, "ethernet", - }, - { - 0xFFFF, 0xFFFF, - NULL, NULL, NULL, NULL, - -1, -1, -1, - NULL, NULL, - }, -}; - -static int eth_config_cb (const pci_config_t *config) +int eth_config_cb (const pci_config_t *config) { phandle_t ph; cell props[12]; @@ -244,856 +93,8 @@ return 0; } -static const pci_subclass_t net_subclass[] = { - { - 0x00, "ethernet controller", NULL, eth_devices, NULL, - eth_config_cb, "ethernet", - }, - { - 0x01, "token ring controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x02, "FDDI controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x03, "ATM controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x04, "ISDN controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x05, "WordFip controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x06, "PICMG 2.14 controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc network controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static const pci_dev_t vga_devices[] = { - { - 0x1002, 0x5046, - NULL, "ATY", "ATY Rage128", "VGA", - 0, 0, 0, - NULL, NULL, - }, - { - 0x1234, 0x1111, - NULL, "QEMU,VGA", "Qemu VGA", "VGA", - 0, 0, 0, - NULL, NULL, - }, - { - 0xFFFF, 0xFFFF, - NULL, NULL, NULL, NULL, - -1, -1, -1, - NULL, NULL, - }, -}; - -/* VGA configuration */ - -static int vga_config_cb (const pci_config_t *config) -{ - if (config->regions[0] != 0x00000000) - vga_vbe_init(config->path, config->regions[0], config->sizes[0], - config->regions[1], config->sizes[1]); - return 0; -} - -static const struct pci_iface_t vga_iface[] = { - { - 0x00, "VGA controller", NULL, - vga_devices, &vga_config_cb, NULL, - }, - { - 0x01, "8514 compatible controller", NULL, - NULL, NULL, NULL, - }, - { - 0xFF, NULL, NULL, - NULL, NULL, NULL, - }, -}; - -static const pci_subclass_t displ_subclass[] = { - { - 0x00, "display controller", NULL, NULL, vga_iface, - NULL, NULL, - }, - { - 0x01, "XGA display controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x02, "3D display controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc display controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static const pci_subclass_t media_subclass[] = { - { - 0x00, "video device", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x01, "audio device", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x02, "computer telephony device", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc multimedia device", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static const pci_subclass_t mem_subclass[] = { - { - 0x00, "RAM controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x01, "flash controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static const pci_dev_t grackle_fake_bridge = { - 0xFFFF, 0xFFFF, - "pci", "pci-bridge", "DEC,21154", "DEC,21154.pci-bridge", - -1, -1, -1, - NULL, NULL, -}; - -static const pci_dev_t uninorth_agp_fake_bridge = { - 0xFFFF, 0xFFFF, - "uni-north-agp", "uni-north-agp", NULL, "uni-north-agp", - -1, -1, -1, - NULL, NULL, -}; - -static const pci_dev_t uninorth_fake_bridge = { - 0xFFFF, 0xFFFF, - "uni-north", "uni-north", NULL, "uni-north", - -1, -1, -1, - NULL, NULL, -}; - - -static const pci_dev_t hbrg_devices[] = { - { - 0x106B, 0x0020, NULL, - "pci", "AAPL,UniNorth", "uni-north", - 3, 2, 1, - NULL, &uninorth_agp_fake_bridge, - }, - { - 0x106B, 0x001F, NULL, - "pci", "AAPL,UniNorth", "uni-north", - 3, 2, 1, - NULL, &uninorth_fake_bridge, - }, - { - 0x106B, 0x001E, NULL, - "pci", "AAPL,UniNorth", "uni-north", - 3, 2, 1, - NULL, &uninorth_fake_bridge, - }, - { - 0x1057, 0x0002, "pci", - "pci", "MOT,MPC106", "grackle", - 3, 2, 1, - NULL, &grackle_fake_bridge, - }, - { - 0x1057, 0x4801, NULL, - "pci-bridge", "PREP Host PCI Bridge - Motorola Raven", NULL, - 3, 2, 1, - NULL, NULL, - }, - { - 0xFFFF, 0xFFFF, - NULL, NULL, NULL, NULL, - -1, -1, -1, - NULL, NULL, - }, -}; - -static const pci_dev_t PCIbrg_devices[] = { - { - 0x1011, 0x0026, NULL, - "pci-bridge", NULL, NULL, - 3, 2, 1, - NULL, NULL, - }, - { - 0xFFFF, 0xFFFF, - NULL, NULL, NULL, NULL, - -1, -1, -1, - NULL, NULL, - }, -}; - -static const pci_subclass_t bridg_subclass[] = { - { - 0x00, "PCI host bridge", NULL, hbrg_devices, NULL, - NULL, NULL, - }, - { - 0x01, "ISA bridge", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x02, "EISA bridge", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x03, "MCA bridge", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x04, "PCI-to-PCI bridge", NULL, PCIbrg_devices, NULL, - NULL, NULL, - }, - { - 0x05, "PCMCIA bridge", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x06, "NUBUS bridge", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x07, "cardbus bridge", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x08, "raceway bridge", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x09, "semi-transparent PCI-to-PCI bridge", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x0A, "infiniband-to-PCI bridge", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc PCI bridge", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static const pci_iface_t serial_iface[] = { - { - 0x00, "XT serial controller", NULL, - NULL, NULL, NULL, - }, - { - 0x01, "16450 serial controller", NULL, - NULL, NULL, NULL, - }, - { - 0x02, "16550 serial controller", NULL, - NULL, NULL, NULL, - }, - { - 0x03, "16650 serial controller", NULL, - NULL, NULL, NULL, - }, - { - 0x04, "16750 serial controller", NULL, - NULL, NULL, NULL, - }, - { - 0x05, "16850 serial controller", NULL, - NULL, NULL, NULL, - }, - { - 0x06, "16950 serial controller", NULL, - NULL, NULL, NULL, - }, - { - 0xFF, NULL, NULL, - NULL, NULL, NULL, - }, -}; - -static const pci_iface_t par_iface[] = { - { - 0x00, "parallel port", NULL, - NULL, NULL, NULL, - }, - { - 0x01, "bi-directional parallel port", NULL, - NULL, NULL, NULL, - }, - { - 0x02, "ECP 1.x parallel port", NULL, - NULL, NULL, NULL, - }, - { - 0x03, "IEEE 1284 controller", NULL, - NULL, NULL, NULL, - }, - { - 0xFE, "IEEE 1284 device", NULL, - NULL, NULL, NULL, - }, - { - 0xFF, NULL, NULL, - NULL, NULL, NULL, - }, -}; - -static const pci_iface_t modem_iface[] = { - { - 0x00, "generic modem", NULL, - NULL, NULL, NULL, - }, - { - 0x01, "Hayes 16450 modem", NULL, - NULL, NULL, NULL, - }, - { - 0x02, "Hayes 16550 modem", NULL, - NULL, NULL, NULL, - }, - { - 0x03, "Hayes 16650 modem", NULL, - NULL, NULL, NULL, - }, - { - 0x04, "Hayes 16750 modem", NULL, - NULL, NULL, NULL, - }, - { - 0xFF, NULL, NULL, - NULL, NULL, NULL, - }, -}; - -static const pci_subclass_t comm_subclass[] = { - { - 0x00, "serial controller", NULL, NULL, serial_iface, - NULL, NULL, - }, - { - 0x01, "parallel port", NULL, NULL, par_iface, - NULL, NULL, - }, - { - 0x02, "multiport serial controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x03, "modem", NULL, NULL, modem_iface, - NULL, NULL, - }, - { - 0x04, "GPIB controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x05, "smart card", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc communication device", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static const pci_iface_t pic_iface[] = { - { - 0x00, "8259 PIC", NULL, - NULL, NULL, NULL, - }, - { - 0x01, "ISA PIC", NULL, - NULL, NULL, NULL, - }, - { - 0x02, "EISA PIC", NULL, - NULL, NULL, NULL, - }, - { - 0x10, "I/O APIC", NULL, - NULL, NULL, NULL, - }, - { - 0x20, "I/O APIC", NULL, - NULL, NULL, NULL, - }, - { - 0xFF, NULL, NULL, - NULL, NULL, NULL, - }, -}; - -static const pci_iface_t dma_iface[] = { - { - 0x00, "8237 DMA controller", NULL, - NULL, NULL, NULL, - }, - { - 0x01, "ISA DMA controller", NULL, - NULL, NULL, NULL, - }, - { - 0x02, "EISA DMA controller", NULL, - NULL, NULL, NULL, - }, - { - 0xFF, NULL, NULL, - NULL, NULL, NULL, - }, -}; - -static const pci_iface_t tmr_iface[] = { - { - 0x00, "8254 system timer", NULL, - NULL, NULL, NULL, - }, - { - 0x01, "ISA system timer", NULL, - NULL, NULL, NULL, - }, - { - 0x02, "EISA system timer", NULL, - NULL, NULL, NULL, - }, - { - 0xFF, NULL, NULL, - NULL, NULL, NULL, - }, -}; - -static const pci_iface_t rtc_iface[] = { - { - 0x00, "generic RTC controller", NULL, - NULL, NULL, NULL, - }, - { - 0x01, "ISA RTC controller", NULL, - NULL, NULL, NULL, - }, - { - 0xFF, NULL, NULL, - NULL, NULL, NULL, - }, -}; - -static const pci_dev_t sys_devices[] = { - /* IBM MPIC controller */ - { - 0x1014, 0x0002, - "open-pic", "MPIC", NULL, "chrp,open-pic", - 0, 0, 2, - NULL, NULL, - }, - /* IBM MPIC2 controller */ - { - 0x1014, 0xFFFF, - "open-pic", "MPIC2", NULL, "chrp,open-pic", - 0, 0, 2, - NULL, NULL, - }, - { - 0xFFFF, 0xFFFF, - NULL, NULL, NULL, NULL, - -1, -1, -1, - NULL, NULL, - }, -}; - -static const pci_subclass_t sys_subclass[] = { - { - 0x00, "PIC", NULL, NULL, pic_iface, - NULL, NULL, - }, - { - 0x01, "DMA controller", NULL, NULL, dma_iface, - NULL, NULL, - }, - { - 0x02, "system timer", NULL, NULL, tmr_iface, - NULL, NULL, - }, - { - 0x03, "RTC controller", NULL, NULL, rtc_iface, - NULL, NULL, - }, - { - 0x04, "PCI hotplug controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc system peripheral", NULL, sys_devices, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static const pci_subclass_t inp_subclass[] = { - { - 0x00, "keyboard controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x01, "digitizer", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x02, "mouse controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x03, "scanner controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x04, "gameport controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc input device", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static const pci_subclass_t dock_subclass[] = { - { - 0x00, "generic docking station", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc docking station", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static const pci_subclass_t cpu_subclass[] = { - { - 0x00, "i386 processor", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x01, "i486 processor", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x02, "pentium processor", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x10, "alpha processor", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x20, "PowerPC processor", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x30, "MIPS processor", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x40, "co-processor", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static const pci_iface_t usb_iface[] = { - { - 0x00, "UHCI USB controller", NULL, - NULL, NULL, NULL, - }, - { - 0x10, "OHCI USB controller", NULL, - NULL, NULL, NULL, - }, - { - 0x20, "EHCI USB controller", NULL, - NULL, NULL, NULL, - }, - { - 0x80, "misc USB controller", NULL, - NULL, NULL, NULL, - }, - { - 0xFE, "USB device", NULL, - NULL, NULL, NULL, - }, - { - 0xFF, NULL, NULL, - NULL, NULL, NULL, - }, -}; - -static const pci_iface_t ipmi_iface[] = { - { - 0x00, "IPMI SMIC interface", NULL, - NULL, NULL, NULL, - }, - { - 0x01, "IPMI keyboard interface", NULL, - NULL, NULL, NULL, - }, - { - 0x02, "IPMI block transfer interface", NULL, - NULL, NULL, NULL, - }, - { - 0xFF, NULL, NULL, - NULL, NULL, NULL, - }, -}; - -static const pci_subclass_t ser_subclass[] = { - { - 0x00, "Firewire bus controller", "ieee1394", NULL, NULL, - NULL, NULL, - }, - { - 0x01, "ACCESS bus controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x02, "SSA controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x03, "USB controller", "usb", NULL, usb_iface, - NULL, NULL, - }, - { - 0x04, "fibre channel controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x05, "SMBus controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x06, "InfiniBand controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x07, "IPMI interface", NULL, NULL, ipmi_iface, - NULL, NULL, - }, - { - 0x08, "SERCOS controller", NULL, NULL, ipmi_iface, - NULL, NULL, - }, - { - 0x09, "CANbus controller", NULL, NULL, ipmi_iface, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static const pci_subclass_t wrl_subclass[] = { - { - 0x00, "IRDA controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x01, "consumer IR controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x10, "RF controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x11, "bluetooth controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x12, "broadband controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc wireless controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static const pci_subclass_t sat_subclass[] = { - { - 0x01, "satellite TV controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x02, "satellite audio controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x03, "satellite voice controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x04, "satellite data controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static const pci_subclass_t crypt_subclass[] = { - { - 0x00, "cryptographic network controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x10, "cryptographic entertainment controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc cryptographic controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static const pci_subclass_t spc_subclass[] = { - { - 0x00, "DPIO module", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x01, "performances counters", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x10, "communication synchronisation", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x20, "management card", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc signal processing controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static const pci_class_t pci_classes[] = { - /* 0x00 */ - { "undefined", NULL, undef_subclass, }, - /* 0x01 */ - { "mass-storage controller", NULL, mass_subclass, }, - /* 0x02 */ - { "network controller", "network", net_subclass, }, - /* 0x03 */ - { "display controller", "display", displ_subclass, }, - /* 0x04 */ - { "multimedia device", NULL, media_subclass, }, - /* 0x05 */ - { "memory controller", "memory-controller", mem_subclass, }, - /* 0x06 */ - { "PCI bridge", "pci", bridg_subclass, }, - /* 0x07 */ - { "communication device", NULL, comm_subclass,}, - /* 0x08 */ - { "system peripheral", NULL, sys_subclass, }, - /* 0x09 */ - { "input device", NULL, inp_subclass, }, - /* 0x0A */ - { "docking station", NULL, dock_subclass, }, - /* 0x0B */ - { "processor", NULL, cpu_subclass, }, - /* 0x0C */ - { "serial bus controller", NULL, ser_subclass, }, - /* 0x0D */ - { "wireless controller", NULL, wrl_subclass, }, - /* 0x0E */ - { "intelligent I/O controller", NULL, NULL, }, - /* 0x0F */ - { "satellite communication controller", NULL, sat_subclass, }, - /* 0x10 */ - { "cryptographic controller", NULL, crypt_subclass, }, - /* 0x11 */ - { "signal processing controller", NULL, spc_subclass, }, -}; - phandle_t pic_handle; -static int macio_config_cb (const pci_config_t *config) +int macio_config_cb (const pci_config_t *config) { #ifdef CONFIG_PPC char buf[64]; @@ -1118,142 +119,14 @@ return 0; } -static const pci_dev_t misc_pci[] = { - /* Paddington Mac I/O */ - { - 0x106B, 0x0017, - "mac-io", "mac-io", "AAPL,343S1211", "paddington\1heathrow", - 1, 1, 1, - &macio_config_cb, NULL, - }, - /* KeyLargo Mac I/O */ - { - 0x106B, 0x0022, - "mac-io", "mac-io", "AAPL,Keylargo", "Keylargo", - 1, 1, 2, - &macio_config_cb, NULL, - }, - { - 0xFFFF, 0xFFFF, - NULL, NULL, NULL, NULL, - -1, -1, -1, - NULL, NULL, - }, -}; - -static const pci_dev_t *pci_find_device (uint8_t class, uint8_t subclass, - uint8_t iface, uint16_t vendor, - uint16_t product) +int vga_config_cb (const pci_config_t *config) { - int (*config_cb)(const pci_config_t *config); - const pci_class_t *pclass; - const pci_subclass_t *psubclass; - const pci_iface_t *piface; - const pci_dev_t *dev; - const void *private; - pci_dev_t *new; - const char *name, *type; - - name = "unknown"; - type = "unknown"; - config_cb = NULL; - private = NULL; - - if (class == 0x00 && subclass == 0x01) { - /* Special hack for old style VGA devices */ - class = 0x03; - subclass = 0x00; - } else if (class == 0xFF) { - /* Special case for misc devices */ - dev = misc_pci; - goto find_device; - } - if (class > (sizeof(pci_classes) / sizeof(pci_class_t))) { - name = "invalid PCI device"; - type = "invalid"; - goto bad_device; - } - pclass = &pci_classes[class]; - name = pclass->name; - type = pclass->type; - for (psubclass = pclass->subc; ; psubclass++) { - if (psubclass->subclass == 0xFF) - goto bad_device; - if (psubclass->subclass == subclass) { - if (psubclass->name != NULL) - name = psubclass->name; - if (psubclass->type != NULL) - type = psubclass->type; - if (psubclass->config_cb != NULL) { - config_cb = psubclass->config_cb; - } - if (psubclass->private != NULL) - private = psubclass->private; - if (psubclass->iface != NULL) - break; - dev = psubclass->devices; - goto find_device; - } - } - for (piface = psubclass->iface; ; piface++) { - if (piface->iface == 0xFF) { - dev = psubclass->devices; - break; - } - if (piface->iface == iface) { - if (piface->name != NULL) - name = piface->name; - if (piface->type != NULL) - type = piface->type; - if (piface->config_cb != NULL) { - config_cb = piface->config_cb; - } - if (piface->private != NULL) - private = piface->private; - dev = piface->devices; - break; - } - } - find_device: - for (;; dev++) { - if (dev->vendor == 0xFFFF && dev->product == 0xFFFF) { - goto bad_device; - } - if (dev->vendor == vendor && dev->product == product) { - if (dev->name != NULL) - name = dev->name; - if (dev->type != NULL) - type = dev->type; - if (dev->config_cb != NULL) { - config_cb = dev->config_cb; - } - if (dev->private != NULL) - private = dev->private; - new = malloc(sizeof(pci_dev_t)); - if (new == NULL) - return NULL; - new->vendor = vendor; - new->product = product; - new->type = type; - new->name = name; - new->model = dev->model; - new->compat = dev->compat; - new->config_cb = config_cb; - new->private = private; - - return new; - } - } - bad_device: - printk("Cannot manage '%s' PCI device type '%s':\n %x %x (%x %x %x)\n", - name, type, vendor, product, class, subclass, iface); - - return NULL; + if (config->regions[0] != 0x00000000) + vga_vbe_init(config->path, config->regions[0], config->sizes[0], + config->regions[1], config->sizes[1]); + return 0; } -#define set_bool_property(ph, name) set_property(ph, name, NULL, 0); - - static void ob_pci_add_properties(pci_addr addr, const pci_dev_t *pci_dev, const pci_config_t *config) { @@ -1268,7 +141,6 @@ /* create properties as described in 2.5 */ - printk("%s\n", pci_dev->name); set_int_property(dev, "vendor-id", vendor_id); set_int_property(dev, "device-id", device_id); set_int_property(dev, "revision-id", rev); @@ -1529,7 +401,9 @@ int bus; unsigned long mem_base, io_base; +#ifdef CONFIG_DEBUG_PCI printk("Initializing PCI devices...\n"); +#endif /* brute force bus scan */ Added: openbios-devel/drivers/pci_database.c =================================================================== --- openbios-devel/drivers/pci_database.c (rev 0) +++ openbios-devel/drivers/pci_database.c 2008-12-31 16:21:08 UTC (rev 334) @@ -0,0 +1,1063 @@ +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "libc/vsprintf.h" + +#include "pci_database.h" + +/* PCI devices database */ + +typedef struct pci_class_t pci_class_t; +typedef struct pci_subclass_t pci_subclass_t; +typedef struct pci_iface_t pci_iface_t; + +struct pci_iface_t { + uint8_t iface; + const char *name; + const char *type; + const pci_dev_t *devices; + int (*config_cb)(const pci_config_t *config); + const void *private; +}; + +struct pci_subclass_t { + uint8_t subclass; + const char *name; + const char *type; + const pci_dev_t *devices; + const pci_iface_t *iface; + int (*config_cb)(const pci_config_t *config); + const void *private; +}; + +struct pci_class_t { + const char *name; + const char *type; + const pci_subclass_t *subc; +}; + +/* Current machine description */ + +static const pci_subclass_t undef_subclass[] = { + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_dev_t ide_devices[] = { + { + 0x1095, 0x0646, /* CMD646 IDE controller */ + "pci-ide", "pci-ata", NULL, + "pci1095,646\0pci1095,646\0pciclass,01018f\0", + 0, 0, 0, + ide_config_cb2, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +static const pci_subclass_t mass_subclass[] = { + { + 0x00, "SCSI bus controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "IDE controller", "ide", ide_devices, NULL, + NULL, NULL, + }, + { + 0x02, "Floppy disk controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "IPI bus controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x04, "RAID controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x05, "ATA controller", "ata", NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc mass-storage controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_dev_t eth_devices[] = { + { 0x10EC, 0x8029, + NULL, "NE2000", "NE2000 PCI", NULL, + 0, 0, 0, + NULL, "ethernet", + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +static const pci_subclass_t net_subclass[] = { + { + 0x00, "ethernet controller", NULL, eth_devices, NULL, + eth_config_cb, "ethernet", + }, + { + 0x01, "token ring controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "FDDI controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "ATM controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x04, "ISDN controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x05, "WordFip controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x06, "PICMG 2.14 controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc network controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_dev_t vga_devices[] = { + { + 0x1002, 0x5046, + NULL, "ATY", "ATY Rage128", "VGA\0", + 0, 0, 0, + NULL, NULL, + }, + { + 0x1234, 0x1111, + NULL, "QEMU,VGA", "Qemu VGA", "VGA\0", + 0, 0, 0, + NULL, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +static const struct pci_iface_t vga_iface[] = { + { + 0x00, "VGA controller", NULL, + vga_devices, &vga_config_cb, NULL, + }, + { + 0x01, "8514 compatible controller", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_subclass_t displ_subclass[] = { + { + 0x00, "display controller", NULL, NULL, vga_iface, + NULL, NULL, + }, + { + 0x01, "XGA display controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "3D display controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc display controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_subclass_t media_subclass[] = { + { + 0x00, "video device", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "audio device", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "computer telephony device", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc multimedia device", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_subclass_t mem_subclass[] = { + { + 0x00, "RAM controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "flash controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + + +static const pci_dev_t hbrg_devices[] = { + { + 0x106B, 0x0020, NULL, + "pci", "AAPL,UniNorth", "uni-north\0", + 3, 2, 1, + NULL, NULL + }, + { + 0x106B, 0x001F, NULL, + "pci", "AAPL,UniNorth", "uni-north\0", + 3, 2, 1, + NULL, NULL + }, + { + 0x106B, 0x001E, NULL, + "pci", "AAPL,UniNorth", "uni-north\0", + 3, 2, 1, + NULL, NULL + }, + { + 0x1057, 0x0002, "pci", + "pci", "MOT,MPC106", "grackle\0", + 3, 2, 1, + NULL, NULL + }, + { + 0x1057, 0x4801, NULL, + "pci-bridge", "PREP Host PCI Bridge - Motorola Raven", NULL, + 3, 2, 1, + NULL, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +static const pci_dev_t PCIbrg_devices[] = { + { + 0x1011, 0x0026, NULL, + "pci-bridge", "DEV,21154", "DEV,21154\0pci-bridge\0", + 3, 2, 1, + NULL, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +static const pci_subclass_t bridg_subclass[] = { + { + 0x00, "PCI host bridge", NULL, hbrg_devices, NULL, + NULL, NULL, + }, + { + 0x01, "ISA bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "EISA bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "MCA bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x04, "PCI-to-PCI bridge", NULL, PCIbrg_devices, NULL, + NULL, NULL, + }, + { + 0x05, "PCMCIA bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x06, "NUBUS bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x07, "cardbus bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x08, "raceway bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x09, "semi-transparent PCI-to-PCI bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x0A, "infiniband-to-PCI bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc PCI bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_iface_t serial_iface[] = { + { + 0x00, "XT serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "16450 serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "16550 serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0x03, "16650 serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0x04, "16750 serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0x05, "16850 serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0x06, "16950 serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_iface_t par_iface[] = { + { + 0x00, "parallel port", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "bi-directional parallel port", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "ECP 1.x parallel port", NULL, + NULL, NULL, NULL, + }, + { + 0x03, "IEEE 1284 controller", NULL, + NULL, NULL, NULL, + }, + { + 0xFE, "IEEE 1284 device", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_iface_t modem_iface[] = { + { + 0x00, "generic modem", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "Hayes 16450 modem", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "Hayes 16550 modem", NULL, + NULL, NULL, NULL, + }, + { + 0x03, "Hayes 16650 modem", NULL, + NULL, NULL, NULL, + }, + { + 0x04, "Hayes 16750 modem", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_subclass_t comm_subclass[] = { + { + 0x00, "serial controller", NULL, NULL, serial_iface, + NULL, NULL, + }, + { + 0x01, "parallel port", NULL, NULL, par_iface, + NULL, NULL, + }, + { + 0x02, "multiport serial controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "modem", NULL, NULL, modem_iface, + NULL, NULL, + }, + { + 0x04, "GPIB controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x05, "smart card", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc communication device", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_iface_t pic_iface[] = { + { + 0x00, "8259 PIC", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "ISA PIC", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "EISA PIC", NULL, + NULL, NULL, NULL, + }, + { + 0x10, "I/O APIC", NULL, + NULL, NULL, NULL, + }, + { + 0x20, "I/O APIC", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_iface_t dma_iface[] = { + { + 0x00, "8237 DMA controller", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "ISA DMA controller", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "EISA DMA controller", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_iface_t tmr_iface[] = { + { + 0x00, "8254 system timer", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "ISA system timer", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "EISA system timer", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_iface_t rtc_iface[] = { + { + 0x00, "generic RTC controller", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "ISA RTC controller", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_dev_t sys_devices[] = { + /* IBM MPIC controller */ + { + 0x1014, 0x0002, + "open-pic", "MPIC", NULL, "chrp,open-pic\0", + 0, 0, 2, + NULL, NULL, + }, + /* IBM MPIC2 controller */ + { + 0x1014, 0xFFFF, + "open-pic", "MPIC2", NULL, "chrp,open-pic\0", + 0, 0, 2, + NULL, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +static const pci_subclass_t sys_subclass[] = { + { + 0x00, "PIC", NULL, NULL, pic_iface, + NULL, NULL, + }, + { + 0x01, "DMA controller", NULL, NULL, dma_iface, + NULL, NULL, + }, + { + 0x02, "system timer", NULL, NULL, tmr_iface, + NULL, NULL, + }, + { + 0x03, "RTC controller", NULL, NULL, rtc_iface, + NULL, NULL, + }, + { + 0x04, "PCI hotplug controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc system peripheral", NULL, sys_devices, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_subclass_t inp_subclass[] = { + { + 0x00, "keyboard controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "digitizer", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "mouse controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "scanner controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x04, "gameport controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc input device", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_subclass_t dock_subclass[] = { + { + 0x00, "generic docking station", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc docking station", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_subclass_t cpu_subclass[] = { + { + 0x00, "i386 processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "i486 processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "pentium processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x10, "alpha processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x20, "PowerPC processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x30, "MIPS processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x40, "co-processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_iface_t usb_iface[] = { + { + 0x00, "UHCI USB controller", NULL, + NULL, NULL, NULL, + }, + { + 0x10, "OHCI USB controller", NULL, + NULL, NULL, NULL, + }, + { + 0x20, "EHCI USB controller", NULL, + NULL, NULL, NULL, + }, + { + 0x80, "misc USB controller", NULL, + NULL, NULL, NULL, + }, + { + 0xFE, "USB device", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_iface_t ipmi_iface[] = { + { + 0x00, "IPMI SMIC interface", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "IPMI keyboard interface", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "IPMI block transfer interface", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_subclass_t ser_subclass[] = { + { + 0x00, "Firewire bus controller", "ieee1394", NULL, NULL, + NULL, NULL, + }, + { + 0x01, "ACCESS bus controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "SSA controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "USB controller", "usb", NULL, usb_iface, + NULL, NULL, + }, + { + 0x04, "fibre channel controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x05, "SMBus controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x06, "InfiniBand controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x07, "IPMI interface", NULL, NULL, ipmi_iface, + NULL, NULL, + }, + { + 0x08, "SERCOS controller", NULL, NULL, ipmi_iface, + NULL, NULL, + }, + { + 0x09, "CANbus controller", NULL, NULL, ipmi_iface, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_subclass_t wrl_subclass[] = { + { + 0x00, "IRDA controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "consumer IR controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x10, "RF controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x11, "bluetooth controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x12, "broadband controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc wireless controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_subclass_t sat_subclass[] = { + { + 0x01, "satellite TV controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "satellite audio controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "satellite voice controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x04, "satellite data controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_subclass_t crypt_subclass[] = { + { + 0x00, "cryptographic network controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x10, "cryptographic entertainment controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc cryptographic controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_subclass_t spc_subclass[] = { + { + 0x00, "DPIO module", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "performances counters", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x10, "communication synchronisation", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x20, "management card", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc signal processing controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_class_t pci_classes[] = { + /* 0x00 */ + { "undefined", NULL, undef_subclass, }, + /* 0x01 */ + { "mass-storage controller", NULL, mass_subclass, }, + /* 0x02 */ + { "network controller", "network", net_subclass, }, + /* 0x03 */ + { "display controller", "display", displ_subclass, }, + /* 0x04 */ + { "multimedia device", NULL, media_subclass, }, + /* 0x05 */ + { "memory controller", "memory-controller", mem_subclass, }, + /* 0x06 */ + { "PCI bridge", "pci", bridg_subclass, }, + /* 0x07 */ + { "communication device", NULL, comm_subclass,}, + /* 0x08 */ + { "system peripheral", NULL, sys_subclass, }, + /* 0x09 */ + { "input device", NULL, inp_subclass, }, + /* 0x0A */ + { "docking station", NULL, dock_subclass, }, + /* 0x0B */ + { "processor", NULL, cpu_subclass, }, + /* 0x0C */ + { "serial bus controller", NULL, ser_subclass, }, + /* 0x0D */ + { "wireless controller", NULL, wrl_subclass, }, + /* 0x0E */ + { "intelligent I/O controller", NULL, NULL, }, + /* 0x0F */ + { "satellite communication controller", NULL, sat_subclass, }, + /* 0x10 */ + { "cryptographic controller", NULL, crypt_subclass, }, + /* 0x11 */ + { "signal processing controller", NULL, spc_subclass, }, +}; + +static const pci_dev_t misc_pci[] = { + /* Paddington Mac I/O */ + { + 0x106B, 0x0017, + "mac-io", "mac-io", "AAPL,343S1211", "paddington\0heathrow\0", + 1, 1, 1, + &macio_config_cb, NULL, + }, + /* KeyLargo Mac I/O */ + { + 0x106B, 0x0022, + "mac-io", "mac-io", "AAPL,Keylargo", "Keylargo\0", + 1, 1, 2, + &macio_config_cb, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +const pci_dev_t *pci_find_device (uint8_t class, uint8_t subclass, + uint8_t iface, uint16_t vendor, + uint16_t product) +{ + int (*config_cb)(const pci_config_t *config); + const pci_class_t *pclass; + const pci_subclass_t *psubclass; + const pci_iface_t *piface; + const pci_dev_t *dev; + const void *private; + pci_dev_t *new; + const char *name, *type; + + name = "unknown"; + type = "unknown"; + config_cb = NULL; + private = NULL; + + if (class == 0x00 && subclass == 0x01) { + /* Special hack for old style VGA devices */ + class = 0x03; + subclass = 0x00; + } else if (class == 0xFF) { + /* Special case for misc devices */ + dev = misc_pci; + goto find_device; + } + if (class > (sizeof(pci_classes) / sizeof(pci_class_t))) { + name = "invalid PCI device"; + type = "invalid"; + goto bad_device; + } + pclass = &pci_classes[class]; + name = pclass->name; + type = pclass->type; + for (psubclass = pclass->subc; ; psubclass++) { + if (psubclass->subclass == 0xFF) + goto bad_device; + if (psubclass->subclass == subclass) { + if (psubclass->name != NULL) + name = psubclass->name; + if (psubclass->type != NULL) + type = psubclass->type; + if (psubclass->config_cb != NULL) { + config_cb = psubclass->config_cb; + } + if (psubclass->private != NULL) + private = psubclass->private; + if (psubclass->iface != NULL) + break; + dev = psubclass->devices; + goto find_device; + } + } + for (piface = psubclass->iface; ; piface++) { + if (piface->iface == 0xFF) { + dev = psubclass->devices; + break; + } + if (piface->iface == iface) { + if (piface->name != NULL) + name = piface->name; + if (piface->type != NULL) + type = piface->type; + if (piface->config_cb != NULL) { + config_cb = piface->config_cb; + } + if (piface->private != NULL) + private = piface->private; + dev = piface->devices; + break; + } + } + find_device: + for (;; dev++) { + if (dev->vendor == 0xFFFF && dev->product == 0xFFFF) { + goto bad_device; + } + if (dev->vendor == vendor && dev->product == product) { + if (dev->name != NULL) + name = dev->name; + if (dev->type != NULL) + type = dev->type; + if (dev->config_cb != NULL) { + config_cb = dev->config_cb; + } + if (dev->private != NULL) + private = dev->private; + new = malloc(sizeof(pci_dev_t)); + if (new == NULL) + return NULL; + new->vendor = vendor; + new->product = product; + new->type = type; + new->name = name; + new->model = dev->model; + new->compat = dev->compat; + new->acells = dev->acells; + new->scells = dev->scells; + new->icells = dev->icells; + new->config_cb = config_cb; + new->private = private; + + return new; + } + } + bad_device: + printk("Cannot manage '%s' PCI device type '%s':\n %x %x (%x %x %x)\n", + name, type, vendor, product, class, subclass, iface); + + return NULL; +} Added: openbios-devel/drivers/pci_database.h =================================================================== --- openbios-devel/drivers/pci_database.h (rev 0) +++ openbios-devel/drivers/pci_database.h 2008-12-31 16:21:08 UTC (rev 334) @@ -0,0 +1,43 @@ +typedef struct pci_config_t pci_config_t; + +struct pci_config_t { + char path[256]; + uint32_t regions[7]; + uint32_t sizes[7]; +}; + +typedef struct pci_dev_t pci_dev_t; +struct pci_dev_t { + uint16_t vendor; + uint16_t product; + const char *type; + const char *name; + const char *model; + const char *compat; + int acells; + int scells; + int icells; + int (*config_cb)(const pci_config_t *config); + const void *private; +}; + +extern int ide_config_cb2(const pci_config_t *config); +extern int eth_config_cb(const pci_config_t *config); +extern int macio_config_cb(const pci_config_t *config); +extern int vga_config_cb(const pci_config_t *config); + +static inline int pci_compat_len(pci_dev_t *dev) +{ + int len, ret; + const char *path = dev->compat; + ret = 0; + while ((len = strlen(path)) != 0) { + ret += len + 1; + path += len + 1; + } + return ret; +} + +extern const pci_dev_t *pci_find_device(uint8_t class, uint8_t subclass, + uint8_t iface, uint16_t vendor, + uint16_t product);

1 0

r333 - in openbios-devel: arch/ppc/qemu include
by svn＠openbios.org 31 Dec '08

31 Dec '08

Author: blueswirl Date: 2008-12-31 17:19:15 +0100 (Wed, 31 Dec 2008) New Revision: 333 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/ofmem.c openbios-devel/include/ofmem.h Log: Define the translations property for cpu (Laurent Vivier) Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-12-31 16:18:34 UTC (rev 332) +++ openbios-devel/arch/ppc/qemu/init.c 2008-12-31 16:19:15 UTC (rev 333) @@ -28,6 +28,7 @@ #include "ofmem.h" #include "openbios-version.h" #include "libc/byteorder.h" +#include "libc/vsprintf.h" #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" @@ -424,6 +425,7 @@ #endif uint64_t ram_size; const struct cpudef *cpu; + char buf[64]; devtree_init(); @@ -485,6 +487,8 @@ #ifdef CONFIG_DRIVER_PCI ob_pci_init(); #endif + snprintf(buf, sizeof(buf), "/cpus/%s", cpu->name); + ofmem_register(find_dev(buf)); node_methods_init(); #ifdef USE_RTAS Modified: openbios-devel/arch/ppc/qemu/ofmem.c =================================================================== --- openbios-devel/arch/ppc/qemu/ofmem.c 2008-12-31 16:18:34 UTC (rev 332) +++ openbios-devel/arch/ppc/qemu/ofmem.c 2008-12-31 16:19:15 UTC (rev 333) @@ -110,6 +110,36 @@ return (ulong)OF_MALLOC_BASE; } +static phandle_t cpu_handle = 0; +static void +ofmem_update_translations( void ) +{ + ofmem_t *ofmem = OFMEM; + translation_t *t; + int ncells; + cell *props; + + if (cpu_handle == 0) + return; + + for( t = ofmem->trans, ncells = 0; t ; t=t->next, ncells++ ) + ; + + props = malloc(ncells * sizeof(cell) * 4); + if (props == NULL) + return; + + for( t = ofmem->trans, ncells = 0 ; t ; t=t->next ) { + props[ncells++] = t->virt; + props[ncells++] = t->size; + props[ncells++] = t->phys; + props[ncells++] = t->mode; + } + set_property(cpu_handle, "translations", + (char*)props, ncells * sizeof(cell)); + free(props); +} + /************************************************************************/ /* OF private allocations */ /************************************************************************/ @@ -502,6 +532,8 @@ t->next = *tt; *tt = t; + ofmem_update_translations(); + return 0; } @@ -703,3 +735,10 @@ ofmem_claim_phys( get_ram_top(), get_ram_size() - get_ram_top(), 0); ofmem_claim_virt( get_ram_top(), get_ram_size() - get_ram_top(), 0); } + +void +ofmem_register( phandle_t ph ) +{ + cpu_handle = ph; + ofmem_update_translations(); +} Modified: openbios-devel/include/ofmem.h =================================================================== --- openbios-devel/include/ofmem.h 2008-12-31 16:18:34 UTC (rev 332) +++ openbios-devel/include/ofmem.h 2008-12-31 16:19:15 UTC (rev 333) @@ -36,6 +36,7 @@ void dsi_exception( void ); void isi_exception( void ); void setup_mmu( ulong ramsize ); +void ofmem_register( phandle_t ph ); #endif #endif /* _H_OFMEM */

1 0

r332 - in openbios-devel: arch/ppc/qemu drivers
by svn＠openbios.org 31 Dec '08

31 Dec '08

Author: blueswirl Date: 2008-12-31 17:18:34 +0100 (Wed, 31 Dec 2008) New Revision: 332 Modified: openbios-devel/arch/ppc/qemu/tree.fs openbios-devel/drivers/ide.c Log: Remove unused definition from qemu/tree.fs and move cd and hd alias definition to ide.c (Laurent Vivier) Modified: openbios-devel/arch/ppc/qemu/tree.fs =================================================================== --- openbios-devel/arch/ppc/qemu/tree.fs 2008-12-31 15:43:34 UTC (rev 331) +++ openbios-devel/arch/ppc/qemu/tree.fs 2008-12-31 16:18:34 UTC (rev 332) @@ -1,7 +1,5 @@ \ Qemu specific initialization code \ -\ Copyright (C) 2005 Stefan Reinauer -\ \ This program is free software; you can redistribute it and/or \ modify it under the terms of the GNU General Public License \ as published by the Free Software Foundation @@ -13,13 +11,23 @@ " /" find-device -" chrp" device-type -" OpenSource,QEMU" model -" Power Macintosh" encode-string " compatible" property -1 encode-int " #interrupt-cells" property +" bootrom" device-type +" PowerMac1,1" model +" PowerMac1,1" encode-string +" MacRisc" encode-string encode+ +" Power Macintosh" encode-string encode+ " compatible" property +" 0000000000000" encode-string " system-id" property +1 encode-int " #address-cells" property 1 encode-int " #size-cells" property +h# 0x05f5e100 encode-int " clock-frequency" property new-device + " cpus" device-name + 1 encode-int " #address-cells" property + 0 encode-int " #size-cells" property +finish-device + +new-device " memory" device-name " memory" device-type external @@ -34,222 +42,6 @@ 0 encode-int " #size-cells" property finish-device -" /pci" find-device - h# 01000000 encode-int 0 encode-int encode+ 0 encode-int encode+ - h# 80000000 encode-int encode+ 0 encode-int encode+ - h# 01000000 encode-int encode+ - h# 02000000 encode-int encode+ 0 encode-int encode+ 0 encode-int encode+ - h# C0000000 encode-int encode+ 0 encode-int encode+ - h# 08000000 encode-int encode+ - " ranges" property - " IBM,CPC710" model - h# FF5F7700 encode-int " 8259-interrupt-acknowledge" property - h# 0000F800 encode-int 0 encode-int encode+ 0 encode-int encode+ - 7 encode-int encode+ - " interrupt-map-mask" property - 1 encode-int " #interrupt-cells" property - h# 80000000 encode-int " system-dma-base" property - d# 33333333 encode-int " clock-frequency" property - " " encode-string " primary-bridge" property - 0 encode-int " pci-bridge-number" property - h# FEC00000 encode-int h# 100000 encode-int encode+ " reg" property - 0 encode-int 0 encode-int encode+ " bus-range" property - -new-device - " isa" device-name - " isa" device-type - 2 encode-int " #address-cells" property - 1 encode-int " #size-cells" property - - external - : open true ; - : close ; - -finish-device - -: ?devalias ( alias-str alias-len device-str device-len -- - \ alias-str alias-len false | true ) - active-package >r - " /aliases" find-device - \ 2dup ." Checking " type - 2dup find-dev if \ check if device exists - drop - 2over find-dev if \ do we already have an alias? - \ ." alias exists" cr - drop 2drop false - else - \ ." device exists" cr - encode-string - 2swap property - true - then - else - \ ." device doesn't exist" cr - 2drop false - then - r> active-package! - ; - -:noname - " hd" - " /pci/pci-ata/ata-1/disk@0" ?devalias not if - " /pci/pci-ata/ata-1/disk@1" ?devalias not if - " /pci/pci-ata/ata-2/disk@0" ?devalias not if - " /pci/pci-ata/ata-2/disk@1" ?devalias not if - 2drop ." No disk found." cr - then - then - then - then - - " cd" - " /pci/pci-ata/ata-1/cdrom@0" ?devalias not if - " /pci/pci-ata/ata-1/cdrom@1" ?devalias not if - " /pci/pci-ata/ata-2/cdrom@0" ?devalias not if - " /pci/pci-ata/ata-2/cdrom@1" ?devalias not if - 2drop ." No cdrom found" cr - then - then - then - then -; SYSTEM-initializer - -new-device - " ide" device-name - " ide" device-type - " WINBOND,82C553" model - h# 28 encode-int " max-latency" property - h# 2 encode-int " min-grant" property - h# 1 encode-int " devsel-speed" property - h# 0 encode-int " subsystem-vendor-id" property - h# 0 encode-int " subsystem-id" property - h# 1018A encode-int " class-code" property - h# 5 encode-int " revision-id" property - h# 105 encode-int " device-id" property - h# 10AD encode-int " vendor-id" property - h# 1003110 encode-int 0 encode-int encode+ h# 10020 encode-int encode+ - h# 10 encode-int encode+ 0 encode-int encode+ - h# 1003114 encode-int 0 encode-int encode+ h# 10030 encode-int encode+ - h# 4 encode-int encode+ 0 encode-int encode+ - h# 1003118 encode-int 0 encode-int encode+ h# 10040 encode-int encode+ - h# 10 encode-int encode+ 0 encode-int encode+ - h# 100311C encode-int 0 encode-int encode+ h# 10034 encode-int encode+ - h# 4 encode-int encode+ 0 encode-int encode+ - h# 1003120 encode-int 0 encode-int encode+ h# 10050 encode-int encode+ - h# 10 encode-int encode+ 0 encode-int encode+ - h# 1003124 encode-int 0 encode-int encode+ h# 10060 encode-int encode+ - h# 10 encode-int encode+ 0 encode-int encode+ - " assigned-addresses" property - h# 3100 encode-int 0 encode-int encode+ 0 encode-int encode+ - 0 encode-int encode+ 0 encode-int encode+ - h# 1003110 encode-int 0 encode-int encode+ h# 0 encode-int encode+ - h# 10 encode-int encode+ 0 encode-int encode+ - h# 1003114 encode-int 0 encode-int encode+ h# 0 encode-int encode+ - h# 4 encode-int encode+ 0 encode-int encode+ - h# 1003118 encode-int 0 encode-int encode+ h# 0 encode-int encode+ - h# 10 encode-int encode+ 0 encode-int encode+ - h# 100311C encode-int 0 encode-int encode+ h# 0 encode-int encode+ - h# 4 encode-int encode+ 0 encode-int encode+ - h# 1003120 encode-int 0 encode-int encode+ h# 0 encode-int encode+ - h# 10 encode-int encode+ 0 encode-int encode+ - h# 1003124 encode-int 0 encode-int encode+ h# 0 encode-int encode+ - h# 10 encode-int encode+ 0 encode-int encode+ - " reg" property -finish-device - -new-device - " ethernet" device-name - " network" device-type - " AMD,79C973" model - h# 3800 encode-int 0 encode-int encode+ 0 encode-int encode+ - 0 encode-int encode+ 0 encode-int encode+ - " reg" property -finish-device - -" /pci/isa" find-device - 0 0 " assigned-addresses" property - 0 0 " ranges" property - 0 encode-int " slot-names" property - d# 8333333 encode-int " clock-frequency" property - 0 encode-int " eisa-slots" property - 2 encode-int " #interrupt-cells" property - " W83C553F" encode-string " compatible" property - " WINBOND,82C553" model - 0 encode-int " max-latency" property - 0 encode-int " min-grant" property - 1 encode-int " devsel-speed" property - 0 encode-int " subsystem-vendor-id" property - 0 encode-int " subsystem-id" property - h# 60100 encode-int " class-code" property - h# 10 encode-int " revision-id" property - h# 565 encode-int " device-id" property - h# 10AD encode-int " vendor-id" property - h# 3000 encode-int 0 encode-int encode+ 0 encode-int encode+ - 0 encode-int encode+ 0 encode-int encode+ " reg" property - -new-device - " rtc" device-name - " rtc" device-type - " DS17285S" model - " MC146818" encode-string - " DS17285S" encode-string encode+ - " pnpPNP,b00" encode-string encode+ " compatible" property - 8 encode-int 0 encode-int encode+ " interrupts" property - h# 70 encode-int 1 encode-int encode+ - 2 encode-int encode+ " reg" property -finish-device - -new-device - " interrupt-controller" device-name - " interrupt-controller" device-type - " 8259" model - " " encode-string " interrupt-controller" property - 2 encode-int " #interrupt-cells" property - 1 encode-int - 2 encode-int encode+ - 3 encode-int encode+ - 6 encode-int encode+ - " reserved-interrupts" property - " 8259" encode-string - " chrp,iic" encode-string encode+ - " compatible" property - h# 20 encode-int 1 encode-int encode+ - 2 encode-int encode+ " reg" property -finish-device - -new-device - " serial" device-name - " serial" device-type - " no" encode-string " ctsrts" property - " no" encode-string " xon" property - " no" encode-string " parity" property - d# 115200 encode-int " bps" property - 1 encode-int " stop-bits" property - 8 encode-int " data-bits" property - h# 70800 encode-int " divisor" property - h# 708000 encode-int " clock-frequency" property - 4 encode-int 0 encode-int encode+ " interrupts" property - h# 3F8 encode-int 1 encode-int encode+ - 8 encode-int encode+ " reg" property -finish-device - -" /pci" find-device - " /pci/isa/interrupt-controller" find-dev if - encode-int " interrupt-parent" property - then - h# 3800 encode-int 0 encode-int encode+ - 0 encode-int encode+ 1 encode-int encode+ - " /pci/isa/interrupt-controller" find-dev if - encode-int encode+ - then - h# 0C encode-int encode+ 1 encode-int encode+ - " interrupt-map" property - -" /pci/isa" find-device - " /pci/isa/interrupt-controller" find-dev if - encode-int " interrupt-parent" property - then - \ ------------------------------------------------------------- \ /packages \ ------------------------------------------------------------- Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2008-12-31 15:43:34 UTC (rev 331) +++ openbios-devel/drivers/ide.c 2008-12-31 16:18:34 UTC (rev 332) @@ -1314,8 +1314,13 @@ { int i, j; char nodebuff[32]; - phandle_t dnode; + phandle_t dnode, aliases; + int hd_found, cd_found; + aliases = find_dev("/aliases"); + hd_found = 0; + cd_found = 0; + io_ports[0] = io_port0; ctl_ports[0] = ctl_port0 + 2; io_ports[1] = io_port1; @@ -1404,6 +1409,19 @@ REGISTER_NAMED_NODE(ob_ide, nodebuff); dnode=find_dev(nodebuff); set_int_property(dnode, "reg", j); + + /* create aliases */ + + if (drive->media == ide_media_cdrom && !cd_found) { + cd_found = 1; + set_property(aliases, "cd", + nodebuff, strlen(nodebuff) + 1); + } + if (drive->media == ide_media_disk && !hd_found) { + hd_found = 1; + set_property(aliases, "hd", + nodebuff, strlen(nodebuff) + 1); + } } }

1 0

r331 - in openbios-devel: config/examples drivers
by svn＠openbios.org 31 Dec '08

31 Dec '08

Author: blueswirl Date: 2008-12-31 16:43:34 +0100 (Wed, 31 Dec 2008) New Revision: 331 Modified: openbios-devel/config/examples/cross-ppc_config.xml openbios-devel/drivers/ide.c Log: Remove debug printk when IDE debugging is disabled (Laurent Vivier) Modified: openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_config.xml 2008-12-28 16:35:39 UTC (rev 330) +++ openbios-devel/config/examples/cross-ppc_config.xml 2008-12-31 15:43:34 UTC (rev 331) @@ -64,7 +64,7 @@  <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/> - <option name="CONFIG_DEBUG_PCI" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_PCI" type="boolean" value="false"/> <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="2"/> <option name="CONFIG_IDE_FIRST_UNIT" type="integer" value="1"/> Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2008-12-28 16:35:39 UTC (rev 330) +++ openbios-devel/drivers/ide.c 2008-12-31 15:43:34 UTC (rev 331) @@ -1364,9 +1364,11 @@ snprintf(nodebuff, sizeof(nodebuff), "%s/" DEV_NAME, path, current_channel); REGISTER_NAMED_NODE(ob_ide_ctrl, nodebuff); +#ifdef CONFIG_DEBUG_IDE printk(DEV_NAME": [io ports 0x%x-0x%x,0x%x]\n", current_channel, chan->io_regs[0], chan->io_regs[0] + 7, chan->io_regs[8]); +#endif for (j = 0; j < 2; j++) { struct ide_drive *drive = &chan->drives[j]; @@ -1375,7 +1377,10 @@ if (!drive->present) continue; - printk(" drive%d [ATA%s ", j, drive->type == ide_type_atapi ? "PI" : ""); +#ifdef CONFIG_DEBUG_IDE + printk(" drive%d [ATA%s ", j, + drive->type == ide_type_atapi ? "PI" : ""); +#endif switch (drive->media) { case ide_media_floppy: media = "floppy"; @@ -1390,7 +1395,9 @@ media = "disk"; break; } +#ifdef CONFIG_DEBUG_IDE printk("%s]: %s\n", media, drive->model); +#endif snprintf(nodebuff, sizeof(nodebuff), "%s/" DEV_NAME "/%s", path, current_channel, media);

1 0

r330 - openbios-devel/drivers
by svn＠openbios.org 28 Dec '08

28 Dec '08

Author: blueswirl Date: 2008-12-28 17:35:39 +0100 (Sun, 28 Dec 2008) New Revision: 330 Modified: openbios-devel/drivers/cuda.c Log: Enable reset-all and add poweroff Modified: openbios-devel/drivers/cuda.c =================================================================== --- openbios-devel/drivers/cuda.c 2008-12-28 15:27:19 UTC (rev 329) +++ openbios-devel/drivers/cuda.c 2008-12-28 16:35:39 UTC (rev 330) @@ -58,6 +58,10 @@ #define ADB_PACKET 0 #define CUDA_PACKET 1 +/* CUDA commands (2nd byte) */ +#define CUDA_POWERDOWN 0xa +#define CUDA_RESET_SYSTEM 0x11 + static uint8_t cuda_readb (cuda_t *dev, int reg) { return *(volatile uint8_t *)(dev->base + reg); @@ -153,7 +157,27 @@ DECLARE_UNNAMED_NODE(ob_cuda, INSTALL_OPEN, sizeof(int)); +static cuda_t *main_cuda; + static void +ppc32_reset_all(void) +{ + uint8_t cmdbuf[2], obuf[64]; + + cmdbuf[0] = CUDA_RESET_SYSTEM; + cuda_request(main_cuda, CUDA_PACKET, cmdbuf, sizeof(cmdbuf), obuf); +} + +static void +ppc32_poweroff(void) +{ + uint8_t cmdbuf[2], obuf[64]; + + cmdbuf[0] = CUDA_POWERDOWN; + cuda_request(main_cuda, CUDA_PACKET, cmdbuf, sizeof(cmdbuf), obuf); +} + +static void ob_cuda_initialize (int *idx) { phandle_t ph=get_cur_dev(); @@ -174,6 +198,14 @@ set_int_property(ph, "interrupt-parent", pic_handle); // HEATHROW set_int_property(ph, "interrupts", 0x12); + + bind_func("ppc32-reset-all", ppc32_reset_all); + push_str("' ppc32-reset-all to reset-all"); + fword("eval"); + + PUSH(0); + fword("active-package!"); + bind_func("poweroff", ppc32_poweroff); } static void @@ -269,6 +301,8 @@ rtc_init(buf); + main_cuda = cuda; + return cuda; }

1 0

r329 - openbios-devel/drivers
by svn＠openbios.org 28 Dec '08

28 Dec '08

Author: blueswirl Date: 2008-12-28 16:27:19 +0100 (Sun, 28 Dec 2008) New Revision: 329 Modified: openbios-devel/drivers/ide.c Log: Suppress -Wformat-security warning Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2008-12-28 14:04:49 UTC (rev 328) +++ openbios-devel/drivers/ide.c 2008-12-28 15:27:19 UTC (rev 329) @@ -1313,8 +1313,6 @@ uint32_t io_port1, uint32_t ctl_port1) { int i, j; - const char * nodetemp_chan = "%s/"DEV_NAME; - const char * nodetemp = "%s/"DEV_NAME"/%s"; char nodebuff[32]; phandle_t dnode; @@ -1363,7 +1361,7 @@ ob_ide_identify_drives(chan); - snprintf(nodebuff, sizeof(nodebuff), nodetemp_chan, path, + snprintf(nodebuff, sizeof(nodebuff), "%s/" DEV_NAME, path, current_channel); REGISTER_NAMED_NODE(ob_ide_ctrl, nodebuff); printk(DEV_NAME": [io ports 0x%x-0x%x,0x%x]\n", @@ -1393,8 +1391,9 @@ break; } printk("%s]: %s\n", media, drive->model); - snprintf(nodebuff, sizeof(nodebuff), nodetemp, path, - current_channel, media); + snprintf(nodebuff, sizeof(nodebuff), + "%s/" DEV_NAME "/%s", path, current_channel, + media); REGISTER_NAMED_NODE(ob_ide, nodebuff); dnode=find_dev(nodebuff); set_int_property(dnode, "reg", j);

1 0

r328 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 28 Dec '08

28 Dec '08

Author: blueswirl Date: 2008-12-28 15:04:49 +0100 (Sun, 28 Dec 2008) New Revision: 328 Modified: openbios-devel/arch/ppc/qemu/init.c Log: Add CPU reg node from PIR if available Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-12-28 13:34:52 UTC (rev 327) +++ openbios-devel/arch/ppc/qemu/init.c 2008-12-28 14:04:49 UTC (rev 328) @@ -229,26 +229,50 @@ fword("encode-string"); push_str("state"); fword("property"); +} - fword("finish-device"); +static void +cpu_add_pir_property(void) +{ + unsigned long pir; + + asm("mfspr %0, 1023\n" + : "=r"(pir) :); + PUSH(pir); + fword("encode-int"); + push_str("reg"); + fword("property"); } static void cpu_604_init(const struct cpudef *cpu) { cpu_generic_init(cpu); + cpu_add_pir_property(); + + fword("finish-device"); } static void cpu_750_init(const struct cpudef *cpu) { cpu_generic_init(cpu); + + PUSH(0); + fword("encode-int"); + push_str("reg"); + fword("property"); + + fword("finish-device"); } static void cpu_g4_init(const struct cpudef *cpu) { cpu_generic_init(cpu); + cpu_add_pir_property(); + + fword("finish-device"); } static const struct cpudef ppc_defs[] = {

1 0

r327 - openbios-devel/include/ppc
by svn＠openbios.org 28 Dec '08

28 Dec '08

Author: blueswirl Date: 2008-12-28 14:34:52 +0100 (Sun, 28 Dec 2008) New Revision: 327 Modified: openbios-devel/include/ppc/asmdefs.h Log: Fix Linux dependency Modified: openbios-devel/include/ppc/asmdefs.h =================================================================== --- openbios-devel/include/ppc/asmdefs.h 2008-12-25 20:23:02 UTC (rev 326) +++ openbios-devel/include/ppc/asmdefs.h 2008-12-28 13:34:52 UTC (rev 327) @@ -22,7 +22,7 @@ /* High/low halfword compatibility macros */ /************************************************************************/ -#ifdef __linux__ +#ifndef __darwin__ #define ha16( v ) (v)##@ha #define hi16( v ) (v)##@h #define lo16( v ) (v)##@l

1 0

r326 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 25 Dec '08

25 Dec '08

Author: blueswirl Date: 2008-12-25 21:23:02 +0100 (Thu, 25 Dec 2008) New Revision: 326 Modified: openbios-devel/arch/ppc/qemu/init.c Log: Add more CPU definitions Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-12-25 10:38:40 UTC (rev 325) +++ openbios-devel/arch/ppc/qemu/init.c 2008-12-25 20:23:02 UTC (rev 326) @@ -234,6 +234,12 @@ } static void +cpu_604_init(const struct cpudef *cpu) +{ + cpu_generic_init(cpu); +} + +static void cpu_750_init(const struct cpudef *cpu) { cpu_generic_init(cpu); @@ -247,6 +253,54 @@ static const struct cpudef ppc_defs[] = { { + .iu_version = 0x00040000, + .name = "PowerPC,604", + .icache_size = 0x4000, + .dcache_size = 0x4000, + .icache_sets = 0x80, + .dcache_sets = 0x80, + .icache_block_size = 0x20, + .dcache_block_size = 0x20, + .clock_frequency = 0x07de2900, + .initfn = cpu_604_init, + }, + { // XXX find out real values + .iu_version = 0x00090000, + .name = "PowerPC,604e", + .icache_size = 0x4000, + .dcache_size = 0x4000, + .icache_sets = 0x80, + .dcache_sets = 0x80, + .icache_block_size = 0x20, + .dcache_block_size = 0x20, + .clock_frequency = 0x07de2900, + .initfn = cpu_604_init, + }, + { // XXX find out real values + .iu_version = 0x000a0000, + .name = "PowerPC,604r", + .icache_size = 0x4000, + .dcache_size = 0x4000, + .icache_sets = 0x80, + .dcache_sets = 0x80, + .icache_block_size = 0x20, + .dcache_block_size = 0x20, + .clock_frequency = 0x07de2900, + .initfn = cpu_604_init, + }, + { // XXX find out real values + .iu_version = 0x80040000, + .name = "PowerPC,MPC86xx", + .icache_size = 0x8000, + .dcache_size = 0x8000, + .icache_sets = 0x80, + .dcache_sets = 0x80, + .icache_block_size = 0x20, + .dcache_block_size = 0x20, + .clock_frequency = 0x14dc9380, + .initfn = cpu_750_init, + }, + { .iu_version = 0x000080000, .name = "PowerPC,750", .icache_size = 0x8000, @@ -258,6 +312,54 @@ .clock_frequency = 0x14dc9380, .initfn = cpu_750_init, }, + { // XXX find out real values + .iu_version = 0x10080000, + .name = "PowerPC,750", + .icache_size = 0x8000, + .dcache_size = 0x8000, + .icache_sets = 0x80, + .dcache_sets = 0x80, + .icache_block_size = 0x20, + .dcache_block_size = 0x20, + .clock_frequency = 0x14dc9380, + .initfn = cpu_750_init, + }, + { // XXX find out real values + .iu_version = 0x70000000, + .name = "PowerPC,750", + .icache_size = 0x8000, + .dcache_size = 0x8000, + .icache_sets = 0x80, + .dcache_sets = 0x80, + .icache_block_size = 0x20, + .dcache_block_size = 0x20, + .clock_frequency = 0x14dc9380, + .initfn = cpu_750_init, + }, + { // XXX find out real values + .iu_version = 0x70020000, + .name = "PowerPC,750", + .icache_size = 0x8000, + .dcache_size = 0x8000, + .icache_sets = 0x80, + .dcache_sets = 0x80, + .icache_block_size = 0x20, + .dcache_block_size = 0x20, + .clock_frequency = 0x14dc9380, + .initfn = cpu_750_init, + }, + { // XXX find out real values + .iu_version = 0x800c0000, + .name = "PowerPC,74xx", + .icache_size = 0x8000, + .dcache_size = 0x8000, + .icache_sets = 0x80, + .dcache_sets = 0x80, + .icache_block_size = 0x20, + .dcache_block_size = 0x20, + .clock_frequency = 0x14dc9380, + .initfn = cpu_750_init, + }, { .iu_version = 0x0000c0000, .name = "PowerPC,G4",

1 0

[PATCH][QEMU] Change cdrom alias
by Laurent Vivier 25 Dec '08

25 Dec '08

According to: http://penguinppc.org/historical/dev-trees-html/g3bw_400.html#aliases cdrom alias on a G3 B&W is "cd", not "cdrom".

3 3

[PATCH][PPC] Allow yaboot to read files from cdrom
by Laurent Vivier 25 Dec '08

25 Dec '08

Currently yaboot fails to read its yaboot.conf. The reason is it provides a path like "cdrom:,/etc/yaboot.conf" without partition number. This patch sets the default partition number to 0, which means the whole disk.

2 1

r325 - in openbios-devel: arch/ppc/qemu modules
by svn＠openbios.org 25 Dec '08

25 Dec '08

Author: blueswirl Date: 2008-12-25 11:38:40 +0100 (Thu, 25 Dec 2008) New Revision: 325 Modified: openbios-devel/arch/ppc/qemu/main.c openbios-devel/modules/filesystems.c openbios-devel/modules/mac-parts.c Log: Allow yaboot to read files from cdrom (Laurent Vivier) Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2008-12-25 10:36:19 UTC (rev 324) +++ openbios-devel/arch/ppc/qemu/main.c 2008-12-25 10:38:40 UTC (rev 325) @@ -61,10 +61,12 @@ /* the ELF-image (usually) starts at offset 0x4000 */ if( (elf_offs=find_elf(fd)) < 0 ) { ELF_DPRINTF("----> %s is not an ELF image\n", get_file_path(fd)); - exit(1); + return -1; } - if( !(phdr=elf_readhdrs(fd, elf_offs, &ehdr)) ) - fatal_error("elf_readhdrs failed\n"); + if( !(phdr=elf_readhdrs(fd, elf_offs, &ehdr)) ) { + ELF_DPRINTF("elf_readhdrs failed\n"); + return -1; + } *elf_entry = ehdr.e_entry; @@ -89,8 +91,10 @@ fatal_error("Claim failed!\n"); addr = (char*)phdr[i].p_vaddr; - if( read_io(fd, addr, s) != s ) - fatal_error("read failed\n"); + if( read_io(fd, addr, s) != s ) { + ELF_DPRINTF("read failed\n"); + return -1; + } flush_icache_range( addr, addr+s ); @@ -116,14 +120,16 @@ try_path(const char *path, const char *param) { ulong elf_entry; - int fd; + int fd, ret; ELF_DPRINTF("Trying %s %s\n", path, param); if ((fd = open_io(path)) == -1) { ELF_DPRINTF("Can't open %s\n", path); return; } - (void) load_elf_rom( &elf_entry, fd ); + ret = load_elf_rom( &elf_entry, fd ); + if (ret < 0) + return; close_io( fd ); encode_bootpath( path, param ); @@ -258,8 +264,8 @@ POP(); param = pop_fstr_copy(); } + try_path(path, param); try_bootinfo(path); - try_path(path, param); } else { char boot_device = nvram_read(0x34); Modified: openbios-devel/modules/filesystems.c =================================================================== --- openbios-devel/modules/filesystems.c 2008-12-25 10:36:19 UTC (rev 324) +++ openbios-devel/modules/filesystems.c 2008-12-25 10:38:40 UTC (rev 325) @@ -256,6 +256,12 @@ } static void +files_block_size( files_info_t *dummy ) +{ + PUSH(512); +} + +static void files_initializer( files_info_t *dummy ) { fword("register-fs-package"); @@ -269,6 +275,7 @@ { "write", files_write }, { "seek", files_seek }, { "tell", files_tell }, + { "block-size", files_block_size }, /* special */ { "reopen", files_reopen }, Modified: openbios-devel/modules/mac-parts.c =================================================================== --- openbios-devel/modules/mac-parts.c 2008-12-25 10:36:19 UTC (rev 324) +++ openbios-devel/modules/mac-parts.c 2008-12-25 10:38:40 UTC (rev 325) @@ -55,7 +55,7 @@ free( str ); } if( parnum < 0 ) - parnum = 1; + parnum = 0; DPRINTF("macparts_open %d\n", parnum); SEEK( 0 );

1 0

r324 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 25 Dec '08

25 Dec '08

Author: blueswirl Date: 2008-12-25 11:36:19 +0100 (Thu, 25 Dec 2008) New Revision: 324 Modified: openbios-devel/arch/ppc/qemu/main.c openbios-devel/arch/ppc/qemu/tree.fs Log: Change cdrom alias (original patch by Laurent Vivier) Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2008-12-24 07:12:14 UTC (rev 323) +++ openbios-devel/arch/ppc/qemu/main.c 2008-12-25 10:36:19 UTC (rev 324) @@ -269,7 +269,7 @@ break; default: case 'd': - path = strdup("cdrom:0"); + path = strdup("cd:0"); break; } try_bootinfo(path); Modified: openbios-devel/arch/ppc/qemu/tree.fs =================================================================== --- openbios-devel/arch/ppc/qemu/tree.fs 2008-12-24 07:12:14 UTC (rev 323) +++ openbios-devel/arch/ppc/qemu/tree.fs 2008-12-25 10:36:19 UTC (rev 324) @@ -102,7 +102,7 @@ then then - " cdrom" + " cd" " /pci/pci-ata/ata-1/cdrom@0" ?devalias not if " /pci/pci-ata/ata-1/cdrom@1" ?devalias not if " /pci/pci-ata/ata-2/cdrom@0" ?devalias not if

1 0

r323 - openbios-devel/drivers
by svn＠openbios.org 24 Dec '08

24 Dec '08

Author: blueswirl Date: 2008-12-24 08:12:14 +0100 (Wed, 24 Dec 2008) New Revision: 323 Modified: openbios-devel/drivers/obio.c Log: Fix serial console broken by r317 Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2008-12-23 20:36:45 UTC (rev 322) +++ openbios-devel/drivers/obio.c 2008-12-24 07:12:14 UTC (rev 323) @@ -119,8 +119,8 @@ static volatile unsigned char *kbd_dev, *serial_dev; -#define CTRL(port) serial_dev[(port) * 2 + 0] -#define DATA(port) serial_dev[(port) * 2 + 2] +#define CTRL(addr) (*(volatile unsigned char *)(addr)) +#define DATA(addr) (*(volatile unsigned char *)(addr + 2)) /* Conversion routines to/from brg time constants from/to bits * per second. @@ -177,7 +177,7 @@ DATA(port) = c; } -static void uart_init_line(int port, unsigned long baud) +static void uart_init_line(volatile unsigned char *port, unsigned long baud) { CTRL(port) = 4; // reg 4 CTRL(port) = SB1 | X16CLK; // no parity, async, 1 stop bit, 16x @@ -203,19 +203,17 @@ int uart_init(uint64_t port, unsigned long speed) { - int line; - serial_dev = map_io(port & ~7ULL, 2 * 4); serial_dev += port & 7ULL; - line = port & 3ULL; - uart_init_line(line, speed); + uart_init_line(serial_dev, speed); return -1; } void serial_putchar(int c) { - uart_putchar(CONFIG_SERIAL_PORT, (unsigned char) (c & 0xff)); + uart_putchar((int)(serial_dev + CONFIG_SERIAL_PORT), + (unsigned char) (c & 0xff)); } void serial_cls(void)

1 0

r322 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 21:36:45 +0100 (Tue, 23 Dec 2008) New Revision: 322 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/start.S Log: Get ram size from the configuration device Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-12-23 18:32:42 UTC (rev 321) +++ openbios-devel/arch/ppc/qemu/init.c 2008-12-23 20:36:45 UTC (rev 322) @@ -152,6 +152,9 @@ printk("CPUs: %x\n", temp); + temp = fw_cfg_read_i32(FW_CFG_RAM_SIZE); + printk("Memory: %dM\n", temp / 1024 / 1024); + fw_cfg_read(FW_CFG_UUID, qemu_uuid, 16); printk("UUID: " UUID_FMT "\n", qemu_uuid[0], qemu_uuid[1], qemu_uuid[2], Modified: openbios-devel/arch/ppc/qemu/start.S =================================================================== --- openbios-devel/arch/ppc/qemu/start.S 2008-12-23 18:32:42 UTC (rev 321) +++ openbios-devel/arch/ppc/qemu/start.S 2008-12-23 20:36:45 UTC (rev 322) @@ -356,43 +356,30 @@ isync blr - /* compute RAM size - * - * Exception vectors are beween 0x00000000 and 0x00004000 - * RAM size is limited to 2 MB (0x80000000) - * MMIO and IO are after 0x80000000. - * ROM is at 0xfff00000 - * so we can scan from 0x4000 to 0x80000000 - * - */ + /* Get RAM size from Qemu configuration device */ +#define CFG_ADDR 0xf0000510 +#define FW_CFG_RAM_SIZE 0x03 + compute_ramsize: - li r3, 0x4000 /* start address */ + lis r9,HA(CFG_ADDR) + ori r9,r9,LO(CFG_ADDR) + li r0,FW_CFG_RAM_SIZE + sth r0,0(r9) + lis r9,HA(CFG_ADDR + 2) + ori r9,r9,LO(CFG_ADDR + 2) + lbz r1,0(r9) + lbz r0,0(r9) + slwi r0,r0,8 + or r1,r1,r0 + lbz r0,0(r9) + slwi r0,r0,16 + or r1,r1,r0 + lbz r0,0(r9) + slwi r0,r0,24 + or r3,r1,r0 + blr - /* how many pages between 0x4000 and 0x80000000 */ - - lis r4, 0x0007 - ori r4, r4, 0xfffc - mtctr r4 - - /* pattern to write in memory */ - - lis r4, 0x55aa - ori r4, r4, 0x55aa - -memloop: - /* store and re-read pattern */ - - stw r4, 0(r3) - sync - lwz r0, 0(r3) - cmpw cr7, r0, r4 - bne cr7, exit_memloop - addi r3, r3, 4096 /* add page size */ - bdnz memloop -exit_memloop: - blr - /* Hard reset vector */ .section .romentry,"ax" bl _start

1 0

r321 - openbios-devel/drivers
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 19:32:42 +0100 (Tue, 23 Dec 2008) New Revision: 321 Modified: openbios-devel/drivers/floppy.c Log: Infinite loop fix (Justin Chevrier) Modified: openbios-devel/drivers/floppy.c =================================================================== --- openbios-devel/drivers/floppy.c 2008-12-23 15:54:58 UTC (rev 320) +++ openbios-devel/drivers/floppy.c 2008-12-23 18:32:42 UTC (rev 321) @@ -359,11 +359,8 @@ printk_debug("SENSEI %02x %02x\n", reply_buffer[0], reply_buffer[1]); } -#if 0 - }while((nr == 2) && (reply_buffer[0] != 0x80)); -#else + max_sensei--; }while(((reply_buffer[0] & 0x83) != FD_DRIVE) && (nr == 2) && max_sensei); -#endif status = inb(FD_STATUS); printk_debug("status = %x, reply_buffer=", status); for(i = 0; i < nr; i++) {

1 0

r320 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 16:54:58 +0100 (Tue, 23 Dec 2008) New Revision: 320 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/tree.fs Log: Probe CPU type Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-12-23 13:38:11 UTC (rev 319) +++ openbios-devel/arch/ppc/qemu/init.c 2008-12-23 15:54:58 UTC (rev 320) @@ -35,6 +35,16 @@ #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" +struct cpudef { + unsigned long iu_version; + const char *name; + int icache_size, dcache_size; + int icache_sets, dcache_sets; + int icache_block_size, dcache_block_size; + int clock_frequency; + void (*initfn)(const struct cpudef *cpu); +}; + extern void unexpected_excep( int vector ); extern void ob_pci_init( void ); extern void setup_timers( void ); @@ -159,6 +169,124 @@ ; } +static void +cpu_generic_init(const struct cpudef *cpu) +{ + unsigned long iu_version; + + push_str("/cpus"); + fword("find-device"); + + fword("new-device"); + + push_str(cpu->name); + fword("device-name"); + + push_str("cpu"); + fword("device-type"); + + asm("mfpvr %0\n" + : "=r"(iu_version) :); + PUSH(iu_version); + fword("encode-int"); + push_str("cpu-version"); + fword("property"); + + PUSH(cpu->dcache_size); + fword("encode-int"); + push_str("dcache-size"); + fword("property"); + + PUSH(cpu->icache_size); + fword("encode-int"); + push_str("icache-size"); + fword("property"); + + PUSH(cpu->dcache_sets); + fword("encode-int"); + push_str("dcache-sets"); + fword("property"); + + PUSH(cpu->icache_sets); + fword("encode-int"); + push_str("icache-sets"); + fword("property"); + + PUSH(cpu->dcache_block_size); + fword("encode-int"); + push_str("dcache-block-size"); + fword("property"); + + PUSH(cpu->icache_block_size); + fword("encode-int"); + push_str("icache-block-size"); + fword("property"); + + push_str("running"); + fword("encode-string"); + push_str("state"); + fword("property"); + + fword("finish-device"); +} + +static void +cpu_750_init(const struct cpudef *cpu) +{ + cpu_generic_init(cpu); +} + +static void +cpu_g4_init(const struct cpudef *cpu) +{ + cpu_generic_init(cpu); +} + +static const struct cpudef ppc_defs[] = { + { + .iu_version = 0x000080000, + .name = "PowerPC,750", + .icache_size = 0x8000, + .dcache_size = 0x8000, + .icache_sets = 0x80, + .dcache_sets = 0x80, + .icache_block_size = 0x20, + .dcache_block_size = 0x20, + .clock_frequency = 0x14dc9380, + .initfn = cpu_750_init, + }, + { + .iu_version = 0x0000c0000, + .name = "PowerPC,G4", + .icache_size = 0x8000, + .dcache_size = 0x8000, + .icache_sets = 0x80, + .dcache_sets = 0x80, + .icache_block_size = 0x20, + .dcache_block_size = 0x20, + .clock_frequency = 0x1dcd6500, + .initfn = cpu_g4_init, + }, +}; + +static const struct cpudef * +id_cpu(void) +{ + unsigned long iu_version; + unsigned int i; + + asm("mfpvr %0\n" + : "=r"(iu_version) :); + iu_version &= 0xffff0000; + + for (i = 0; i < sizeof(ppc_defs)/sizeof(struct cpudef); i++) { + if (iu_version == ppc_defs[i].iu_version) + return &ppc_defs[i]; + } + printk("Unknown cpu (pvr %lx), freezing!\n", iu_version); + for (;;); +} + void arch_of_init( void ) { @@ -166,6 +294,7 @@ phandle_t ph; #endif uint64_t ram_size; + const struct cpudef *cpu; devtree_init(); @@ -218,6 +347,10 @@ push_str("available"); fword("property"); + cpu = id_cpu(); + cpu->initfn(cpu); + printk("CPU type %s\n", cpu->name); + modules_init(); setup_timers(); #ifdef CONFIG_DRIVER_PCI Modified: openbios-devel/arch/ppc/qemu/tree.fs =================================================================== --- openbios-devel/arch/ppc/qemu/tree.fs 2008-12-23 13:38:11 UTC (rev 319) +++ openbios-devel/arch/ppc/qemu/tree.fs 2008-12-23 15:54:58 UTC (rev 320) @@ -28,32 +28,10 @@ finish-device new-device - " cpu" device-name - " cpu" device-type - " " encode-string " translations" property - 0 encode-phys h# 8000000 encode-int encode+ " available" property - d# 32 encode-int " d-cache-block-size" property - 8 encode-int " d-cache-sets" property - d# 32768 encode-int " d-cache-size" property - d# 32 encode-int " i-cache-block-size" property - 8 encode-int " i-cache-sets" property - d# 32768 encode-int " i-cache-size" property - " " encode-string " cache-unified" property - 2 encode-int " i-tlb-sets" property - d# 128 encode-int " i-tlb-size" property - 2 encode-int " d-tlb-sets" property - d# 128 encode-int " d-tlb-size" property - " " encode-string " tlb-split" property - 2 encode-int " tlb-sets" property - d# 256 encode-int " tlb-size" property - " " encode-string " performance-monitor" property - " " encode-string " graphics" property - 4 encode-int " reservation-granule-size" property - d# 25000000 encode-int " timebase-frequency" property - d# 300000000 encode-int " clock-frequency" property - d# 66000000 encode-int " bus-frequency" property - h# 88201 encode-int " cpu-version" property - 0 encode-int " reg" property + " cpus" device-name + " cpus" device-type + 1 encode-int " #address-cells" property + 0 encode-int " #size-cells" property finish-device " /pci" find-device

1 0

r319 - in openbios-devel: arch/ppc/qemu arch/sparc64 drivers
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 14:38:11 +0100 (Tue, 23 Dec 2008) New Revision: 319 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/sparc64/openbios.c openbios-devel/drivers/obio.c Log: Check configuration device version Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-12-23 13:14:33 UTC (rev 318) +++ openbios-devel/arch/ppc/qemu/init.c 2008-12-23 13:38:11 UTC (rev 319) @@ -105,13 +105,22 @@ void entry( void ) { - uint32_t temp; - uint16_t machine_id; + uint32_t temp = 0; + uint16_t machine_id = 0; char buf[5], qemu_uuid[16]; - machine_id = fw_cfg_read_i16(FW_CFG_MACHINE_ID); + arch = &known_arch[ARCH_HEATHROW]; - arch = &known_arch[machine_id]; + fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); + buf[4] = '\0'; + if (strncmp(buf, "QEMU", 4) == 0) { + temp = fw_cfg_read_i32(FW_CFG_ID); + if (temp == 1) { + machine_id = fw_cfg_read_i16(FW_CFG_MACHINE_ID); + arch = &known_arch[machine_id]; + } + } + isa_io_base = arch->io_base; serial_init(); @@ -120,13 +129,13 @@ printk("=============================================================\n"); printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); - fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); - buf[4] = '\0'; + if (temp != 1) { + printk("Incompatible configuration device version, freezing\n"); + for(;;); + } printk("Configuration device id %s", buf); - temp = fw_cfg_read_i32(FW_CFG_ID); - printk(" version %d machine id %d\n", temp, machine_id); temp = fw_cfg_read_i32(FW_CFG_NB_CPUS); Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-12-23 13:14:33 UTC (rev 318) +++ openbios-devel/arch/sparc64/openbios.c 2008-12-23 13:38:11 UTC (rev 319) @@ -656,6 +656,11 @@ printk(" version %d machine id %d\n", temp, machine_id); + if (temp != 1) { + printk("Incompatible configuration device version, freezing\n"); + for(;;); + } + kernel_image = nv_info.kernel_image; kernel_size = nv_info.kernel_size; size = nv_info.cmdline_size; Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2008-12-23 13:14:33 UTC (rev 318) +++ openbios-devel/drivers/obio.c 2008-12-23 13:38:11 UTC (rev 319) @@ -1042,6 +1042,11 @@ printk(" version %d machine id %d\n", temp, machine_id); + if (temp != 1) { + printk("Incompatible configuration device version, freezing\n"); + for(;;); + } + memcpy(&nv_info, nvram, sizeof(nv_info)); kernel_image = nv_info.kernel_image; kernel_size = nv_info.kernel_size;

1 0

r318 - in openbios-devel: arch/sparc64 drivers
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 14:14:33 +0100 (Tue, 23 Dec 2008) New Revision: 318 Modified: openbios-devel/arch/sparc64/openbios.c openbios-devel/drivers/obio.c Log: Clean up configuration device and NVRAM access, add UUID to Sparc32 Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-12-23 12:07:07 UTC (rev 317) +++ openbios-devel/arch/sparc64/openbios.c 2008-12-23 13:14:33 UTC (rev 318) @@ -32,6 +32,10 @@ #define BIOS_CFG_CMD 0x510 #define BIOS_CFG_DATA 0x511 +#define NVRAM_ADDR_LO 0x74 +#define NVRAM_ADDR_HI 0x75 +#define NVRAM_DATA 0x77 + #define APB_SPECIAL_BASE 0x1fe00000000ULL #define PCI_CONFIG (APB_SPECIAL_BASE + 0x1000000ULL) #define APB_MEM_BASE 0x1ff00000000ULL @@ -40,20 +44,21 @@ // XXX #define NVRAM_SIZE 0x2000 -#define NVRAM_IDPROM 0x1fd0 +#define NVRAM_IDPROM 0x1fd8 +#define NVRAM_IDPROM_SIZE 32 #define NVRAM_OB_START (sizeof(ohwcfg_v3_t) + sizeof(struct sparc_arch_cfg)) -#define NVRAM_OB_SIZE ((NVRAM_IDPROM - NVRAM_OB_START) & ~15) +#define NVRAM_OB_SIZE ((0x1fd0 - NVRAM_OB_START) & ~15) static ohwcfg_v3_t nv_info; #define OBIO_CMDLINE_MAX 256 static char obio_cmdline[OBIO_CMDLINE_MAX]; -static uint8_t idprom[32]; +static uint8_t idprom[NVRAM_IDPROM_SIZE]; struct hwdef { pci_arch_t pci; - uint8_t machine_id_low, machine_id_high; + uint16_t machine_id_low, machine_id_high; }; static const struct hwdef hwdefs[] = { @@ -556,12 +561,80 @@ for (;;); } +static void +fw_cfg_read(uint16_t cmd, char *buf, unsigned int nbytes) +{ + unsigned int i; + + outw(__cpu_to_le16(cmd), BIOS_CFG_CMD); + for (i = 0; i < nbytes; i++) + buf[i] = inb(BIOS_CFG_DATA); +} + +static uint64_t +fw_cfg_read_i64(uint16_t cmd) +{ + char buf[sizeof(uint64_t)]; + + fw_cfg_read(cmd, buf, sizeof(uint64_t)); + + return __le64_to_cpu(*(uint64_t *)buf); +} + +static uint32_t +fw_cfg_read_i32(uint16_t cmd) +{ + char buf[sizeof(uint32_t)]; + + fw_cfg_read(cmd, buf, sizeof(uint32_t)); + + return __le32_to_cpu(*(uint32_t *)buf); +} + +static uint16_t +fw_cfg_read_i16(uint16_t cmd) +{ + char buf[sizeof(uint16_t)]; + + fw_cfg_read(cmd, buf, sizeof(uint16_t)); + + return __le16_to_cpu(*(uint16_t *)buf); +} + +static uint8_t nvram_read_byte(uint16_t offset) +{ + outb(offset & 0xff, NVRAM_ADDR_LO); + outb(offset >> 8, NVRAM_ADDR_HI); + return inb(NVRAM_DATA); +} + +static void nvram_read(uint16_t offset, char *buf, unsigned int nbytes) +{ + unsigned int i; + + for (i = 0; i < nbytes; i++) + buf[i] = nvram_read_byte(offset + i); +} + +static void nvram_write_byte(uint16_t offset, uint8_t val) +{ + outb(offset & 0xff, NVRAM_ADDR_LO); + outb(offset >> 8, NVRAM_ADDR_HI); + outb(val, NVRAM_DATA); +} + +static void nvram_write(uint16_t offset, const char *buf, unsigned int nbytes) +{ + unsigned int i; + + for (i = 0; i < nbytes; i++) + nvram_write_byte(offset + i, buf[i]); +} + static uint8_t qemu_uuid[16]; void arch_nvram_get(char *data) { - unsigned short i; - unsigned char *nvptr = (unsigned char *)&nv_info; uint32_t size; const struct cpudef *cpu; const char *bootpath; @@ -569,27 +642,19 @@ uint32_t temp; uint64_t ram_size; uint32_t clock_frequency; + uint16_t machine_id; - for (i = 0; i < sizeof(ohwcfg_v3_t); i++) { - outb(i & 0xff, 0x74); - outb(i >> 8, 0x75); - *nvptr++ = inb(0x77); - } + nvram_read(0, (char *)&nv_info, sizeof(ohwcfg_v3_t)); - outw(__cpu_to_le16(FW_CFG_SIGNATURE), BIOS_CFG_CMD); - for (i = 0; i < 4; i++) - buf[i] = inb(BIOS_CFG_DATA); - + fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); buf[4] = '\0'; printk("Configuration device id %s", buf); - outw(__cpu_to_le16(FW_CFG_ID), BIOS_CFG_CMD); - for (i = 0; i < 4; i++) - buf[i] = inb(BIOS_CFG_DATA); + temp = fw_cfg_read_i32(FW_CFG_ID); + machine_id = fw_cfg_read_i16(FW_CFG_MACHINE_ID); - temp = __le32_to_cpu(*(uint32_t *)buf); - printk(" version %d\n", temp); + printk(" version %d machine id %d\n", temp, machine_id); kernel_image = nv_info.kernel_image; kernel_size = nv_info.kernel_size; @@ -606,18 +671,10 @@ if (size) printk("kernel cmdline %s\n", obio_cmdline); - for (i = 0; i < NVRAM_OB_SIZE; i++) { - outb((i + NVRAM_OB_START) & 0xff, 0x74); - outb((i + NVRAM_OB_START) >> 8, 0x75); - data[i] = inb(0x77); - } + nvram_read(NVRAM_OB_START, data, NVRAM_OB_SIZE); - outw(__cpu_to_le16(FW_CFG_NB_CPUS), BIOS_CFG_CMD); - for (i = 0; i < 4; i++) - buf[i] = inb(BIOS_CFG_DATA); + temp = fw_cfg_read_i32(FW_CFG_NB_CPUS); - temp = __le32_to_cpu(*(uint32_t *)buf); - printk("CPUs: %x", temp); clock_frequency = 100000000; @@ -628,9 +685,7 @@ printk(" x %s\n", cpu->name); // Add /uuid - outw(__cpu_to_le16(FW_CFG_UUID), BIOS_CFG_CMD); - for (i = 0; i < 16; i++) - qemu_uuid[i] = inb(BIOS_CFG_DATA); + fw_cfg_read(FW_CFG_UUID, (char *)qemu_uuid, 16); printk("UUID: " UUID_FMT "\n", qemu_uuid[0], qemu_uuid[1], qemu_uuid[2], qemu_uuid[3], qemu_uuid[4], qemu_uuid[5], qemu_uuid[6], @@ -648,11 +703,7 @@ fword("property"); // Add /idprom - for (i = 0; i < 32; i++) { - outb((i + 0x1fd8) & 0xff, 0x74); - outb((i + 0x1fd8) >> 8, 0x75); - idprom[i] = inb(0x77); - } + nvram_read(NVRAM_IDPROM, (char *)idprom, NVRAM_IDPROM_SIZE); PUSH((long)&idprom); PUSH(32); @@ -668,12 +719,8 @@ push_str("/memory"); fword("find-device"); - outw(__cpu_to_le16(FW_CFG_RAM_SIZE), BIOS_CFG_CMD); - for (i = 0; i < 8; i++) - buf[i] = inb(BIOS_CFG_DATA); + ram_size = fw_cfg_read_i64(FW_CFG_RAM_SIZE); - ram_size = __le64_to_cpu(*(uint64_t *)buf); - // All memory: 0 to RAM_size PUSH(0); fword("encode-int"); @@ -811,13 +858,7 @@ void arch_nvram_put(char *data) { - unsigned short i; - - for (i = 0; i < NVRAM_OB_SIZE; i++) { - outb((i + NVRAM_OB_START) & 0xff, 0x74); - outb((i + NVRAM_OB_START) >> 8, 0x75); - outb(data[i], 0x77); - } + nvram_write(0, data, NVRAM_OB_SIZE); } int arch_nvram_size(void) @@ -851,15 +892,14 @@ arch_init( void ) { unsigned int i; - uint8_t qemu_machine_type; - const struct hwdef *hwdef; + uint16_t machine_id; + const struct hwdef *hwdef = NULL; - outw(__cpu_to_le16(FW_CFG_MACHINE_ID), BIOS_CFG_CMD); - qemu_machine_type = inb(BIOS_CFG_DATA); + machine_id = fw_cfg_read_i16(FW_CFG_MACHINE_ID); for (i = 0; i < sizeof(hwdefs) / sizeof(struct hwdef); i++) { - if (hwdefs[i].machine_id_low <= qemu_machine_type && - hwdefs[i].machine_id_high >= qemu_machine_type) { + if (hwdefs[i].machine_id_low <= machine_id && + hwdefs[i].machine_id_high >= machine_id) { hwdef = &hwdefs[i]; break; } Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2008-12-23 12:07:07 UTC (rev 317) +++ openbios-devel/drivers/obio.c 2008-12-23 13:14:33 UTC (rev 318) @@ -24,6 +24,8 @@ #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" +#define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" + #define PROMDEV_KBD 0 /* input from keyboard */ #define PROMDEV_SCREEN 0 /* output to screen */ #define PROMDEV_TTYA 1 /* in/out to ttya */ @@ -964,7 +966,42 @@ for (;;); } +static volatile uint16_t *fw_cfg_cmd; +static volatile uint8_t *fw_cfg_data; + static void +fw_cfg_read(uint16_t cmd, char *buf, unsigned int nbytes) +{ + unsigned int i; + + *fw_cfg_cmd = cmd; + for (i = 0; i < nbytes; i++) + buf[i] = *fw_cfg_data; +} + +static uint32_t +fw_cfg_read_i32(uint16_t cmd) +{ + char buf[sizeof(uint32_t)]; + + fw_cfg_read(cmd, buf, sizeof(uint32_t)); + + return __le32_to_cpu(*(uint32_t *)buf); +} + +static uint16_t +fw_cfg_read_i16(uint16_t cmd) +{ + char buf[sizeof(uint16_t)]; + + fw_cfg_read(cmd, buf, sizeof(uint16_t)); + + return __le16_to_cpu(*(uint16_t *)buf); +} + +static uint8_t qemu_uuid[16]; + +static void ob_nvram_init(uint64_t base, uint64_t offset) { const char *stdin, *stdout; @@ -975,8 +1012,6 @@ const struct cpudef *cpu; const struct machdef *mach; ohwcfg_v3_t *header; - volatile uint8_t *fw_cfg_data; - volatile uint16_t *fw_cfg_cmd; char buf[256]; uint32_t temp; @@ -989,29 +1024,24 @@ push_str("address"); fword("property"); + push_str("mk48t08"); + fword("model"); + + fword("finish-device"); + fw_cfg_cmd = map_io(CFG_ADDR, CFG_SIZE); fw_cfg_data = (uint8_t *)fw_cfg_cmd + 2; - *fw_cfg_cmd = FW_CFG_SIGNATURE; - for (i = 0; i < 4; i++) - buf[i] = *fw_cfg_data; + fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); buf[4] = '\0'; + printk("Configuration device id %s", buf); - *fw_cfg_cmd = FW_CFG_ID; - for (i = 0; i < 4; i++) - buf[i] = *fw_cfg_data; + temp = fw_cfg_read_i32(FW_CFG_ID); + machine_id = fw_cfg_read_i16(FW_CFG_MACHINE_ID); - temp = __le32_to_cpu(*(uint32_t *)buf); - printk(" version %d", temp); + printk(" version %d machine id %d\n", temp, machine_id); - *fw_cfg_cmd = FW_CFG_MACHINE_ID; - for (i = 0; i < 2; i++) - buf[i] = *fw_cfg_data; - - machine_id = __le16_to_cpu(*(uint16_t *)buf); - printk(" machine id %d\n", machine_id); - memcpy(&nv_info, nvram, sizeof(nv_info)); kernel_image = nv_info.kernel_image; kernel_size = nv_info.kernel_size; @@ -1029,16 +1059,27 @@ header->crc = OHW_compute_crc(header, 0x00, 0xF8); boot_device = nv_info.boot_devices[0]; - *fw_cfg_cmd = FW_CFG_NOGRAPHIC; - nographic = *fw_cfg_data; - *fw_cfg_cmd = FW_CFG_SUN4M_DEPTH; - graphic_depth = *fw_cfg_data; + fw_cfg_read(FW_CFG_NOGRAPHIC, &nographic, 1); + graphic_depth = fw_cfg_read_i16(FW_CFG_SUN4M_DEPTH); - push_str("mk48t08"); - fword("model"); + // Add /uuid + fw_cfg_read(FW_CFG_UUID, (char *)qemu_uuid, 16); - fword("finish-device"); + printk("UUID: " UUID_FMT "\n", qemu_uuid[0], qemu_uuid[1], qemu_uuid[2], + qemu_uuid[3], qemu_uuid[4], qemu_uuid[5], qemu_uuid[6], + qemu_uuid[7], qemu_uuid[8], qemu_uuid[9], qemu_uuid[10], + qemu_uuid[11], qemu_uuid[12], qemu_uuid[13], qemu_uuid[14], + qemu_uuid[15]); + push_str("/"); + fword("find-device"); + + PUSH((long)&qemu_uuid); + PUSH(16); + fword("encode-bytes"); + push_str("uuid"); + fword("property"); + // Add /idprom push_str("/"); fword("find-device"); @@ -1070,12 +1111,8 @@ fword("property"); // Add cpus - *fw_cfg_cmd = FW_CFG_NB_CPUS; - for (i = 0; i < 4; i++) - buf[i] = *fw_cfg_data; + temp = fw_cfg_read_i32(FW_CFG_NB_CPUS); - temp = __le32_to_cpu(*(uint32_t *)buf); - printk("CPUs: %x", temp); cpu = id_cpu(); printk(" x %s\n", cpu->name);

1 0

Re: [OpenBIOS] r315 - openbios-devel/arch/ppc/qemu
by Laurent Vivier 23 Dec '08

23 Dec '08

Le 23 déc. 08 à 12:57, svn(a)openbios.org a écrit : > Author: blueswirl > Date: 2008-12-23 12:57:36 +0100 (Tue, 23 Dec 2008) > New Revision: 315 > > Modified: > openbios-devel/arch/ppc/qemu/init.c > openbios-devel/arch/ppc/qemu/main.c > Log: > Get machine ID, boot device, preloaded kernel parameters and UUID > from Qemu > configuration device and NVRAM. This one hangs when it is used with a QEmu that doesn't present the FW cfg interface to openbios. > > > Modified: openbios-devel/arch/ppc/qemu/init.c > =================================================================== > --- openbios-devel/arch/ppc/qemu/init.c 2008-12-23 11:54:25 UTC (rev > 314) > +++ openbios-devel/arch/ppc/qemu/init.c 2008-12-23 11:57:36 UTC (rev > 315) > @@ -27,7 +27,14 @@ > #include "qemu/qemu.h" > #include "ofmem.h" > #include "openbios-version.h" > +#include "libc/byteorder.h" > +#define NO_QEMU_PROTOS > +#include "openbios/fw_cfg.h" > > +#define CFG_ADDR 0xf0000510 > + > +#define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x > %02x%02x%02x%02x%02x" > + > extern void unexpected_excep( int vector ); > extern void ob_pci_init( void ); > extern void setup_timers( void ); > @@ -62,10 +69,49 @@ > }; > uint32_t isa_io_base; > > +static volatile uint16_t *fw_cfg_cmd = (void *)CFG_ADDR; > +static volatile uint8_t *fw_cfg_data = (void *)(CFG_ADDR + 2); > + > +static void > +fw_cfg_read(uint16_t cmd, char *buf, unsigned int nbytes) > +{ > + unsigned int i; > + > + *fw_cfg_cmd = cmd; > + for (i = 0; i < nbytes; i++) > + buf[i] = *fw_cfg_data; > +} > + > +static uint32_t > +fw_cfg_read_i32(uint16_t cmd) > +{ > + char buf[sizeof(uint32_t)]; > + > + fw_cfg_read(cmd, buf, sizeof(uint32_t)); > + > + return __le32_to_cpu(*(uint32_t *)buf); > +} > + > +static uint16_t > +fw_cfg_read_i16(uint16_t cmd) > +{ > + char buf[sizeof(uint16_t)]; > + > + fw_cfg_read(cmd, buf, sizeof(uint16_t)); > + > + return __le16_to_cpu(*(uint16_t *)buf); > +} > + > void > entry( void ) > { > - arch = &known_arch[ARCH_HEATHROW]; > + uint32_t temp; > + uint16_t machine_id; > + char buf[5], qemu_uuid[16]; > + > + machine_id = fw_cfg_read_i16(FW_CFG_MACHINE_ID); > If qemu doesn't provide FW cfg interface machine_id is 0, which means ARCH_PREPS. > + arch = &known_arch[machine_id]; > isa_io_base = arch->io_base; > > serial_init(); > @@ -74,6 +120,27 @@ > > printk("============================================================= > \n"); > printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); > > + fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); > + buf[4] = '\0'; > + > + printk("Configuration device id %s", buf); > + > + temp = fw_cfg_read_i32(FW_CFG_ID); > + > + printk(" version %d machine id %d\n", temp, machine_id); > + > + temp = fw_cfg_read_i32(FW_CFG_NB_CPUS); > + > + printk("CPUs: %x\n", temp); > + > + fw_cfg_read(FW_CFG_UUID, qemu_uuid, 16); > + > + printk("UUID: " UUID_FMT "\n", qemu_uuid[0], qemu_uuid[1], > qemu_uuid[2], > + qemu_uuid[3], qemu_uuid[4], qemu_uuid[5], > qemu_uuid[6], > + qemu_uuid[7], qemu_uuid[8], qemu_uuid[9], > qemu_uuid[10], > + qemu_uuid[11], qemu_uuid[12], qemu_uuid[13], > qemu_uuid[14], > + qemu_uuid[15]); > + > ofmem_init(); > initialize_forth(); > /* won't return */ > > Modified: openbios-devel/arch/ppc/qemu/main.c > =================================================================== > --- openbios-devel/arch/ppc/qemu/main.c 2008-12-23 11:54:25 UTC (rev > 314) > +++ openbios-devel/arch/ppc/qemu/main.c 2008-12-23 11:57:36 UTC (rev > 315) > @@ -33,6 +33,10 @@ > #define ELF_DPRINTF(fmt, args...) do { } while (0) > #endif > > +#define NVRAM_ADDR_LO 0x74 > +#define NVRAM_ADDR_HI 0x75 > +#define NVRAM_DATA 0x77 > + > static void > transfer_control_to_elf( ulong elf_entry ) > { > @@ -206,6 +210,24 @@ > close_io( fd ); > } > > +static uint8_t nvram_read(uint16_t offset) > +{ > + outb(offset & 0xff, NVRAM_ADDR_LO); > + outb(offset >> 8, NVRAM_ADDR_HI); > + return inb(NVRAM_DATA); > +} > + > +static uint32_t nvram_read_be32(uint16_t offset) > +{ > + uint32_t ret; > + > + ret = nvram_read(offset) << 24; > + ret |= nvram_read(offset + 1) << 16; > + ret |= nvram_read(offset + 2) << 8; > + ret |= nvram_read(offset + 3); > + return ret; > +} > + > static void > yaboot_startup( void ) > { > @@ -238,6 +260,19 @@ > } > try_bootinfo(path); > try_path(path, param); > + } else { > + char boot_device = nvram_read(0x34); > + > + switch (boot_device) { > + case 'c': > + path = strdup("hd:0"); > + break; > + default: > + case 'd': > + path = strdup("cdrom:0"); > + break; > + } > + try_bootinfo(path); > } > } else { > ELF_DPRINTF("Entering boot, path %s\n", path); > @@ -250,7 +285,23 @@ > printk("*** Boot failure! No secondary bootloader specified ***\n"); > } > > +static void check_preloaded_kernel(void) > +{ > + unsigned long kernel_image, kernel_size, cmdline; > + unsigned long initrd_image, initrd_size; > > + kernel_size = nvram_read_be32(0x3c); > + if (kernel_size) { > + kernel_image = nvram_read_be32(0x38); > + cmdline = nvram_read_be32(0x40); > + initrd_image = nvram_read_be32(0x48); > + initrd_size = nvram_read_be32(0x4c); > + printk("[ppc] Kernel already loaded (0x%8.8lx + 0x%8.8lx)\n", > + kernel_image, kernel_size); > + call_elf(kernel_image); > + } > +} > + > / > ************************************************************************/ > /* entry */ > / > ************************************************************************/ > @@ -259,5 +310,6 @@ > boot( void ) > { > fword("update-chosen"); > + check_preloaded_kernel(); > yaboot_startup(); > } > > > -- > OpenBIOS http://openbios.org/ > Mailinglist: http://lists.openbios.org/mailman/listinfo > Free your System - May the Forth be with you ----------------------- Laurent Vivier ---------------------- "The best way to predict the future is to invent it." - Alan Kay

2 1

r317 - in openbios-devel: arch/sparc32 drivers include/openbios
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 13:07:07 +0100 (Tue, 23 Dec 2008) New Revision: 317 Modified: openbios-devel/arch/sparc32/console.c openbios-devel/arch/sparc32/openbios.h openbios-devel/drivers/obio.c openbios-devel/include/openbios/drivers.h Log: Move serial console functions to obio.c Modified: openbios-devel/arch/sparc32/console.c =================================================================== --- openbios-devel/arch/sparc32/console.c 2008-12-23 12:03:02 UTC (rev 316) +++ openbios-devel/arch/sparc32/console.c 2008-12-23 12:07:07 UTC (rev 317) @@ -13,124 +13,6 @@ #ifdef CONFIG_DEBUG_CONSOLE /* ****************************************************************** - * serial console functions - * ****************************************************************** */ - -#ifdef CONFIG_DEBUG_CONSOLE_SERIAL - -static volatile unsigned char *kbd_dev, *serial_dev; - -#define CTRL(port) serial_dev[(port) * 2 + 0] -#define DATA(port) serial_dev[(port) * 2 + 2] - -/* Conversion routines to/from brg time constants from/to bits - * per second. - */ -#define BRG_TO_BPS(brg, freq) ((freq) / 2 / ((brg) + 2)) -#define BPS_TO_BRG(bps, freq) ((((freq) + (bps)) / (2 * (bps))) - 2) - -#define ZS_CLOCK 4915200 /* Zilog input clock rate. */ -#define ZS_CLOCK_DIVISOR 16 /* Divisor this driver uses. */ - -/* Write Register 3 */ -#define RxENAB 0x1 /* Rx Enable */ -#define Rx8 0xc0 /* Rx 8 Bits/Character */ - -/* Write Register 4 */ -#define SB1 0x4 /* 1 stop bit/char */ -#define X16CLK 0x40 /* x16 clock mode */ - -/* Write Register 5 */ -#define RTS 0x2 /* RTS */ -#define TxENAB 0x8 /* Tx Enable */ -#define Tx8 0x60 /* Tx 8 bits/character */ -#define DTR 0x80 /* DTR */ - -/* Write Register 14 (Misc control bits) */ -#define BRENAB 1 /* Baud rate generator enable */ -#define BRSRC 2 /* Baud rate generator source */ - -/* Read Register 0 */ -#define Rx_CH_AV 0x1 /* Rx Character Available */ - -static int uart_charav(int port) -{ - return ((CTRL(port) & Rx_CH_AV) != 0); -} - -static char uart_getchar(int port) -{ - while (!uart_charav(port)) - ; - return DATA(port) & 0177; -} - -static void uart_putchar(int port, unsigned char c) -{ - if (!serial_dev) - return; - - if (c == '\n') - uart_putchar(port, '\r'); - while (!(CTRL(port) & 4)) - ; - DATA(port) = c; -} - -static void uart_init_line(int port, unsigned long baud) -{ - CTRL(port) = 4; // reg 4 - CTRL(port) = SB1 | X16CLK; // no parity, async, 1 stop bit, 16x - // clock - - baud = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR); - - CTRL(port) = 12; // reg 12 - CTRL(port) = baud & 0xff; - CTRL(port) = 13; // reg 13 - CTRL(port) = (baud >> 8) & 0xff; - CTRL(port) = 14; // reg 14 - CTRL(port) = BRSRC | BRENAB; - - CTRL(port) = 3; // reg 3 - CTRL(port) = RxENAB | Rx8; // enable rx, 8 bits/char - - CTRL(port) = 5; // reg 5 - CTRL(port) = RTS | TxENAB | Tx8 | DTR; // enable tx, 8 bits/char, - // set RTS & DTR - -} - -int uart_init(uint64_t port, unsigned long speed) -{ - int line; - - serial_dev = map_io(port & ~7ULL, 2 * 4); - serial_dev += port & 7ULL; - line = port & 3ULL; - uart_init_line(line, speed); - - return -1; -} - -static void serial_putchar(int c) -{ - uart_putchar(CONFIG_SERIAL_PORT, (unsigned char) (c & 0xff)); -} - -static void serial_cls(void) -{ - serial_putchar(27); - serial_putchar('['); - serial_putchar('H'); - serial_putchar(27); - serial_putchar('['); - serial_putchar('J'); -} - -#endif - -/* ****************************************************************** * simple polling video/keyboard console functions * ****************************************************************** */ @@ -175,79 +57,6 @@ console_init(); } -void kbd_init(uint64_t base) -{ - kbd_dev = map_io(base, 2 * 4); - kbd_dev += 4; -} - -static const unsigned char sunkbd_keycode[128] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', 0, 8, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, - 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', '\\', 13, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - ' ', -}; - -static const unsigned char sunkbd_keycode_shifted[128] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+', 0, 8, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, - 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '"', '|', 13, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?', - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - ' ', -}; - -static int shiftstate; - -int -keyboard_dataready(void) -{ - return ((kbd_dev[0] & 1) == 1); -} - -unsigned char -keyboard_readdata(void) -{ - unsigned char ch; - - while (!keyboard_dataready()) { } - - do { - ch = kbd_dev[2] & 0xff; - if (ch == 99) - shiftstate |= 1; - else if (ch == 110) - shiftstate |= 2; - else if (ch == 227) - shiftstate &= ~1; - else if (ch == 238) - shiftstate &= ~2; - //printk("getch: %d\n", ch); - } - while ((ch & 0x80) == 0 || ch == 238 || ch == 227); // Wait for key release - //printk("getch rel: %d\n", ch); - ch &= 0x7f; - if (shiftstate) - ch = sunkbd_keycode_shifted[ch]; - else - ch = sunkbd_keycode[ch]; - //printk("getch xlate: %d\n", ch); - - return ch; -} - #endif /* ****************************************************************** Modified: openbios-devel/arch/sparc32/openbios.h =================================================================== --- openbios-devel/arch/sparc32/openbios.h 2008-12-23 12:03:02 UTC (rev 316) +++ openbios-devel/arch/sparc32/openbios.h 2008-12-23 12:07:07 UTC (rev 317) @@ -22,7 +22,6 @@ /* console.c */ extern unsigned char *vmem; #ifdef CONFIG_DEBUG_CONSOLE -extern int uart_init(uint64_t port, unsigned long speed); extern void video_init(void); #endif Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2008-12-23 12:03:02 UTC (rev 316) +++ openbios-devel/drivers/obio.c 2008-12-23 12:07:07 UTC (rev 317) @@ -111,35 +111,121 @@ fword("property"); } -// XXX move all arch/sparc32/console.c stuff here -#define CTRL(addr) (*(char *)(addr)) -#define DATA(addr) (*(char *)(addr + 2)) +/* ****************************************************************** + * serial console functions + * ****************************************************************** */ +static volatile unsigned char *kbd_dev, *serial_dev; + +#define CTRL(port) serial_dev[(port) * 2 + 0] +#define DATA(port) serial_dev[(port) * 2 + 2] + +/* Conversion routines to/from brg time constants from/to bits + * per second. + */ +#define BRG_TO_BPS(brg, freq) ((freq) / 2 / ((brg) + 2)) +#define BPS_TO_BRG(bps, freq) ((((freq) + (bps)) / (2 * (bps))) - 2) + +#define ZS_CLOCK 4915200 /* Zilog input clock rate. */ +#define ZS_CLOCK_DIVISOR 16 /* Divisor this driver uses. */ + +/* Write Register 3 */ +#define RxENAB 0x1 /* Rx Enable */ +#define Rx8 0xc0 /* Rx 8 Bits/Character */ + +/* Write Register 4 */ +#define SB1 0x4 /* 1 stop bit/char */ +#define X16CLK 0x40 /* x16 clock mode */ + +/* Write Register 5 */ +#define RTS 0x2 /* RTS */ +#define TxENAB 0x8 /* Tx Enable */ +#define Tx8 0x60 /* Tx 8 bits/character */ +#define DTR 0x80 /* DTR */ + +/* Write Register 14 (Misc control bits) */ +#define BRENAB 1 /* Baud rate generator enable */ +#define BRSRC 2 /* Baud rate generator source */ + /* Read Register 0 */ #define Rx_CH_AV 0x1 /* Rx Character Available */ #define Tx_BUF_EMP 0x4 /* Tx Buffer empty */ -static int uart_charav(int port) +int uart_charav(int port) { return (CTRL(port) & Rx_CH_AV) != 0; } -static char uart_getchar(int port) +char uart_getchar(int port) { - while (!uart_charav(port)); - + while (!uart_charav(port)) + ; return DATA(port) & 0177; } static void uart_putchar(int port, unsigned char c) { - if (c == '\n') - uart_putchar(port, '\r'); - while (!(CTRL(port) & Tx_BUF_EMP)); + if (!serial_dev) + return; - DATA(port) = c; + if (c == '\n') + uart_putchar(port, '\r'); + while (!(CTRL(port) & Tx_BUF_EMP)) + ; + DATA(port) = c; } +static void uart_init_line(int port, unsigned long baud) +{ + CTRL(port) = 4; // reg 4 + CTRL(port) = SB1 | X16CLK; // no parity, async, 1 stop bit, 16x + // clock + + baud = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR); + + CTRL(port) = 12; // reg 12 + CTRL(port) = baud & 0xff; + CTRL(port) = 13; // reg 13 + CTRL(port) = (baud >> 8) & 0xff; + CTRL(port) = 14; // reg 14 + CTRL(port) = BRSRC | BRENAB; + + CTRL(port) = 3; // reg 3 + CTRL(port) = RxENAB | Rx8; // enable rx, 8 bits/char + + CTRL(port) = 5; // reg 5 + CTRL(port) = RTS | TxENAB | Tx8 | DTR; // enable tx, 8 bits/char, + // set RTS & DTR + +} + +int uart_init(uint64_t port, unsigned long speed) +{ + int line; + + serial_dev = map_io(port & ~7ULL, 2 * 4); + serial_dev += port & 7ULL; + line = port & 3ULL; + uart_init_line(line, speed); + + return -1; +} + +void serial_putchar(int c) +{ + uart_putchar(CONFIG_SERIAL_PORT, (unsigned char) (c & 0xff)); +} + +void serial_cls(void) +{ + serial_putchar(27); + serial_putchar('['); + serial_putchar('H'); + serial_putchar(27); + serial_putchar('['); + serial_putchar('J'); +} + /* ( addr len -- actual ) */ static void zs_read(unsigned long *address) @@ -161,6 +247,79 @@ } } +void kbd_init(uint64_t base) +{ + kbd_dev = map_io(base, 2 * 4); + kbd_dev += 4; +} + +static const unsigned char sunkbd_keycode[128] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', 0, 8, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, + 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', '\\', 13, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + ' ', +}; + +static const unsigned char sunkbd_keycode_shifted[128] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+', 0, 8, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, + 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '"', '|', 13, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?', + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + ' ', +}; + +static int shiftstate; + +int +keyboard_dataready(void) +{ + return ((kbd_dev[0] & 1) == 1); +} + +unsigned char +keyboard_readdata(void) +{ + unsigned char ch; + + while (!keyboard_dataready()) { } + + do { + ch = kbd_dev[2] & 0xff; + if (ch == 99) + shiftstate |= 1; + else if (ch == 110) + shiftstate |= 2; + else if (ch == 227) + shiftstate &= ~1; + else if (ch == 238) + shiftstate &= ~2; + //printk("getch: %d\n", ch); + } + while ((ch & 0x80) == 0 || ch == 238 || ch == 227); // Wait for key release + //printk("getch rel: %d\n", ch); + ch &= 0x7f; + if (shiftstate) + ch = sunkbd_keycode_shifted[ch]; + else + ch = sunkbd_keycode[ch]; + //printk("getch xlate: %d\n", ch); + + return ch; +} + /* ( addr len -- actual ) */ static void zs_read_keyboard(void) Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2008-12-23 12:03:02 UTC (rev 316) +++ openbios-devel/include/openbios/drivers.h 2008-12-23 12:07:07 UTC (rev 317) @@ -59,6 +59,11 @@ unsigned long aux1_offset, unsigned long aux2_offset); int start_cpu(unsigned int pc, unsigned int context_ptr, unsigned int context, int cpu); +void serial_putchar(int c); +int uart_charav(int port); +char uart_getchar(int port); +void serial_cls(void); +int uart_init(uint64_t port, unsigned long speed); /* drivers/iommu.c */ extern struct mem cmem;

1 0

r316 - openbios-devel/config/examples
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 13:03:02 +0100 (Tue, 23 Dec 2008) New Revision: 316 Modified: openbios-devel/config/examples/cross-sparc32_config.xml Log: Enable floppy driver for cross-sparc32 like native build Modified: openbios-devel/config/examples/cross-sparc32_config.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_config.xml 2008-12-23 11:57:36 UTC (rev 315) +++ openbios-devel/config/examples/cross-sparc32_config.xml 2008-12-23 12:03:02 UTC (rev 316) @@ -71,6 +71,6 @@ <option name="CONFIG_DRIVER_SBUS" type="boolean" value="true"/> <option name="CONFIG_DRIVER_OBIO" type="boolean" value="true"/> <option name="CONFIG_DRIVER_ESP" type="boolean" value="true"/> - <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="false"/> + <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/> </config>

1 0

r315 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 12:57:36 +0100 (Tue, 23 Dec 2008) New Revision: 315 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/main.c Log: Get machine ID, boot device, preloaded kernel parameters and UUID from Qemu configuration device and NVRAM. Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-12-23 11:54:25 UTC (rev 314) +++ openbios-devel/arch/ppc/qemu/init.c 2008-12-23 11:57:36 UTC (rev 315) @@ -27,7 +27,14 @@ #include "qemu/qemu.h" #include "ofmem.h" #include "openbios-version.h" +#include "libc/byteorder.h" +#define NO_QEMU_PROTOS +#include "openbios/fw_cfg.h" +#define CFG_ADDR 0xf0000510 + +#define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" + extern void unexpected_excep( int vector ); extern void ob_pci_init( void ); extern void setup_timers( void ); @@ -62,10 +69,49 @@ }; uint32_t isa_io_base; +static volatile uint16_t *fw_cfg_cmd = (void *)CFG_ADDR; +static volatile uint8_t *fw_cfg_data = (void *)(CFG_ADDR + 2); + +static void +fw_cfg_read(uint16_t cmd, char *buf, unsigned int nbytes) +{ + unsigned int i; + + *fw_cfg_cmd = cmd; + for (i = 0; i < nbytes; i++) + buf[i] = *fw_cfg_data; +} + +static uint32_t +fw_cfg_read_i32(uint16_t cmd) +{ + char buf[sizeof(uint32_t)]; + + fw_cfg_read(cmd, buf, sizeof(uint32_t)); + + return __le32_to_cpu(*(uint32_t *)buf); +} + +static uint16_t +fw_cfg_read_i16(uint16_t cmd) +{ + char buf[sizeof(uint16_t)]; + + fw_cfg_read(cmd, buf, sizeof(uint16_t)); + + return __le16_to_cpu(*(uint16_t *)buf); +} + void entry( void ) { - arch = &known_arch[ARCH_HEATHROW]; + uint32_t temp; + uint16_t machine_id; + char buf[5], qemu_uuid[16]; + + machine_id = fw_cfg_read_i16(FW_CFG_MACHINE_ID); + + arch = &known_arch[machine_id]; isa_io_base = arch->io_base; serial_init(); @@ -74,6 +120,27 @@ printk("=============================================================\n"); printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); + fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); + buf[4] = '\0'; + + printk("Configuration device id %s", buf); + + temp = fw_cfg_read_i32(FW_CFG_ID); + + printk(" version %d machine id %d\n", temp, machine_id); + + temp = fw_cfg_read_i32(FW_CFG_NB_CPUS); + + printk("CPUs: %x\n", temp); + + fw_cfg_read(FW_CFG_UUID, qemu_uuid, 16); + + printk("UUID: " UUID_FMT "\n", qemu_uuid[0], qemu_uuid[1], qemu_uuid[2], + qemu_uuid[3], qemu_uuid[4], qemu_uuid[5], qemu_uuid[6], + qemu_uuid[7], qemu_uuid[8], qemu_uuid[9], qemu_uuid[10], + qemu_uuid[11], qemu_uuid[12], qemu_uuid[13], qemu_uuid[14], + qemu_uuid[15]); + ofmem_init(); initialize_forth(); /* won't return */ Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2008-12-23 11:54:25 UTC (rev 314) +++ openbios-devel/arch/ppc/qemu/main.c 2008-12-23 11:57:36 UTC (rev 315) @@ -33,6 +33,10 @@ #define ELF_DPRINTF(fmt, args...) do { } while (0) #endif +#define NVRAM_ADDR_LO 0x74 +#define NVRAM_ADDR_HI 0x75 +#define NVRAM_DATA 0x77 + static void transfer_control_to_elf( ulong elf_entry ) { @@ -206,6 +210,24 @@ close_io( fd ); } +static uint8_t nvram_read(uint16_t offset) +{ + outb(offset & 0xff, NVRAM_ADDR_LO); + outb(offset >> 8, NVRAM_ADDR_HI); + return inb(NVRAM_DATA); +} + +static uint32_t nvram_read_be32(uint16_t offset) +{ + uint32_t ret; + + ret = nvram_read(offset) << 24; + ret |= nvram_read(offset + 1) << 16; + ret |= nvram_read(offset + 2) << 8; + ret |= nvram_read(offset + 3); + return ret; +} + static void yaboot_startup( void ) { @@ -238,6 +260,19 @@ } try_bootinfo(path); try_path(path, param); + } else { + char boot_device = nvram_read(0x34); + + switch (boot_device) { + case 'c': + path = strdup("hd:0"); + break; + default: + case 'd': + path = strdup("cdrom:0"); + break; + } + try_bootinfo(path); } } else { ELF_DPRINTF("Entering boot, path %s\n", path); @@ -250,7 +285,23 @@ printk("*** Boot failure! No secondary bootloader specified ***\n"); } +static void check_preloaded_kernel(void) +{ + unsigned long kernel_image, kernel_size, cmdline; + unsigned long initrd_image, initrd_size; + kernel_size = nvram_read_be32(0x3c); + if (kernel_size) { + kernel_image = nvram_read_be32(0x38); + cmdline = nvram_read_be32(0x40); + initrd_image = nvram_read_be32(0x48); + initrd_size = nvram_read_be32(0x4c); + printk("[ppc] Kernel already loaded (0x%8.8lx + 0x%8.8lx)\n", + kernel_image, kernel_size); + call_elf(kernel_image); + } +} + /************************************************************************/ /* entry */ /************************************************************************/ @@ -259,5 +310,6 @@ boot( void ) { fword("update-chosen"); + check_preloaded_kernel(); yaboot_startup(); }

1 0

r314 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 12:54:25 +0100 (Tue, 23 Dec 2008) New Revision: 314 Modified: openbios-devel/arch/ppc/qemu/main.c Log: Parse bootscript in ppc\bootinfo.txt Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2008-12-23 11:53:13 UTC (rev 313) +++ openbios-devel/arch/ppc/qemu/main.c 2008-12-23 11:54:25 UTC (rev 314) @@ -130,7 +130,83 @@ /* won't come here */ } +/* + Parse SGML structure like: + <chrp-boot> + <description>Debian/GNU Linux Installation on IBM CHRP hardware</description> + <os-name>Debian/GNU Linux for PowerPC</os-name> + <boot-script>boot &device;:\install\yaboot</boot-script> + <icon size=64,64 color-space=3,3,2> + + CHRP system bindings are described at: + http://playground.sun.com/1275/bindings/chrp/chrp1_7a.ps +*/ static void +try_bootinfo(const char *path) +{ + int fd; + char tagbuf[256], bootscript[256], c, *left, *right; + int len, tag, taglen, script, scriptlen; + + snprintf(bootscript, sizeof(bootscript), "%s,ppc\\bootinfo.txt", path); + ELF_DPRINTF("Trying %s\n", bootscript); + if ((fd = open_io(bootscript)) == -1) { + ELF_DPRINTF("Can't open %s\n", bootscript); + return; + } + len = read_io(fd, tagbuf, 11); + tagbuf[11] = '\0'; + if (len < 0 || strcasecmp(tagbuf, "<chrp-boot>") != 0) + goto badf; + + tag = 0; + taglen = 0; + script = 0; + scriptlen = 0; + do { + len = read_io(fd, &c, 1); + if (len < 0) + goto badf; + if (c == '<') { + tag = 1; + taglen = 0; + } else if (c == '>') { + tag = 0; + tagbuf[taglen] = '\0'; + if (strcasecmp(tagbuf, "boot-script") == 0) + script = 1; + else if (strcasecmp(tagbuf, "/boot-script") == 0) { + bootscript[scriptlen] = '\0'; + break; + } + } else if (tag && taglen < sizeof(tagbuf)) { + tagbuf[taglen++] = c; + } else if (script && scriptlen < sizeof(bootscript)) { + bootscript[scriptlen++] = c; + } + } while (1); + + ELF_DPRINTF("got bootscript %s\n", bootscript); + + // Replace &device;: with original path + push_str(bootscript); + PUSH('&'); + fword("left-split"); + fword("2swap"); + PUSH(':'); + fword("left-split"); + fword("2drop"); + right = pop_fstr_copy(); + left = pop_fstr_copy(); + snprintf(bootscript, sizeof(bootscript), "%s%s,%s", left, path, right); + ELF_DPRINTF("fixed bootscript %s\n", bootscript); + + feval(bootscript); + badf: + close_io( fd ); +} + +static void yaboot_startup( void ) { static const char * const paths[] = { "hd:2,\\ofclient", "hd:2,\\yaboot" }; @@ -139,6 +215,7 @@ int i; if (!path) { + ELF_DPRINTF("Entering boot, no path\n"); push_str("boot-device"); push_str("/options"); fword("(find-dev)"); @@ -159,8 +236,13 @@ POP(); param = pop_fstr_copy(); } + try_bootinfo(path); try_path(path, param); } + } else { + ELF_DPRINTF("Entering boot, path %s\n", path); + try_path(path, ""); + try_bootinfo(path); } for( i=0; i < sizeof(paths) / sizeof(paths[0]); i++ ) { try_path(paths[i], args[i]);

1 0

r313 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 12:53:13 +0100 (Tue, 23 Dec 2008) New Revision: 313 Modified: openbios-devel/arch/ppc/qemu/main.c Log: Use boot-device and boot-args NVRAM variables, fix warnings when debugging Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2008-12-23 10:15:14 UTC (rev 312) +++ openbios-devel/arch/ppc/qemu/main.c 2008-12-23 11:53:13 UTC (rev 313) @@ -56,7 +56,7 @@ /* the ELF-image (usually) starts at offset 0x4000 */ if( (elf_offs=find_elf(fd)) < 0 ) { - ELF_DPRINTF("----> %s is not an ELF image\n", buf ); + ELF_DPRINTF("----> %s is not an ELF image\n", get_file_path(fd)); exit(1); } if( !(phdr=elf_readhdrs(fd, elf_offs, &ehdr)) ) @@ -73,8 +73,8 @@ seek_io( fd, elf_offs + phdr[i].p_offset ); ELF_DPRINTF("filesz: %08lX memsz: %08lX p_offset: %08lX p_vaddr %08lX\n", - phdr[i].p_filesz, phdr[i].p_memsz, phdr[i].p_offset, - phdr[i].p_vaddr ); + (ulong)phdr[i].p_filesz, (ulong)phdr[i].p_memsz, (ulong)phdr[i].p_offset, + (ulong)phdr[i].p_vaddr ); if( phdr[i].p_vaddr != phdr[i].p_paddr ) ELF_DPRINTF("WARNING: ELF segment virtual addr != physical addr\n"); @@ -108,28 +108,63 @@ /************************************************************************/ /* qemu booting */ /************************************************************************/ +static void +try_path(const char *path, const char *param) +{ + ulong elf_entry; + int fd; + ELF_DPRINTF("Trying %s %s\n", path, param); + if ((fd = open_io(path)) == -1) { + ELF_DPRINTF("Can't open %s\n", path); + return; + } + (void) load_elf_rom( &elf_entry, fd ); + close_io( fd ); + encode_bootpath( path, param ); + + update_nvram(); + ELF_DPRINTF("Transfering control to %s %s\n", + path, param); + transfer_control_to_elf( elf_entry ); + /* won't come here */ +} + static void yaboot_startup( void ) { - const char *paths[] = { "hd:2,\\ofclient", "hd:2,\\yaboot", NULL }; - const char *args[] = { "", "conf=hd:2,\\yaboot.conf", NULL }; - ulong elf_entry; - int i, fd; + static const char * const paths[] = { "hd:2,\\ofclient", "hd:2,\\yaboot" }; + static const char * const args[] = { "", "conf=hd:2,\\yaboot.conf" }; + char *path = pop_fstr_copy(), *param; + int i; - for( i=0; paths[i]; i++ ) { - if( (fd=open_io(paths[i])) == -1 ) - continue; - (void) load_elf_rom( &elf_entry, fd ); - close_io( fd ); - encode_bootpath( paths[i], args[i] ); - - update_nvram(); - ELF_DPRINTF("Transfering control to %s %s\n", - paths[i], args[i]); - transfer_control_to_elf( elf_entry ); - /* won't come here */ - } + if (!path) { + push_str("boot-device"); + push_str("/options"); + fword("(find-dev)"); + POP(); + fword("get-package-property"); + if (!POP()) { + path = pop_fstr_copy(); + param = strchr(path, ' '); + if (param) { + *param = '\0'; + param++; + } else { + push_str("boot-args"); + push_str("/options"); + fword("(find-dev)"); + POP(); + fword("get-package-property"); + POP(); + param = pop_fstr_copy(); + } + try_path(path, param); + } + } + for( i=0; i < sizeof(paths) / sizeof(paths[0]); i++ ) { + try_path(paths[i], args[i]); + } printk("*** Boot failure! No secondary bootloader specified ***\n"); }

1 0

Re: [OpenBIOS] r312 - in openbios-devel: arch/ppc/qemu drivers include/openbios modules
by Blue Swirl 23 Dec '08

23 Dec '08

On 12/23/08, svn(a)openbios.org <svn(a)openbios.org> wrote: > Author: blueswirl > Date: 2008-12-23 11:15:14 +0100 (Tue, 23 Dec 2008) > New Revision: 312 > > Modified: > openbios-devel/arch/ppc/qemu/init.c > openbios-devel/drivers/adb.c > openbios-devel/drivers/kbd.c > openbios-devel/drivers/kbd.h > openbios-devel/drivers/pci.c > openbios-devel/include/openbios/pci.h > openbios-devel/modules/font_8x8.c > Log: > Change part_length to a define Sorry, the log entry should have been: Make some structures used by PPC "const".

1 0

r312 - in openbios-devel: arch/ppc/qemu drivers include/openbios modules
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 11:15:14 +0100 (Tue, 23 Dec 2008) New Revision: 312 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/drivers/adb.c openbios-devel/drivers/kbd.c openbios-devel/drivers/kbd.h openbios-devel/drivers/pci.c openbios-devel/include/openbios/pci.h openbios-devel/modules/font_8x8.c Log: Change part_length to a define Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-12-23 10:14:48 UTC (rev 311) +++ openbios-devel/arch/ppc/qemu/init.c 2008-12-23 10:15:14 UTC (rev 312) @@ -46,7 +46,7 @@ ARCH_HEATHROW, }; -static pci_arch_t known_arch[] = { +static const pci_arch_t known_arch[] = { [ARCH_PREP] = { "PREP", 0x1057, 0x4801, 0x80800000, 0x800c0000, 0x80000000, 0x00100000, 0xf0000000, 0x10000000, 0x80000000, 0x00010000, 0x00000000, 0x00400000, Modified: openbios-devel/drivers/adb.c =================================================================== --- openbios-devel/drivers/adb.c 2008-12-23 10:14:48 UTC (rev 311) +++ openbios-devel/drivers/adb.c 2008-12-23 10:15:14 UTC (rev 312) @@ -65,7 +65,7 @@ */ -static keymap_t ADB_kbd_us[] = { +static const keymap_t ADB_kbd_us[] = { /* 0x00 */ { KBD_SH_CAPS, { 0x61, 0x41, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, Modified: openbios-devel/drivers/kbd.c =================================================================== --- openbios-devel/drivers/kbd.c 2008-12-23 10:14:48 UTC (rev 311) +++ openbios-devel/drivers/kbd.c 2008-12-23 10:15:14 UTC (rev 312) @@ -30,7 +30,7 @@ #define KBD_DPRINTF(fmt, args...) do { } while (0) #endif -int kbd_set_keymap (kbd_t *kbd, int nb_keys, keymap_t *keymap) +int kbd_set_keymap (kbd_t *kbd, int nb_keys, const keymap_t *keymap) { kbd->nb_keys = nb_keys; kbd->keymap = keymap; @@ -40,7 +40,7 @@ int kbd_translate_key (kbd_t *kbd, int keycode, int up_down) { - keymap_t *keyt; + const keymap_t *keyt; int mod_state, key, type; int ret; Modified: openbios-devel/drivers/kbd.h =================================================================== --- openbios-devel/drivers/kbd.h 2008-12-23 10:14:48 UTC (rev 311) +++ openbios-devel/drivers/kbd.h 2008-12-23 10:15:14 UTC (rev 312) @@ -34,7 +34,7 @@ * Right modifiers -----------+ */ int nb_keys; - keymap_t *keymap; + const keymap_t *keymap; }; /* Modifiers */ @@ -97,7 +97,7 @@ }; void *kbd_new (int len); -int kbd_set_keymap (kbd_t *kbd, int nb_keys, keymap_t *keymap); +int kbd_set_keymap (kbd_t *kbd, int nb_keys, const keymap_t *keymap); int kbd_translate_key (kbd_t *kbd, int keycode, int up_down); #endif /* !defined (__OHW_KBD_H__) */ Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-12-23 10:14:48 UTC (rev 311) +++ openbios-devel/drivers/pci.c 2008-12-23 10:15:14 UTC (rev 312) @@ -33,7 +33,7 @@ /* DECLARE data structures for the nodes. */ DECLARE_UNNAMED_NODE( ob_pci_node, INSTALL_OPEN, 2*sizeof(int) ); -pci_arch_t *arch; +const pci_arch_t *arch; static void ob_pci_open(int *idx) Modified: openbios-devel/include/openbios/pci.h =================================================================== --- openbios-devel/include/openbios/pci.h 2008-12-23 10:14:48 UTC (rev 311) +++ openbios-devel/include/openbios/pci.h 2008-12-23 10:15:14 UTC (rev 312) @@ -21,6 +21,6 @@ unsigned long rlen; }; -extern pci_arch_t *arch; +extern const pci_arch_t *arch; #endif /* _H_PCI */ Modified: openbios-devel/modules/font_8x8.c =================================================================== --- openbios-devel/modules/font_8x8.c 2008-12-23 10:14:48 UTC (rev 311) +++ openbios-devel/modules/font_8x8.c 2008-12-23 10:15:14 UTC (rev 312) @@ -8,7 +8,7 @@ #define FONT_WIDTH 8 #define FONT_HEIGHT 8 -static unsigned char fontdata[FONTDATAMAX] = { +static const unsigned char fontdata[FONTDATAMAX] = { /* 0 0x00 '^@' */ 0x00, /* 00000000 */

1 0

r311 - openbios-devel/fs/grubfs
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 11:14:48 +0100 (Tue, 23 Dec 2008) New Revision: 311 Modified: openbios-devel/fs/grubfs/filesys.h openbios-devel/fs/grubfs/grubfs_fs.c Log: Change part_length to a define Modified: openbios-devel/fs/grubfs/filesys.h =================================================================== --- openbios-devel/fs/grubfs/filesys.h 2008-12-23 10:12:09 UTC (rev 310) +++ openbios-devel/fs/grubfs/filesys.h 2008-12-23 10:14:48 UTC (rev 311) @@ -121,8 +121,8 @@ #define current_slice 0 #define current_partition 0 -extern unsigned long part_start; -extern unsigned long part_length; +/* we fake this for now, assuming that the filesystem is not corrupt */ +#define part_length -1 extern int filepos; extern int filemax; extern int fsmax; Modified: openbios-devel/fs/grubfs/grubfs_fs.c =================================================================== --- openbios-devel/fs/grubfs/grubfs_fs.c 2008-12-23 10:12:09 UTC (rev 310) +++ openbios-devel/fs/grubfs/grubfs_fs.c 2008-12-23 10:14:48 UTC (rev 311) @@ -31,9 +31,6 @@ grub_error_t errnum; char FSYS_BUF[FSYS_BUFLEN]; -/* we fake this for now, assuming that the filesystem is not corrupt */ -unsigned long part_length=(unsigned long)-1; - /* these are not even used by us, instead * the grub fs drivers want them: */

1 0

r310 - openbios-devel/kernel
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 11:12:09 +0100 (Tue, 23 Dec 2008) New Revision: 310 Modified: openbios-devel/kernel/internal.c openbios-devel/kernel/primitives.c Log: Make words array static and change the definition to a stricter one Modified: openbios-devel/kernel/internal.c =================================================================== --- openbios-devel/kernel/internal.c 2008-12-23 10:09:04 UTC (rev 309) +++ openbios-devel/kernel/internal.c 2008-12-23 10:12:09 UTC (rev 310) @@ -13,7 +13,9 @@ * - address pointed by CFA is executed by CPU */ -extern void * const words[]; +typedef void forth_word(void); + +static forth_word * const words[]; ucell PC; volatile int runforth = 0; Modified: openbios-devel/kernel/primitives.c =================================================================== --- openbios-devel/kernel/primitives.c 2008-12-23 10:09:04 UTC (rev 309) +++ openbios-devel/kernel/primitives.c 2008-12-23 10:12:09 UTC (rev 310) @@ -39,8 +39,7 @@ * THE END). ANY OTHER CHANGE WILL BREAK COMPATIBILITY TO OLDER * BINARY DICTIONARIES. */ -void * const words[] = { - +static forth_word * const words[] = { /* * CFAs and special words */

1 0

r309 - openbios-devel/drivers
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 11:09:04 +0100 (Tue, 23 Dec 2008) New Revision: 309 Modified: openbios-devel/drivers/pci.c Log: Add copyright Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-12-23 08:11:53 UTC (rev 308) +++ openbios-devel/drivers/pci.c 2008-12-23 10:09:04 UTC (rev 309) @@ -7,6 +7,8 @@ * (C) 2004 Stefan Reinauer <stepan(a)openbios.org> * (C) 2005 Ed Schouten <ed(a)fxq.nl> * + * Some parts from OpenHackWare-0.4, Copyright (c) 2004-2005 Jocelyn Mayer + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2

1 0

[PATCH] sparc64 add cpuid to cpu node
by Igor Kovalenko 23 Dec '08

23 Dec '08

Hi! Linux kernel expects at least "cpuid" property in cpu device node, or it halts execution. This patch adds one with dummy "1" value. This allows to make some progress into booting the kernel. Please apply. -- Kind regards, Igor V. Kovalenko

2 7

r308 - openbios-devel/arch/sparc64
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 09:11:53 +0100 (Tue, 23 Dec 2008) New Revision: 308 Modified: openbios-devel/arch/sparc64/openbios.c Log: Add clock-frequency property (original patch by Igor Kovalenko) Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-12-22 16:01:44 UTC (rev 307) +++ openbios-devel/arch/sparc64/openbios.c 2008-12-23 08:11:53 UTC (rev 308) @@ -385,7 +385,7 @@ : : "r" (addr)); } -static void cpu_generic_init(const struct cpudef *cpu) +static void cpu_generic_init(const struct cpudef *cpu, uint32_t clock_frequency) { unsigned long iu_version; char nodebuff[256]; @@ -429,6 +429,11 @@ push_str("cpuid"); fword("property"); + PUSH(clock_frequency); + fword("encode-int"); + push_str("clock-frequency"); + fword("property"); + fword("finish-device"); // MMU node @@ -563,6 +568,7 @@ char buf[256]; uint32_t temp; uint64_t ram_size; + uint32_t clock_frequency; for (i = 0; i < sizeof(ohwcfg_v3_t); i++) { outb(i & 0xff, 0x74); @@ -614,9 +620,11 @@ printk("CPUs: %x", temp); + clock_frequency = 100000000; + cpu = id_cpu(); //cpu->initfn(); - cpu_generic_init(cpu); + cpu_generic_init(cpu, clock_frequency); printk(" x %s\n", cpu->name); // Add /uuid

1 0

Re: [OpenBIOS] First OOPS
by Laurent Vivier 22 Dec '08

22 Dec '08

Le 22 déc. 08 à 17:23, Blue Swirl a écrit : > On 12/22/08, Laurent Vivier <laurent(a)lvivier.info> wrote: >> >> Le 22 déc. 08 à 12:20, Blue Swirl a écrit : >> >> >> >>> On 12/22/08, Laurent Vivier <laurent(a)lvivier.info> wrote: >>> >>>> On an install CD there is a forth script which start yaboot with >>>> good >>>> parameters but currently OpenBIOS is not able to decode this script >> (inside >>>> XML tags). >>>> >>> >>> Did OHW ever handle this? >>> >> >> It does, but it is a hack: it computes the checksum of the script to >> identify it, and according the checksum the things to do are >> hardcoded into >> OHW. >> >> You have a big "switch()" and a "case" for each known script (for >> instance >> "debian etch install CD", "debian sarge install CD", etc). > > Well, it wasn't that hard. The patch o_2_use_bootinfo.diff adds > parsing of CHRP file ppc\bootinfo.txt. Still, the loaded yaboot does > not work. Maybe a problem with ELF loader? > > I've shuffled the patch series a bit, so here are all pending patches. > Would anyone mind if I applied them? > < > q_1_ppc_openbios > .diff > > > < > q_2_ppc_use_prom_env > .diff > > > < > q_3_ppc_use_fw_cfg > .diff > > > < > o_1_ppc_add_boot.diff><o_2_use_bootinfo.diff><o_3_ppc_use_fw_cfg.diff> I don't totally agree with some of them, but it is a good start and all are really needed, so please apply... Regards, Laurent ----------------------- Laurent Vivier ---------------------- "The best way to predict the future is to invent it." - Alan Kay

1 0

r307 - openbios-devel/config/examples
by svn＠openbios.org 22 Dec '08

22 Dec '08

Author: blueswirl Date: 2008-12-22 17:01:44 +0100 (Mon, 22 Dec 2008) New Revision: 307 Modified: openbios-devel/config/examples/cross-ppc_config.xml Log: Enable ISO9660 Modified: openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_config.xml 2008-12-22 16:01:12 UTC (rev 306) +++ openbios-devel/config/examples/cross-ppc_config.xml 2008-12-22 16:01:44 UTC (rev 307) @@ -52,7 +52,7 @@ <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_UFS" type="boolean" value="false"/> - <option name="CONFIG_FSYS_ISO9660" type="boolean" value="false"/> + <option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/> <option name="CONFIG_FSYS_FFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/>

1 0

r306 - openbios-devel/fs/grubfs
by svn＠openbios.org 22 Dec '08

22 Dec '08

Author: blueswirl Date: 2008-12-22 17:01:12 +0100 (Mon, 22 Dec 2008) New Revision: 306 Modified: openbios-devel/fs/grubfs/fsys_iso9660.c Log: Fix ISO9660 endian problems, ignore case Modified: openbios-devel/fs/grubfs/fsys_iso9660.c =================================================================== --- openbios-devel/fs/grubfs/fsys_iso9660.c 2008-12-22 06:19:19 UTC (rev 305) +++ openbios-devel/fs/grubfs/fsys_iso9660.c 2008-12-22 16:01:12 UTC (rev 306) @@ -42,6 +42,12 @@ #define DEBUG_THIS 1 #include "debug.h" +#if defined(__sparc__) || defined(__PPC__) +#define ENDIAN b +#else +#define ENDIAN l +#endif + struct iso_superblock { unsigned long vol_sector; @@ -90,7 +96,7 @@ { ISO_SUPER->vol_sector = sector; ISO_SUPER->file_start = 0; - fsmax = PRIMDESC->volume_space_size.l; + fsmax = PRIMDESC->volume_space_size.ENDIAN; return 1; } } @@ -125,8 +131,8 @@ pathlen++) ; - size = idr->size.l; - extent = idr->extent.l; + size = idr->size.ENDIAN; + extent = idr->extent.ENDIAN; while (size > 0) { @@ -138,13 +144,13 @@ extent++; idr = (struct iso_directory_record *)DIRREC; - for (; idr->length.l > 0; - idr = (struct iso_directory_record *)((char *)idr + idr->length.l) ) + for (; idr->length.ENDIAN > 0; + idr = (struct iso_directory_record *)((char *)idr + idr->length.ENDIAN) ) { const char *name = (char *)idr->name; - unsigned int name_len = idr->name_len.l; + unsigned int name_len = idr->name_len.ENDIAN; - file_type = (idr->flags.l & 2) ? ISO_DIRECTORY : ISO_REGULAR; + file_type = (idr->flags.ENDIAN & 2) ? ISO_DIRECTORY : ISO_REGULAR; if (name_len == 1) { if ((name[0] == 0) || /* self */ @@ -161,10 +167,10 @@ /* * Parse Rock-Ridge extension */ - rr_len = (idr->length.l - idr->name_len.l + rr_len = (idr->length.ENDIAN - idr->name_len.ENDIAN - (unsigned char)sizeof(struct iso_directory_record) + (unsigned char)sizeof(idr->name)); - rr_ptr.ptr = ((char *)idr + idr->name_len.l + rr_ptr.ptr = ((char *)idr + idr->name_len.ENDIAN + sizeof(struct iso_directory_record) - sizeof(idr->name)); if (rr_ptr.i & 1) @@ -187,7 +193,7 @@ } else if (rr_ptr.rr->signature == RRMAGIC('R', 'R') && rr_ptr.rr->len >= 5) - rr_flag &= rr_ptr.rr->u.rr.flags.l; + rr_flag &= rr_ptr.rr->u.rr.flags.ENDIAN; else if (rr_ptr.rr->signature == RRMAGIC('N', 'M')) { name = (char *)rr_ptr.rr->u.nm.name; @@ -197,10 +203,10 @@ else if (rr_ptr.rr->signature == RRMAGIC('P', 'X') && rr_ptr.rr->len >= 36) { - file_type = ((rr_ptr.rr->u.px.mode.l & POSIX_S_IFMT) + file_type = ((rr_ptr.rr->u.px.mode.ENDIAN & POSIX_S_IFMT) == POSIX_S_IFREG ? ISO_REGULAR - : ((rr_ptr.rr->u.px.mode.l & POSIX_S_IFMT) + : ((rr_ptr.rr->u.px.mode.ENDIAN & POSIX_S_IFMT) == POSIX_S_IFDIR ? ISO_DIRECTORY : ISO_OTHER)); rr_flag &= ~RR_FLAG_PX; @@ -224,9 +230,9 @@ memcpy(NAME_BUF, name, name_len); name = (char *)NAME_BUF; } - rr_ptr.ptr = (char *)(RRCONT_BUF + ce_ptr->u.ce.offset.l); - rr_len = ce_ptr->u.ce.size.l; - if (!iso9660_devread(ce_ptr->u.ce.extent.l, 0, + rr_ptr.ptr = (char *)(RRCONT_BUF + ce_ptr->u.ce.offset.ENDIAN); + rr_len = ce_ptr->u.ce.size.ENDIAN; + if (!iso9660_devread(ce_ptr->u.ce.extent.ENDIAN, 0, ISO_SECTOR_SIZE, (char *)RRCONT_BUF)) { errnum = 0; /* this is not fatal. */ @@ -238,7 +244,7 @@ filemax = MAXINT; if (name_len >= pathlen - && !__builtin_memcmp(name, dirname, pathlen)) + && !strnicmp(name, dirname, pathlen)) { if (dirname[pathlen] == '/' || !print_possibilities) { @@ -262,9 +268,9 @@ errnum = ERR_BAD_FILETYPE; return 0; } - ISO_SUPER->file_start = idr->extent.l; + ISO_SUPER->file_start = idr->extent.ENDIAN; filepos = 0; - filemax = idr->size.l; + filemax = idr->size.ENDIAN; return 1; } }

1 0

First OOPS
by Laurent Vivier 22 Dec '08

22 Dec '08

Hi, I've got my first oops under linux booted with OpenBIOS. The kernel (2.6.28-rc9) was hanging into probe_machine() because it didn't recognize the machine. The following patch correct this: --- arch/ppc/qemu/tree.fs | 1 + 1 file changed, 1 insertion(+) Index: openbios-devel/arch/ppc/qemu/tree.fs =================================================================== --- openbios-devel.orig/arch/ppc/qemu/tree.fs 2008-12-22 00:32:26.000000000 +0100 +++ openbios-devel/arch/ppc/qemu/tree.fs 2008-12-22 00:32:31.000000000 +0100 @@ -15,6 +15,7 @@ " chrp" device-type " OpenSource,QEMU" model +" Power Macintosh" encode-string " compatible" property 1 encode-int " #interrupt-cells" property 1 encode-int " #size-cells" property BTW tree.fs needs more cleanup... Some screenshots: and after a while:

2 4

r305 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 22 Dec '08

22 Dec '08

Author: blueswirl Date: 2008-12-22 07:19:19 +0100 (Mon, 22 Dec 2008) New Revision: 305 Modified: openbios-devel/arch/ppc/qemu/tree.fs Log: Fix Linux OOPS (Laurent Vivier) Modified: openbios-devel/arch/ppc/qemu/tree.fs =================================================================== --- openbios-devel/arch/ppc/qemu/tree.fs 2008-12-21 14:24:30 UTC (rev 304) +++ openbios-devel/arch/ppc/qemu/tree.fs 2008-12-22 06:19:19 UTC (rev 305) @@ -15,6 +15,7 @@ " chrp" device-type " OpenSource,QEMU" model +" Power Macintosh" encode-string " compatible" property 1 encode-int " #interrupt-cells" property 1 encode-int " #size-cells" property

1 0

r304 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 21 Dec '08

21 Dec '08

Author: blueswirl Date: 2008-12-21 15:24:30 +0100 (Sun, 21 Dec 2008) New Revision: 304 Modified: openbios-devel/arch/ppc/qemu/qemu.c Log: Add missing "static" Modified: openbios-devel/arch/ppc/qemu/qemu.c =================================================================== --- openbios-devel/arch/ppc/qemu/qemu.c 2008-12-21 10:17:03 UTC (rev 303) +++ openbios-devel/arch/ppc/qemu/qemu.c 2008-12-21 14:24:30 UTC (rev 304) @@ -123,7 +123,7 @@ } #ifdef DUMP_NVRAM -void +static void dump_nvram(void) { int i, j;

1 0

[PATCH] qemu better support
by Laurent Vivier 21 Dec '08

21 Dec '08

This patches copies all needed ppc files to qemu and modifies them. The generated OpenBIOS image must be loaded at adresse 0xfff00000 by Qemu. It is able to load Yaboot from disk and Yaboot is able to load Linux, but Linux hangs somewhere... of course it needs more work (but this cleans up my patch queue). Thank you to Blue Swirl and Aurélien Jarno for their help. Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info> --- arch/ppc/build.xml | 7 arch/ppc/qemu/init.c | 75 ++- arch/ppc/qemu/kernel.c | 95 ++++ arch/ppc/qemu/kernel.h | 41 ++ arch/ppc/qemu/ldscript | 55 ++ arch/ppc/qemu/main.c | 58 +- arch/ppc/qemu/methods.c | 38 - arch/ppc/qemu/mmutypes.h | 76 +++ arch/ppc/qemu/ofmem.c | 708 +++++++++++++++++++++++++ ++++++++++ arch/ppc/qemu/qemu.fs | 1 arch/ppc/qemu/start.S | 393 +++++++++++++++++++ arch/ppc/qemu/tree.fs | 5 config/examples/cross-ppc_config.xml | 18 drivers/timer.c | 2 include/ofmem.h | 2 15 files changed, 1470 insertions(+), 104 deletions(-) Index: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel.orig/arch/ppc/qemu/main.c 2008-12-20 20:51:41.000000000 +0100 +++ openbios-devel/arch/ppc/qemu/main.c 2008-12-20 20:52:21.000000000 +0100 @@ -1,12 +1,11 @@ /* - * Creation Date: <2004/08/28 18:38:22 greg> - * Time-stamp: <2004/08/28 18:38:22 greg> + * Creation Date: <2002/10/02 22:24:24 samuel> + * Time-stamp: <2004/03/27 01:57:55 samuel> * * <main.c> * - * Copyright (C) 2004 Greg Watson * - * Based on MOL specific code which is + * * Copyright (C) 2002, 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) * * This program is free software; you can redistribute it and/or @@ -22,16 +21,23 @@ #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" -#include "qemu/qemu.h" #include "ofmem.h" +//#define DEBUG_ELF + +#ifdef DEBUG_ELF +#define ELF_DPRINTF(fmt, args...) \ +do { printk("ELF - %s: " fmt, __func__ , ##args); } while (0) +#else +#define ELF_DPRINTF(fmt, args...) do { } while (0) +#endif + static void -transfer_control_to_elf( ulong elf_entry ) +transfer_control_to_elf( ulong entry ) { extern void call_elf( ulong entry ); - printk("Starting ELF image at 0x%08lX\n", elf_entry); - call_elf( 0x400000 ); - //call_elf( entry ); + ELF_DPRINTF("Starting ELF boot loader\n"); + call_elf( entry ); fatal_error("call_elf returned unexpectedly\n"); } @@ -45,11 +51,12 @@ Elf_phdr *phdr; size_t s; - printk("Loading '%s'\n", get_file_path(fd)); + ELF_DPRINTF("Loading '%s' from '%s'\n", get_file_path(fd), + get_volume_name(fd) ); /* the ELF-image (usually) starts at offset 0x4000 */ if( (elf_offs=find_elf(fd)) < 0 ) { - printk("----> %s is not an ELF image\n", buf ); + ELF_DPRINTF("----> %s is not an ELF image\n", buf ); exit(1); } if( !(phdr=elf_readhdrs(fd, elf_offs, &ehdr)) ) @@ -65,12 +72,12 @@ s = MIN( phdr[i].p_filesz, phdr[i].p_memsz ); seek_io( fd, elf_offs + phdr[i].p_offset ); - /* printk("filesz: %08lX memsz: %08lX p_offset: %08lX p_vaddr %08lX \n", + ELF_DPRINTF("filesz: %08lX memsz: %08lX p_offset: %08lX p_vaddr %08lX\n", phdr[i].p_filesz, phdr[i].p_memsz, phdr[i].p_offset, - phdr[i].p_vaddr ); */ + phdr[i].p_vaddr ); if( phdr[i].p_vaddr != phdr[i].p_paddr ) - printk("WARNING: ELF segment virtual addr != physical addr\n"); + ELF_DPRINTF("WARNING: ELF segment virtual addr != physical addr\n"); lszz_offs = MAX( lszz_offs, elf_offs + phdr[i].p_offset + phdr[i].p_filesz ); if( !s ) continue; @@ -81,24 +88,15 @@ if( read_io(fd, addr, s) != s ) fatal_error("read failed\n"); -#if 0 - /* patch CODE segment */ - if( *elf_entry >= phdr[i].p_vaddr && - *elf_entry < phdr[i].p_vaddr + s ) { - patch_newworld_rom( (char*)phdr[i].p_vaddr, s ); - newworld_timer_hack( (char*)phdr[i].p_vaddr, s ); - } -#endif flush_icache_range( addr, addr+s ); - /*printk("ELF ROM-section loaded at %08lX (size %08lX)\n", - (ulong)phdr[i].p_vaddr, (ulong)phdr[i].p_memsz );*/ + ELF_DPRINTF("ELF ROM-section loaded at %08lX (size %08lX)\n", + (ulong)phdr[i].p_vaddr, (ulong)phdr[i].p_memsz ); } free( phdr ); return lszz_offs; } - static void encode_bootpath( const char *spec, const char *args ) { @@ -112,10 +110,10 @@ / ************************************************************************/ static void -qemu_startup( void ) +yaboot_startup( void ) { - const char *paths[] = { "hd:0,\\zImage.chrp", NULL }; - const char *args[] = { "root=/dev/hda2 console=ttyS0,115200", NULL }; + const char *paths[] = { "hd:2,\\ofclient", "hd:2,\\yaboot", NULL }; + const char *args[] = { "", "conf=hd:2,\\yaboot.conf", NULL }; ulong elf_entry; int i, fd; @@ -127,6 +125,8 @@ encode_bootpath( paths[i], args[i] ); update_nvram(); + ELF_DPRINTF("Transfering control to %s %s\n", + paths[i], args[i]); transfer_control_to_elf( elf_entry ); /* won't come here */ } @@ -142,5 +142,5 @@ boot( void ) { fword("update-chosen"); - qemu_startup(); + yaboot_startup(); } Index: openbios-devel/arch/ppc/qemu/tree.fs =================================================================== --- openbios-devel.orig/arch/ppc/qemu/tree.fs 2008-12-20 20:51:41.000000000 +0100 +++ openbios-devel/arch/ppc/qemu/tree.fs 2008-12-20 20:52:21.000000000 +0100 @@ -15,17 +15,12 @@ " chrp" device-type " OpenSource,QEMU" model -h# 80000000 encode-int " isa-io-base" property 1 encode-int " #interrupt-cells" property 1 encode-int " #size-cells" property new-device " memory" device-name " memory" device-type - 0 encode-int h# 1E00000 encode-int encode+ - h# 2000000 encode-int encode+ h# 40000000 encode-int encode+ - " available" property - 0 h# 40000000 reg external : open true ; : close ; Index: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel.orig/arch/ppc/qemu/init.c 2008-12-20 20:51:41.000000000 +0100 +++ openbios-devel/arch/ppc/qemu/init.c 2008-12-20 20:52:21.000000000 +0100 @@ -32,6 +32,11 @@ extern void ob_pci_init( void ); extern void setup_timers( void ); +extern ulong get_ram_size( void ); +extern ulong get_ram_top( void ); +extern ulong get_ram_bottom( void ); + + void unexpected_excep( int vector ) { @@ -67,11 +72,9 @@ { arch = &known_arch[ARCH_HEATHROW]; isa_io_base = arch->io_base; -#ifdef CONFIG_DEBUG_CONSOLE -#ifdef CONFIG_DEBUG_CONSOLE_SERIAL + serial_init(); -#endif -#endif + printk("\n"); printk("============================================================= \n"); printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); @@ -100,8 +103,59 @@ phandle_t ph; #endif int autoboot; + uint64_t ram_size; devtree_init(); + + /* ISA BASE */ + + push_str("/"); + fword("find-device"); + + PUSH(isa_io_base); + fword("encode-int"); + push_str("isa-io-base"); + fword("property"); + + /* memory info */ + + push_str("/memory"); + fword("find-device"); + + /* all memory */ + + ram_size = get_ram_size(); + + PUSH(ram_size >> 32); + fword("encode-int"); + PUSH(ram_size & 0xffffffff); + fword("encode-int"); + fword("encode+"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); + + /* available memory */ + + PUSH(0); + fword("encode-int"); + PUSH((unsigned long)get_ram_bottom()); + fword("encode-int"); + fword("encode+"); + PUSH((unsigned long)get_ram_top()); + fword("encode-int"); + fword("encode+"); + PUSH(ram_size); + fword("encode-int"); + fword("encode+"); + push_str("available"); + fword("property"); + modules_init(); setup_timers(); #ifdef CONFIG_DRIVER_PCI @@ -119,22 +173,13 @@ set_property( ph, "rtas-size", (char*)&size, sizeof(size) ); } #endif -#if 0 - /* tweak boot settings */ - autoboot = !!getbool("autoboot?"); -#endif - autoboot = 0; - if( !autoboot ) - printk("Autobooting disabled - dropping into OpenFirmware\n"); - setenv("auto-boot?", autoboot ? "true" : "false" ); - setenv("boot-command", "qemuboot"); #if 0 if( getbool("tty-interface?") == 1 ) #endif fword("activate-tty-interface"); - /* hack */ device_end(); - bind_func("qemuboot", boot ); + + bind_func("platform-boot", boot ); } Index: openbios-devel/arch/ppc/qemu/methods.c =================================================================== --- openbios-devel.orig/arch/ppc/qemu/methods.c 2008-12-20 20:51:41.000000000 +0100 +++ openbios-devel/arch/ppc/qemu/methods.c 2008-12-20 20:52:21.000000000 +0100 @@ -24,6 +24,7 @@ #include "libc/string.h" #include "qemu/qemu.h" #include "ofmem.h" +#include "ppc/processor.h" / ************************************************************************/ /* RTAS (run-time abstraction services) */ @@ -60,37 +61,6 @@ / ************************************************************************/ -/* stdout */ -/ ************************************************************************/ - -DECLARE_NODE( video_stdout, INSTALL_OPEN, 0, "Tdisplay" ); - -/* ( addr len -- actual ) */ -static void -stdout_write( void ) -{ - int len = POP(); - char *addr = (char*)POP(); - char *s = malloc( len + 1 ); - - strncpy_nopad( s, addr, len ); - s[len]=0; - - printk( "%s", s ); - //vfd_draw_str( s ); - console_draw_str( s ); - - free( s ); - - PUSH( len ); -} - -NODE_METHODS( video_stdout ) = { - { "write", stdout_write }, -}; - - -/ ************************************************************************/ /* tty */ / ************************************************************************/ @@ -136,7 +106,7 @@ /* client interface 'quiesce' */ / ************************************************************************/ -DECLARE_NODE( ciface, 0, 0, "/packages/client-iface" ); +DECLARE_NODE( ciface, 0, 0, "+/openprom/client-services" ); /* ( -- ) */ static void @@ -149,7 +119,6 @@ msr &= ~(MSR_IR | MSR_DR); asm volatile("mtmsr %0" :: "r" (msr) ); #endif - printk("============================================================= \n\n"); } /* ( -- ms ) */ @@ -181,7 +150,7 @@ DECLARE_NODE( memory, INSTALL_OPEN, 0, "/memory" ); DECLARE_NODE( mmu, INSTALL_OPEN, 0, "/cpu@0" ); -DECLARE_NODE( mmu_ciface, 0, 0, "/packages/client-iface" ); +DECLARE_NODE( mmu_ciface, 0, 0, "+/openprom/client-services" ); /* ( phys size align --- base ) */ @@ -327,7 +296,6 @@ #ifdef USE_RTAS REGISTER_NODE( rtas ); #endif - REGISTER_NODE( video_stdout ); REGISTER_NODE( ciface ); REGISTER_NODE( memory ); REGISTER_NODE( mmu ); Index: openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- openbios-devel.orig/config/examples/cross-ppc_config.xml 2008-12-20 20:51:41.000000000 +0100 +++ openbios-devel/config/examples/cross-ppc_config.xml 2008-12-20 20:52:21.000000000 +0100 @@ -4,9 +4,9 @@   <option name="CONFIG_PPC" type="boolean" value="true"/> -  -  -  + <option name="CONFIG_MOL" type="boolean" value="false"/> + <option name="CONFIG_BRIQ" type="boolean" value="false"/> + <option name="CONFIG_PEARPC" type="boolean" value="false"/> <option name="CONFIG_QEMU" type="boolean" value="true"/> <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/> @@ -17,7 +17,7 @@  <option name="CONFIG_DEBUG" type="boolean" value="true"/> - <option name="CONFIG_DEBUG_BOOT" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> <option name="CONFIG_DEBUG_DSTACK" type="boolean" value="false"/> <option name="CONFIG_DEBUG_RSTACK" type="boolean" value="false"/> <option name="CONFIG_DEBUG_DICTIONARY" type="boolean" value="false"/> @@ -42,14 +42,14 @@ <option name="CONFIG_DEBUG_MAC_PARTS" type="boolean" value="false"/> <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> <option name="CONFIG_FS" type="boolean" value="true"/> - <option name="CONFIG_HFS" type="boolean" value="false"/> - <option name="CONFIG_HFSP" type="boolean" value="true"/> + <option name="CONFIG_HFS" type="boolean" value="true"/> + <option name="CONFIG_HFSP" type="boolean" value="false"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> <option name="CONFIG_FSYS_JFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/> - <option name="CONFIG_FSYS_REISERFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_UFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_ISO9660" type="boolean" value="false"/> @@ -57,7 +57,7 @@ <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_AFFS" type="boolean" value="false"/> - <option name="CONFIG_DEBUG_FS" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/>  <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/> Index: openbios-devel/drivers/timer.c =================================================================== --- openbios-devel.orig/drivers/timer.c 2008-12-20 20:51:41.000000000 +0100 +++ openbios-devel/drivers/timer.c 2008-12-20 20:52:21.000000000 +0100 @@ -81,7 +81,7 @@ unsigned long get_timer_freq(void) { - return 100000000 / 4; + return 10000000 / 4; } void udelay(unsigned int usecs) Index: openbios-devel/arch/ppc/qemu/qemu.fs =================================================================== --- openbios-devel.orig/arch/ppc/qemu/qemu.fs 2008-12-20 20:51:41.000000000 +0100 +++ openbios-devel/arch/ppc/qemu/qemu.fs 2008-12-20 20:52:21.000000000 +0100 @@ -111,6 +111,5 @@ " /chosen" find-device stdin @ encode-int " stdin" property stdout @ encode-int " stdout" property - " /pci/isa/interrupt-controller" find-dev if encode-int " interrupt- controller" property then device-end ; Index: openbios-devel/arch/ppc/qemu/ofmem.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ openbios-devel/arch/ppc/qemu/ofmem.c 2008-12-20 20:52:21.000000000 +0100 @@ -0,0 +1,708 @@ +/* + * Creation Date: <1999/11/07 19:02:11 samuel> + * Time-stamp: <2004/01/07 19:42:36 samuel> + * + * <ofmem.c> + * + * OF Memory manager + * + * Copyright (C) 1999-2004 Samuel Rydh (samuel(a)ibrium.se) + * Copyright (C) 2004 Stefan Reinauer + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "libc/string.h" +#include "ofmem.h" +#include "kernel.h" +#include "mmutypes.h" +#include "asm/processor.h" + +#define BIT(n) (1U<<(31-(n))) + +#define FREE_BASE 0x00004000 +#define IO_BASE 0x80000000 +#define OFMEM ((ofmem_t*)FREE_BASE) +#define OF_MALLOC_BASE ((char*)OFMEM + ((sizeof(ofmem_t) + 3) & ~3)) + +#define HASH_SIZE (2 << 15) + +#define SEGR_USER BIT(2) +#define SEGR_BASE 0x0400 + +typedef struct alloc_desc { + struct alloc_desc *next; + int size; /* size (including) this struct */ +} alloc_desc_t; + +typedef struct mem_range { + struct mem_range *next; + ulong start; + ulong size; +} range_t; + +typedef struct trans { + struct trans *next; + ulong virt; /* chain is sorted by virt */ + ulong size; + ulong phys; + int mode; +} translation_t; + +typedef struct { + ulong ramsize; + char *next_malloc; + alloc_desc_t *mfree; /* list of free malloc blocks */ + + range_t *phys_range; + range_t *virt_range; + + translation_t *trans; /* this is really a translation_t */ +} ofmem_t; + +static inline ulong +get_hash_base( void ) +{ + ulong sdr1; + + asm volatile("mfsdr1 %0" :: "r" (sdr1) ); + + return (sdr1 & 0xffff0000); +} + +static inline ulong +get_hash_size( void ) +{ + ulong sdr1; + + asm volatile("mfsdr1 %0" :: "r" (sdr1) ); + + return ((sdr1 << 16) | 0x0000ffff) + 1; +} + +ulong +get_ram_size( void ) +{ + ofmem_t *ofmem = OFMEM; + return ofmem->ramsize; +} + +static inline ulong +get_rom_base( void ) +{ + return get_ram_size() - 0x00100000; +} + +ulong +get_ram_top( void ) +{ + return get_rom_base() - HASH_SIZE - (32 + 32 + 64) * 1024; +} + +ulong +get_ram_bottom( void ) +{ + return OF_MALLOC_BASE; +} + +/ ************************************************************************/ +/* OF private allocations */ +/ ************************************************************************/ + +void * +malloc( int size ) +{ + ofmem_t *ofmem = OFMEM; + alloc_desc_t *d, **pp; + char *ret; + ulong top; + + if( !size ) + return NULL; + + if( !ofmem->next_malloc ) + ofmem->next_malloc = (char*)OF_MALLOC_BASE; + + if( size & 3 ) + size += 4 - (size & 3); + size += sizeof(alloc_desc_t); + + /* look in the freelist */ + for( pp=&ofmem->mfree; *pp && (**pp).size < size; pp = &(**pp).next ) + ; + + /* waste at most 4K by taking an entry from the freelist */ + if( *pp && (**pp).size < size + 0x1000 ) { + ret = (char*)*pp + sizeof(alloc_desc_t); + memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) ); + *pp = (**pp).next; + return ret; + } + + top = get_hash_base() - (32 + 64) * 1024; + if( (ulong)ofmem->next_malloc + size > top ) { + printk("out of malloc memory (%x)!\n", size ); + return NULL; + } + + d = (alloc_desc_t*) ofmem->next_malloc; + ofmem->next_malloc += size; + + d->next = NULL; + d->size = size; + + ret = (char*)d + sizeof(alloc_desc_t); + memset( ret, 0, size - sizeof(alloc_desc_t) ); + + return ret; +} + +void +free( void *ptr ) +{ + ofmem_t *ofmem = OFMEM; + alloc_desc_t **pp, *d; + + /* it is legal to free NULL pointers (size zero allocations) */ + if( !ptr ) + return; + + d = (alloc_desc_t*)(ptr - sizeof(alloc_desc_t)); + d->next = ofmem->mfree; + + /* insert in the (sorted) freelist */ + for( pp=&ofmem->mfree; *pp && (**pp).size < d->size ; pp = &(**pp).next ) + ; + d->next = *pp; + *pp = d; +} + +void * +realloc( void *ptr, size_t size ) +{ + alloc_desc_t *d = (alloc_desc_t*)(ptr - sizeof(alloc_desc_t)); + char *p; + + if( !ptr ) + return malloc( size ); + if( !size ) { + free( ptr ); + return NULL; + } + p = malloc( size ); + memcpy( p, ptr, MIN(d->size - sizeof(alloc_desc_t),size) ); + free( ptr ); + return p; +} + + +/ ************************************************************************/ +/* misc */ +/ ************************************************************************/ + +extern char _start[], _end[]; +static inline int +def_memmode( ulong phys ) +{ + /* XXX: Guard bit not set as it should! */ + if( phys < IO_BASE ) + return 0x02; /*0xa*/ /* wim GxPp */ + return 0x6a; /* WIm GxPp, I/O */ +} + + +/ ************************************************************************/ +/* client interface */ +/ ************************************************************************/ + +static int +is_free( ulong ea, ulong size, range_t *r ) +{ + if( size == 0 ) + return 1; + for( ; r ; r=r->next ) { + if( r->start + r->size - 1 >= ea && r->start <= ea ) + return 0; + if( r->start >= ea && r->start <= ea + size - 1 ) + return 0; + } + return 1; +} + +static void +add_entry_( ulong ea, ulong size, range_t **r ) +{ + range_t *nr; + + for( ; *r && (**r).start < ea; r=&(**r).next ) + ; + nr = (range_t*)malloc( sizeof(range_t) ); + nr->next = *r; + nr->start = ea; + nr->size = size; + *r = nr; +} + +static int +add_entry( ulong ea, ulong size, range_t **r ) +{ + if( !is_free( ea, size, *r ) ) { + printk("add_entry: range not free!\n"); + return -1; + } + add_entry_( ea, size, r ); + return 0; +} + +static void +join_ranges( range_t **rr ) +{ + range_t *n, *r = *rr; + while( r ) { + if( !(n=r->next) ) + break; + + if( r->start + r->size - 1 >= n->start -1 ) { + int s = n->size + (n->start - r->start - r->size); + if( s > 0 ) + r->size += s; + r->next = n->next; + free( n ); + continue; + } + r=r->next; + } +} + +static void +fill_range( ulong ea, int size, range_t **rr ) +{ + add_entry_( ea, size, rr ); + join_ranges( rr ); +} + +static ulong +find_area( ulong align, ulong size, range_t *r, ulong min, ulong max, int reverse ) +{ + ulong base = min; + range_t *r2; + + if( (align & (align-1)) ) { + printk("bad alignment %ld\n", align); + align = 0x1000; + } + if( !align ) + align = 0x1000; + + base = reverse ? max - size : min; + r2 = reverse ? NULL : r; + + for( ;; ) { + if( !reverse ) { + base = (base + align - 1) & ~(align-1); + if( base < min ) + base = min; + if( base + size - 1 >= max -1 ) + break; + } else { + if( base > max - size ) + base = max - size; + base -= base & (align-1); + } + if( is_free( base, size, r ) ) + return base; + + if( !reverse ) { + if( !r2 ) + break; + base = r2->start + r2->size; + r2 = r2->next; + } else { + range_t *rp; + for( rp=r; rp && rp->next != r2 ; rp=rp->next ) + ; + r2 = rp; + if( !r2 ) + break; + base = r2->start - size; + } + } + return (ulong)-1; +} + +static ulong +ofmem_claim_phys_( ulong phys, ulong size, ulong align, int min, int max, int reverse ) +{ + ofmem_t *ofmem = OFMEM; + if( !align ) { + if( !is_free( phys, size, ofmem->phys_range ) ) { + printk("Non-free physical memory claimed!\n"); + return -1; + } + add_entry( phys, size, &ofmem->phys_range ); + return phys; + } + phys = find_area( align, size, ofmem->phys_range, min, max, reverse ); + if( phys == (ulong)-1 ) { + printk("ofmem->claim_phys - out of space\n"); + return -1; + } + add_entry( phys, size, &ofmem->phys_range ); + return phys; +} + +/* if align != 0, phys is ignored. Returns -1 on error */ +ulong +ofmem_claim_phys( ulong phys, ulong size, ulong align ) +{ + /* printk("+ ofmem_claim phys %08lx %lx %ld\n", phys, size, align ); */ + return ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 ); +} + +static ulong +ofmem_claim_virt_( ulong virt, ulong size, ulong align, int min, int max, int reverse ) +{ + ofmem_t *ofmem = OFMEM; + if( !align ) { + if( !is_free( virt, size, ofmem->virt_range ) ) { + printk("Non-free physical memory claimed!\n"); + return -1; + } + add_entry( virt, size, &ofmem->virt_range ); + return virt; + } + + virt = find_area( align, size, ofmem->virt_range, min, max, reverse ); + if( virt == (ulong)-1 ) { + printk("ofmem_claim_virt - out of space\n"); + return -1; + } + add_entry( virt, size, &ofmem->virt_range ); + return virt; +} + +ulong +ofmem_claim_virt( ulong virt, ulong size, ulong align ) +{ + /* printk("+ ofmem_claim virt %08lx %lx %ld\n", virt, size, align ); */ + return ofmem_claim_virt_( virt, size, align, get_ram_size() , IO_BASE, 0 ); +} + + +/* allocate both physical and virtual space and add a translation */ +ulong +ofmem_claim( ulong addr, ulong size, ulong align ) +{ + ofmem_t *ofmem = OFMEM; + ulong virt, phys; + ulong offs = addr & 0xfff; + + /* printk("+ ofmem_claim %08lx %lx %ld\n", addr, size, align ); */ + virt = phys = 0; + if( !align ) { + if( is_free(addr, size, ofmem->virt_range) && + is_free(addr, size, ofmem->phys_range) ) { + ofmem_claim_phys_( addr, size, 0, 0, 0, 0 ); + ofmem_claim_virt_( addr, size, 0, 0, 0, 0 ); + virt = phys = addr; + } else { + /* printk("**** ofmem_claim failure ***!\n"); */ + return -1; + } + } else { + if( align < 0x1000 ) + align = 0x1000; + phys = ofmem_claim_phys_( addr, size, align, 0, get_ram_size(), 1 / * reverse */ ); + virt = ofmem_claim_virt_( addr, size, align, 0, get_ram_size(), 1 / * reverse */ ); + if( phys == (ulong)-1 || virt == (ulong)-1 ) { + printk("ofmem_claim failed\n"); + return -1; + } + /* printk("...phys = %08lX, virt = %08lX, size = %08lX\n", phys, virt, size ); */ + } + + /* align */ + if( phys & 0xfff ) { + size += (phys & 0xfff); + virt -= (phys & 0xfff); + phys &= ~0xfff; + } + if( size & 0xfff ) + size = (size + 0xfff) & ~0xfff; + + /* printk("...free memory found... phys: %08lX, virt: %08lX, size %lX \n", phys, virt, size ); */ + ofmem_map( phys, virt, size, def_memmode(phys) ); + return virt + offs; +} + + +/ ************************************************************************/ +/* keep track of ea -> phys translations */ +/ ************************************************************************/ + +static void +split_trans( ulong virt ) +{ + ofmem_t *ofmem = OFMEM; + translation_t *t, *t2; + + for( t=ofmem->trans; t; t=t->next ) { + if( virt > t->virt && virt < t->virt + t->size-1 ) { + t2 = (translation_t*)malloc( sizeof(translation_t) ); + t2->virt = virt; + t2->size = t->size - (virt - t->virt); + t->size = virt - t->virt; + t2->phys = t->phys + t->size; + t2->mode = t->mode; + t2->next = t->next; + t->next = t2; + } + } +} + +static int +map_page_range( ulong virt, ulong phys, ulong size, int mode ) +{ + ofmem_t *ofmem = OFMEM; + translation_t *t, **tt; + + split_trans( virt ); + split_trans( virt + size ); + + /* detect remappings */ + for( t=ofmem->trans; t; ) { + if( virt == t->virt || (virt < t->virt && virt + size > t->virt )) { + if( t->phys + virt - t->virt != phys ) { + printk("mapping altered (ea %08lx)\n", t->virt ); + } else if( t->mode != mode ){ + printk("mapping mode altered\n"); + } + for( tt=&ofmem->trans; *tt != t ; tt=&(**tt).next ) + ; + *tt = t->next; + free((char*)t); + t=ofmem->trans; + continue; + } + t=t->next; + } + /* add mapping */ + for( tt=&ofmem->trans; *tt && (**tt).virt < virt ; tt=&(**tt).next ) + ; + t = (translation_t*)malloc( sizeof(translation_t) ); + t->virt = virt; + t->phys = phys; + t->size = size; + t->mode = mode; + t->next = *tt; + *tt = t; + + return 0; +} + +int +ofmem_map( ulong phys, ulong virt, ulong size, int mode ) +{ + ofmem_t *ofmem = OFMEM; + /* printk("+ofmem_map: %08lX --> %08lX (size %08lX, mode 0x%02X)\n", + virt, phys, size, mode ); */ + + if( (phys & 0xfff) || (virt & 0xfff) || (size & 0xfff) ) { + printk("ofmem_map: Bad parameters (%08lX %08lX %08lX)\n", phys, virt, size ); + phys &= ~0xfff; + virt &= ~0xfff; + size = (size + 0xfff) & ~0xfff; + } +#if 1 + /* claim any unclaimed virtual memory in the range */ + fill_range( virt, size, &ofmem->virt_range ); + /* hmm... we better claim the physical range too */ + fill_range( phys, size, &ofmem->phys_range ); +#endif + //printk("map_page_range %08lx -> %08lx %08lx\n", virt, phys, size ); + map_page_range( virt, phys, size, (mode==-1)? def_memmode(phys) : mode ); + return 0; +} + +/* virtual -> physical. */ +ulong +ofmem_translate( ulong virt, int *mode ) +{ + ofmem_t *ofmem = OFMEM; + translation_t *t; + + for( t=ofmem->trans; t && t->virt <= virt ; t=t->next ) { + ulong offs; + if( t->virt + t->size - 1 < virt ) + continue; + offs = virt - t->virt; + *mode = t->mode; + return t->phys + offs; + } + + //printk("ofmem_translate: no translation defined (%08lx)\n", virt); + //print_trans(); + return -1UL; +} + +/* release memory allocated by ofmem_claim */ +void +ofmem_release( ulong virt, ulong size ) +{ + /* printk("ofmem_release unimplemented (%08lx, %08lx)\n", virt, size ); */ +} + + +/ ************************************************************************/ +/* page fault handler */ +/ ************************************************************************/ + +static ulong +ea_to_phys( ulong ea, int *mode ) +{ + ulong phys; + + if (ea >= 0xfff00000UL) { + /* ROM into RAM */ + ea -= 0xfff00000UL; + phys = get_rom_base() + ea; + *mode = 0x02; + return phys; + } + + phys = ofmem_translate(ea, mode); + if( phys == -1UL ) { + phys = ea; + *mode = def_memmode( phys ); + + /* print_virt_range(); */ + /* print_phys_range(); */ + /* print_trans(); */ + } + return phys; +} + +static void +hash_page( ulong ea, ulong phys, int mode ) +{ + static int next_grab_slot=0; + ulong *upte, cmp, hash1; + int i, vsid, found; + mPTE_t *pp; + + vsid = (ea>>28) + SEGR_BASE; + cmp = BIT(0) | (vsid << 7) | ((ea & 0x0fffffff) >> 22); + + hash1 = vsid; + hash1 ^= (ea >> 12) & 0xffff; + hash1 &= (get_hash_size() - 1) >> 6; + + pp = (mPTE_t*)(get_hash_base() + (hash1 << 6)); + upte = (ulong*)pp; + + /* replace old translation */ + for( found=0, i=0; !found && i<8; i++ ) + if( cmp == upte[i*2] ) + found=1; + + /* otherwise use a free slot */ + for( i=0; !found && i<8; i++ ) + if( !pp[i].v ) + found=1; + + /* out of slots, just evict one */ + if( !found ) { + i = next_grab_slot + 1; + next_grab_slot = (next_grab_slot + 1) % 8; + } + i--; + upte[i*2] = cmp; + upte[i*2+1] = (phys & ~0xfff) | mode; + + asm volatile( "tlbie %0" :: "r"(ea) ); +} + +void +dsi_exception( void ) +{ + ulong dar, dsisr; + int mode; + ulong phys; + + asm volatile("mfdar %0" : "=r" (dar) : ); + asm volatile("mfdsisr %0" : "=r" (dsisr) : ); + + phys = ea_to_phys(dar, &mode); + hash_page( dar, phys, mode ); +} + +void +isi_exception( void ) +{ + ulong nip, srr1; + int mode; + ulong phys; + + asm volatile("mfsrr0 %0" : "=r" (nip) : ); + asm volatile("mfsrr1 %0" : "=r" (srr1) : ); + + phys = ea_to_phys(nip, &mode); + hash_page( nip, phys, mode ); +} + + +/ ************************************************************************/ +/* init / cleanup */ +/ ************************************************************************/ + +void +setup_mmu( ulong ramsize ) +{ + ofmem_t *ofmem = OFMEM; + ulong sdr1, sr_base, msr; + ulong hash_base, page; + ulong data_size, bss_size; + int i; + + memset(ofmem, 0, sizeof(ofmem_t)); + ofmem->ramsize = ramsize; + + /* SDR1: Storage Description Register 1 */ + + hash_base = (ramsize - 0x00100000 - HASH_SIZE) & 0xffff0000; + memset(hash_base, 0, HASH_SIZE); + sdr1 = hash_base | ((HASH_SIZE-1) >> 16); + asm volatile("mtsdr1 %0" :: "r" (sdr1) ); + + /* Segment Register */ + + sr_base = SEGR_USER | SEGR_BASE ; + for( i=0; i<16; i++ ) { + int j = i << 28; + asm volatile("mtsrin %0,%1" :: "r" (sr_base + i), "r" (j) ); + } + + memcpy(get_rom_base(), 0xfff00000, 0x00100000); + + /* Enable MMU */ + + asm volatile("mfmsr %0" : "=r" (msr) : ); + msr |= MSR_IR | MSR_DR; + asm volatile("mtmsr %0" :: "r" (msr) ); +} + +void +ofmem_init( void ) +{ + ulong top; + + ofmem_claim_phys( 0, get_ram_bottom(), 0 ); + ofmem_claim_virt( 0, get_ram_bottom(), 0 ); + ofmem_claim_phys( get_ram_top(), get_ram_size() - get_ram_top(), 0); + ofmem_claim_virt( get_ram_top(), get_ram_size() - get_ram_top(), 0); +} Index: openbios-devel/arch/ppc/qemu/start.S =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ openbios-devel/arch/ppc/qemu/start.S 2008-12-20 20:52:21.000000000 +0100 @@ -0,0 +1,393 @@ +/* + * Creation Date: <2001/06/16 21:30:18 samuel> + * Time-stamp: <2003/04/04 16:32:06 samuel> + * + * <init.S> + * + * Asm glue for ELF images + * + * Copyright (C) 2001, 2002, 2003 Samuel Rydh (samuel(a)ibrium.se) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#include "asm/asmdefs.h" +#include "asm/processor.h" + +/ ************************************************************************/ +/* Macros */ +/ ************************************************************************/ + +#define ILLEGAL_VECTOR( v ) .org __vectors + v ; bl trap_error ; +#define VECTOR( v, dummystr ) .org __vectors + v ; vector__##v + +#define EXCEPTION_PREAMBLE \ + mtsprg1 r1 ; /* scratch */ \ + mfsprg0 r1 ; /* exception stack in sprg0 */ \ + addi r1,r1,-80 ; /* push exception frame */ \ + \ + stw r0,0(r1) ; /* save r0 */ \ + mfsprg1 r0 ; \ + stw r0,4(r1) ; /* save r1 */ \ + stw r2,8(r1) ; /* save r2 */ \ + stw r3,12(r1) ; /* save r3 */ \ + stw r4,16(r1) ; \ + stw r5,20(r1) ; \ + stw r6,24(r1) ; \ + stw r7,28(r1) ; \ + stw r8,32(r1) ; \ + stw r9,36(r1) ; \ + stw r10,40(r1) ; \ + stw r11,44(r1) ; \ + stw r12,48(r1) ; \ + \ + mflr r0 ; \ + stw r0,52(r1) ; \ + mfcr r0 ; \ + stw r0,56(r1) ; \ + mfctr r0 ; \ + stw r0,60(r1) ; \ + mfxer r0 ; \ + stw r0,64(r1) ; \ + \ + /* 76(r1) unused */ \ + addi r1,r1,-16 ; /* call conventions uses 0(r1) and 4(r1)... */ + + +/ ************************************************************************/ +/* entry */ +/ ************************************************************************/ + + + .text + .space 0x0100 +GLOBL(_start): + /* clear MSR, disable MMU */ + + li r0,0 + mtmsr r0 + + /* copy exception vectors */ + + lis r3,HA(__vectors) + addi r3,r3,LO(__vectors) + li r4,0 + li r5,__vectors_end - __vectors + 16 + rlwinm r5,r5,0,0,28 +1: lwz r6,0(r3) + lwz r7,4(r3) + lwz r8,8(r3) + lwz r9,12(r3) + stw r6,0(r4) + stw r7,4(r4) + stw r8,8(r4) + stw r9,12(r4) + dcbst 0,r4 + sync + icbi 0,r4 + sync + addi r5,r5,-16 + addi r3,r3,16 + addi r4,r4,16 + cmpwi r5,0 + bgt 1b + isync + + bl compute_ramsize + + /* Memory map: + * + * Top +-------------------------+ + * | | + * | ROM into RAM (1 MB) | + * | | + * +-------------------------+ + * | | + * | MMU Hash Table (64 kB) | + * | | + * +-------------------------+ + * | | + * | Exception Stack (32 kB) + * | | + * +-------------------------+ + * | | + * | Stack (64 kB) + * | | + * +-------------------------+ + * | | + * | Client Stack (64 kB) | + * | | + * +-------------------------+ + * : : + * Bottom + */ + + addis r1, r3, -16 /* ramsize - 1MB */ + + /* setup exception stack */ + + addis r1, r1, -1 /* - 64 kB */ + mtsprg0 r1 + + /* setup stack */ + + addi r1, r1, -32768 /* - 32 kB */ + + /* save memory size in stack */ + + bl setup_mmu + bl entry +1: nop + b 1b + + + /* According to IEEE 1275, PPC bindings: + * + * MSR = FP, ME + (DR|IR) + * r1 = stack (32 K + 32 bytes link area above) + * r5 = clint interface handler + * r6 = address of client program arguments (unused) + * r7 = length of client program arguments (unsed) + */ +saved_stack: + .long 0 + /* void call_elf( entry ) */ +GLOBL(call_elf): + mflr r0 + stwu r1,-16(r1) + stw r0,20(r1) + mtlr r3 + lis r8,HA(saved_stack) + addi r8,r8,LO(saved_stack) // save our stack pointer + stw r1,0(r8) + mfsdr1 r1 + addis r1, r1, -96 + lis r5,HA(of_client_callback) + addi r5,r5,LO(of_client_callback) // r5 = callback + li r6,0 // r6 = address of client program arguments (unused) + li r7,0 // r7 = length of client program arguments (unused) + li r0,MSR_FP | MSR_ME | MSR_DR | MSR_IR + mtmsr r0 + blrl + + lis r8,HA(saved_stack) + addi r8,r8,LO(saved_stack) // restore stack pointer + mr r1,r8 + lwz r0,20(r1) + mtlr r0 + addi r1,r1,16 + // XXX: should restore r12-r31 etc.. + // we should not really come here though + blr + +GLOBL(of_client_callback): + lis r4,HA(saved_stack) + addi r4,r4,LO(saved_stack) + lwz r4,0(r4) + stwu r4,-32(r4) + mflr r5 + stw r5,32+4(r4) + stw r1,8(r4) // save caller stack + mr r1,r4 + stw r2,12(r1) + stw r0,16(r1) + mfctr r2 + stw r2,20(r1) + mfcr r2 + stw r2,24(r1) + mfxer r2 + stw r2,28(r1) + // do we need to save more registers? + bl of_client_interface + lwz r4,32+4(r1) + mtlr r4 + lwz r2,20(r1) + mtctr r2 + lwz r2,24(r1) + mtcr r2 + lwz r2,28(r1) + mtxer r2 + lwz r2,12(r1) + lwz r0,16(r1) + lwz r1,8(r1) // restore caller stack + blr + + /* rtas glue (must be reloctable) */ +GLOBL(of_rtas_start): + /* r3 = argument buffer, r4 = of_rtas_start */ + /* according to the CHRP standard, cr must be preserved (cr0/cr1 too?) */ + blr +GLOBL(of_rtas_end): + + + /* used in a hack to the newworld calibration */ +GLOBL(nw_dec_calibration): + .long 0 +GLOBL(timer_calib_start): + lis r3,HA(nw_dec_calibration) + addi r3,r3,LO(nw_dec_calibration) + lwz r3,0(r3) + blr +GLOBL(timer_calib_end): + + +/ ************************************************************************/ +/* vectors */ +/ ************************************************************************/ + +GLOBL(__vectors): + nop // NULL-jmp trap +1: nop // + b 1b + +exception_return: + addi r1,r1,16 // pop ABI frame + + lwz r0,52(r1) + mtlr r0 + lwz r0,56(r1) + mtcr r0 + lwz r0,60(r1) + mtctr r0 + lwz r0,64(r1) + mtxer r0 + + lwz r0,0(r1) // restore r0 + lwz r2,8(r1) // restore r2 + lwz r3,12(r1) // restore r3 + lwz r4,16(r1) + lwz r5,20(r1) + lwz r6,24(r1) + lwz r7,28(r1) + lwz r8,32(r1) + lwz r9,36(r1) + lwz r10,40(r1) + lwz r11,44(r1) + lwz r12,48(r1) + lwz r1,4(r1) // restore r1 + rfi + + .globl __divide_error +__divide_error: +trap_error: + mflr r3 + b unexpected_excep + +ILLEGAL_VECTOR( 0x100 ) +ILLEGAL_VECTOR( 0x200 ) + +VECTOR( 0x300, "DSI" ): + EXCEPTION_PREAMBLE + lis r3,HA(dsi_exception) + addi r3,r3,LO(dsi_exception) + mtctr r3 + bctrl + ba exception_return + +VECTOR( 0x400, "ISI" ): + EXCEPTION_PREAMBLE + lis r3,HA(isi_exception) + addi r3,r3,LO(isi_exception) + mtctr r3 + bctrl + ba exception_return + + ILLEGAL_VECTOR( 0x500 ) + ILLEGAL_VECTOR( 0x600 ) + ILLEGAL_VECTOR( 0x700 ) + +VECTOR( 0x800, "FPU" ): + mtsprg1 r3 + mfsrr1 r3 + ori r3,r3,0x2000 + mtsrr1 r3 + mfsprg1 r3 + rfi + +ILLEGAL_VECTOR( 0x900 ) +ILLEGAL_VECTOR( 0xa00 ) +ILLEGAL_VECTOR( 0xb00 ) +ILLEGAL_VECTOR( 0xc00 ) +ILLEGAL_VECTOR( 0xd00 ) +ILLEGAL_VECTOR( 0xe00 ) +ILLEGAL_VECTOR( 0xf00 ) +ILLEGAL_VECTOR( 0xf20 ) +ILLEGAL_VECTOR( 0x1000 ) +ILLEGAL_VECTOR( 0x1100 ) +ILLEGAL_VECTOR( 0x1200 ) +ILLEGAL_VECTOR( 0x1300 ) +ILLEGAL_VECTOR( 0x1400 ) +ILLEGAL_VECTOR( 0x1500 ) +ILLEGAL_VECTOR( 0x1600 ) +ILLEGAL_VECTOR( 0x1700 ) + +GLOBL(__vectors_end): + + +#define CACHE_LINE_SIZE 32 +#define LG_CACHE_LINE_SIZE 5 + +/* flush_icache_range( ulong start, ulong stop) */ +GLOBL(flush_icache_range): + li r5,CACHE_LINE_SIZE-1 + andc r3,r3,r5 + subf r4,r3,r4 + add r4,r4,r5 + srwi. r4,r4,LG_CACHE_LINE_SIZE + beqlr + mtctr r4 + mr r6,r3 +1: dcbst 0,r3 + addi r3,r3,CACHE_LINE_SIZE + bdnz 1b + sync /* wait for dcbst's to get to ram */ + mtctr r4 +2: icbi 0,r6 + addi r6,r6,CACHE_LINE_SIZE + bdnz 2b + sync /* additional sync needed on g4 */ + isync + blr + + /* compute RAM size + * + * Exception vectors are beween 0x00000000 and 0x00004000 + * RAM size is limited to 2 MB (0x80000000) + * MMIO and IO are after 0x80000000. + * ROM is at 0xfff00000 + * so we can scan from 0x4000 to 0x80000000 + * + */ + +compute_ramsize: + li r3, 0x4000 /* start address */ + + /* how many pages between 0x4000 and 0x80000000 */ + + lis r4, 0x0007 + ori r4, r4, 0xfffc + mtctr r4 + + /* pattern to write in memory */ + + lis r4, 0x55aa + ori r4, r4, 0x55aa + +memloop: + /* store and re-read pattern */ + + stw r4, 0(r3) + sync + lwz r0, 0(r3) + cmpw cr7, r0, r4 + bne cr7, exit_memloop + addi r3, r3, 4096 /* add page size */ + bdnz memloop +exit_memloop: + blr + + .section .romentry,"ax" + bl _start Index: openbios-devel/arch/ppc/qemu/kernel.c =================================================================== --- openbios-devel.orig/arch/ppc/qemu/kernel.c 2008-12-20 20:51:41.000000000 +0100 +++ openbios-devel/arch/ppc/qemu/kernel.c 2008-12-20 20:52:21.000000000 +0100 @@ -1,10 +1,15 @@ /* - * Creation Date: <2004/08/28 18:03:25 stepan> - * Time-stamp: <2004/08/28 18:03:25 stepan> + * Creation Date: <2003/10/25 14:07:17 samuel> + * Time-stamp: <2004/08/28 17:48:19 stepan> * - * <qemu/kernel.c> + * <kernel.c> * - * Copyright (C) 2005 Stefan Reinauer + * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) + * Copyright (C) 2003, 2004 Stefan Reinauer + * + * Based upon unix.c (from OpenBIOS): + * + * Copyright (C) 2003 Patrick Mauritz, Stefan Reinauer * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -13,4 +18,84 @@ */ #include "qemu-dict.h" -#include "../kernel.c" +#include "openbios/config.h" +#include "dict.h" +#include "openbios/bindings.h" +#include "openbios/stack.h" +#include "openbios/kernel.h" +#include "libc/string.h" +#include "kernel.h" + +#define MEMORY_SIZE (256*1024) /* 256K ram for hosted system */ +#define DICTIONARY_SIZE (512*1024) /* 128K for the dictionary */ + +extern unsigned char *dict; +extern cell dicthead; +static ucell *memory; + +/ ************************************************************************/ +/* F U N C T I O N S */ +/ ************************************************************************/ + +int +forth_segv_handler( char *segv_addr ) +{ + ucell addr = 0xdeadbeef; + + if( PC >= (ucell) dict && PC <= (ucell) dict + dicthead ) + addr = *(ucell *) PC; + + printk("panic: segmentation violation at %x\n", (int)segv_addr); + printk("dict=0x%x here=0x%x(dict+0x%x) pc=0x%x(dict+0x%x)\n", + (int)dict, (int)(dict + dicthead), dicthead, + PC, PC - (ucell) dict); + printk("dstackcnt=%d rstackcnt=%d instruction=%x\n", + dstackcnt, rstackcnt, addr); + +#ifdef DEBUG_DSTACK + printdstack(); +#endif +#ifdef DEBUG_RSTACK + printrstack(); +#endif + return -1; +} + +/* + * allocate memory and prepare engine for memory management. + */ + +static void +init_memory( void ) +{ + memory = malloc(MEMORY_SIZE); + if( !memory ) + panic("panic: not enough memory on host system.\n"); + + /* we push start and end of memory to the stack + * so that it can be used by the forth word QUIT + * to initialize the memory allocator + */ + + PUSH( (ucell)memory ); + PUSH( (ucell)memory + MEMORY_SIZE ); +} + +int +initialize_forth( void ) +{ + dict = malloc(DICTIONARY_SIZE); + load_dictionary( forth_dictionary, sizeof(forth_dictionary) ); + + PUSH_xt( bind_noname_func(arch_of_init) ); + fword("PREPOST-initializer"); + + PC = (ucell)findword("initialize-of"); + if( PC ) { + init_memory(); + enterforth((xt_t)PC); + free( memory ); + } + free( dict ); + return 0; +} Index: openbios-devel/arch/ppc/qemu/kernel.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ openbios-devel/arch/ppc/qemu/kernel.h 2008-12-20 20:52:21.000000000 +0100 @@ -0,0 +1,41 @@ +/* + * Creation Date: <2004/08/28 17:50:12 stepan> + * Time-stamp: <2004/08/28 17:50:12 stepan> + * + * <kernel.h> + * + * Copyright (C) 2004 Stefan Reinauer + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#ifndef __KERNEL_H__ +#define __KERNEL_H__ + +/* misc.c */ +extern void fatal_error( const char *str ); +extern void exit( int status ); + +/* start.S */ +extern void flush_icache_range( char *start, char *stop ); +extern char of_rtas_start[], of_rtas_end[]; + +/* methods.c */ +extern void node_methods_init( void ); + +/* main.c */ +extern void boot( void ); + +/* init.c */ +extern void entry( void ); +extern void arch_of_init( void ); +extern int get_bool_res( const char *str ); + +/* tree.c */ +extern void devtree_init( void ); + + +#endif /* __KERNEL_H__ */ Index: openbios-devel/arch/ppc/qemu/mmutypes.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ openbios-devel/arch/ppc/qemu/mmutypes.h 2008-12-20 20:52:21.000000000 +0100 @@ -0,0 +1,76 @@ +/* + * Creation Date: <2002/01/13 13:53:14 samuel> + * Time-stamp: <2002/01/27 19:56:11 samuel> + * + * <mmutypes.h> + * + * MMU definitions + * + * Most of these declarations originate from the Linux Kernel + * + * Copyright (C) 2002 Samuel Rydh (samuel(a)ibrium.se) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#ifndef _H_MMUTYPES +#define _H_MMUTYPES + +/* Hardware Page Table Entry */ +typedef struct mPTE { + unsigned long v:1; /* Entry is valid */ + unsigned long vsid:24; /* Virtual segment identifier */ + unsigned long h:1; /* Hash algorithm indicator */ + unsigned long api:6; /* Abbreviated page index */ + + unsigned long rpn:20; /* Real (physical) page number */ + unsigned long :3; /* Unused */ + unsigned long r:1; /* Referenced */ + unsigned long c:1; /* Changed */ + unsigned long w:1; /* Write-thru cache mode */ + unsigned long i:1; /* Cache inhibited */ + unsigned long m:1; /* Memory coherence */ + unsigned long g:1; /* Guarded */ + unsigned long :1; /* Unused */ + unsigned long pp:2; /* Page protection */ +} mPTE_t; + + +typedef struct _mBATU { /* Upper part of BAT (all except 601) */ + unsigned long bepi:15; /* Effective page index (virtual address) */ + unsigned long :4; /* Unused */ + unsigned long bl:11; /* Block size mask */ + unsigned long vs:1; /* Supervisor valid */ + unsigned long vp:1; /* User valid */ +} mBATU; + +typedef struct _mBATL { /* Lower part of BAT (all except 601) */ + unsigned long brpn:15; /* Real page index (physical address) */ + unsigned long :10; /* Unused */ + unsigned long w:1; /* Write-thru cache */ + unsigned long i:1; /* Cache inhibit */ + unsigned long m:1; /* Memory coherence */ + unsigned long g:1; /* Guarded (MBZ in IBAT) */ + unsigned long :1; /* Unused */ + unsigned long pp:2; /* Page access protections */ +} mBATL; + +typedef struct _mBAT { + mBATU batu; /* Upper register */ + mBATL batl; /* Lower register */ +} mBAT; + +typedef struct _mSEGREG { + unsigned long t:1; /* Normal or I/O type */ + unsigned long ks:1; /* Supervisor 'key' (normally 0) */ + unsigned long kp:1; /* User 'key' (normally 1) */ + unsigned long n:1; /* No-execute */ + unsigned long :4; /* Unused */ + unsigned long vsid:24; /* Virtual Segment Identifier */ +} mSEGREG; + + +#endif /* _H_MMUTYPES */ Index: openbios-devel/arch/ppc/build.xml =================================================================== --- openbios-devel.orig/arch/ppc/build.xml 2008-12-20 20:51:41.000000000 +0100 +++ openbios-devel/arch/ppc/build.xml 2008-12-20 20:52:21.000000000 +0100 @@ -136,7 +136,7 @@ <rule><![CDATA[ $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> - <object source="ofmem.c"/> + <object source="qemu/ofmem.c"/> <object source="qemu/qemu.c" flags="-Iarch/ppc"/> <object source="qemu/init.c" flags="-Iarch/ppc"/> <external-object source="target/arch/ppc/qemu/kernel.o"/> @@ -216,12 +216,12 @@ <executable name="openbios-qemu.elf" target="target" condition="QEMU"> <rule> - $(LD) -g -Ttext=0x01e01000 -Bstatic $^ $(shell $(CC) -print-libgcc- file-name) -o $@ + $(LD) --warn-common -N -T arch/ppc/qemu/ldscript $^ -o $@ $(NM) $@ | sort > $(ODIR)/openbios-qemu.syms cp $@ $@.nostrip $(STRIP) $@ </rule> - <object source="start.S"> + <object source="qemu/start.S"> <rule><![CDATA[ $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> @@ -235,6 +235,7 @@ <external-object source="libdrivers.a"/> <external-object source="liblibc.a"/> <external-object source="libfs.a"/> + <external-object source="libgcc.a"/> </executable> Index: openbios-devel/arch/ppc/qemu/ldscript =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ openbios-devel/arch/ppc/qemu/ldscript 2008-12-20 20:52:21.000000000 +0100 @@ -0,0 +1,55 @@ +OUTPUT_FORMAT(elf32-powerpc) +OUTPUT_ARCH(powerpc) + +/* Initial load address + */ +BASE_ADDR = 0xfff00000; + +CSTACK_SIZE = 32768; /* client stack size */ + +SECTIONS +{ + . = BASE_ADDR; + + _start = BASE_ADDR + 0x0100; + + /* Normal sections */ + .text ALIGN(4096): { + *(.text.vectors) + *(.text) + *(.text.*) + } + + .rodata ALIGN(4096): { + _rodata = .; + *(.rodata) + *(.rodata.*) + *(.note.ELFBoot) + } + .data ALIGN(4096): { + _data = .; + *(.data) + *(.data.*) + _edata = .; + } + + .bss ALIGN(4096): { + _bss = .; + *(.bss) + *(.bss.*) + *(COMMON) + _ebss = .; + } + + . = 0xfffffffc; + + .romentry : { *(.romentry) } + + . = ALIGN(4096); + _end = .; + + /* We discard .note sections other than .note.ELFBoot, + * because some versions of GCC generates useless ones. */ + + /DISCARD/ : { *(.comment*) *(.note.*) } +} Index: openbios-devel/include/ofmem.h =================================================================== --- openbios-devel.orig/include/ofmem.h 2008-12-20 20:51:41.000000000 +0100 +++ openbios-devel/include/ofmem.h 2008-12-20 20:52:21.000000000 +0100 @@ -27,6 +27,6 @@ extern int ofmem_map( ulong phys, ulong virt, ulong size, int mode ); extern void ofmem_release( ulong virt, ulong size ); -extern ulong ofmem_translate( ulong virt, ulong *ret_mode ); +extern ulong ofmem_translate( ulong virt, int *ret_mode ); #endif /* _H_OFMEM */

2 6

r303 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 21 Dec '08

21 Dec '08

Author: blueswirl Date: 2008-12-21 11:17:03 +0100 (Sun, 21 Dec 2008) New Revision: 303 Modified: openbios-devel/arch/ppc/qemu/ldscript openbios-devel/arch/ppc/qemu/start.S Log: Avoid using NVRAM area for ROM, add SRE vector Modified: openbios-devel/arch/ppc/qemu/ldscript =================================================================== --- openbios-devel/arch/ppc/qemu/ldscript 2008-12-21 09:15:57 UTC (rev 302) +++ openbios-devel/arch/ppc/qemu/ldscript 2008-12-21 10:17:03 UTC (rev 303) @@ -5,6 +5,14 @@ */ BASE_ADDR = 0xfff00000; +/* As NVRAM is at 0xfff04000, the .text needs to be after that + */ +TEXT_ADDR = 0xfff06000; + +/* Hard reset vector address + */ +HRESET_ADDR = 0xfffffffc; + CSTACK_SIZE = 32768; /* client stack size */ SECTIONS @@ -12,10 +20,13 @@ . = BASE_ADDR; _start = BASE_ADDR + 0x0100; + .text.vectors ALIGN(4096): { + *(.text.vectors) + } + . = TEXT_ADDR; /* Normal sections */ .text ALIGN(4096): { - *(.text.vectors) *(.text) *(.text.*) } @@ -41,7 +52,7 @@ _ebss = .; } - . = 0xfffffffc; + . = HRESET_ADDR; .romentry : { *(.romentry) } Modified: openbios-devel/arch/ppc/qemu/start.S =================================================================== --- openbios-devel/arch/ppc/qemu/start.S 2008-12-21 09:15:57 UTC (rev 302) +++ openbios-devel/arch/ppc/qemu/start.S 2008-12-21 10:17:03 UTC (rev 303) @@ -62,7 +62,7 @@ /************************************************************************/ - .text + .section .text.vectors, "ax" .space 0x0100 GLOBL(_start): /* clear MSR, disable MMU */ @@ -152,8 +152,10 @@ * r6 = address of client program arguments (unused) * r7 = length of client program arguments (unsed) */ + .data saved_stack: .long 0 + .previous /* void call_elf( entry ) */ GLOBL(call_elf): mflr r0 @@ -276,7 +278,9 @@ mflr r3 b unexpected_excep -ILLEGAL_VECTOR( 0x100 ) +VECTOR( 0x100, "SRE" ): + b _start + ILLEGAL_VECTOR( 0x200 ) VECTOR( 0x300, "DSI" ): @@ -389,5 +393,6 @@ exit_memloop: blr + /* Hard reset vector */ .section .romentry,"ax" bl _start

1 0

r302 - in openbios-devel: arch/ppc/qemu fs/hfs fs/hfs/include include
by svn＠openbios.org 21 Dec '08

21 Dec '08

Author: blueswirl Date: 2008-12-21 10:15:57 +0100 (Sun, 21 Dec 2008) New Revision: 302 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/kernel.c openbios-devel/arch/ppc/qemu/kernel.h openbios-devel/arch/ppc/qemu/main.c openbios-devel/arch/ppc/qemu/methods.c openbios-devel/arch/ppc/qemu/ofmem.c openbios-devel/fs/hfs/block.c openbios-devel/fs/hfs/btree.c openbios-devel/fs/hfs/data.c openbios-devel/fs/hfs/file.c openbios-devel/fs/hfs/hfs.c openbios-devel/fs/hfs/hfs_fs.c openbios-devel/fs/hfs/include/data.h openbios-devel/fs/hfs/include/libhfs.h openbios-devel/fs/hfs/include/volume.h openbios-devel/fs/hfs/volume.c openbios-devel/include/ofmem.h Log: Fix gcc and Sparse warnings generated by r301 Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-12-21 08:30:42 UTC (rev 301) +++ openbios-devel/arch/ppc/qemu/init.c 2008-12-21 09:15:57 UTC (rev 302) @@ -32,11 +32,6 @@ extern void ob_pci_init( void ); extern void setup_timers( void ); -extern ulong get_ram_size( void ); -extern ulong get_ram_top( void ); -extern ulong get_ram_bottom( void ); - - void unexpected_excep( int vector ) { @@ -88,21 +83,12 @@ ; } -static void -setenv( const char *env, const char *value ) -{ - push_str( value ); - push_str( env ); - fword("$setenv"); -} - void arch_of_init( void ) { #ifdef USE_RTAS phandle_t ph; #endif - int autoboot; uint64_t ram_size; devtree_init(); Modified: openbios-devel/arch/ppc/qemu/kernel.c =================================================================== --- openbios-devel/arch/ppc/qemu/kernel.c 2008-12-21 08:30:42 UTC (rev 301) +++ openbios-devel/arch/ppc/qemu/kernel.c 2008-12-21 09:15:57 UTC (rev 302) @@ -29,8 +29,6 @@ #define MEMORY_SIZE (256*1024) /* 256K ram for hosted system */ #define DICTIONARY_SIZE (512*1024) /* 128K for the dictionary */ -extern unsigned char *dict; -extern cell dicthead; static ucell *memory; /************************************************************************/ Modified: openbios-devel/arch/ppc/qemu/kernel.h =================================================================== --- openbios-devel/arch/ppc/qemu/kernel.h 2008-12-21 08:30:42 UTC (rev 301) +++ openbios-devel/arch/ppc/qemu/kernel.h 2008-12-21 09:15:57 UTC (rev 302) @@ -22,6 +22,7 @@ /* start.S */ extern void flush_icache_range( char *start, char *stop ); extern char of_rtas_start[], of_rtas_end[]; +extern void call_elf( ulong elf_entry ); /* methods.c */ extern void node_methods_init( void ); Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2008-12-21 08:30:42 UTC (rev 301) +++ openbios-devel/arch/ppc/qemu/main.c 2008-12-21 09:15:57 UTC (rev 302) @@ -21,6 +21,7 @@ #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" +#include "kernel.h" #include "ofmem.h" //#define DEBUG_ELF @@ -33,11 +34,10 @@ #endif static void -transfer_control_to_elf( ulong entry ) +transfer_control_to_elf( ulong elf_entry ) { - extern void call_elf( ulong entry ); ELF_DPRINTF("Starting ELF boot loader\n"); - call_elf( entry ); + call_elf( elf_entry ); fatal_error("call_elf returned unexpectedly\n"); } @@ -46,7 +46,7 @@ load_elf_rom( ulong *elf_entry, int fd ) { int i, lszz_offs, elf_offs; - char buf[128], *addr; + char *addr; Elf_ehdr ehdr; Elf_phdr *phdr; size_t s; Modified: openbios-devel/arch/ppc/qemu/methods.c =================================================================== --- openbios-devel/arch/ppc/qemu/methods.c 2008-12-21 08:30:42 UTC (rev 301) +++ openbios-devel/arch/ppc/qemu/methods.c 2008-12-21 09:15:57 UTC (rev 302) @@ -232,7 +232,7 @@ static void mmu_translate( void ) { - ulong mode; + int mode; int virt = POP(); int phys = ofmem_translate( virt, &mode ); @@ -240,7 +240,7 @@ PUSH( 0 ); } else { PUSH( phys ); - PUSH( (int)mode ); + PUSH( mode ); PUSH( -1 ); } } Modified: openbios-devel/arch/ppc/qemu/ofmem.c =================================================================== --- openbios-devel/arch/ppc/qemu/ofmem.c 2008-12-21 08:30:42 UTC (rev 301) +++ openbios-devel/arch/ppc/qemu/ofmem.c 2008-12-21 09:15:57 UTC (rev 302) @@ -70,7 +70,7 @@ { ulong sdr1; - asm volatile("mfsdr1 %0" :: "r" (sdr1) ); + asm volatile("mfsdr1 %0" : "=r" (sdr1) ); return (sdr1 & 0xffff0000); } @@ -80,7 +80,7 @@ { ulong sdr1; - asm volatile("mfsdr1 %0" :: "r" (sdr1) ); + asm volatile("mfsdr1 %0" : "=r" (sdr1) ); return ((sdr1 << 16) | 0x0000ffff) + 1; } @@ -107,7 +107,7 @@ ulong get_ram_bottom( void ) { - return OF_MALLOC_BASE; + return (ulong)OF_MALLOC_BASE; } /************************************************************************/ @@ -172,7 +172,7 @@ if( !ptr ) return; - d = (alloc_desc_t*)(ptr - sizeof(alloc_desc_t)); + d = (alloc_desc_t*)((char *)ptr - sizeof(alloc_desc_t)); d->next = ofmem->mfree; /* insert in the (sorted) freelist */ @@ -185,7 +185,7 @@ void * realloc( void *ptr, size_t size ) { - alloc_desc_t *d = (alloc_desc_t*)(ptr - sizeof(alloc_desc_t)); + alloc_desc_t *d = (alloc_desc_t*)((char *)ptr - sizeof(alloc_desc_t)); char *p; if( !ptr ) @@ -665,8 +665,7 @@ { ofmem_t *ofmem = OFMEM; ulong sdr1, sr_base, msr; - ulong hash_base, page; - ulong data_size, bss_size; + ulong hash_base; int i; memset(ofmem, 0, sizeof(ofmem_t)); @@ -675,7 +674,7 @@ /* SDR1: Storage Description Register 1 */ hash_base = (ramsize - 0x00100000 - HASH_SIZE) & 0xffff0000; - memset(hash_base, 0, HASH_SIZE); + memset((void *)hash_base, 0, HASH_SIZE); sdr1 = hash_base | ((HASH_SIZE-1) >> 16); asm volatile("mtsdr1 %0" :: "r" (sdr1) ); @@ -687,7 +686,7 @@ asm volatile("mtsrin %0,%1" :: "r" (sr_base + i), "r" (j) ); } - memcpy(get_rom_base(), 0xfff00000, 0x00100000); + memcpy((void *)get_rom_base(), (void *)0xfff00000, 0x00100000); /* Enable MMU */ @@ -699,8 +698,6 @@ void ofmem_init( void ) { - ulong top; - ofmem_claim_phys( 0, get_ram_bottom(), 0 ); ofmem_claim_virt( 0, get_ram_bottom(), 0 ); ofmem_claim_phys( get_ram_top(), get_ram_size() - get_ram_top(), 0); Modified: openbios-devel/fs/hfs/block.c =================================================================== --- openbios-devel/fs/hfs/block.c 2008-12-21 08:30:42 UTC (rev 301) +++ openbios-devel/fs/hfs/block.c 2008-12-21 09:15:57 UTC (rev 302) @@ -41,8 +41,8 @@ ASSERT(vol->cache == 0); cache = ALLOC(bcache, 1); - if (cache == 0) - ERROR(ENOMEM, 0); + if (cache == NULL) + ERROR(ENOMEM, NULL); vol->cache = cache; @@ -65,15 +65,15 @@ b->cnext = b + 1; b->cprev = b - 1; - b->hnext = 0; - b->hprev = 0; + b->hnext = NULL; + b->hprev = NULL; } cache->chain[0].cprev = cache->tail; cache->tail->cnext = &cache->chain[0]; for (i = 0; i < HFS_HASHSZ; ++i) - cache->hash[i] = 0; + cache->hash[i] = NULL; return 0; @@ -259,7 +259,7 @@ { int result = 0; - if (vol->cache == 0) + if (vol->cache == NULL) goto done; # ifdef DEBUG @@ -267,7 +267,7 @@ # endif FREE(vol->cache); - vol->cache = 0; + vol->cache = NULL; done: return result; @@ -469,7 +469,7 @@ return b; fail: - return 0; + return NULL; } /* @@ -524,7 +524,7 @@ bucket *b; b = getbucket(vol->cache, bnum, 1); - if (b == 0) + if (b == NULL) goto fail; memcpy(bp, b->data, HFS_BLOCKSZ); Modified: openbios-devel/fs/hfs/btree.c =================================================================== --- openbios-devel/fs/hfs/btree.c 2008-12-21 08:30:42 UTC (rev 301) +++ openbios-devel/fs/hfs/btree.c 2008-12-21 09:15:57 UTC (rev 302) @@ -89,7 +89,7 @@ int bt_readhdr(btree *bt) { const byte *ptr; - byte *map = 0; + byte *map = NULL; int i; unsigned long nnum; @@ -128,8 +128,8 @@ /* don't set bt->map until we're done, since getnode() checks it */ map = ALLOC(byte, HFS_MAP1SZ); - if (map == 0) - ERROR(ENOMEM, 0); + if (map == NULL) + ERROR(ENOMEM, NULL); memcpy(map, HFS_NODEREC(bt->hdrnd, 2), HFS_MAP1SZ); bt->mapsz = HFS_MAP1SZ; @@ -153,8 +153,8 @@ ERROR(EIO, "malformed b*-tree map node"); newmap = REALLOC(map, byte, bt->mapsz + HFS_MAPXSZ); - if (newmap == 0) - ERROR(ENOMEM, 0); + if (newmap == NULL) + ERROR(ENOMEM, NULL); map = newmap; @@ -186,7 +186,7 @@ nnum = bt->hdr.bthRoot; if (nnum == 0) - ERROR(ENOENT, 0); + ERROR(ENOENT, NULL); while (1) { @@ -204,7 +204,7 @@ { case ndIndxNode: if (np->rnum == -1) - ERROR(ENOENT, 0); + ERROR(ENOENT, NULL); rec = HFS_NODEREC(*np, np->rnum); nnum = d_getul(HFS_RECDATA(rec)); @@ -213,7 +213,7 @@ case ndLeafNode: if (! found) - ERROR(ENOENT, 0); + ERROR(ENOENT, NULL); goto done; Modified: openbios-devel/fs/hfs/data.c =================================================================== --- openbios-devel/fs/hfs/data.c 2008-12-21 08:30:42 UTC (rev 301) +++ openbios-devel/fs/hfs/data.c 2008-12-21 09:15:57 UTC (rev 302) @@ -27,7 +27,7 @@ static time_t tzdiff = -1; -const +static const unsigned char hfs_charorder[256] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, Modified: openbios-devel/fs/hfs/file.c =================================================================== --- openbios-devel/fs/hfs/file.c 2008-12-21 08:30:42 UTC (rev 301) +++ openbios-devel/fs/hfs/file.c 2008-12-21 09:15:57 UTC (rev 302) @@ -86,8 +86,8 @@ file->flags = 0; - file->prev = 0; - file->next = 0; + file->prev = NULL; + file->next = NULL; } /* @@ -156,7 +156,7 @@ { ExtDataRec *extrec; - f_getptrs(file, &extrec, 0, 0); + f_getptrs(file, &extrec, NULL, NULL); fabn = file->fabn = 0; memcpy(&file->ext, extrec, sizeof(ExtDataRec)); @@ -179,7 +179,7 @@ abnum -= n; } - if (v_extsearch(file, fabn, &file->ext, 0) <= 0) + if (v_extsearch(file, fabn, &file->ext, NULL) <= 0) goto fail; file->fabn = fabn; Modified: openbios-devel/fs/hfs/hfs.c =================================================================== --- openbios-devel/fs/hfs/hfs.c 2008-12-21 08:30:42 UTC (rev 301) +++ openbios-devel/fs/hfs/hfs.c 2008-12-21 09:15:57 UTC (rev 302) @@ -45,9 +45,9 @@ static int getvol(hfsvol **vol) { - if (*vol == 0) + if (*vol == NULL) { - if (curvol == 0) + if (curvol == NULL) ERROR(EINVAL, "no volume is current"); *vol = curvol; @@ -81,8 +81,8 @@ } vol = ALLOC(hfsvol, 1); - if (vol == 0) - ERROR(ENOMEM, 0); + if (vol == NULL) + ERROR(ENOMEM, NULL); v_init(vol, mode); @@ -98,7 +98,7 @@ /* add to linked list of volumes */ - vol->prev = 0; + vol->prev = NULL; vol->next = hfs_mounts; if (hfs_mounts) @@ -119,7 +119,7 @@ FREE(vol); } - return 0; + return NULL; } @@ -168,7 +168,7 @@ if (vol == hfs_mounts) hfs_mounts = vol->next; if (vol == curvol) - curvol = 0; + curvol = NULL; FREE(vol); @@ -197,7 +197,7 @@ { hfsvol *vol; - if (name == 0) + if (name == NULL) return curvol; for (vol = hfs_mounts; vol; vol = vol->next) @@ -206,7 +206,7 @@ return vol; } - return 0; + return NULL; } /* @@ -264,11 +264,11 @@ CatDataRec data; if (getvol(&vol) == -1 || - v_resolve(&vol, path, &data, 0, 0, 0) <= 0) + v_resolve(&vol, path, &data, NULL, NULL, NULL) <= 0) goto fail; if (data.cdrType != cdrDirRec) - ERROR(ENOTDIR, 0); + ERROR(ENOTDIR, NULL); vol->cwd = data.u.dir.dirDirID; @@ -304,7 +304,7 @@ /* make sure the directory exists */ - if (v_getdthread(vol, id, 0, 0) <= 0) + if (v_getdthread(vol, id, NULL, NULL) <= 0) goto fail; vol->cwd = id; @@ -325,7 +325,7 @@ CatDataRec thread; if (getvol(&vol) == -1 || - v_getdthread(vol, *id, &thread, 0) <= 0) + v_getdthread(vol, *id, &thread, NULL) <= 0) goto fail; *id = thread.u.dthd.thdParID; @@ -345,7 +345,7 @@ */ hfsdir *hfs_opendir(hfsvol *vol, const char *path) { - hfsdir *dir = 0; + hfsdir *dir = NULL; CatKeyRec key; CatDataRec data; byte pkey[HFS_CATKEYLEN]; @@ -354,8 +354,8 @@ goto fail; dir = ALLOC(hfsdir, 1); - if (dir == 0) - ERROR(ENOMEM, 0); + if (dir == NULL) + ERROR(ENOMEM, NULL); dir->vol = vol; @@ -368,23 +368,23 @@ } else { - if (v_resolve(&vol, path, &data, 0, 0, 0) <= 0) + if (v_resolve(&vol, path, &data, NULL, NULL, NULL) <= 0) goto fail; if (data.cdrType != cdrDirRec) - ERROR(ENOTDIR, 0); + ERROR(ENOTDIR, NULL); dir->dirid = data.u.dir.dirDirID; - dir->vptr = 0; + dir->vptr = NULL; r_makecatkey(&key, dir->dirid, ""); - r_packcatkey(&key, pkey, 0); + r_packcatkey(&key, pkey, NULL); if (bt_search(&vol->cat, pkey, &dir->n) <= 0) goto fail; } - dir->prev = 0; + dir->prev = NULL; dir->next = vol->dirs; if (vol->dirs) @@ -396,7 +396,7 @@ fail: FREE(dir); - return 0; + return NULL; } /* @@ -420,12 +420,12 @@ break; } - if (vol == 0) + if (vol == NULL) ERROR(ENOENT, "no more entries"); - if (v_getdthread(vol, HFS_CNID_ROOTDIR, &data, 0) <= 0 || + if (v_getdthread(vol, HFS_CNID_ROOTDIR, &data, NULL) <= 0 || v_catsearch(vol, HFS_CNID_ROOTPAR, data.u.dthd.thdCName, - &data, cname, 0) <= 0) + &data, cname, NULL) <= 0) goto fail; r_unpackdirent(HFS_CNID_ROOTPAR, cname, &data, ent); @@ -523,20 +523,20 @@ */ hfsfile *hfs_open(hfsvol *vol, const char *path) { - hfsfile *file = 0; + hfsfile *file = NULL; if (getvol(&vol) == -1) goto fail; file = ALLOC(hfsfile, 1); - if (file == 0) - ERROR(ENOMEM, 0); + if (file == NULL) + ERROR(ENOMEM, NULL); - if (v_resolve(&vol, path, &file->cat, &file->parid, file->name, 0) <= 0) + if (v_resolve(&vol, path, &file->cat, &file->parid, file->name, NULL) <= 0) goto fail; if (file->cat.cdrType != cdrFilRec) - ERROR(EISDIR, 0); + ERROR(EISDIR, NULL); /* package file handle for user */ @@ -545,7 +545,7 @@ f_selectfork(file, fkData); - file->prev = 0; + file->prev = NULL; file->next = vol->files; if (vol->files) @@ -557,7 +557,7 @@ fail: FREE(file); - return 0; + return NULL; } /* @@ -591,7 +591,7 @@ unsigned long *lglen, count; byte *ptr = buf; - f_getptrs(file, 0, &lglen, 0); + f_getptrs(file, NULL, &lglen, NULL); if (file->pos + len > *lglen) len = *lglen - file->pos; @@ -643,7 +643,7 @@ { unsigned long *lglen, newpos; - f_getptrs(file, 0, &lglen, 0); + f_getptrs(file, NULL, &lglen, NULL); switch (from) { @@ -666,7 +666,7 @@ break; default: - ERROR(EINVAL, 0); + ERROR(EINVAL, NULL); } if (newpos > *lglen) @@ -714,7 +714,7 @@ char name[HFS_MAX_FLEN + 1]; if (getvol(&vol) == -1 || - v_resolve(&vol, path, &data, &parid, name, 0) <= 0) + v_resolve(&vol, path, &data, &parid, name, NULL) <= 0) goto fail; r_unpackdirent(parid, name, &data, ent); Modified: openbios-devel/fs/hfs/hfs_fs.c =================================================================== --- openbios-devel/fs/hfs/hfs_fs.c 2008-12-21 08:30:42 UTC (rev 301) +++ openbios-devel/fs/hfs/hfs_fs.c 2008-12-21 09:15:57 UTC (rev 302) @@ -288,7 +288,7 @@ /* callers responsibility to call free(fs) */ } -static char * +static const char * get_fstype( fs_ops_t *fs ) { return ("HFS"); Modified: openbios-devel/fs/hfs/include/data.h =================================================================== --- openbios-devel/fs/hfs/include/data.h 2008-12-21 08:30:42 UTC (rev 301) +++ openbios-devel/fs/hfs/include/data.h 2008-12-21 09:15:57 UTC (rev 302) @@ -19,8 +19,6 @@ * $Id: data.h,v 1.7 1998/11/02 22:08:58 rob Exp $ */ -extern const unsigned char hfs_charorder[]; - signed char d_getsb(register const unsigned char *); unsigned char d_getub(register const unsigned char *); signed short d_getsw(register const unsigned char *); Modified: openbios-devel/fs/hfs/include/libhfs.h =================================================================== --- openbios-devel/fs/hfs/include/libhfs.h 2008-12-21 08:30:42 UTC (rev 301) +++ openbios-devel/fs/hfs/include/libhfs.h 2008-12-21 09:15:57 UTC (rev 302) @@ -22,8 +22,6 @@ # include "hfs.h" # include "apple.h" -extern int errno; - # define ERROR(code, str) \ do { hfs_error = (str), errno = (code); goto fail; } while (0) Modified: openbios-devel/fs/hfs/include/volume.h =================================================================== --- openbios-devel/fs/hfs/include/volume.h 2008-12-21 08:30:42 UTC (rev 301) +++ openbios-devel/fs/hfs/include/volume.h 2008-12-21 09:15:57 UTC (rev 302) @@ -57,7 +57,8 @@ int v_allocblocks(hfsvol *, ExtDescriptor *); int v_freeblocks(hfsvol *, const ExtDescriptor *); -int v_resolve(hfsvol **, const char *, CatDataRec *, long *, char *, node *); +int v_resolve(hfsvol **vol, const char *path, + CatDataRec *data, unsigned long *parid, char *fname, node *np); int v_adjvalence(hfsvol *, unsigned long, int, int); int v_mkdir(hfsvol *, unsigned long, const char *); Modified: openbios-devel/fs/hfs/volume.c =================================================================== --- openbios-devel/fs/hfs/volume.c 2008-12-21 08:30:42 UTC (rev 301) +++ openbios-devel/fs/hfs/volume.c 2008-12-21 09:15:57 UTC (rev 302) @@ -48,14 +48,14 @@ vol->vlen = 0; vol->lpa = 0; - vol->cache = 0; + vol->cache = NULL; - vol->vbm = 0; + vol->vbm = NULL; vol->vbmsz = 0; f_init(&ext->f, vol, HFS_CNID_EXT, "extents overflow"); - ext->map = 0; + ext->map = NULL; ext->mapsz = 0; ext->flags = 0; @@ -64,7 +64,7 @@ f_init(&cat->f, vol, HFS_CNID_CAT, "catalog"); - cat->map = 0; + cat->map = NULL; cat->mapsz = 0; cat->flags = 0; @@ -74,11 +74,11 @@ vol->cwd = HFS_CNID_ROOTDIR; vol->refs = 0; - vol->files = 0; - vol->dirs = 0; + vol->files = NULL; + vol->dirs = NULL; - vol->prev = 0; - vol->next = 0; + vol->prev = NULL; + vol->next = NULL; } /* @@ -126,14 +126,14 @@ FREE(vol->vbm); - vol->vbm = 0; + vol->vbm = NULL; vol->vbmsz = 0; FREE(vol->ext.map); FREE(vol->cat.map); - vol->ext.map = 0; - vol->cat.map = 0; + vol->ext.map = NULL; + vol->cat.map = NULL; done: return result; @@ -275,8 +275,8 @@ ERROR(EIO, "volume bitmap collides with volume data"); vol->vbm = ALLOC(block, vbmsz); - if (vol->vbm == 0) - ERROR(ENOMEM, 0); + if (vol->vbm == NULL) + ERROR(ENOMEM, NULL); vol->vbmsz = vbmsz; @@ -291,7 +291,7 @@ fail: FREE(vol->vbm); - vol->vbm = 0; + vol->vbm = NULL; vol->vbmsz = 0; return -1; @@ -339,11 +339,11 @@ node n; int found; - if (np == 0) + if (np == NULL) np = &n; r_makecatkey(&key, parid, name); - r_packcatkey(&key, pkey, 0); + r_packcatkey(&key, pkey, NULL); found = bt_search(&vol->cat, pkey, np); if (found <= 0) @@ -378,11 +378,11 @@ node n; int found; - if (np == 0) + if (np == NULL) np = &n; r_makeextkey(&key, file->fork, file->cat.u.fil.filFlNum, fabn); - r_packextkey(&key, pkey, 0); + r_packextkey(&key, pkey, NULL); /* in case bt_search() clobbers these */ @@ -416,10 +416,10 @@ CatDataRec rec; int found; - if (thread == 0) + if (thread == NULL) thread = &rec; - found = v_catsearch(vol, id, "", thread, 0, np); + found = v_catsearch(vol, id, "", thread, NULL, np); if (found == 1 && thread->cdrType != type) ERROR(EIO, "bad thread record"); @@ -435,7 +435,7 @@ * DESCRIPTION: translate a pathname; return catalog information */ int v_resolve(hfsvol **vol, const char *path, - CatDataRec *data, long *parid, char *fname, node *np) + CatDataRec *data, unsigned long *parid, char *fname, node *np) { unsigned long dirid; char name[HFS_MAX_FLEN + 1], *nptr; @@ -449,7 +449,7 @@ nptr = strchr(path, ':'); - if (*path == ':' || nptr == 0) + if (*path == ':' || nptr == NULL) { dirid = (*vol)->cwd; /* relative path */ @@ -458,7 +458,7 @@ if (*path == 0) { - found = v_getdthread(*vol, dirid, data, 0); + found = v_getdthread(*vol, dirid, data, NULL); if (found == -1) goto fail; @@ -483,7 +483,7 @@ dirid = HFS_CNID_ROOTPAR; /* absolute path */ if (nptr - path > HFS_MAX_VLEN) - ERROR(ENAMETOOLONG, 0); + ERROR(ENAMETOOLONG, NULL); strncpy(name, path, nptr - path); name[nptr - path] = 0; @@ -504,7 +504,7 @@ { ++path; - found = v_getdthread(*vol, dirid, data, 0); + found = v_getdthread(*vol, dirid, data, NULL); if (found == -1) goto fail; else if (! found) @@ -515,7 +515,7 @@ if (*path == 0) { - found = v_getdthread(*vol, dirid, data, 0); + found = v_getdthread(*vol, dirid, data, NULL); if (found == -1) goto fail; @@ -538,7 +538,7 @@ *nptr++ = *path++; if (*path && *path != ':') - ERROR(ENAMETOOLONG, 0); + ERROR(ENAMETOOLONG, NULL); *nptr = 0; if (*path == ':') Modified: openbios-devel/include/ofmem.h =================================================================== --- openbios-devel/include/ofmem.h 2008-12-21 08:30:42 UTC (rev 301) +++ openbios-devel/include/ofmem.h 2008-12-21 09:15:57 UTC (rev 302) @@ -29,4 +29,13 @@ extern void ofmem_release( ulong virt, ulong size ); extern ulong ofmem_translate( ulong virt, int *ret_mode ); +#ifdef CONFIG_PPC +ulong get_ram_size( void ); +ulong get_ram_top( void ); +ulong get_ram_bottom( void ); +void dsi_exception( void ); +void isi_exception( void ); +void setup_mmu( ulong ramsize ); +#endif + #endif /* _H_OFMEM */

1 0

r301 - in openbios-devel: arch/ppc arch/ppc/qemu config/examples drivers include
by svn＠openbios.org 21 Dec '08

21 Dec '08

Author: blueswirl Date: 2008-12-21 09:30:42 +0100 (Sun, 21 Dec 2008) New Revision: 301 Added: openbios-devel/arch/ppc/qemu/kernel.h openbios-devel/arch/ppc/qemu/ldscript openbios-devel/arch/ppc/qemu/mmutypes.h openbios-devel/arch/ppc/qemu/ofmem.c openbios-devel/arch/ppc/qemu/start.S Modified: openbios-devel/arch/ppc/build.xml openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/kernel.c openbios-devel/arch/ppc/qemu/main.c openbios-devel/arch/ppc/qemu/methods.c openbios-devel/arch/ppc/qemu/qemu.fs openbios-devel/arch/ppc/qemu/tree.fs openbios-devel/config/examples/cross-ppc_config.xml openbios-devel/drivers/timer.c openbios-devel/include/ofmem.h Log: qemu better support This patches copies all needed ppc files to qemu and modifies them. The generated OpenBIOS image must be loaded at adresse 0xfff00000 by Qemu. It is able to load Yaboot from disk and Yaboot is able to load Linux, but Linux hangs somewhere... of course it needs more work (but this cleans up my patch queue). Thank you to Blue Swirl and Aurelien Jarno for their help. Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info> Modified: openbios-devel/arch/ppc/build.xml =================================================================== --- openbios-devel/arch/ppc/build.xml 2008-12-20 20:23:55 UTC (rev 300) +++ openbios-devel/arch/ppc/build.xml 2008-12-21 08:30:42 UTC (rev 301) @@ -136,7 +136,7 @@ <rule><![CDATA[ $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> - <object source="ofmem.c"/> + <object source="qemu/ofmem.c"/> <object source="qemu/qemu.c" flags="-Iarch/ppc"/> <object source="qemu/init.c" flags="-Iarch/ppc"/> <external-object source="target/arch/ppc/qemu/kernel.o"/> @@ -216,12 +216,12 @@ <executable name="openbios-qemu.elf" target="target" condition="QEMU"> <rule> - $(LD) -g -Ttext=0x01e01000 -Bstatic $^ $(shell $(CC) -print-libgcc-file-name) -o $@ + $(LD) --warn-common -N -T arch/ppc/qemu/ldscript $^ -o $@ $(NM) $@ | sort > $(ODIR)/openbios-qemu.syms cp $@ $@.nostrip $(STRIP) $@ </rule> - <object source="start.S"> + <object source="qemu/start.S"> <rule><![CDATA[ $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> @@ -235,6 +235,7 @@ <external-object source="libdrivers.a"/> <external-object source="liblibc.a"/> <external-object source="libfs.a"/> + <external-object source="libgcc.a"/> </executable> Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-12-20 20:23:55 UTC (rev 300) +++ openbios-devel/arch/ppc/qemu/init.c 2008-12-21 08:30:42 UTC (rev 301) @@ -32,6 +32,11 @@ extern void ob_pci_init( void ); extern void setup_timers( void ); +extern ulong get_ram_size( void ); +extern ulong get_ram_top( void ); +extern ulong get_ram_bottom( void ); + + void unexpected_excep( int vector ) { @@ -67,11 +72,9 @@ { arch = &known_arch[ARCH_HEATHROW]; isa_io_base = arch->io_base; -#ifdef CONFIG_DEBUG_CONSOLE -#ifdef CONFIG_DEBUG_CONSOLE_SERIAL + serial_init(); -#endif -#endif + printk("\n"); printk("=============================================================\n"); printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); @@ -100,8 +103,59 @@ phandle_t ph; #endif int autoboot; + uint64_t ram_size; devtree_init(); + + /* ISA BASE */ + + push_str("/"); + fword("find-device"); + + PUSH(isa_io_base); + fword("encode-int"); + push_str("isa-io-base"); + fword("property"); + + /* memory info */ + + push_str("/memory"); + fword("find-device"); + + /* all memory */ + + ram_size = get_ram_size(); + + PUSH(ram_size >> 32); + fword("encode-int"); + PUSH(ram_size & 0xffffffff); + fword("encode-int"); + fword("encode+"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); + + /* available memory */ + + PUSH(0); + fword("encode-int"); + PUSH((unsigned long)get_ram_bottom()); + fword("encode-int"); + fword("encode+"); + PUSH((unsigned long)get_ram_top()); + fword("encode-int"); + fword("encode+"); + PUSH(ram_size); + fword("encode-int"); + fword("encode+"); + push_str("available"); + fword("property"); + modules_init(); setup_timers(); #ifdef CONFIG_DRIVER_PCI @@ -119,22 +173,13 @@ set_property( ph, "rtas-size", (char*)&size, sizeof(size) ); } #endif -#if 0 - /* tweak boot settings */ - autoboot = !!getbool("autoboot?"); -#endif - autoboot = 0; - if( !autoboot ) - printk("Autobooting disabled - dropping into OpenFirmware\n"); - setenv("auto-boot?", autoboot ? "true" : "false" ); - setenv("boot-command", "qemuboot"); #if 0 if( getbool("tty-interface?") == 1 ) #endif fword("activate-tty-interface"); - /* hack */ device_end(); - bind_func("qemuboot", boot ); + + bind_func("platform-boot", boot ); } Modified: openbios-devel/arch/ppc/qemu/kernel.c =================================================================== --- openbios-devel/arch/ppc/qemu/kernel.c 2008-12-20 20:23:55 UTC (rev 300) +++ openbios-devel/arch/ppc/qemu/kernel.c 2008-12-21 08:30:42 UTC (rev 301) @@ -1,11 +1,16 @@ /* - * Creation Date: <2004/08/28 18:03:25 stepan> - * Time-stamp: <2004/08/28 18:03:25 stepan> + * Creation Date: <2003/10/25 14:07:17 samuel> + * Time-stamp: <2004/08/28 17:48:19 stepan> * - * <qemu/kernel.c> + * <kernel.c> * - * Copyright (C) 2005 Stefan Reinauer + * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) + * Copyright (C) 2003, 2004 Stefan Reinauer * + * Based upon unix.c (from OpenBIOS): + * + * Copyright (C) 2003 Patrick Mauritz, Stefan Reinauer + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 @@ -13,4 +18,84 @@ */ #include "qemu-dict.h" -#include "../kernel.c" +#include "openbios/config.h" +#include "dict.h" +#include "openbios/bindings.h" +#include "openbios/stack.h" +#include "openbios/kernel.h" +#include "libc/string.h" +#include "kernel.h" + +#define MEMORY_SIZE (256*1024) /* 256K ram for hosted system */ +#define DICTIONARY_SIZE (512*1024) /* 128K for the dictionary */ + +extern unsigned char *dict; +extern cell dicthead; +static ucell *memory; + +/************************************************************************/ +/* F U N C T I O N S */ +/************************************************************************/ + +int +forth_segv_handler( char *segv_addr ) +{ + ucell addr = 0xdeadbeef; + + if( PC >= (ucell) dict && PC <= (ucell) dict + dicthead ) + addr = *(ucell *) PC; + + printk("panic: segmentation violation at %x\n", (int)segv_addr); + printk("dict=0x%x here=0x%x(dict+0x%x) pc=0x%x(dict+0x%x)\n", + (int)dict, (int)(dict + dicthead), dicthead, + PC, PC - (ucell) dict); + printk("dstackcnt=%d rstackcnt=%d instruction=%x\n", + dstackcnt, rstackcnt, addr); + +#ifdef DEBUG_DSTACK + printdstack(); +#endif +#ifdef DEBUG_RSTACK + printrstack(); +#endif + return -1; +} + +/* + * allocate memory and prepare engine for memory management. + */ + +static void +init_memory( void ) +{ + memory = malloc(MEMORY_SIZE); + if( !memory ) + panic("panic: not enough memory on host system.\n"); + + /* we push start and end of memory to the stack + * so that it can be used by the forth word QUIT + * to initialize the memory allocator + */ + + PUSH( (ucell)memory ); + PUSH( (ucell)memory + MEMORY_SIZE ); +} + +int +initialize_forth( void ) +{ + dict = malloc(DICTIONARY_SIZE); + load_dictionary( forth_dictionary, sizeof(forth_dictionary) ); + + PUSH_xt( bind_noname_func(arch_of_init) ); + fword("PREPOST-initializer"); + + PC = (ucell)findword("initialize-of"); + if( PC ) { + init_memory(); + enterforth((xt_t)PC); + free( memory ); + } + free( dict ); + return 0; +} Added: openbios-devel/arch/ppc/qemu/kernel.h =================================================================== --- openbios-devel/arch/ppc/qemu/kernel.h (rev 0) +++ openbios-devel/arch/ppc/qemu/kernel.h 2008-12-21 08:30:42 UTC (rev 301) @@ -0,0 +1,41 @@ +/* + * Creation Date: <2004/08/28 17:50:12 stepan> + * Time-stamp: <2004/08/28 17:50:12 stepan> + * + * <kernel.h> + * + * Copyright (C) 2004 Stefan Reinauer + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#ifndef __KERNEL_H__ +#define __KERNEL_H__ + +/* misc.c */ +extern void fatal_error( const char *str ); +extern void exit( int status ); + +/* start.S */ +extern void flush_icache_range( char *start, char *stop ); +extern char of_rtas_start[], of_rtas_end[]; + +/* methods.c */ +extern void node_methods_init( void ); + +/* main.c */ +extern void boot( void ); + +/* init.c */ +extern void entry( void ); +extern void arch_of_init( void ); +extern int get_bool_res( const char *str ); + +/* tree.c */ +extern void devtree_init( void ); + + +#endif /* __KERNEL_H__ */ Added: openbios-devel/arch/ppc/qemu/ldscript =================================================================== --- openbios-devel/arch/ppc/qemu/ldscript (rev 0) +++ openbios-devel/arch/ppc/qemu/ldscript 2008-12-21 08:30:42 UTC (rev 301) @@ -0,0 +1,55 @@ +OUTPUT_FORMAT(elf32-powerpc) +OUTPUT_ARCH(powerpc) + +/* Initial load address + */ +BASE_ADDR = 0xfff00000; + +CSTACK_SIZE = 32768; /* client stack size */ + +SECTIONS +{ + . = BASE_ADDR; + + _start = BASE_ADDR + 0x0100; + + /* Normal sections */ + .text ALIGN(4096): { + *(.text.vectors) + *(.text) + *(.text.*) + } + + .rodata ALIGN(4096): { + _rodata = .; + *(.rodata) + *(.rodata.*) + *(.note.ELFBoot) + } + .data ALIGN(4096): { + _data = .; + *(.data) + *(.data.*) + _edata = .; + } + + .bss ALIGN(4096): { + _bss = .; + *(.bss) + *(.bss.*) + *(COMMON) + _ebss = .; + } + + . = 0xfffffffc; + + .romentry : { *(.romentry) } + + . = ALIGN(4096); + _end = .; + + /* We discard .note sections other than .note.ELFBoot, + * because some versions of GCC generates useless ones. */ + + /DISCARD/ : { *(.comment*) *(.note.*) } +} Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2008-12-20 20:23:55 UTC (rev 300) +++ openbios-devel/arch/ppc/qemu/main.c 2008-12-21 08:30:42 UTC (rev 301) @@ -1,12 +1,11 @@ /* - * Creation Date: <2004/08/28 18:38:22 greg> - * Time-stamp: <2004/08/28 18:38:22 greg> + * Creation Date: <2002/10/02 22:24:24 samuel> + * Time-stamp: <2004/03/27 01:57:55 samuel> * * <main.c> * - * Copyright (C) 2004 Greg Watson * - * Based on MOL specific code which is + * * Copyright (C) 2002, 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) * * This program is free software; you can redistribute it and/or @@ -22,16 +21,23 @@ #include "openbios/nvram.h" #include "libc/diskio.h" #include "libc/vsprintf.h" -#include "qemu/qemu.h" #include "ofmem.h" +//#define DEBUG_ELF + +#ifdef DEBUG_ELF +#define ELF_DPRINTF(fmt, args...) \ +do { printk("ELF - %s: " fmt, __func__ , ##args); } while (0) +#else +#define ELF_DPRINTF(fmt, args...) do { } while (0) +#endif + static void -transfer_control_to_elf( ulong elf_entry ) +transfer_control_to_elf( ulong entry ) { extern void call_elf( ulong entry ); - printk("Starting ELF image at 0x%08lX\n", elf_entry); - call_elf( 0x400000 ); - //call_elf( entry ); + ELF_DPRINTF("Starting ELF boot loader\n"); + call_elf( entry ); fatal_error("call_elf returned unexpectedly\n"); } @@ -45,11 +51,12 @@ Elf_phdr *phdr; size_t s; - printk("Loading '%s'\n", get_file_path(fd)); + ELF_DPRINTF("Loading '%s' from '%s'\n", get_file_path(fd), + get_volume_name(fd) ); /* the ELF-image (usually) starts at offset 0x4000 */ if( (elf_offs=find_elf(fd)) < 0 ) { - printk("----> %s is not an ELF image\n", buf ); + ELF_DPRINTF("----> %s is not an ELF image\n", buf ); exit(1); } if( !(phdr=elf_readhdrs(fd, elf_offs, &ehdr)) ) @@ -65,12 +72,12 @@ s = MIN( phdr[i].p_filesz, phdr[i].p_memsz ); seek_io( fd, elf_offs + phdr[i].p_offset ); - /* printk("filesz: %08lX memsz: %08lX p_offset: %08lX p_vaddr %08lX\n", + ELF_DPRINTF("filesz: %08lX memsz: %08lX p_offset: %08lX p_vaddr %08lX\n", phdr[i].p_filesz, phdr[i].p_memsz, phdr[i].p_offset, - phdr[i].p_vaddr ); */ + phdr[i].p_vaddr ); if( phdr[i].p_vaddr != phdr[i].p_paddr ) - printk("WARNING: ELF segment virtual addr != physical addr\n"); + ELF_DPRINTF("WARNING: ELF segment virtual addr != physical addr\n"); lszz_offs = MAX( lszz_offs, elf_offs + phdr[i].p_offset + phdr[i].p_filesz ); if( !s ) continue; @@ -81,24 +88,15 @@ if( read_io(fd, addr, s) != s ) fatal_error("read failed\n"); -#if 0 - /* patch CODE segment */ - if( *elf_entry >= phdr[i].p_vaddr && - *elf_entry < phdr[i].p_vaddr + s ) { - patch_newworld_rom( (char*)phdr[i].p_vaddr, s ); - newworld_timer_hack( (char*)phdr[i].p_vaddr, s ); - } -#endif flush_icache_range( addr, addr+s ); - /*printk("ELF ROM-section loaded at %08lX (size %08lX)\n", - (ulong)phdr[i].p_vaddr, (ulong)phdr[i].p_memsz );*/ + ELF_DPRINTF("ELF ROM-section loaded at %08lX (size %08lX)\n", + (ulong)phdr[i].p_vaddr, (ulong)phdr[i].p_memsz ); } free( phdr ); return lszz_offs; } - static void encode_bootpath( const char *spec, const char *args ) { @@ -112,10 +110,10 @@ /************************************************************************/ static void -qemu_startup( void ) +yaboot_startup( void ) { - const char *paths[] = { "hd:0,\\zImage.chrp", NULL }; - const char *args[] = { "root=/dev/hda2 console=ttyS0,115200", NULL }; + const char *paths[] = { "hd:2,\\ofclient", "hd:2,\\yaboot", NULL }; + const char *args[] = { "", "conf=hd:2,\\yaboot.conf", NULL }; ulong elf_entry; int i, fd; @@ -127,6 +125,8 @@ encode_bootpath( paths[i], args[i] ); update_nvram(); + ELF_DPRINTF("Transfering control to %s %s\n", + paths[i], args[i]); transfer_control_to_elf( elf_entry ); /* won't come here */ } @@ -142,5 +142,5 @@ boot( void ) { fword("update-chosen"); - qemu_startup(); + yaboot_startup(); } Modified: openbios-devel/arch/ppc/qemu/methods.c =================================================================== --- openbios-devel/arch/ppc/qemu/methods.c 2008-12-20 20:23:55 UTC (rev 300) +++ openbios-devel/arch/ppc/qemu/methods.c 2008-12-21 08:30:42 UTC (rev 301) @@ -24,6 +24,7 @@ #include "libc/string.h" #include "qemu/qemu.h" #include "ofmem.h" +#include "ppc/processor.h" /************************************************************************/ /* RTAS (run-time abstraction services) */ @@ -60,37 +61,6 @@ /************************************************************************/ -/* stdout */ -/************************************************************************/ - -DECLARE_NODE( video_stdout, INSTALL_OPEN, 0, "Tdisplay" ); - -/* ( addr len -- actual ) */ -static void -stdout_write( void ) -{ - int len = POP(); - char *addr = (char*)POP(); - char *s = malloc( len + 1 ); - - strncpy_nopad( s, addr, len ); - s[len]=0; - - printk( "%s", s ); - //vfd_draw_str( s ); - console_draw_str( s ); - - free( s ); - - PUSH( len ); -} - -NODE_METHODS( video_stdout ) = { - { "write", stdout_write }, -}; - - -/************************************************************************/ /* tty */ /************************************************************************/ @@ -136,7 +106,7 @@ /* client interface 'quiesce' */ /************************************************************************/ -DECLARE_NODE( ciface, 0, 0, "/packages/client-iface" ); +DECLARE_NODE( ciface, 0, 0, "+/openprom/client-services" ); /* ( -- ) */ static void @@ -149,7 +119,6 @@ msr &= ~(MSR_IR | MSR_DR); asm volatile("mtmsr %0" :: "r" (msr) ); #endif - printk("=============================================================\n\n"); } /* ( -- ms ) */ @@ -181,7 +150,7 @@ DECLARE_NODE( memory, INSTALL_OPEN, 0, "/memory" ); DECLARE_NODE( mmu, INSTALL_OPEN, 0, "/cpu@0" ); -DECLARE_NODE( mmu_ciface, 0, 0, "/packages/client-iface" ); +DECLARE_NODE( mmu_ciface, 0, 0, "+/openprom/client-services" ); /* ( phys size align --- base ) */ @@ -327,7 +296,6 @@ #ifdef USE_RTAS REGISTER_NODE( rtas ); #endif - REGISTER_NODE( video_stdout ); REGISTER_NODE( ciface ); REGISTER_NODE( memory ); REGISTER_NODE( mmu ); Added: openbios-devel/arch/ppc/qemu/mmutypes.h =================================================================== --- openbios-devel/arch/ppc/qemu/mmutypes.h (rev 0) +++ openbios-devel/arch/ppc/qemu/mmutypes.h 2008-12-21 08:30:42 UTC (rev 301) @@ -0,0 +1,76 @@ +/* + * Creation Date: <2002/01/13 13:53:14 samuel> + * Time-stamp: <2002/01/27 19:56:11 samuel> + * + * <mmutypes.h> + * + * MMU definitions + * + * Most of these declarations originate from the Linux Kernel + * + * Copyright (C) 2002 Samuel Rydh (samuel(a)ibrium.se) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#ifndef _H_MMUTYPES +#define _H_MMUTYPES + +/* Hardware Page Table Entry */ +typedef struct mPTE { + unsigned long v:1; /* Entry is valid */ + unsigned long vsid:24; /* Virtual segment identifier */ + unsigned long h:1; /* Hash algorithm indicator */ + unsigned long api:6; /* Abbreviated page index */ + + unsigned long rpn:20; /* Real (physical) page number */ + unsigned long :3; /* Unused */ + unsigned long r:1; /* Referenced */ + unsigned long c:1; /* Changed */ + unsigned long w:1; /* Write-thru cache mode */ + unsigned long i:1; /* Cache inhibited */ + unsigned long m:1; /* Memory coherence */ + unsigned long g:1; /* Guarded */ + unsigned long :1; /* Unused */ + unsigned long pp:2; /* Page protection */ +} mPTE_t; + + +typedef struct _mBATU { /* Upper part of BAT (all except 601) */ + unsigned long bepi:15; /* Effective page index (virtual address) */ + unsigned long :4; /* Unused */ + unsigned long bl:11; /* Block size mask */ + unsigned long vs:1; /* Supervisor valid */ + unsigned long vp:1; /* User valid */ +} mBATU; + +typedef struct _mBATL { /* Lower part of BAT (all except 601) */ + unsigned long brpn:15; /* Real page index (physical address) */ + unsigned long :10; /* Unused */ + unsigned long w:1; /* Write-thru cache */ + unsigned long i:1; /* Cache inhibit */ + unsigned long m:1; /* Memory coherence */ + unsigned long g:1; /* Guarded (MBZ in IBAT) */ + unsigned long :1; /* Unused */ + unsigned long pp:2; /* Page access protections */ +} mBATL; + +typedef struct _mBAT { + mBATU batu; /* Upper register */ + mBATL batl; /* Lower register */ +} mBAT; + +typedef struct _mSEGREG { + unsigned long t:1; /* Normal or I/O type */ + unsigned long ks:1; /* Supervisor 'key' (normally 0) */ + unsigned long kp:1; /* User 'key' (normally 1) */ + unsigned long n:1; /* No-execute */ + unsigned long :4; /* Unused */ + unsigned long vsid:24; /* Virtual Segment Identifier */ +} mSEGREG; + + +#endif /* _H_MMUTYPES */ Added: openbios-devel/arch/ppc/qemu/ofmem.c =================================================================== --- openbios-devel/arch/ppc/qemu/ofmem.c (rev 0) +++ openbios-devel/arch/ppc/qemu/ofmem.c 2008-12-21 08:30:42 UTC (rev 301) @@ -0,0 +1,708 @@ +/* + * Creation Date: <1999/11/07 19:02:11 samuel> + * Time-stamp: <2004/01/07 19:42:36 samuel> + * + * <ofmem.c> + * + * OF Memory manager + * + * Copyright (C) 1999-2004 Samuel Rydh (samuel(a)ibrium.se) + * Copyright (C) 2004 Stefan Reinauer + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "libc/string.h" +#include "ofmem.h" +#include "kernel.h" +#include "mmutypes.h" +#include "asm/processor.h" + +#define BIT(n) (1U<<(31-(n))) + +#define FREE_BASE 0x00004000 +#define IO_BASE 0x80000000 +#define OFMEM ((ofmem_t*)FREE_BASE) +#define OF_MALLOC_BASE ((char*)OFMEM + ((sizeof(ofmem_t) + 3) & ~3)) + +#define HASH_SIZE (2 << 15) + +#define SEGR_USER BIT(2) +#define SEGR_BASE 0x0400 + +typedef struct alloc_desc { + struct alloc_desc *next; + int size; /* size (including) this struct */ +} alloc_desc_t; + +typedef struct mem_range { + struct mem_range *next; + ulong start; + ulong size; +} range_t; + +typedef struct trans { + struct trans *next; + ulong virt; /* chain is sorted by virt */ + ulong size; + ulong phys; + int mode; +} translation_t; + +typedef struct { + ulong ramsize; + char *next_malloc; + alloc_desc_t *mfree; /* list of free malloc blocks */ + + range_t *phys_range; + range_t *virt_range; + + translation_t *trans; /* this is really a translation_t */ +} ofmem_t; + +static inline ulong +get_hash_base( void ) +{ + ulong sdr1; + + asm volatile("mfsdr1 %0" :: "r" (sdr1) ); + + return (sdr1 & 0xffff0000); +} + +static inline ulong +get_hash_size( void ) +{ + ulong sdr1; + + asm volatile("mfsdr1 %0" :: "r" (sdr1) ); + + return ((sdr1 << 16) | 0x0000ffff) + 1; +} + +ulong +get_ram_size( void ) +{ + ofmem_t *ofmem = OFMEM; + return ofmem->ramsize; +} + +static inline ulong +get_rom_base( void ) +{ + return get_ram_size() - 0x00100000; +} + +ulong +get_ram_top( void ) +{ + return get_rom_base() - HASH_SIZE - (32 + 32 + 64) * 1024; +} + +ulong +get_ram_bottom( void ) +{ + return OF_MALLOC_BASE; +} + +/************************************************************************/ +/* OF private allocations */ +/************************************************************************/ + +void * +malloc( int size ) +{ + ofmem_t *ofmem = OFMEM; + alloc_desc_t *d, **pp; + char *ret; + ulong top; + + if( !size ) + return NULL; + + if( !ofmem->next_malloc ) + ofmem->next_malloc = (char*)OF_MALLOC_BASE; + + if( size & 3 ) + size += 4 - (size & 3); + size += sizeof(alloc_desc_t); + + /* look in the freelist */ + for( pp=&ofmem->mfree; *pp && (**pp).size < size; pp = &(**pp).next ) + ; + + /* waste at most 4K by taking an entry from the freelist */ + if( *pp && (**pp).size < size + 0x1000 ) { + ret = (char*)*pp + sizeof(alloc_desc_t); + memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) ); + *pp = (**pp).next; + return ret; + } + + top = get_hash_base() - (32 + 64) * 1024; + if( (ulong)ofmem->next_malloc + size > top ) { + printk("out of malloc memory (%x)!\n", size ); + return NULL; + } + + d = (alloc_desc_t*) ofmem->next_malloc; + ofmem->next_malloc += size; + + d->next = NULL; + d->size = size; + + ret = (char*)d + sizeof(alloc_desc_t); + memset( ret, 0, size - sizeof(alloc_desc_t) ); + + return ret; +} + +void +free( void *ptr ) +{ + ofmem_t *ofmem = OFMEM; + alloc_desc_t **pp, *d; + + /* it is legal to free NULL pointers (size zero allocations) */ + if( !ptr ) + return; + + d = (alloc_desc_t*)(ptr - sizeof(alloc_desc_t)); + d->next = ofmem->mfree; + + /* insert in the (sorted) freelist */ + for( pp=&ofmem->mfree; *pp && (**pp).size < d->size ; pp = &(**pp).next ) + ; + d->next = *pp; + *pp = d; +} + +void * +realloc( void *ptr, size_t size ) +{ + alloc_desc_t *d = (alloc_desc_t*)(ptr - sizeof(alloc_desc_t)); + char *p; + + if( !ptr ) + return malloc( size ); + if( !size ) { + free( ptr ); + return NULL; + } + p = malloc( size ); + memcpy( p, ptr, MIN(d->size - sizeof(alloc_desc_t),size) ); + free( ptr ); + return p; +} + + +/************************************************************************/ +/* misc */ +/************************************************************************/ + +extern char _start[], _end[]; +static inline int +def_memmode( ulong phys ) +{ + /* XXX: Guard bit not set as it should! */ + if( phys < IO_BASE ) + return 0x02; /*0xa*/ /* wim GxPp */ + return 0x6a; /* WIm GxPp, I/O */ +} + + +/************************************************************************/ +/* client interface */ +/************************************************************************/ + +static int +is_free( ulong ea, ulong size, range_t *r ) +{ + if( size == 0 ) + return 1; + for( ; r ; r=r->next ) { + if( r->start + r->size - 1 >= ea && r->start <= ea ) + return 0; + if( r->start >= ea && r->start <= ea + size - 1 ) + return 0; + } + return 1; +} + +static void +add_entry_( ulong ea, ulong size, range_t **r ) +{ + range_t *nr; + + for( ; *r && (**r).start < ea; r=&(**r).next ) + ; + nr = (range_t*)malloc( sizeof(range_t) ); + nr->next = *r; + nr->start = ea; + nr->size = size; + *r = nr; +} + +static int +add_entry( ulong ea, ulong size, range_t **r ) +{ + if( !is_free( ea, size, *r ) ) { + printk("add_entry: range not free!\n"); + return -1; + } + add_entry_( ea, size, r ); + return 0; +} + +static void +join_ranges( range_t **rr ) +{ + range_t *n, *r = *rr; + while( r ) { + if( !(n=r->next) ) + break; + + if( r->start + r->size - 1 >= n->start -1 ) { + int s = n->size + (n->start - r->start - r->size); + if( s > 0 ) + r->size += s; + r->next = n->next; + free( n ); + continue; + } + r=r->next; + } +} + +static void +fill_range( ulong ea, int size, range_t **rr ) +{ + add_entry_( ea, size, rr ); + join_ranges( rr ); +} + +static ulong +find_area( ulong align, ulong size, range_t *r, ulong min, ulong max, int reverse ) +{ + ulong base = min; + range_t *r2; + + if( (align & (align-1)) ) { + printk("bad alignment %ld\n", align); + align = 0x1000; + } + if( !align ) + align = 0x1000; + + base = reverse ? max - size : min; + r2 = reverse ? NULL : r; + + for( ;; ) { + if( !reverse ) { + base = (base + align - 1) & ~(align-1); + if( base < min ) + base = min; + if( base + size - 1 >= max -1 ) + break; + } else { + if( base > max - size ) + base = max - size; + base -= base & (align-1); + } + if( is_free( base, size, r ) ) + return base; + + if( !reverse ) { + if( !r2 ) + break; + base = r2->start + r2->size; + r2 = r2->next; + } else { + range_t *rp; + for( rp=r; rp && rp->next != r2 ; rp=rp->next ) + ; + r2 = rp; + if( !r2 ) + break; + base = r2->start - size; + } + } + return (ulong)-1; +} + +static ulong +ofmem_claim_phys_( ulong phys, ulong size, ulong align, int min, int max, int reverse ) +{ + ofmem_t *ofmem = OFMEM; + if( !align ) { + if( !is_free( phys, size, ofmem->phys_range ) ) { + printk("Non-free physical memory claimed!\n"); + return -1; + } + add_entry( phys, size, &ofmem->phys_range ); + return phys; + } + phys = find_area( align, size, ofmem->phys_range, min, max, reverse ); + if( phys == (ulong)-1 ) { + printk("ofmem->claim_phys - out of space\n"); + return -1; + } + add_entry( phys, size, &ofmem->phys_range ); + return phys; +} + +/* if align != 0, phys is ignored. Returns -1 on error */ +ulong +ofmem_claim_phys( ulong phys, ulong size, ulong align ) +{ + /* printk("+ ofmem_claim phys %08lx %lx %ld\n", phys, size, align ); */ + return ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 ); +} + +static ulong +ofmem_claim_virt_( ulong virt, ulong size, ulong align, int min, int max, int reverse ) +{ + ofmem_t *ofmem = OFMEM; + if( !align ) { + if( !is_free( virt, size, ofmem->virt_range ) ) { + printk("Non-free physical memory claimed!\n"); + return -1; + } + add_entry( virt, size, &ofmem->virt_range ); + return virt; + } + + virt = find_area( align, size, ofmem->virt_range, min, max, reverse ); + if( virt == (ulong)-1 ) { + printk("ofmem_claim_virt - out of space\n"); + return -1; + } + add_entry( virt, size, &ofmem->virt_range ); + return virt; +} + +ulong +ofmem_claim_virt( ulong virt, ulong size, ulong align ) +{ + /* printk("+ ofmem_claim virt %08lx %lx %ld\n", virt, size, align ); */ + return ofmem_claim_virt_( virt, size, align, get_ram_size() , IO_BASE, 0 ); +} + + +/* allocate both physical and virtual space and add a translation */ +ulong +ofmem_claim( ulong addr, ulong size, ulong align ) +{ + ofmem_t *ofmem = OFMEM; + ulong virt, phys; + ulong offs = addr & 0xfff; + + /* printk("+ ofmem_claim %08lx %lx %ld\n", addr, size, align ); */ + virt = phys = 0; + if( !align ) { + if( is_free(addr, size, ofmem->virt_range) && + is_free(addr, size, ofmem->phys_range) ) { + ofmem_claim_phys_( addr, size, 0, 0, 0, 0 ); + ofmem_claim_virt_( addr, size, 0, 0, 0, 0 ); + virt = phys = addr; + } else { + /* printk("**** ofmem_claim failure ***!\n"); */ + return -1; + } + } else { + if( align < 0x1000 ) + align = 0x1000; + phys = ofmem_claim_phys_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ ); + virt = ofmem_claim_virt_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ ); + if( phys == (ulong)-1 || virt == (ulong)-1 ) { + printk("ofmem_claim failed\n"); + return -1; + } + /* printk("...phys = %08lX, virt = %08lX, size = %08lX\n", phys, virt, size ); */ + } + + /* align */ + if( phys & 0xfff ) { + size += (phys & 0xfff); + virt -= (phys & 0xfff); + phys &= ~0xfff; + } + if( size & 0xfff ) + size = (size + 0xfff) & ~0xfff; + + /* printk("...free memory found... phys: %08lX, virt: %08lX, size %lX\n", phys, virt, size ); */ + ofmem_map( phys, virt, size, def_memmode(phys) ); + return virt + offs; +} + + +/************************************************************************/ +/* keep track of ea -> phys translations */ +/************************************************************************/ + +static void +split_trans( ulong virt ) +{ + ofmem_t *ofmem = OFMEM; + translation_t *t, *t2; + + for( t=ofmem->trans; t; t=t->next ) { + if( virt > t->virt && virt < t->virt + t->size-1 ) { + t2 = (translation_t*)malloc( sizeof(translation_t) ); + t2->virt = virt; + t2->size = t->size - (virt - t->virt); + t->size = virt - t->virt; + t2->phys = t->phys + t->size; + t2->mode = t->mode; + t2->next = t->next; + t->next = t2; + } + } +} + +static int +map_page_range( ulong virt, ulong phys, ulong size, int mode ) +{ + ofmem_t *ofmem = OFMEM; + translation_t *t, **tt; + + split_trans( virt ); + split_trans( virt + size ); + + /* detect remappings */ + for( t=ofmem->trans; t; ) { + if( virt == t->virt || (virt < t->virt && virt + size > t->virt )) { + if( t->phys + virt - t->virt != phys ) { + printk("mapping altered (ea %08lx)\n", t->virt ); + } else if( t->mode != mode ){ + printk("mapping mode altered\n"); + } + for( tt=&ofmem->trans; *tt != t ; tt=&(**tt).next ) + ; + *tt = t->next; + free((char*)t); + t=ofmem->trans; + continue; + } + t=t->next; + } + /* add mapping */ + for( tt=&ofmem->trans; *tt && (**tt).virt < virt ; tt=&(**tt).next ) + ; + t = (translation_t*)malloc( sizeof(translation_t) ); + t->virt = virt; + t->phys = phys; + t->size = size; + t->mode = mode; + t->next = *tt; + *tt = t; + + return 0; +} + +int +ofmem_map( ulong phys, ulong virt, ulong size, int mode ) +{ + ofmem_t *ofmem = OFMEM; + /* printk("+ofmem_map: %08lX --> %08lX (size %08lX, mode 0x%02X)\n", + virt, phys, size, mode ); */ + + if( (phys & 0xfff) || (virt & 0xfff) || (size & 0xfff) ) { + printk("ofmem_map: Bad parameters (%08lX %08lX %08lX)\n", phys, virt, size ); + phys &= ~0xfff; + virt &= ~0xfff; + size = (size + 0xfff) & ~0xfff; + } +#if 1 + /* claim any unclaimed virtual memory in the range */ + fill_range( virt, size, &ofmem->virt_range ); + /* hmm... we better claim the physical range too */ + fill_range( phys, size, &ofmem->phys_range ); +#endif + //printk("map_page_range %08lx -> %08lx %08lx\n", virt, phys, size ); + map_page_range( virt, phys, size, (mode==-1)? def_memmode(phys) : mode ); + return 0; +} + +/* virtual -> physical. */ +ulong +ofmem_translate( ulong virt, int *mode ) +{ + ofmem_t *ofmem = OFMEM; + translation_t *t; + + for( t=ofmem->trans; t && t->virt <= virt ; t=t->next ) { + ulong offs; + if( t->virt + t->size - 1 < virt ) + continue; + offs = virt - t->virt; + *mode = t->mode; + return t->phys + offs; + } + + //printk("ofmem_translate: no translation defined (%08lx)\n", virt); + //print_trans(); + return -1UL; +} + +/* release memory allocated by ofmem_claim */ +void +ofmem_release( ulong virt, ulong size ) +{ + /* printk("ofmem_release unimplemented (%08lx, %08lx)\n", virt, size ); */ +} + + +/************************************************************************/ +/* page fault handler */ +/************************************************************************/ + +static ulong +ea_to_phys( ulong ea, int *mode ) +{ + ulong phys; + + if (ea >= 0xfff00000UL) { + /* ROM into RAM */ + ea -= 0xfff00000UL; + phys = get_rom_base() + ea; + *mode = 0x02; + return phys; + } + + phys = ofmem_translate(ea, mode); + if( phys == -1UL ) { + phys = ea; + *mode = def_memmode( phys ); + + /* print_virt_range(); */ + /* print_phys_range(); */ + /* print_trans(); */ + } + return phys; +} + +static void +hash_page( ulong ea, ulong phys, int mode ) +{ + static int next_grab_slot=0; + ulong *upte, cmp, hash1; + int i, vsid, found; + mPTE_t *pp; + + vsid = (ea>>28) + SEGR_BASE; + cmp = BIT(0) | (vsid << 7) | ((ea & 0x0fffffff) >> 22); + + hash1 = vsid; + hash1 ^= (ea >> 12) & 0xffff; + hash1 &= (get_hash_size() - 1) >> 6; + + pp = (mPTE_t*)(get_hash_base() + (hash1 << 6)); + upte = (ulong*)pp; + + /* replace old translation */ + for( found=0, i=0; !found && i<8; i++ ) + if( cmp == upte[i*2] ) + found=1; + + /* otherwise use a free slot */ + for( i=0; !found && i<8; i++ ) + if( !pp[i].v ) + found=1; + + /* out of slots, just evict one */ + if( !found ) { + i = next_grab_slot + 1; + next_grab_slot = (next_grab_slot + 1) % 8; + } + i--; + upte[i*2] = cmp; + upte[i*2+1] = (phys & ~0xfff) | mode; + + asm volatile( "tlbie %0" :: "r"(ea) ); +} + +void +dsi_exception( void ) +{ + ulong dar, dsisr; + int mode; + ulong phys; + + asm volatile("mfdar %0" : "=r" (dar) : ); + asm volatile("mfdsisr %0" : "=r" (dsisr) : ); + + phys = ea_to_phys(dar, &mode); + hash_page( dar, phys, mode ); +} + +void +isi_exception( void ) +{ + ulong nip, srr1; + int mode; + ulong phys; + + asm volatile("mfsrr0 %0" : "=r" (nip) : ); + asm volatile("mfsrr1 %0" : "=r" (srr1) : ); + + phys = ea_to_phys(nip, &mode); + hash_page( nip, phys, mode ); +} + + +/************************************************************************/ +/* init / cleanup */ +/************************************************************************/ + +void +setup_mmu( ulong ramsize ) +{ + ofmem_t *ofmem = OFMEM; + ulong sdr1, sr_base, msr; + ulong hash_base, page; + ulong data_size, bss_size; + int i; + + memset(ofmem, 0, sizeof(ofmem_t)); + ofmem->ramsize = ramsize; + + /* SDR1: Storage Description Register 1 */ + + hash_base = (ramsize - 0x00100000 - HASH_SIZE) & 0xffff0000; + memset(hash_base, 0, HASH_SIZE); + sdr1 = hash_base | ((HASH_SIZE-1) >> 16); + asm volatile("mtsdr1 %0" :: "r" (sdr1) ); + + /* Segment Register */ + + sr_base = SEGR_USER | SEGR_BASE ; + for( i=0; i<16; i++ ) { + int j = i << 28; + asm volatile("mtsrin %0,%1" :: "r" (sr_base + i), "r" (j) ); + } + + memcpy(get_rom_base(), 0xfff00000, 0x00100000); + + /* Enable MMU */ + + asm volatile("mfmsr %0" : "=r" (msr) : ); + msr |= MSR_IR | MSR_DR; + asm volatile("mtmsr %0" :: "r" (msr) ); +} + +void +ofmem_init( void ) +{ + ulong top; + + ofmem_claim_phys( 0, get_ram_bottom(), 0 ); + ofmem_claim_virt( 0, get_ram_bottom(), 0 ); + ofmem_claim_phys( get_ram_top(), get_ram_size() - get_ram_top(), 0); + ofmem_claim_virt( get_ram_top(), get_ram_size() - get_ram_top(), 0); +} Modified: openbios-devel/arch/ppc/qemu/qemu.fs =================================================================== --- openbios-devel/arch/ppc/qemu/qemu.fs 2008-12-20 20:23:55 UTC (rev 300) +++ openbios-devel/arch/ppc/qemu/qemu.fs 2008-12-21 08:30:42 UTC (rev 301) @@ -111,6 +111,5 @@ " /chosen" find-device stdin @ encode-int " stdin" property stdout @ encode-int " stdout" property - " /pci/isa/interrupt-controller" find-dev if encode-int " interrupt-controller" property then device-end ; Added: openbios-devel/arch/ppc/qemu/start.S =================================================================== --- openbios-devel/arch/ppc/qemu/start.S (rev 0) +++ openbios-devel/arch/ppc/qemu/start.S 2008-12-21 08:30:42 UTC (rev 301) @@ -0,0 +1,393 @@ +/* + * Creation Date: <2001/06/16 21:30:18 samuel> + * Time-stamp: <2003/04/04 16:32:06 samuel> + * + * <init.S> + * + * Asm glue for ELF images + * + * Copyright (C) 2001, 2002, 2003 Samuel Rydh (samuel(a)ibrium.se) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#include "asm/asmdefs.h" +#include "asm/processor.h" + +/************************************************************************/ +/* Macros */ +/************************************************************************/ + +#define ILLEGAL_VECTOR( v ) .org __vectors + v ; bl trap_error ; +#define VECTOR( v, dummystr ) .org __vectors + v ; vector__##v + +#define EXCEPTION_PREAMBLE \ + mtsprg1 r1 ; /* scratch */ \ + mfsprg0 r1 ; /* exception stack in sprg0 */ \ + addi r1,r1,-80 ; /* push exception frame */ \ + \ + stw r0,0(r1) ; /* save r0 */ \ + mfsprg1 r0 ; \ + stw r0,4(r1) ; /* save r1 */ \ + stw r2,8(r1) ; /* save r2 */ \ + stw r3,12(r1) ; /* save r3 */ \ + stw r4,16(r1) ; \ + stw r5,20(r1) ; \ + stw r6,24(r1) ; \ + stw r7,28(r1) ; \ + stw r8,32(r1) ; \ + stw r9,36(r1) ; \ + stw r10,40(r1) ; \ + stw r11,44(r1) ; \ + stw r12,48(r1) ; \ + \ + mflr r0 ; \ + stw r0,52(r1) ; \ + mfcr r0 ; \ + stw r0,56(r1) ; \ + mfctr r0 ; \ + stw r0,60(r1) ; \ + mfxer r0 ; \ + stw r0,64(r1) ; \ + \ + /* 76(r1) unused */ \ + addi r1,r1,-16 ; /* call conventions uses 0(r1) and 4(r1)... */ + + +/************************************************************************/ +/* entry */ +/************************************************************************/ + + + .text + .space 0x0100 +GLOBL(_start): + /* clear MSR, disable MMU */ + + li r0,0 + mtmsr r0 + + /* copy exception vectors */ + + lis r3,HA(__vectors) + addi r3,r3,LO(__vectors) + li r4,0 + li r5,__vectors_end - __vectors + 16 + rlwinm r5,r5,0,0,28 +1: lwz r6,0(r3) + lwz r7,4(r3) + lwz r8,8(r3) + lwz r9,12(r3) + stw r6,0(r4) + stw r7,4(r4) + stw r8,8(r4) + stw r9,12(r4) + dcbst 0,r4 + sync + icbi 0,r4 + sync + addi r5,r5,-16 + addi r3,r3,16 + addi r4,r4,16 + cmpwi r5,0 + bgt 1b + isync + + bl compute_ramsize + + /* Memory map: + * + * Top +-------------------------+ + * | | + * | ROM into RAM (1 MB) | + * | | + * +-------------------------+ + * | | + * | MMU Hash Table (64 kB) | + * | | + * +-------------------------+ + * | | + * | Exception Stack (32 kB) + * | | + * +-------------------------+ + * | | + * | Stack (64 kB) + * | | + * +-------------------------+ + * | | + * | Client Stack (64 kB) | + * | | + * +-------------------------+ + * : : + * Bottom + */ + + addis r1, r3, -16 /* ramsize - 1MB */ + + /* setup exception stack */ + + addis r1, r1, -1 /* - 64 kB */ + mtsprg0 r1 + + /* setup stack */ + + addi r1, r1, -32768 /* - 32 kB */ + + /* save memory size in stack */ + + bl setup_mmu + bl entry +1: nop + b 1b + + + /* According to IEEE 1275, PPC bindings: + * + * MSR = FP, ME + (DR|IR) + * r1 = stack (32 K + 32 bytes link area above) + * r5 = clint interface handler + * r6 = address of client program arguments (unused) + * r7 = length of client program arguments (unsed) + */ +saved_stack: + .long 0 + /* void call_elf( entry ) */ +GLOBL(call_elf): + mflr r0 + stwu r1,-16(r1) + stw r0,20(r1) + mtlr r3 + lis r8,HA(saved_stack) + addi r8,r8,LO(saved_stack) // save our stack pointer + stw r1,0(r8) + mfsdr1 r1 + addis r1, r1, -96 + lis r5,HA(of_client_callback) + addi r5,r5,LO(of_client_callback) // r5 = callback + li r6,0 // r6 = address of client program arguments (unused) + li r7,0 // r7 = length of client program arguments (unused) + li r0,MSR_FP | MSR_ME | MSR_DR | MSR_IR + mtmsr r0 + blrl + + lis r8,HA(saved_stack) + addi r8,r8,LO(saved_stack) // restore stack pointer + mr r1,r8 + lwz r0,20(r1) + mtlr r0 + addi r1,r1,16 + // XXX: should restore r12-r31 etc.. + // we should not really come here though + blr + +GLOBL(of_client_callback): + lis r4,HA(saved_stack) + addi r4,r4,LO(saved_stack) + lwz r4,0(r4) + stwu r4,-32(r4) + mflr r5 + stw r5,32+4(r4) + stw r1,8(r4) // save caller stack + mr r1,r4 + stw r2,12(r1) + stw r0,16(r1) + mfctr r2 + stw r2,20(r1) + mfcr r2 + stw r2,24(r1) + mfxer r2 + stw r2,28(r1) + // do we need to save more registers? + bl of_client_interface + lwz r4,32+4(r1) + mtlr r4 + lwz r2,20(r1) + mtctr r2 + lwz r2,24(r1) + mtcr r2 + lwz r2,28(r1) + mtxer r2 + lwz r2,12(r1) + lwz r0,16(r1) + lwz r1,8(r1) // restore caller stack + blr + + /* rtas glue (must be reloctable) */ +GLOBL(of_rtas_start): + /* r3 = argument buffer, r4 = of_rtas_start */ + /* according to the CHRP standard, cr must be preserved (cr0/cr1 too?) */ + blr +GLOBL(of_rtas_end): + + + /* used in a hack to the newworld calibration */ +GLOBL(nw_dec_calibration): + .long 0 +GLOBL(timer_calib_start): + lis r3,HA(nw_dec_calibration) + addi r3,r3,LO(nw_dec_calibration) + lwz r3,0(r3) + blr +GLOBL(timer_calib_end): + + +/************************************************************************/ +/* vectors */ +/************************************************************************/ + +GLOBL(__vectors): + nop // NULL-jmp trap +1: nop // + b 1b + +exception_return: + addi r1,r1,16 // pop ABI frame + + lwz r0,52(r1) + mtlr r0 + lwz r0,56(r1) + mtcr r0 + lwz r0,60(r1) + mtctr r0 + lwz r0,64(r1) + mtxer r0 + + lwz r0,0(r1) // restore r0 + lwz r2,8(r1) // restore r2 + lwz r3,12(r1) // restore r3 + lwz r4,16(r1) + lwz r5,20(r1) + lwz r6,24(r1) + lwz r7,28(r1) + lwz r8,32(r1) + lwz r9,36(r1) + lwz r10,40(r1) + lwz r11,44(r1) + lwz r12,48(r1) + lwz r1,4(r1) // restore r1 + rfi + + .globl __divide_error +__divide_error: +trap_error: + mflr r3 + b unexpected_excep + +ILLEGAL_VECTOR( 0x100 ) +ILLEGAL_VECTOR( 0x200 ) + +VECTOR( 0x300, "DSI" ): + EXCEPTION_PREAMBLE + lis r3,HA(dsi_exception) + addi r3,r3,LO(dsi_exception) + mtctr r3 + bctrl + ba exception_return + +VECTOR( 0x400, "ISI" ): + EXCEPTION_PREAMBLE + lis r3,HA(isi_exception) + addi r3,r3,LO(isi_exception) + mtctr r3 + bctrl + ba exception_return + + ILLEGAL_VECTOR( 0x500 ) + ILLEGAL_VECTOR( 0x600 ) + ILLEGAL_VECTOR( 0x700 ) + +VECTOR( 0x800, "FPU" ): + mtsprg1 r3 + mfsrr1 r3 + ori r3,r3,0x2000 + mtsrr1 r3 + mfsprg1 r3 + rfi + +ILLEGAL_VECTOR( 0x900 ) +ILLEGAL_VECTOR( 0xa00 ) +ILLEGAL_VECTOR( 0xb00 ) +ILLEGAL_VECTOR( 0xc00 ) +ILLEGAL_VECTOR( 0xd00 ) +ILLEGAL_VECTOR( 0xe00 ) +ILLEGAL_VECTOR( 0xf00 ) +ILLEGAL_VECTOR( 0xf20 ) +ILLEGAL_VECTOR( 0x1000 ) +ILLEGAL_VECTOR( 0x1100 ) +ILLEGAL_VECTOR( 0x1200 ) +ILLEGAL_VECTOR( 0x1300 ) +ILLEGAL_VECTOR( 0x1400 ) +ILLEGAL_VECTOR( 0x1500 ) +ILLEGAL_VECTOR( 0x1600 ) +ILLEGAL_VECTOR( 0x1700 ) + +GLOBL(__vectors_end): + + +#define CACHE_LINE_SIZE 32 +#define LG_CACHE_LINE_SIZE 5 + +/* flush_icache_range( ulong start, ulong stop) */ +GLOBL(flush_icache_range): + li r5,CACHE_LINE_SIZE-1 + andc r3,r3,r5 + subf r4,r3,r4 + add r4,r4,r5 + srwi. r4,r4,LG_CACHE_LINE_SIZE + beqlr + mtctr r4 + mr r6,r3 +1: dcbst 0,r3 + addi r3,r3,CACHE_LINE_SIZE + bdnz 1b + sync /* wait for dcbst's to get to ram */ + mtctr r4 +2: icbi 0,r6 + addi r6,r6,CACHE_LINE_SIZE + bdnz 2b + sync /* additional sync needed on g4 */ + isync + blr + + /* compute RAM size + * + * Exception vectors are beween 0x00000000 and 0x00004000 + * RAM size is limited to 2 MB (0x80000000) + * MMIO and IO are after 0x80000000. + * ROM is at 0xfff00000 + * so we can scan from 0x4000 to 0x80000000 + * + */ + +compute_ramsize: + li r3, 0x4000 /* start address */ + + /* how many pages between 0x4000 and 0x80000000 */ + + lis r4, 0x0007 + ori r4, r4, 0xfffc + mtctr r4 + + /* pattern to write in memory */ + + lis r4, 0x55aa + ori r4, r4, 0x55aa + +memloop: + /* store and re-read pattern */ + + stw r4, 0(r3) + sync + lwz r0, 0(r3) + cmpw cr7, r0, r4 + bne cr7, exit_memloop + addi r3, r3, 4096 /* add page size */ + bdnz memloop +exit_memloop: + blr + + .section .romentry,"ax" + bl _start Modified: openbios-devel/arch/ppc/qemu/tree.fs =================================================================== --- openbios-devel/arch/ppc/qemu/tree.fs 2008-12-20 20:23:55 UTC (rev 300) +++ openbios-devel/arch/ppc/qemu/tree.fs 2008-12-21 08:30:42 UTC (rev 301) @@ -15,17 +15,12 @@ " chrp" device-type " OpenSource,QEMU" model -h# 80000000 encode-int " isa-io-base" property 1 encode-int " #interrupt-cells" property 1 encode-int " #size-cells" property new-device " memory" device-name " memory" device-type - 0 encode-int h# 1E00000 encode-int encode+ - h# 2000000 encode-int encode+ h# 40000000 encode-int encode+ - " available" property - 0 h# 40000000 reg external : open true ; : close ; Modified: openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_config.xml 2008-12-20 20:23:55 UTC (rev 300) +++ openbios-devel/config/examples/cross-ppc_config.xml 2008-12-21 08:30:42 UTC (rev 301) @@ -4,9 +4,9 @@   <option name="CONFIG_PPC" type="boolean" value="true"/> -  -  -  + <option name="CONFIG_MOL" type="boolean" value="false"/> + <option name="CONFIG_BRIQ" type="boolean" value="false"/> + <option name="CONFIG_PEARPC" type="boolean" value="false"/> <option name="CONFIG_QEMU" type="boolean" value="true"/> <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/> @@ -17,7 +17,7 @@  <option name="CONFIG_DEBUG" type="boolean" value="true"/> - <option name="CONFIG_DEBUG_BOOT" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> <option name="CONFIG_DEBUG_DSTACK" type="boolean" value="false"/> <option name="CONFIG_DEBUG_RSTACK" type="boolean" value="false"/> <option name="CONFIG_DEBUG_DICTIONARY" type="boolean" value="false"/> @@ -42,14 +42,14 @@ <option name="CONFIG_DEBUG_MAC_PARTS" type="boolean" value="false"/> <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> <option name="CONFIG_FS" type="boolean" value="true"/> - <option name="CONFIG_HFS" type="boolean" value="false"/> - <option name="CONFIG_HFSP" type="boolean" value="true"/> + <option name="CONFIG_HFS" type="boolean" value="true"/> + <option name="CONFIG_HFSP" type="boolean" value="false"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> <option name="CONFIG_FSYS_JFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/> - <option name="CONFIG_FSYS_REISERFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_UFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_ISO9660" type="boolean" value="false"/> @@ -57,7 +57,7 @@ <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_AFFS" type="boolean" value="false"/> - <option name="CONFIG_DEBUG_FS" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/>  <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/> Modified: openbios-devel/drivers/timer.c =================================================================== --- openbios-devel/drivers/timer.c 2008-12-20 20:23:55 UTC (rev 300) +++ openbios-devel/drivers/timer.c 2008-12-21 08:30:42 UTC (rev 301) @@ -81,7 +81,7 @@ unsigned long get_timer_freq(void) { - return 100000000 / 4; + return 10000000 / 4; } void udelay(unsigned int usecs) Modified: openbios-devel/include/ofmem.h =================================================================== --- openbios-devel/include/ofmem.h 2008-12-20 20:23:55 UTC (rev 300) +++ openbios-devel/include/ofmem.h 2008-12-21 08:30:42 UTC (rev 301) @@ -27,6 +27,6 @@ extern int ofmem_map( ulong phys, ulong virt, ulong size, int mode ); extern void ofmem_release( ulong virt, ulong size ); -extern ulong ofmem_translate( ulong virt, ulong *ret_mode ); +extern ulong ofmem_translate( ulong virt, int *ret_mode ); #endif /* _H_OFMEM */

1 0

[PATCH] remove useless printk
by Laurent Vivier 20 Dec '08

20 Dec '08

This patch removes useless printk() Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info> --- drivers/pci.c | 1 - fs/grubfs/grubfs_fs.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) Index: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel.orig/drivers/pci.c 2008-12-20 20:51:41.000000000 +0100 +++ openbios-devel/drivers/pci.c 2008-12-20 20:51:56.000000000 +0100 @@ -1444,7 +1444,6 @@ } pci_config_write32(addr, config_addr, reloc | omask); config->regions[reg] = reloc; -printk("region %08x size %08x\n", config->regions[reg], config- >sizes[reg]); } } Index: openbios-devel/fs/grubfs/grubfs_fs.c =================================================================== --- openbios-devel.orig/fs/grubfs/grubfs_fs.c 2008-12-20 20:51:41.000000000 +0100 +++ openbios-devel/fs/grubfs/grubfs_fs.c 2008-12-20 20:51:56.000000000 +0100 @@ -267,7 +267,9 @@ return 0; } } +#ifdef CONFIG_DEBUG_FS printk("Unknown filesystem type\n"); +#endif return -1; }

2 1

[PATCH] re-indent cuda_init()
by Laurent Vivier 20 Dec '08

20 Dec '08

This patch re-indents function cuda_init() Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info> --- drivers/cuda.c | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) Index: openbios-devel/drivers/cuda.c =================================================================== --- openbios-devel.orig/drivers/cuda.c 2008-12-20 20:47:20.000000000 +0100 +++ openbios-devel/drivers/cuda.c 2008-12-20 20:47:34.000000000 +0100 @@ -240,32 +240,36 @@ cuda_t *cuda_init (const char *path, uint32_t base) { - cuda_t *cuda; - char buf[64]; + cuda_t *cuda; + char buf[64]; + phandle_t aliases; + + base += IO_CUDA_OFFSET; + CUDA_DPRINTF(" base=%08x\n", base); + cuda = malloc(sizeof(cuda_t)); + if (cuda == NULL) + return NULL; - base += IO_CUDA_OFFSET; - CUDA_DPRINTF(" base=%08x\n", base); - cuda = malloc(sizeof(cuda_t)); - if (cuda == NULL) - return NULL; + snprintf(buf, sizeof(buf), "%s/via-cuda", path); + REGISTER_NAMED_NODE(ob_cuda, buf); - snprintf(buf, sizeof(buf), "%s/via-cuda", path); - REGISTER_NAMED_NODE(ob_cuda, buf); + aliases = find_dev("/aliases"); + set_property(aliases, "via-cuda", buf, strlen(buf) + 1); - cuda->base = base; - cuda_writeb(cuda, B, cuda_readb(cuda, B) | TREQ | TIP); + cuda->base = base; + cuda_writeb(cuda, B, cuda_readb(cuda, B) | TREQ | TIP); #ifdef CONFIG_DRIVER_ADB - cuda->adb_bus = adb_bus_new(cuda, &cuda_adb_req); - if (cuda->adb_bus == NULL) { - free(cuda); - return NULL; - } - adb_bus_init(buf, cuda->adb_bus); + cuda->adb_bus = adb_bus_new(cuda, &cuda_adb_req); + if (cuda->adb_bus == NULL) { + free(cuda); + return NULL; + } + adb_bus_init(buf, cuda->adb_bus); #endif - rtc_init(buf); + rtc_init(buf); - return cuda; + return cuda; } #ifdef CONFIG_DRIVER_ADB

2 1

[PATCH] qemu console cleanup
by Laurent Vivier 20 Dec '08

20 Dec '08

This patch removes unused macro from qemu/console.c Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info> --- arch/ppc/qemu/console.c | 3 --- 1 file changed, 3 deletions(-) Index: openbios-devel/arch/ppc/qemu/console.c =================================================================== --- openbios-devel.orig/arch/ppc/qemu/console.c 2008-12-20 20:38:34.000000000 +0100 +++ openbios-devel/arch/ppc/qemu/console.c 2008-12-20 20:42:25.000000000 +0100 @@ -130,9 +130,6 @@ int rb, w, h, depth; } osi_fb_info_t; - -#define openbios_GetFBInfo(x) Qemu_GetFBInfo(x) - #include "../../../modules/font_8x16.c" #undef FONTDATAMAX #include "../../../modules/video.c"

2 1

r300 - in openbios-devel: drivers fs/grubfs
by svn＠openbios.org 20 Dec '08

20 Dec '08

Author: blueswirl Date: 2008-12-20 21:23:55 +0100 (Sat, 20 Dec 2008) New Revision: 300 Modified: openbios-devel/drivers/pci.c openbios-devel/fs/grubfs/grubfs_fs.c Log: remove useless printk This patch removes useless printk() Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info> Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-12-20 20:23:16 UTC (rev 299) +++ openbios-devel/drivers/pci.c 2008-12-20 20:23:55 UTC (rev 300) @@ -1444,7 +1444,6 @@ } pci_config_write32(addr, config_addr, reloc | omask); config->regions[reg] = reloc; -printk("region %08x size %08x\n", config->regions[reg], config->sizes[reg]); } } Modified: openbios-devel/fs/grubfs/grubfs_fs.c =================================================================== --- openbios-devel/fs/grubfs/grubfs_fs.c 2008-12-20 20:23:16 UTC (rev 299) +++ openbios-devel/fs/grubfs/grubfs_fs.c 2008-12-20 20:23:55 UTC (rev 300) @@ -267,7 +267,9 @@ return 0; } } +#ifdef CONFIG_DEBUG_FS printk("Unknown filesystem type\n"); +#endif return -1; }

1 0

r299 - openbios-devel/drivers
by svn＠openbios.org 20 Dec '08

20 Dec '08

Author: blueswirl Date: 2008-12-20 21:23:16 +0100 (Sat, 20 Dec 2008) New Revision: 299 Modified: openbios-devel/drivers/cuda.c Log: re-indent cuda_init() This patch re-indents function cuda_init() Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info> Modified: openbios-devel/drivers/cuda.c =================================================================== --- openbios-devel/drivers/cuda.c 2008-12-20 20:22:17 UTC (rev 298) +++ openbios-devel/drivers/cuda.c 2008-12-20 20:23:16 UTC (rev 299) @@ -240,32 +240,36 @@ cuda_t *cuda_init (const char *path, uint32_t base) { - cuda_t *cuda; - char buf[64]; + cuda_t *cuda; + char buf[64]; + phandle_t aliases; - base += IO_CUDA_OFFSET; - CUDA_DPRINTF(" base=%08x\n", base); - cuda = malloc(sizeof(cuda_t)); - if (cuda == NULL) - return NULL; + base += IO_CUDA_OFFSET; + CUDA_DPRINTF(" base=%08x\n", base); + cuda = malloc(sizeof(cuda_t)); + if (cuda == NULL) + return NULL; - snprintf(buf, sizeof(buf), "%s/via-cuda", path); - REGISTER_NAMED_NODE(ob_cuda, buf); + snprintf(buf, sizeof(buf), "%s/via-cuda", path); + REGISTER_NAMED_NODE(ob_cuda, buf); - cuda->base = base; - cuda_writeb(cuda, B, cuda_readb(cuda, B) | TREQ | TIP); + aliases = find_dev("/aliases"); + set_property(aliases, "via-cuda", buf, strlen(buf) + 1); + + cuda->base = base; + cuda_writeb(cuda, B, cuda_readb(cuda, B) | TREQ | TIP); #ifdef CONFIG_DRIVER_ADB - cuda->adb_bus = adb_bus_new(cuda, &cuda_adb_req); - if (cuda->adb_bus == NULL) { - free(cuda); - return NULL; - } - adb_bus_init(buf, cuda->adb_bus); + cuda->adb_bus = adb_bus_new(cuda, &cuda_adb_req); + if (cuda->adb_bus == NULL) { + free(cuda); + return NULL; + } + adb_bus_init(buf, cuda->adb_bus); #endif - rtc_init(buf); + rtc_init(buf); - return cuda; + return cuda; } #ifdef CONFIG_DRIVER_ADB

1 0

r298 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 20 Dec '08

20 Dec '08

Author: blueswirl Date: 2008-12-20 21:22:17 +0100 (Sat, 20 Dec 2008) New Revision: 298 Modified: openbios-devel/arch/ppc/qemu/console.c Log: Qemu console cleanup (Laurent Vivier) This patch removes unused macro from qemu/console.c Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info> Modified: openbios-devel/arch/ppc/qemu/console.c =================================================================== --- openbios-devel/arch/ppc/qemu/console.c 2008-12-20 18:38:04 UTC (rev 297) +++ openbios-devel/arch/ppc/qemu/console.c 2008-12-20 20:22:17 UTC (rev 298) @@ -130,9 +130,6 @@ int rb, w, h, depth; } osi_fb_info_t; - -#define openbios_GetFBInfo(x) Qemu_GetFBInfo(x) - #include "../../../modules/font_8x16.c" #undef FONTDATAMAX #include "../../../modules/video.c"

1 0

r297 - openbios-devel/drivers
by svn＠openbios.org 20 Dec '08

20 Dec '08

Author: blueswirl Date: 2008-12-20 19:38:04 +0100 (Sat, 20 Dec 2008) New Revision: 297 Removed: openbios-devel/drivers/ide.fs Log: Delete drivers/ide.fs, should have been deleted in r292 Deleted: openbios-devel/drivers/ide.fs =================================================================== --- openbios-devel/drivers/ide.fs 2008-12-20 18:36:23 UTC (rev 296) +++ openbios-devel/drivers/ide.fs 2008-12-20 18:38:04 UTC (rev 297) @@ -1,69 +0,0 @@ - -dev /pci - -[IFDEF] CONFIG_DRIVER_IDE - -\ simple isa bus node -new-device - " isa" device-name - " isa" device-type - 2 encode-int " #address-cells" property - 1 encode-int " #size-cells" property - - external - : open true ; - : close ; - -finish-device - -: ?devalias ( alias-str alias-len device-str device-len -- - \ alias-str alias-len false | true ) - active-package >r - " /aliases" find-device - \ 2dup ." Checking " type - 2dup find-dev if \ check if device exists - drop - 2over find-dev if \ do we already have an alias? - \ ." alias exists" cr - drop 2drop false - else - \ ." device exists" cr - encode-string - 2swap property - true - then - else - \ ." device doesn't exist" cr - 2drop false - then - r> active-package! - ; - -:noname - " hd" - " /pci/isa/ide0/disk@0" ?devalias not if - " /pci/isa/ide0/disk@1" ?devalias not if - " /pci/isa/ide1/disk@0" ?devalias not if - " /pci/isa/ide1/disk@1" ?devalias not if - 2drop ." No disk found." cr - then - then - then - then - - " cdrom" - " /pci/isa/ide0/cdrom@0" ?devalias not if - " /pci/isa/ide0/cdrom@1" ?devalias not if - " /pci/isa/ide1/cdrom@0" ?devalias not if - " /pci/isa/ide1/cdrom@1" ?devalias not if - 2drop ." No cdrom found" cr - then - then - then - then -; SYSTEM-initializer - - -[THEN] - -device-end

1 0

r296 - in openbios-devel: arch/sparc64 drivers include/openbios include/sparc32 kernel kernel/include modules
by svn＠openbios.org 20 Dec '08

20 Dec '08

Author: blueswirl Date: 2008-12-20 19:36:23 +0100 (Sat, 20 Dec 2008) New Revision: 296 Modified: openbios-devel/arch/sparc64/boot.h openbios-devel/arch/sparc64/openbios.c openbios-devel/drivers/cuda.c openbios-devel/drivers/cuda.h openbios-devel/drivers/floppy.c openbios-devel/drivers/vga_load_regs.c openbios-devel/include/openbios/stack.h openbios-devel/include/sparc32/types.h openbios-devel/kernel/bootstrap.c openbios-devel/kernel/include/dict.h openbios-devel/kernel/internal.c openbios-devel/modules/font_8x16.c Log: Fix Sparse warnings Modified: openbios-devel/arch/sparc64/boot.h =================================================================== --- openbios-devel/arch/sparc64/boot.h 2008-12-20 17:29:20 UTC (rev 295) +++ openbios-devel/arch/sparc64/boot.h 2008-12-20 18:36:23 UTC (rev 296) @@ -22,6 +22,7 @@ int fcode_load(const char *filename); // context.c +extern struct context *__context; uint64_t start_elf(uint64_t entry_point, uint64_t param); // boot.c @@ -33,5 +34,8 @@ extern char boot_device; void boot(void); +// sys_info.c +extern unsigned int qemu_mem_size; + // console.c void ob_su_init(uint64_t base, uint64_t offset, int intr); Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-12-20 17:29:20 UTC (rev 295) +++ openbios-devel/arch/sparc64/openbios.c 2008-12-20 18:36:23 UTC (rev 296) @@ -44,7 +44,7 @@ #define NVRAM_OB_START (sizeof(ohwcfg_v3_t) + sizeof(struct sparc_arch_cfg)) #define NVRAM_OB_SIZE ((NVRAM_IDPROM - NVRAM_OB_START) & ~15) -ohwcfg_v3_t nv_info; +static ohwcfg_v3_t nv_info; #define OBIO_CMDLINE_MAX 256 static char obio_cmdline[OBIO_CMDLINE_MAX]; @@ -105,7 +105,7 @@ for (i = 0; i < 64; i++) { data = spitfire_get_dtlb_data(i); - if (data & 0x8000000000000000) { // Valid entry? + if (data & 0x8000000000000000ULL) { // Valid entry? switch ((data >> 61) & 3) { default: case 0x0: // 8k @@ -127,7 +127,7 @@ } tag = spitfire_get_dtlb_tag(i); if ((virt & mask) == (tag & mask)) { - phys = data & mask & 0x000001fffffff000; + phys = data & mask & 0x000001fffffff000ULL; phys |= virt & ~mask; *p_phys = phys; *p_data = data & 0xfff; Modified: openbios-devel/drivers/cuda.c =================================================================== --- openbios-devel/drivers/cuda.c 2008-12-20 17:29:20 UTC (rev 295) +++ openbios-devel/drivers/cuda.c 2008-12-20 18:36:23 UTC (rev 296) @@ -156,7 +156,6 @@ static void ob_cuda_initialize (int *idx) { - extern phandle_t pic_handle; phandle_t ph=get_cur_dev(); int props[2]; Modified: openbios-devel/drivers/cuda.h =================================================================== --- openbios-devel/drivers/cuda.h 2008-12-20 17:29:20 UTC (rev 295) +++ openbios-devel/drivers/cuda.h 2008-12-20 18:36:23 UTC (rev 296) @@ -14,5 +14,6 @@ CHARDEV_LAST, }; +extern phandle_t pic_handle; cuda_t *cuda_init (const char *path, uint32_t base); Modified: openbios-devel/drivers/floppy.c =================================================================== --- openbios-devel/drivers/floppy.c 2008-12-20 17:29:20 UTC (rev 295) +++ openbios-devel/drivers/floppy.c 2008-12-20 18:36:23 UTC (rev 296) @@ -194,11 +194,11 @@ /* * FDC state */ -struct drive_state { +static struct drive_state { unsigned track; } drive_state[1]; -struct floppy_fdc_state { +static struct floppy_fdc_state { int in_sync; int spec1; /* spec1 value last used */ int spec2; /* spec2 value last used */ Modified: openbios-devel/drivers/vga_load_regs.c =================================================================== --- openbios-devel/drivers/vga_load_regs.c 2008-12-20 17:29:20 UTC (rev 295) +++ openbios-devel/drivers/vga_load_regs.c 2008-12-20 18:36:23 UTC (rev 296) @@ -26,8 +26,6 @@ static int vga_decode_var(const struct screeninfo *var, struct vga_par *par); static int vga_set_regs(const struct vga_par *par); -extern const u8 VgaLookupTable[]; - u8 read_seq_b(u16 addr) { outb(addr,SEQ_I); return inb(SEQ_D); @@ -322,6 +320,77 @@ return 0; } +// +// originally from the stpc web site +// +static const unsigned char VgaLookupTable[3 * 0x3f + 3] = { + // Red Green Blue + 0x000, 0x000, 0x000, // 00h + 0x000, 0x000, 0x02A, // 01h + 0x000, 0x02A, 0x000, // 02h + 0x000, 0x02A, 0x02A, // 03h + 0x02A, 0x000, 0x000, // 04h + 0x02A, 0x000, 0x02A, // 05h + 0x02A, 0x02A, 0x000, // 06h + 0x02A, 0x02A, 0x02A, // 07h + 0x000, 0x000, 0x015, // 08h + 0x000, 0x000, 0x03F, // 09h + 0x000, 0x02A, 0x015, // 0Ah + 0x000, 0x02A, 0x03F, // 0Bh + 0x02A, 0x000, 0x015, // 0Ch + 0x02A, 0x000, 0x03F, // 0Dh + 0x02A, 0x02A, 0x015, // 0Eh + 0x02A, 0x02A, 0x03F, // 0Fh + 0x000, 0x015, 0x000, // 10h + 0x000, 0x015, 0x02A, // 11h + 0x000, 0x03F, 0x000, // 12h + 0x000, 0x03F, 0x02A, // 13h + 0x02A, 0x015, 0x000, // 14h + 0x02A, 0x015, 0x02A, // 15h + 0x02A, 0x03F, 0x000, // 16h + 0x02A, 0x03F, 0x02A, // 17h + 0x000, 0x015, 0x015, // 18h + 0x000, 0x015, 0x03F, // 19h + 0x000, 0x03F, 0x015, // 1Ah + 0x000, 0x03F, 0x03F, // 1Bh + 0x02A, 0x015, 0x015, // 1Ch + 0x02A, 0x015, 0x03F, // 1Dh + 0x02A, 0x03F, 0x015, // 1Eh + 0x02A, 0x03F, 0x03F, // 1Fh + 0x015, 0x000, 0x000, // 20h + 0x015, 0x000, 0x02A, // 21h + 0x015, 0x02A, 0x000, // 22h + 0x015, 0x02A, 0x02A, // 23h + 0x03F, 0x000, 0x000, // 24h + 0x03F, 0x000, 0x02A, // 25h + 0x03F, 0x02A, 0x000, // 26h + 0x03F, 0x02A, 0x02A, // 27h + 0x015, 0x000, 0x015, // 28h + 0x015, 0x000, 0x03F, // 29h + 0x015, 0x02A, 0x015, // 2Ah + 0x015, 0x02A, 0x03F, // 2Bh + 0x03F, 0x000, 0x015, // 2Ch + 0x03F, 0x000, 0x03F, // 2Dh + 0x03F, 0x02A, 0x015, // 2Eh + 0x03F, 0x02A, 0x03F, // 2Fh + 0x015, 0x015, 0x000, // 30h + 0x015, 0x015, 0x02A, // 31h + 0x015, 0x03F, 0x000, // 32h + 0x015, 0x03F, 0x02A, // 33h + 0x03F, 0x015, 0x000, // 34h + 0x03F, 0x015, 0x02A, // 35h + 0x03F, 0x03F, 0x000, // 36h + 0x03F, 0x03F, 0x02A, // 37h + 0x015, 0x015, 0x015, // 38h + 0x015, 0x015, 0x03F, // 39h + 0x015, 0x03F, 0x015, // 3Ah + 0x015, 0x03F, 0x03F, // 3Bh + 0x03F, 0x015, 0x015, // 3Ch + 0x03F, 0x015, 0x03F, // 3Dh + 0x03F, 0x03F, 0x015, // 3Eh + 0x03F, 0x03F, 0x03F, // 3Fh +}; + /* * From the Linux kernel. * orig by Ben Pfaff and Petr Vandrovec. Modified: openbios-devel/include/openbios/stack.h =================================================================== --- openbios-devel/include/openbios/stack.h 2008-12-20 17:29:20 UTC (rev 295) +++ openbios-devel/include/openbios/stack.h 2008-12-20 18:36:23 UTC (rev 296) @@ -69,7 +69,7 @@ return du; #else ducell du; - du = ((ducell) ((ucell) dstack[dstackcnt--]) << bitspercell); + du = ((ducell)(ucell) dstack[dstackcnt--]) << bitspercell; du |= (ucell) dstack[dstackcnt--]; return du; #endif Modified: openbios-devel/include/sparc32/types.h =================================================================== --- openbios-devel/include/sparc32/types.h 2008-12-20 17:29:20 UTC (rev 295) +++ openbios-devel/include/sparc32/types.h 2008-12-20 18:36:23 UTC (rev 296) @@ -32,8 +32,8 @@ typedef int32_t cell; typedef uint32_t ucell; -typedef int64_t dcell; -typedef uint64_t ducell; +typedef long long dcell; +typedef unsigned long long ducell; #define bitspercell (sizeof(cell)<<3) #define bitsperdcell (sizeof(dcell)<<3) Modified: openbios-devel/kernel/bootstrap.c =================================================================== --- openbios-devel/kernel/bootstrap.c 2008-12-20 17:29:20 UTC (rev 295) +++ openbios-devel/kernel/bootstrap.c 2008-12-20 18:36:23 UTC (rev 296) @@ -34,14 +34,14 @@ #define TRAMPOLINE_SIZE (4*sizeof(cell)) /* 4 cells for the trampoline */ /* state variables */ -ucell *latest, *state, *base; -ucell *memory; +static ucell *latest, *state, *base; +static ucell *memory; ucell *trampoline; /* local variables */ static int errors = 0; static int segfault = 0; -int verbose = 0; +static int verbose = 0; static FILE *srcfiles[128]; static unsigned int cursrc = 0; @@ -57,7 +57,7 @@ include *next; }; -include includes = { ".", NULL }; +static include includes = { ".", NULL }; static ucell * relocation_address=NULL; static int relocation_length=0; @@ -1074,7 +1074,7 @@ sa.sa_sigaction = segv_handler; sigemptyset(&sa.sa_mask); sa.sa_flags = SA_SIGINFO | SA_NODEFER; - sigaction(SIGSEGV, &sa, 0); + sigaction(SIGSEGV, &sa, NULL); if (verbose) printk("done.\n"); Modified: openbios-devel/kernel/include/dict.h =================================================================== --- openbios-devel/kernel/include/dict.h 2008-12-20 17:29:20 UTC (rev 295) +++ openbios-devel/kernel/include/dict.h 2008-12-20 18:36:23 UTC (rev 296) @@ -44,5 +44,8 @@ extern unsigned char *dict; extern cell dicthead; extern ucell *last; +#ifdef FCOMPILER +extern ucell *trampoline; +#endif #endif Modified: openbios-devel/kernel/internal.c =================================================================== --- openbios-devel/kernel/internal.c 2008-12-20 17:29:20 UTC (rev 295) +++ openbios-devel/kernel/internal.c 2008-12-20 18:36:23 UTC (rev 296) @@ -17,9 +17,7 @@ ucell PC; volatile int runforth = 0; -#ifdef FCOMPILER -extern ucell *trampoline; -#else +#ifndef FCOMPILER /* instead of pointing to an explicit 0 variable we * point behind the pointer. */ Modified: openbios-devel/modules/font_8x16.c =================================================================== --- openbios-devel/modules/font_8x16.c 2008-12-20 17:29:20 UTC (rev 295) +++ openbios-devel/modules/font_8x16.c 2008-12-20 18:36:23 UTC (rev 296) @@ -4621,73 +4621,3 @@ 0x00, /* 00000000 */ }; -// -// originally from the stpc web site -// -const unsigned char VgaLookupTable[3 * 0x3f + 3] = { - // Red Green Blue - 0x000, 0x000, 0x000, // 00h - 0x000, 0x000, 0x02A, // 01h - 0x000, 0x02A, 0x000, // 02h - 0x000, 0x02A, 0x02A, // 03h - 0x02A, 0x000, 0x000, // 04h - 0x02A, 0x000, 0x02A, // 05h - 0x02A, 0x02A, 0x000, // 06h - 0x02A, 0x02A, 0x02A, // 07h - 0x000, 0x000, 0x015, // 08h - 0x000, 0x000, 0x03F, // 09h - 0x000, 0x02A, 0x015, // 0Ah - 0x000, 0x02A, 0x03F, // 0Bh - 0x02A, 0x000, 0x015, // 0Ch - 0x02A, 0x000, 0x03F, // 0Dh - 0x02A, 0x02A, 0x015, // 0Eh - 0x02A, 0x02A, 0x03F, // 0Fh - 0x000, 0x015, 0x000, // 10h - 0x000, 0x015, 0x02A, // 11h - 0x000, 0x03F, 0x000, // 12h - 0x000, 0x03F, 0x02A, // 13h - 0x02A, 0x015, 0x000, // 14h - 0x02A, 0x015, 0x02A, // 15h - 0x02A, 0x03F, 0x000, // 16h - 0x02A, 0x03F, 0x02A, // 17h - 0x000, 0x015, 0x015, // 18h - 0x000, 0x015, 0x03F, // 19h - 0x000, 0x03F, 0x015, // 1Ah - 0x000, 0x03F, 0x03F, // 1Bh - 0x02A, 0x015, 0x015, // 1Ch - 0x02A, 0x015, 0x03F, // 1Dh - 0x02A, 0x03F, 0x015, // 1Eh - 0x02A, 0x03F, 0x03F, // 1Fh - 0x015, 0x000, 0x000, // 20h - 0x015, 0x000, 0x02A, // 21h - 0x015, 0x02A, 0x000, // 22h - 0x015, 0x02A, 0x02A, // 23h - 0x03F, 0x000, 0x000, // 24h - 0x03F, 0x000, 0x02A, // 25h - 0x03F, 0x02A, 0x000, // 26h - 0x03F, 0x02A, 0x02A, // 27h - 0x015, 0x000, 0x015, // 28h - 0x015, 0x000, 0x03F, // 29h - 0x015, 0x02A, 0x015, // 2Ah - 0x015, 0x02A, 0x03F, // 2Bh - 0x03F, 0x000, 0x015, // 2Ch - 0x03F, 0x000, 0x03F, // 2Dh - 0x03F, 0x02A, 0x015, // 2Eh - 0x03F, 0x02A, 0x03F, // 2Fh - 0x015, 0x015, 0x000, // 30h - 0x015, 0x015, 0x02A, // 31h - 0x015, 0x03F, 0x000, // 32h - 0x015, 0x03F, 0x02A, // 33h - 0x03F, 0x015, 0x000, // 34h - 0x03F, 0x015, 0x02A, // 35h - 0x03F, 0x03F, 0x000, // 36h - 0x03F, 0x03F, 0x02A, // 37h - 0x015, 0x015, 0x015, // 38h - 0x015, 0x015, 0x03F, // 39h - 0x015, 0x03F, 0x015, // 3Ah - 0x015, 0x03F, 0x03F, // 3Bh - 0x03F, 0x015, 0x015, // 3Ch - 0x03F, 0x015, 0x03F, // 3Dh - 0x03F, 0x03F, 0x015, // 3Eh - 0x03F, 0x03F, 0x03F, // 3Fh -};

1 0

r295 - openbios-devel/drivers
by svn＠openbios.org 20 Dec '08

20 Dec '08

Author: blueswirl Date: 2008-12-20 18:29:20 +0100 (Sat, 20 Dec 2008) New Revision: 295 Modified: openbios-devel/drivers/pci.c Log: Fix the last remaining warning Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-12-20 17:15:47 UTC (rev 294) +++ openbios-devel/drivers/pci.c 2008-12-20 17:29:20 UTC (rev 295) @@ -1379,7 +1379,7 @@ { uint32_t smask, omask, amask, size, reloc, min_align; - uint32_t *base; + unsigned long base; pci_addr config_addr; int reg;

1 0

r294 - in openbios-devel: arch/ppc arch/ppc/qemu arch/sparc32 arch/sparc64 drivers fs/grubfs include include/openbios include/sparc64 kernel modules
by svn＠openbios.org 20 Dec '08

20 Dec '08

Author: blueswirl Date: 2008-12-20 18:15:47 +0100 (Sat, 20 Dec 2008) New Revision: 294 Modified: openbios-devel/arch/ppc/ofmem.c openbios-devel/arch/ppc/qemu/main.c openbios-devel/arch/ppc/qemu/methods.c openbios-devel/arch/ppc/qemu/qemu.c openbios-devel/arch/ppc/qemu/qemu.h openbios-devel/arch/sparc32/openbios.h openbios-devel/arch/sparc64/console.c openbios-devel/arch/sparc64/openbios.c openbios-devel/arch/sparc64/openbios.h openbios-devel/drivers/cuda.c openbios-devel/drivers/cuda.h openbios-devel/drivers/pci.c openbios-devel/drivers/vga_vbe.c openbios-devel/fs/grubfs/fsys_iso9660.c openbios-devel/fs/grubfs/fsys_xfs.c openbios-devel/fs/grubfs/iso9660.h openbios-devel/include/openbios/drivers.h openbios-devel/include/sparc64/types.h openbios-devel/include/video_subr.h openbios-devel/kernel/cross.h openbios-devel/modules/console.c openbios-devel/modules/font_8x16.c openbios-devel/modules/video.c Log: Fix almost all remaining warnings Modified: openbios-devel/arch/ppc/ofmem.c =================================================================== --- openbios-devel/arch/ppc/ofmem.c 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/arch/ppc/ofmem.c 2008-12-20 17:15:47 UTC (rev 294) @@ -155,7 +155,7 @@ if( !ptr ) return; - d = (alloc_desc_t*)(ptr - sizeof(alloc_desc_t)); + d = (alloc_desc_t*)((char *)ptr - sizeof(alloc_desc_t)); d->next = ofmem.mfree; /* insert in the (sorted) freelist */ @@ -168,7 +168,7 @@ void * realloc( void *ptr, size_t size ) { - alloc_desc_t *d = (alloc_desc_t*)(ptr - sizeof(alloc_desc_t)); + alloc_desc_t *d = (alloc_desc_t*)((char *)ptr - sizeof(alloc_desc_t)); char *p; if( !ptr ) Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/arch/ppc/qemu/main.c 2008-12-20 17:15:47 UTC (rev 294) @@ -26,10 +26,10 @@ #include "ofmem.h" static void -transfer_control_to_elf( ulong entry ) +transfer_control_to_elf( ulong elf_entry ) { extern void call_elf( ulong entry ); - printk("Starting ELF image at 0x%08lX\n", entry); + printk("Starting ELF image at 0x%08lX\n", elf_entry); call_elf( 0x400000 ); //call_elf( entry ); @@ -37,7 +37,7 @@ } static int -load_elf_rom( ulong *entry, int fd ) +load_elf_rom( ulong *elf_entry, int fd ) { int i, lszz_offs, elf_offs; char buf[128], *addr; @@ -55,7 +55,7 @@ if( !(phdr=elf_readhdrs(fd, elf_offs, &ehdr)) ) fatal_error("elf_readhdrs failed\n"); - *entry = ehdr.e_entry; + *elf_entry = ehdr.e_entry; /* load segments. Compressed ROM-image assumed to be located immediately * after the last segment */ @@ -83,7 +83,8 @@ #if 0 /* patch CODE segment */ - if( *entry >= phdr[i].p_vaddr && *entry < phdr[i].p_vaddr + s ) { + if( *elf_entry >= phdr[i].p_vaddr && + *elf_entry < phdr[i].p_vaddr + s ) { patch_newworld_rom( (char*)phdr[i].p_vaddr, s ); newworld_timer_hack( (char*)phdr[i].p_vaddr, s ); } @@ -115,18 +116,18 @@ { const char *paths[] = { "hd:0,\\zImage.chrp", NULL }; const char *args[] = { "root=/dev/hda2 console=ttyS0,115200", NULL }; - ulong entry; + ulong elf_entry; int i, fd; for( i=0; paths[i]; i++ ) { if( (fd=open_io(paths[i])) == -1 ) continue; - (void) load_elf_rom( &entry, fd ); + (void) load_elf_rom( &elf_entry, fd ); close_io( fd ); encode_bootpath( paths[i], args[i] ); update_nvram(); - transfer_control_to_elf( entry ); + transfer_control_to_elf( elf_entry ); /* won't come here */ } printk("*** Boot failure! No secondary bootloader specified ***\n"); Modified: openbios-devel/arch/ppc/qemu/methods.c =================================================================== --- openbios-devel/arch/ppc/qemu/methods.c 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/arch/ppc/qemu/methods.c 2008-12-20 17:15:47 UTC (rev 294) @@ -20,6 +20,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" +#include "openbios/drivers.h" #include "libc/string.h" #include "qemu/qemu.h" #include "ofmem.h" @@ -155,7 +156,7 @@ static void ciface_milliseconds( ulong args[], ulong ret[] ) { - extern unsigned long get_timer_freq(); + extern unsigned long get_timer_freq(void); static ulong mticks=0, usecs=0; ulong t; Modified: openbios-devel/arch/ppc/qemu/qemu.c =================================================================== --- openbios-devel/arch/ppc/qemu/qemu.c 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/arch/ppc/qemu/qemu.c 2008-12-20 17:15:47 UTC (rev 294) @@ -97,7 +97,7 @@ static char *nvram; -void macio_nvram_init(char *path, uint32_t addr) +void macio_nvram_init(const char *path, uint32_t addr) { phandle_t chosen, aliases; phandle_t dnode; Modified: openbios-devel/arch/ppc/qemu/qemu.h =================================================================== --- openbios-devel/arch/ppc/qemu/qemu.h 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/arch/ppc/qemu/qemu.h 2008-12-20 17:15:47 UTC (rev 294) @@ -19,8 +19,6 @@ extern int vfd_draw_str( const char *str ); extern void vfd_close( void ); -extern int console_draw_str( const char *str ); - /* console.c */ int serial_init(void); Modified: openbios-devel/arch/sparc32/openbios.h =================================================================== --- openbios-devel/arch/sparc32/openbios.h 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/arch/sparc32/openbios.h 2008-12-20 17:15:47 UTC (rev 294) @@ -21,7 +21,6 @@ /* console.c */ extern unsigned char *vmem; -extern void cls(void); #ifdef CONFIG_DEBUG_CONSOLE extern int uart_init(uint64_t port, unsigned long speed); extern void video_init(void); Modified: openbios-devel/arch/sparc64/console.c =================================================================== --- openbios-devel/arch/sparc64/console.c 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/arch/sparc64/console.c 2008-12-20 17:15:47 UTC (rev 294) @@ -8,6 +8,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" #include "openbios/kernel.h" +#include "openbios/drivers.h" #include "openbios.h" #include "video_subr.h" #include "libc/vsprintf.h" Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/arch/sparc64/openbios.c 2008-12-20 17:15:47 UTC (rev 294) @@ -300,7 +300,7 @@ { unsigned long phys, data; - unsigned long tte_data, currsize; + unsigned long currsize; // align size size = (size + PAGE_MASK_8K) & ~PAGE_MASK_8K; Modified: openbios-devel/arch/sparc64/openbios.h =================================================================== --- openbios-devel/arch/sparc64/openbios.h 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/arch/sparc64/openbios.h 2008-12-20 17:15:47 UTC (rev 294) @@ -20,7 +20,6 @@ int openbios(void); /* console.c */ -extern void cls(void); #ifdef CONFIG_DEBUG_CONSOLE extern int uart_init(int port, unsigned long speed); extern void video_init(void); Modified: openbios-devel/drivers/cuda.c =================================================================== --- openbios-devel/drivers/cuda.c 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/drivers/cuda.c 2008-12-20 17:15:47 UTC (rev 294) @@ -239,7 +239,7 @@ } -cuda_t *cuda_init (char *path, uint32_t base) +cuda_t *cuda_init (const char *path, uint32_t base) { cuda_t *cuda; char buf[64]; Modified: openbios-devel/drivers/cuda.h =================================================================== --- openbios-devel/drivers/cuda.h 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/drivers/cuda.h 2008-12-20 17:15:47 UTC (rev 294) @@ -15,4 +15,4 @@ }; -cuda_t *cuda_init (char *path, uint32_t base); +cuda_t *cuda_init (const char *path, uint32_t base); Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/drivers/pci.c 2008-12-20 17:15:47 UTC (rev 294) @@ -21,8 +21,10 @@ #include "libc/vsprintf.h" #include "openbios/drivers.h" +#include "video_subr.h" #include "timer.h" #include "pci.h" +#include "cuda.h" #define set_bool_property(ph, name) set_property(ph, name, NULL, 0); @@ -219,7 +221,7 @@ }, }; -static void eth_config_cb (const pci_config_t *config) +static int eth_config_cb (const pci_config_t *config) { phandle_t ph; cell props[12]; @@ -236,7 +238,8 @@ props[i*2] = config->regions[i]; props[i*2 + 1] = config->sizes[i]; } - set_property(ph, "reg", props, i * 2 * sizeof(cell)); + set_property(ph, "reg", (char *)props, i * 2 * sizeof(cell)); + return 0; } static const pci_subclass_t net_subclass[] = { @@ -1104,7 +1107,7 @@ set_int_property(ph, "#interrupt-cells", 1); props[0]= 0x10; props[1]= 0x20; - set_property(ph, "reg", &props, sizeof(props)); + set_property(ph, "reg", (char *)&props, sizeof(props)); pic_handle = ph; cuda_init(config->path, config->regions[0]); @@ -1140,7 +1143,7 @@ uint8_t iface, uint16_t vendor, uint16_t product) { - int (*config_cb)(pci_config_t *config); + int (*config_cb)(const pci_config_t *config); const pci_class_t *pclass; const pci_subclass_t *psubclass; const pci_iface_t *piface; @@ -1371,8 +1374,8 @@ #endif static void -ob_pci_configure(pci_arch_t *addr, pci_config_t *config, uint32_t *mem_base, - uint32_t *io_base) +ob_pci_configure(pci_addr addr, pci_config_t *config, unsigned long *mem_base, + unsigned long *io_base) { uint32_t smask, omask, amask, size, reloc, min_align; Modified: openbios-devel/drivers/vga_vbe.c =================================================================== --- openbios-devel/drivers/vga_vbe.c 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/drivers/vga_vbe.c 2008-12-20 17:15:47 UTC (rev 294) @@ -19,7 +19,9 @@ #include "openbios/kernel.h" #include "openbios/bindings.h" #include "openbios/pci.h" +#include "openbios/drivers.h" #include "asm/io.h" +#include "video_subr.h" /* VGA init. We use the Bochs VESA VBE extensions */ #define VBE_DISPI_INDEX_ID 0x0 @@ -96,8 +98,8 @@ vga_build_rgb_palette(); } -void vga_vbe_init(char *path, uint32_t fb, uint32_t fb_size, - uint32_t rom, uint32_t rom_size) +void vga_vbe_init(const char *path, uint32_t fb, uint32_t fb_size, + unsigned long rom, uint32_t rom_size) { phandle_t ph, chosen, aliases; @@ -117,9 +119,10 @@ aliases = find_dev("/aliases"); set_property(aliases, "screen", path, strlen(path) + 1); if (rom_size >= 8) { - const uint8_t *p; + const char *p; int size; - p = rom; + + p = (const char *)rom; if (p[0] == 'N' && p[1] == 'D' && p[2] == 'R' && p[3] == 'V') { size = *(uint32_t*)(p + 4); set_property(ph, "driver,AAPL,MacOS,PowerPC", Modified: openbios-devel/fs/grubfs/fsys_iso9660.c =================================================================== --- openbios-devel/fs/grubfs/fsys_iso9660.c 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/fs/grubfs/fsys_iso9660.c 2008-12-20 17:15:47 UTC (rev 294) @@ -141,7 +141,7 @@ for (; idr->length.l > 0; idr = (struct iso_directory_record *)((char *)idr + idr->length.l) ) { - const char *name = idr->name; + const char *name = (char *)idr->name; unsigned int name_len = idr->name_len.l; file_type = (idr->flags.l & 2) ? ISO_DIRECTORY : ISO_REGULAR; @@ -164,7 +164,7 @@ rr_len = (idr->length.l - idr->name_len.l - (unsigned char)sizeof(struct iso_directory_record) + (unsigned char)sizeof(idr->name)); - rr_ptr.ptr = ((unsigned char *)idr + idr->name_len.l + rr_ptr.ptr = ((char *)idr + idr->name_len.l + sizeof(struct iso_directory_record) - sizeof(idr->name)); if (rr_ptr.i & 1) @@ -190,7 +190,7 @@ rr_flag &= rr_ptr.rr->u.rr.flags.l; else if (rr_ptr.rr->signature == RRMAGIC('N', 'M')) { - name = rr_ptr.rr->u.nm.name; + name = (char *)rr_ptr.rr->u.nm.name; name_len = rr_ptr.rr->len - 5; rr_flag &= ~RR_FLAG_NM; } @@ -222,11 +222,12 @@ && (unsigned char *)name < RRCONT_BUF + ISO_SECTOR_SIZE ) { memcpy(NAME_BUF, name, name_len); - name = NAME_BUF; + name = (char *)NAME_BUF; } - rr_ptr.ptr = RRCONT_BUF + ce_ptr->u.ce.offset.l; + rr_ptr.ptr = (char *)(RRCONT_BUF + ce_ptr->u.ce.offset.l); rr_len = ce_ptr->u.ce.size.l; - if (!iso9660_devread(ce_ptr->u.ce.extent.l, 0, ISO_SECTOR_SIZE, RRCONT_BUF)) + if (!iso9660_devread(ce_ptr->u.ce.extent.l, 0, + ISO_SECTOR_SIZE, (char *)RRCONT_BUF)) { errnum = 0; /* this is not fatal. */ break; Modified: openbios-devel/fs/grubfs/fsys_xfs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_xfs.c 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/fs/grubfs/fsys_xfs.c 2008-12-20 17:15:47 UTC (rev 294) @@ -382,7 +382,7 @@ default: namelen = sfe->namelen; *ino = sf_ino ((char *)sfe, namelen); - name = sfe->name; + name = (char *)sfe->name; sfe = (xfs_dir2_sf_entry_t *) ((char *)sfe + namelen + 11 - xfs.i8param); } Modified: openbios-devel/fs/grubfs/iso9660.h =================================================================== --- openbios-devel/fs/grubfs/iso9660.h 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/fs/grubfs/iso9660.h 2008-12-20 17:15:47 UTC (rev 294) @@ -66,11 +66,11 @@ typedef struct __iso_16bit { u_int16_t l, b; -} iso_16bit_t __attribute__ ((packed)); +} iso_16bit_t; typedef struct __iso_32bit { u_int32_t l, b; -} iso_32bit_t __attribute__ ((packed)); +} iso_32bit_t; typedef u_int8_t iso_date_t[7]; Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/include/openbios/drivers.h 2008-12-20 17:15:47 UTC (rev 294) @@ -8,44 +8,74 @@ * version 2 * */ +#ifndef OPENBIOS_DRIVERS_H +#define OPENBIOS_DRIVERS_H #include "openbios/config.h" +/* modules/video.c */ +int video_get_res(int *w, int *h); +void draw_pixel(int x, int y, int colind); +void set_color(int ind, ulong color); +void video_scroll(int height); +void init_video(unsigned long fb, int width, int height, int depth, int rb); + +/* modules/console.c */ +int console_draw_str(const char *str); +void console_close(void); +void cls(void); + #ifdef CONFIG_DRIVER_PCI +/* drivers/pci.c */ int ob_pci_init(void); -void macio_nvram_init(char *path, uint32_t addr); + +/* arch/ppc/qemu/qemu.c */ +void macio_nvram_init(const char *path, uint32_t addr); #endif #ifdef CONFIG_DRIVER_SBUS +/* drivers/sbus.c */ int ob_sbus_init(uint64_t base, int machine_id); + +/* arch/sparc32/console.c */ void tcx_init(uint64_t base); void kbd_init(uint64_t base); int keyboard_dataready(void); unsigned char keyboard_readdata(void); -#ifdef CONFIG_DEBUG_CONSOLE_VIDEO -void init_video(unsigned long fb, int width, int height, int depth, int rb); #endif -#endif #ifdef CONFIG_DRIVER_IDE +/* drivers/ide.c */ int ob_ide_init(const char *path, uint32_t io_port0, uint32_t ctl_port0, uint32_t io_port1, uint32_t ctl_port1); #endif #ifdef CONFIG_DRIVER_ESP +/* drivers/esp.c */ int ob_esp_init(unsigned int slot, uint64_t base, unsigned long espoffset, unsigned long dmaoffset); #endif #ifdef CONFIG_DRIVER_OBIO +/* drivers/obio.c */ int ob_obio_init(uint64_t slavio_base, unsigned long fd_offset, unsigned long counter_offset, unsigned long intr_offset, unsigned long aux1_offset, unsigned long aux2_offset); int start_cpu(unsigned int pc, unsigned int context_ptr, unsigned int context, int cpu); + +/* drivers/iommu.c */ extern struct mem cmem; + +/* drivers/sbus.c */ extern uint16_t graphic_depth; + +/* drivers/obio.c */ extern volatile unsigned char *power_reg; extern volatile unsigned int *reset_reg; +extern volatile struct sun4m_timer_regs *counter_regs; + +/* arch/sparc32/romvec.c */ extern const char *obp_stdin_path, *obp_stdout_path; extern char obp_stdin, obp_stdout; -extern volatile struct sun4m_timer_regs *counter_regs; + +/* arch/sparc32/boot.c */ extern uint32_t kernel_image; extern uint32_t kernel_size; extern uint32_t qemu_cmdline; @@ -55,3 +85,5 @@ #ifdef CONFIG_DRIVER_FLOPPY int ob_floppy_init(void); #endif + +#endif /* OPENBIOS_DRIVERS_H */ Modified: openbios-devel/include/sparc64/types.h =================================================================== --- openbios-devel/include/sparc64/types.h 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/include/sparc64/types.h 2008-12-20 17:15:47 UTC (rev 294) @@ -29,8 +29,8 @@ #include "autoconf.h" /* cell based types */ -typedef int64_t cell; -typedef uint64_t ucell; +typedef long long cell; +typedef unsigned long long ucell; #ifdef NEED_FAKE_INT128_T typedef struct { Modified: openbios-devel/include/video_subr.h =================================================================== --- openbios-devel/include/video_subr.h 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/include/video_subr.h 2008-12-20 17:15:47 UTC (rev 294) @@ -1,11 +1,18 @@ #ifndef VIDEO_SUBR_H #define VIDEO_SUBR_H -void video_tx_byte(unsigned char byte); +/* drivers/vga_load_regs.c */ void vga_load_regs(void); + +/* drivers/vga_set_mode.c */ +void vga_set_gmode (void); void vga_set_amode (void); -void vga_set_gmode (void); void vga_font_load(unsigned char *vidmem, const unsigned char *font, int height, int num_chars); -extern const unsigned char fontdata_8x16[]; +/* drivers/vga_vbe.c */ +void vga_set_color(int i, unsigned int r, unsigned int g, unsigned int b); +void vga_vbe_set_mode(int width, int height, int depth); +void vga_vbe_init(const char *path, uint32_t fb, uint32_t fb_size, + unsigned long rom, uint32_t rom_size); + #endif /* VIDEO_SUBR_H */ Modified: openbios-devel/kernel/cross.h =================================================================== --- openbios-devel/kernel/cross.h 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/kernel/cross.h 2008-12-20 17:15:47 UTC (rev 294) @@ -112,8 +112,8 @@ #define FMT_CELL_x "x" #define FMT_CELL_d "d" #else -#define FMT_CELL_x "lx" -#define FMT_CELL_d "ld" +#define FMT_CELL_x "llx" +#define FMT_CELL_d "lld" #endif #endif Modified: openbios-devel/modules/console.c =================================================================== --- openbios-devel/modules/console.c 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/modules/console.c 2008-12-20 17:15:47 UTC (rev 294) @@ -53,7 +53,7 @@ static void draw_char( uint h, uint v ) { - char *c = fontdata; + const unsigned char *c = fontdata; int x, y, xx, rskip, m; int invert = (h==cons.x && v==cons.y && cons.cursor_on); int ch = get_conschar( h, v ); Modified: openbios-devel/modules/font_8x16.c =================================================================== --- openbios-devel/modules/font_8x16.c 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/modules/font_8x16.c 2008-12-20 17:15:47 UTC (rev 294) @@ -10,7 +10,7 @@ #define FONTDATAMAX 4096 -const unsigned char fontdata_8x16[FONTDATAMAX] = { +static const unsigned char fontdata_8x16[FONTDATAMAX] = { /* 0 0x00 '^@' */ 0x00, /* 00000000 */ Modified: openbios-devel/modules/video.c =================================================================== --- openbios-devel/modules/video.c 2008-12-20 15:05:43 UTC (rev 293) +++ openbios-devel/modules/video.c 2008-12-20 17:15:47 UTC (rev 294) @@ -18,6 +18,8 @@ #include "openbios/bindings.h" #include "libc/diskio.h" #include "ofmem.h" +#include "openbios/drivers.h" +#include "video_subr.h" static struct { int has_video; @@ -148,7 +150,8 @@ while( ww-- ) *p++ = col; } else { - char *p = (ushort*)pp + x; + char *p = (char *)((ushort*)pp + x); + while( ww-- ) *p++ = col; }

1 0

r293 - openbios-devel/drivers
by svn＠openbios.org 20 Dec '08

20 Dec '08

Author: blueswirl Date: 2008-12-20 16:05:43 +0100 (Sat, 20 Dec 2008) New Revision: 293 Modified: openbios-devel/drivers/ide.c openbios-devel/drivers/ide.h Log: IDE: silence compiler warnings Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2008-12-20 14:48:40 UTC (rev 292) +++ openbios-devel/drivers/ide.c 2008-12-20 15:05:43 UTC (rev 293) @@ -217,7 +217,7 @@ */ static int ob_ide_wait_stat(struct ide_drive *drive, unsigned char ok_stat, - unsigned char bad_stat, char *ret_stat) + unsigned char bad_stat, unsigned char *ret_stat) { unsigned char stat; int i; @@ -700,8 +700,8 @@ * read from an atapi device, using READ_10 */ static int -ob_ide_read_atapi(struct ide_drive *drive, unsigned long long block, char *buf, - unsigned int sectors) +ob_ide_read_atapi(struct ide_drive *drive, unsigned long long block, + unsigned char *buf, unsigned int sectors) { struct atapi_command *cmd = &drive->channel->atapi_cmd; @@ -730,7 +730,7 @@ static int ob_ide_read_ata_chs(struct ide_drive *drive, unsigned long long block, - char *buf, unsigned int sectors) + unsigned char *buf, unsigned int sectors) { struct ata_command *cmd = &drive->channel->ata_cmd; unsigned int track = (block / drive->sect); @@ -759,7 +759,7 @@ static int ob_ide_read_ata_lba28(struct ide_drive *drive, unsigned long long block, - char *buf, unsigned int sectors) + unsigned char *buf, unsigned int sectors) { struct ata_command *cmd = &drive->channel->ata_cmd; @@ -785,7 +785,7 @@ static int ob_ide_read_ata_lba48(struct ide_drive *drive, unsigned long long block, - char *buf, unsigned int sectors) + unsigned char *buf, unsigned int sectors) { struct ata_command *cmd = &drive->channel->ata_cmd; struct ata_sector ata_sector; @@ -818,8 +818,8 @@ * read 'sectors' sectors from ata device */ static int -ob_ide_read_ata(struct ide_drive *drive, unsigned long long block, char *buf, - unsigned int sectors) +ob_ide_read_ata(struct ide_drive *drive, unsigned long long block, + unsigned char *buf, unsigned int sectors) { unsigned long long end_block = block + sectors; const int need_lba48 = (end_block > (1ULL << 28)) || (sectors > 255); @@ -842,7 +842,7 @@ static int ob_ide_read_sectors(struct ide_drive *drive, unsigned long long block, - char *buf, unsigned int sectors) + unsigned char *buf, unsigned int sectors) { if (!sectors) return 1; @@ -958,7 +958,7 @@ drive->sect = id.sectors; } - strcpy(drive->model, id.model); + strcpy(drive->model, (char *)id.model); return 0; } @@ -1161,11 +1161,12 @@ { cell n = POP(), cnt=n; ucell blk = POP(); - char *dest = (char*)POP(); + unsigned char *dest = (unsigned char *)POP(); struct ide_drive *drive=&ob_ide_channels[idx[1]].drives[idx[0]]; #ifdef CONFIG_DEBUG_IDE - printk("ob_ide_read_blocks %x block=%d n=%d\n", (unsigned long)dest, blk, n ); + printk("ob_ide_read_blocks %lx block=%ld n=%ld\n", (unsigned long)dest, + (unsigned long)blk, (long)n); #endif while (n) { Modified: openbios-devel/drivers/ide.h =================================================================== --- openbios-devel/drivers/ide.h 2008-12-20 14:48:40 UTC (rev 292) +++ openbios-devel/drivers/ide.h 2008-12-20 15:05:43 UTC (rev 293) @@ -97,7 +97,7 @@ * simple ata command that works for everything (except 48-bit lba commands) */ struct ata_command { - char *buffer; + unsigned char *buffer; unsigned int buflen; /*

1 0

r292 - in openbios-devel: arch/amd64 arch/ppc/briq arch/ppc/pearpc arch/ppc/qemu arch/sparc64 arch/x86 config/examples config/xml drivers include/openbios
by svn＠openbios.org 20 Dec '08

20 Dec '08

Author: blueswirl Date: 2008-12-20 15:48:40 +0100 (Sat, 20 Dec 2008) New Revision: 292 Modified: openbios-devel/arch/amd64/openbios.c openbios-devel/arch/ppc/briq/init.c openbios-devel/arch/ppc/briq/tree.fs openbios-devel/arch/ppc/pearpc/init.c openbios-devel/arch/ppc/pearpc/tree.fs openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/tree.fs openbios-devel/arch/sparc64/openbios.c openbios-devel/arch/sparc64/tree.fs openbios-devel/arch/x86/init.fs openbios-devel/arch/x86/openbios.c openbios-devel/config/examples/cross-ppc_config.xml openbios-devel/config/xml/config-c.xsl openbios-devel/config/xml/config-forth.xsl openbios-devel/drivers/build.xml openbios-devel/drivers/ide.c openbios-devel/drivers/pci.c openbios-devel/include/openbios/drivers.h Log: IDE fixes for PPC (Laurent Vivier) Modified: openbios-devel/arch/amd64/openbios.c =================================================================== --- openbios-devel/arch/amd64/openbios.c 2008-12-18 20:44:20 UTC (rev 291) +++ openbios-devel/arch/amd64/openbios.c 2008-12-20 14:48:40 UTC (rev 292) @@ -17,7 +17,6 @@ #include "relocate.h" void boot(void); -void ob_ide_init(void); static char intdict[256 * 1024]; @@ -42,7 +41,7 @@ modules_init(); #ifdef CONFIG_DRIVER_IDE setup_timers(); - ob_ide_init(); + ob_ide_init("/pci/pci-ata", 0x1f0, 0x3f4, 0x170, 0x374); #endif device_end(); bind_func("platform-boot", boot ); Modified: openbios-devel/arch/ppc/briq/init.c =================================================================== --- openbios-devel/arch/ppc/briq/init.c 2008-12-18 20:44:20 UTC (rev 291) +++ openbios-devel/arch/ppc/briq/init.c 2008-12-20 14:48:40 UTC (rev 292) @@ -27,7 +27,6 @@ #include "openbios-version.h" extern void unexpected_excep( int vector ); -extern void ob_ide_init( void ); extern void setup_timers( void ); #if 0 @@ -91,15 +90,11 @@ devtree_init(); node_methods_init(); - nvram_init("/pci/mac-io/nvram"); modules_init(); + setup_timers(); #ifdef CONFIG_DRIVER_PCI ob_pci_init(); #endif -#ifdef CONFIG_DRIVER_IDE - setup_timers(); - ob_ide_init(); -#endif #if USE_RTAS if( !(ph=find_dev("/rtas")) ) Modified: openbios-devel/arch/ppc/briq/tree.fs =================================================================== --- openbios-devel/arch/ppc/briq/tree.fs 2008-12-18 20:44:20 UTC (rev 291) +++ openbios-devel/arch/ppc/briq/tree.fs 2008-12-20 14:48:40 UTC (rev 292) @@ -82,6 +82,65 @@ 0 encode-int 0 encode-int encode+ " bus-range" property new-device + " isa" device-name + " isa" device-type + 2 encode-int " #address-cells" property + 1 encode-int " #size-cells" property + + external + : open true ; + : close ; + +finish-device + +: ?devalias ( alias-str alias-len device-str device-len -- + \ alias-str alias-len false | true ) + active-package >r + " /aliases" find-device + \ 2dup ." Checking " type + 2dup find-dev if \ check if device exists + drop + 2over find-dev if \ do we already have an alias? + \ ." alias exists" cr + drop 2drop false + else + \ ." device exists" cr + encode-string + 2swap property + true + then + else + \ ." device doesn't exist" cr + 2drop false + then + r> active-package! + ; + +:noname + " hd" + " /pci/pci-ata/ata-1/disk@0" ?devalias not if + " /pci/pci-ata/ata-1/disk@1" ?devalias not if + " /pci/pci-ata/ata-2/disk@0" ?devalias not if + " /pci/pci-ata/ata-2/disk@1" ?devalias not if + 2drop ." No disk found." cr + then + then + then + then + + " cdrom" + " /pci/pci-ata/ata-1/cdrom@0" ?devalias not if + " /pci/pci-ata/ata-1/cdrom@1" ?devalias not if + " /pci/pci-ata/ata-2/cdrom@0" ?devalias not if + " /pci/pci-ata/ata-2/cdrom@1" ?devalias not if + 2drop ." No cdrom found" cr + then + then + then + then +; SYSTEM-initializer + +new-device " ide" device-name " ide" device-type " WINBOND,82C553" model Modified: openbios-devel/arch/ppc/pearpc/init.c =================================================================== --- openbios-devel/arch/ppc/pearpc/init.c 2008-12-18 20:44:20 UTC (rev 291) +++ openbios-devel/arch/ppc/pearpc/init.c 2008-12-20 14:48:40 UTC (rev 292) @@ -28,7 +28,6 @@ #include "openbios-version.h" extern void unexpected_excep( int vector ); -extern void ob_ide_init( void ); extern void ob_pci_init( void ); extern void ob_adb_init( void ); extern void setup_timers( void ); @@ -95,17 +94,10 @@ devtree_init(); nvram_init("/pci/mac-io/nvram"); modules_init(); + setup_timers(); #ifdef CONFIG_DRIVER_PCI ob_pci_init(); #endif -#ifdef CONFIG_DRIVER_IDE - setup_timers(); - ob_ide_init(); -#endif -#ifdef CONFIG_DRIVER_ADB - ob_adb_init(); -#endif - node_methods_init(); init_video(); Modified: openbios-devel/arch/ppc/pearpc/tree.fs =================================================================== --- openbios-devel/arch/ppc/pearpc/tree.fs 2008-12-18 20:44:20 UTC (rev 291) +++ openbios-devel/arch/ppc/pearpc/tree.fs 2008-12-20 14:48:40 UTC (rev 292) @@ -82,6 +82,65 @@ 0 encode-int 0 encode-int encode+ " bus-range" property new-device + " isa" device-name + " isa" device-type + 2 encode-int " #address-cells" property + 1 encode-int " #size-cells" property + + external + : open true ; + : close ; + +finish-device + +: ?devalias ( alias-str alias-len device-str device-len -- + \ alias-str alias-len false | true ) + active-package >r + " /aliases" find-device + \ 2dup ." Checking " type + 2dup find-dev if \ check if device exists + drop + 2over find-dev if \ do we already have an alias? + \ ." alias exists" cr + drop 2drop false + else + \ ." device exists" cr + encode-string + 2swap property + true + then + else + \ ." device doesn't exist" cr + 2drop false + then + r> active-package! + ; + +:noname + " hd" + " /pci/pci-ata/ata-1/disk@0" ?devalias not if + " /pci/pci-ata/ata-1/disk@1" ?devalias not if + " /pci/pci-ata/ata-2/disk@0" ?devalias not if + " /pci/pci-ata/ata-2/disk@1" ?devalias not if + 2drop ." No disk found." cr + then + then + then + then + + " cdrom" + " /pci/pci-ata/ata-1/cdrom@0" ?devalias not if + " /pci/pci-ata/ata-1/cdrom@1" ?devalias not if + " /pci/pci-ata/ata-2/cdrom@0" ?devalias not if + " /pci/pci-ata/ata-2/cdrom@1" ?devalias not if + 2drop ." No cdrom found" cr + then + then + then + then +; SYSTEM-initializer + +new-device " ide" device-name " ide" device-type " WINBOND,82C553" model Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-12-18 20:44:20 UTC (rev 291) +++ openbios-devel/arch/ppc/qemu/init.c 2008-12-20 14:48:40 UTC (rev 292) @@ -29,7 +29,6 @@ #include "openbios-version.h" extern void unexpected_excep( int vector ); -extern void ob_ide_init( void ); extern void ob_pci_init( void ); extern void setup_timers( void ); @@ -108,10 +107,6 @@ #ifdef CONFIG_DRIVER_PCI ob_pci_init(); #endif -#ifdef CONFIG_DRIVER_IDE - ob_ide_init(); -#endif - node_methods_init(); #ifdef USE_RTAS Modified: openbios-devel/arch/ppc/qemu/tree.fs =================================================================== --- openbios-devel/arch/ppc/qemu/tree.fs 2008-12-18 20:44:20 UTC (rev 291) +++ openbios-devel/arch/ppc/qemu/tree.fs 2008-12-20 14:48:40 UTC (rev 292) @@ -82,6 +82,65 @@ 0 encode-int 0 encode-int encode+ " bus-range" property new-device + " isa" device-name + " isa" device-type + 2 encode-int " #address-cells" property + 1 encode-int " #size-cells" property + + external + : open true ; + : close ; + +finish-device + +: ?devalias ( alias-str alias-len device-str device-len -- + \ alias-str alias-len false | true ) + active-package >r + " /aliases" find-device + \ 2dup ." Checking " type + 2dup find-dev if \ check if device exists + drop + 2over find-dev if \ do we already have an alias? + \ ." alias exists" cr + drop 2drop false + else + \ ." device exists" cr + encode-string + 2swap property + true + then + else + \ ." device doesn't exist" cr + 2drop false + then + r> active-package! + ; + +:noname + " hd" + " /pci/pci-ata/ata-1/disk@0" ?devalias not if + " /pci/pci-ata/ata-1/disk@1" ?devalias not if + " /pci/pci-ata/ata-2/disk@0" ?devalias not if + " /pci/pci-ata/ata-2/disk@1" ?devalias not if + 2drop ." No disk found." cr + then + then + then + then + + " cdrom" + " /pci/pci-ata/ata-1/cdrom@0" ?devalias not if + " /pci/pci-ata/ata-1/cdrom@1" ?devalias not if + " /pci/pci-ata/ata-2/cdrom@0" ?devalias not if + " /pci/pci-ata/ata-2/cdrom@1" ?devalias not if + 2drop ." No cdrom found" cr + then + then + then + then +; SYSTEM-initializer + +new-device " ide" device-name " ide" device-type " WINBOND,82C553" model Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-12-18 20:44:20 UTC (rev 291) +++ openbios-devel/arch/sparc64/openbios.c 2008-12-20 14:48:40 UTC (rev 292) @@ -865,7 +865,7 @@ #endif #ifdef CONFIG_DRIVER_IDE setup_timers(); - ob_ide_init(); + ob_ide_init("/pci/isa", 0x1f0, 0x3f4, 0x170, 0x374); #endif #ifdef CONFIG_DRIVER_FLOPPY ob_floppy_init(); Modified: openbios-devel/arch/sparc64/tree.fs =================================================================== --- openbios-devel/arch/sparc64/tree.fs 2008-12-18 20:44:20 UTC (rev 291) +++ openbios-devel/arch/sparc64/tree.fs 2008-12-20 14:48:40 UTC (rev 292) @@ -32,3 +32,65 @@ " /openprom" find-device " OBP 3.10.24 1999/01/01 01:01" encode-string " version" property + +dev /pci + +\ simple isa bus node +new-device + " isa" device-name + " isa" device-type + 2 encode-int " #address-cells" property + 1 encode-int " #size-cells" property + + external + : open true ; + : close ; + +finish-device + +: ?devalias ( alias-str alias-len device-str device-len -- + \ alias-str alias-len false | true ) + active-package >r + " /aliases" find-device + \ 2dup ." Checking " type + 2dup find-dev if \ check if device exists + drop + 2over find-dev if \ do we already have an alias? + \ ." alias exists" cr + drop 2drop false + else + \ ." device exists" cr + encode-string + 2swap property + true + then + else + \ ." device doesn't exist" cr + 2drop false + then + r> active-package! + ; + +:noname + " hd" + " /pci/isa/ide0/disk@0" ?devalias not if + " /pci/isa/ide0/disk@1" ?devalias not if + " /pci/isa/ide1/disk@0" ?devalias not if + " /pci/isa/ide1/disk@1" ?devalias not if + 2drop ." No disk found." cr + then + then + then + then + + " cdrom" + " /pci/isa/ide0/cdrom@0" ?devalias not if + " /pci/isa/ide0/cdrom@1" ?devalias not if + " /pci/isa/ide1/cdrom@0" ?devalias not if + " /pci/isa/ide1/cdrom@1" ?devalias not if + 2drop ." No cdrom found" cr + then + then + then + then +; SYSTEM-initializer Modified: openbios-devel/arch/x86/init.fs =================================================================== --- openbios-devel/arch/x86/init.fs 2008-12-18 20:44:20 UTC (rev 291) +++ openbios-devel/arch/x86/init.fs 2008-12-20 14:48:40 UTC (rev 292) @@ -75,3 +75,65 @@ " keyboard" input ; CONSOLE-IN-initializer + +dev /pci + +\ simple isa bus node +new-device + " isa" device-name + " isa" device-type + 2 encode-int " #address-cells" property + 1 encode-int " #size-cells" property + + external + : open true ; + : close ; + +finish-device + +: ?devalias ( alias-str alias-len device-str device-len -- + \ alias-str alias-len false | true ) + active-package >r + " /aliases" find-device + \ 2dup ." Checking " type + 2dup find-dev if \ check if device exists + drop + 2over find-dev if \ do we already have an alias? + \ ." alias exists" cr + drop 2drop false + else + \ ." device exists" cr + encode-string + 2swap property + true + then + else + \ ." device doesn't exist" cr + 2drop false + then + r> active-package! + ; + +:noname + " hd" + " /pci/isa/ide0/disk@0" ?devalias not if + " /pci/isa/ide0/disk@1" ?devalias not if + " /pci/isa/ide1/disk@0" ?devalias not if + " /pci/isa/ide1/disk@1" ?devalias not if + 2drop ." No disk found." cr + then + then + then + then + + " cdrom" + " /pci/isa/ide0/cdrom@0" ?devalias not if + " /pci/isa/ide0/cdrom@1" ?devalias not if + " /pci/isa/ide1/cdrom@0" ?devalias not if + " /pci/isa/ide1/cdrom@1" ?devalias not if + 2drop ." No cdrom found" cr + then + then + then + then +; SYSTEM-initializer Modified: openbios-devel/arch/x86/openbios.c =================================================================== --- openbios-devel/arch/x86/openbios.c 2008-12-18 20:44:20 UTC (rev 291) +++ openbios-devel/arch/x86/openbios.c 2008-12-20 14:48:40 UTC (rev 292) @@ -45,7 +45,7 @@ #endif #ifdef CONFIG_DRIVER_IDE setup_timers(); - ob_ide_init(); + ob_ide_init("/pci/isa", 0x1f0, 0x3f4, 0x170, 0x374); #endif #ifdef CONFIG_DRIVER_FLOPPY ob_floppy_init(); Modified: openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_config.xml 2008-12-18 20:44:20 UTC (rev 291) +++ openbios-devel/config/examples/cross-ppc_config.xml 2008-12-20 14:48:40 UTC (rev 292) @@ -66,7 +66,10 @@ <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/> <option name="CONFIG_DEBUG_PCI" type="boolean" value="true"/> <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> - <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> + <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="2"/> + <option name="CONFIG_IDE_FIRST_UNIT" type="integer" value="1"/> + <option name="CONFIG_IDE_DEV_NAME" type="string" value="ata-%d"/> + <option name="CONFIG_IDE_DEV_TYPE" type="string" value="ata"/> <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> <option name="CONFIG_DRIVER_ADB" type="boolean" value="true"/> <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> Modified: openbios-devel/config/xml/config-c.xsl =================================================================== --- openbios-devel/config/xml/config-c.xsl 2008-12-18 20:44:20 UTC (rev 291) +++ openbios-devel/config/xml/config-c.xsl 2008-12-20 14:48:40 UTC (rev 292) @@ -34,6 +34,11 @@ <xsl:value-of select="@name"/><xsl:text> </xsl:text> <xsl:value-of select="@value"/> </xsl:when> + +  + <xsl:when test="@type='string'"> + <xsl:text>#define </xsl:text> + <xsl:value-of select="@name"/><xsl:text> </xsl:text> "<xsl:value-of select="@value"/>" </xsl:when>  <xsl:otherwise> Modified: openbios-devel/config/xml/config-forth.xsl =================================================================== --- openbios-devel/config/xml/config-forth.xsl 2008-12-18 20:44:20 UTC (rev 291) +++ openbios-devel/config/xml/config-forth.xsl 2008-12-20 14:48:40 UTC (rev 292) @@ -26,6 +26,9 @@ <xsl:value-of select="@name"/> <xsl:text>
</xsl:text> </xsl:when> +  + <xsl:when test="@type='string'"> + </xsl:when> <xsl:otherwise> <xsl:message terminate="yes">
ERROR: configuration option '<xsl:value-of select="@name"/>' has unsupported type '<xsl:value-of select="@type"/>'.</xsl:message> </xsl:otherwise> Modified: openbios-devel/drivers/build.xml =================================================================== --- openbios-devel/drivers/build.xml 2008-12-18 20:44:20 UTC (rev 291) +++ openbios-devel/drivers/build.xml 2008-12-20 14:48:40 UTC (rev 292) @@ -19,7 +19,6 @@ <dictionary name="openbios" target="forth"> <object source="pci.fs" condition="DRIVER_PCI"/> - <object source="ide.fs" condition="DRIVER_IDE"/> <object source="sbus.fs" condition="DRIVER_SBUS"/> <object source="esp.fs" condition="DRIVER_ESP"/> </dictionary> Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2008-12-18 20:44:20 UTC (rev 291) +++ openbios-devel/drivers/ide.c 2008-12-20 14:48:40 UTC (rev 292) @@ -13,11 +13,6 @@ * */ -/* - * TODO: - * - Really probe for interfaces, don't just rely on legacy - */ - #include "openbios/config.h" #include "openbios/bindings.h" #include "openbios/kernel.h" @@ -43,13 +38,30 @@ #endif #define IDE_MAX_CHANNELS 4 +#ifndef CONFIG_IDE_FIRST_UNIT +#define FIRST_UNIT 0 +#else +#define FIRST_UNIT CONFIG_IDE_FIRST_UNIT +#endif + +#ifndef CONFIG_IDE_DEV_TYPE +#define DEV_TYPE "ide" +#else +#define DEV_TYPE CONFIG_IDE_DEV_TYPE +#endif + +#ifndef CONFIG_IDE_DEV_NAME +#define DEV_NAME "ide%d" +#else +#define DEV_NAME CONFIG_IDE_DEV_NAME +#endif + +static int current_channel = FIRST_UNIT; + static struct ide_channel ob_ide_channels[IDE_MAX_CHANNELS]; -/* - * FIXME: probe, we just hardwire legacy ports for now - */ -static const int io_ports[IDE_MAX_CHANNELS] = { 0x1f0, 0x170, 0x1e8, 0x168 }; -static const int ctl_ports[IDE_MAX_CHANNELS] = { 0x3f6, 0x376, 0x3ee, 0x36e }; +static int io_ports[IDE_MAX_CHANNELS]; +static int ctl_ports[IDE_MAX_CHANNELS]; /* * don't be pedantic @@ -634,6 +646,9 @@ struct atapi_command *cmd = &drive->channel->atapi_cmd; struct atapi_capacity cap; +#ifdef CONFIG_DEBUG_IDE + printk("ob_ide_atapi_drive_ready\n"); +#endif /* * Test Unit Ready is like a ping */ @@ -835,7 +850,8 @@ return 1; #ifdef CONFIG_DEBUG_IDE - printk("ob_ide_read_sectors: block=%Ld sectors=%u\n", (unsigned long) block, sectors); + printk("ob_ide_read_sectors: block=%lu sectors=%u\n", + (unsigned long) block, sectors); #endif if (drive->type == ide_type_ata) @@ -1133,6 +1149,9 @@ ob_ide_max_transfer(int *idx) { struct ide_drive *drive=&ob_ide_channels[idx[1]].drives[idx[0]]; +#ifdef CONFIG_DEBUG_IDE + printk("max_transfer %x\n", drive->max_sectors * drive->bs); +#endif PUSH(drive->max_sectors * drive->bs); } @@ -1171,6 +1190,9 @@ ob_ide_block_size(int *idx) { struct ide_drive *drive=&ob_ide_channels[idx[1]].drives[idx[0]]; +#ifdef CONFIG_DEBUG_IDE + printk("ob_ide_block_size: block size %x\n", drive->bs); +#endif PUSH(drive->bs); } @@ -1184,6 +1206,10 @@ fword("device-type"); // Set dummy reg properties + + set_int_property(ph, "#address-cells", 1); + set_int_property(ph, "#size-cells", 0); + props[0] = __cpu_to_be32(0); props[1] = __cpu_to_be32(0); props[2] = __cpu_to_be32(0); set_property(ph, "reg", (char *)&props, 3*sizeof(int)); @@ -1205,7 +1231,7 @@ fword("ihandle>phandle"); ph=(phandle_t)POP(); idename=get_property(ph, "name", &len); - idx[1]=idename[3]-0x30; + idx[1]=(idename[strlen(idename) - 1] - '0' - FIRST_UNIT) % 2; #ifdef CONFIG_DEBUG_IDE printk("opening channel %d unit %d\n", idx[1], idx[0]); @@ -1249,20 +1275,21 @@ phandle_t ph=get_cur_dev(); char *idename; - set_int_property(ph, "#address-cells", 1); - set_int_property(ph, "#size-cells", 0); - /* set device type */ - push_str("ide"); + push_str(DEV_TYPE); fword("device-type"); idename=get_property(ph, "name", &len); - devnum=idename[3]-0x30; + devnum=idename[strlen(idename) - 1] - '0' - FIRST_UNIT; /* Create interrupt properties. */ props[0]=14; props[1]=0; set_property(ph, "interrupts", (char *)&props, 2*sizeof(int)); + set_property(ph, "compatible", "pci1095,646\0pci1095,646\0pciclass,01018f", 40); + set_int_property(ph, "#address-cells", 1); + set_int_property(ph, "#size-cells", 0); + props[0] = __cpu_to_be32(io_ports[devnum]); props[1] = __cpu_to_be32(1); props[2] = __cpu_to_be32(8); props[3] = __cpu_to_be32(ctl_ports[devnum]); @@ -1281,16 +1308,21 @@ { "decode-unit", ob_ide_ctrl_decodeunit }, }; -int ob_ide_init(void) +int ob_ide_init(const char *path, uint32_t io_port0, uint32_t ctl_port0, + uint32_t io_port1, uint32_t ctl_port1) { int i, j; - - const char *nodetemp_chan = "/pci/isa/ide%d"; - const char *nodetemp = "/pci/isa/ide%d/%s"; + const char * nodetemp_chan = "%s/"DEV_NAME; + const char * nodetemp = "%s/"DEV_NAME"/%s"; char nodebuff[32]; phandle_t dnode; - for (i = 0; i < IDE_NUM_CHANNELS; i++) { + io_ports[0] = io_port0; + ctl_ports[0] = ctl_port0 + 2; + io_ports[1] = io_port1; + ctl_ports[1] = ctl_port1 + 2; + + for (i = 0; i < IDE_NUM_CHANNELS; i++, current_channel++) { struct ide_channel *chan = &ob_ide_channels[i]; chan->mmio = 0; @@ -1330,10 +1362,13 @@ ob_ide_identify_drives(chan); - snprintf(nodebuff, sizeof(nodebuff), nodetemp_chan, i); + snprintf(nodebuff, sizeof(nodebuff), nodetemp_chan, path, + current_channel); REGISTER_NAMED_NODE(ob_ide_ctrl, nodebuff); + printk(DEV_NAME": [io ports 0x%x-0x%x,0x%x]\n", + current_channel, chan->io_regs[0], + chan->io_regs[0] + 7, chan->io_regs[8]); - printk("ide%d: [io ports 0x%x-0x%x,0x%x]\n", i, chan->io_regs[0], chan->io_regs[0] + 7, chan->io_regs[8]); for (j = 0; j < 2; j++) { struct ide_drive *drive = &chan->drives[j]; const char *media = "UNKNOWN"; @@ -1357,8 +1392,8 @@ break; } printk("%s]: %s\n", media, drive->model); - snprintf(nodebuff, sizeof(nodebuff), nodetemp, i, - media); + snprintf(nodebuff, sizeof(nodebuff), nodetemp, path, + current_channel, media); REGISTER_NAMED_NODE(ob_ide, nodebuff); dnode=find_dev(nodebuff); set_int_property(dnode, "reg", j); Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-12-18 20:44:20 UTC (rev 291) +++ openbios-devel/drivers/pci.c 2008-12-20 14:48:40 UTC (rev 292) @@ -147,13 +147,11 @@ static int ide_config_cb2 (const pci_config_t *config) { -#if 0 - ide_init(config->path, - config->regions[0] & ~0x0000000F, - config->regions[1] & ~0x0000000F, - config->regions[2] & ~0x0000000F, - config->regions[3] & ~0x0000000F); -#endif + ob_ide_init(config->path, + config->regions[0] & ~0x0000000F, + config->regions[1] & ~0x0000000F, + config->regions[2] & ~0x0000000F, + config->regions[3] & ~0x0000000F); return 0; } @@ -1092,6 +1090,7 @@ phandle_t pic_handle; static int macio_config_cb (const pci_config_t *config) { +#ifdef CONFIG_PPC char buf[64]; phandle_t ph; cell props[2]; @@ -1108,21 +1107,10 @@ set_property(ph, "reg", &props, sizeof(props)); pic_handle = ph; -#if 0 cuda_init(config->path, config->regions[0]); macio_nvram_init(config->path, config->regions[0]); - ide_init(config->path, - config->regions[0] + 0x1f000, - config->regions[0] + 0x1f000 + 0x1000, - config->regions[0] + 0x1f000 + 0x2000, - config->regions[0] + 0x1f000 + 0x3000); #endif -#if 0 - OF_finalize_pci_macio(device->common.OF_private, - device->regions[0] & ~0x0000000F, device->sizes[0], - private_data); -#endif - return 0; + return 0; } static const pci_dev_t misc_pci[] = { Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2008-12-18 20:44:20 UTC (rev 291) +++ openbios-devel/include/openbios/drivers.h 2008-12-20 14:48:40 UTC (rev 292) @@ -26,7 +26,8 @@ #endif #endif #ifdef CONFIG_DRIVER_IDE -int ob_ide_init(void); +int ob_ide_init(const char *path, uint32_t io_port0, uint32_t ctl_port0, + uint32_t io_port1, uint32_t ctl_port1); #endif #ifdef CONFIG_DRIVER_ESP int ob_esp_init(unsigned int slot, uint64_t base, unsigned long espoffset,

1 0

[PATCH] Add block-size to partition packages.
by Laurent Vivier 18 Dec '08

18 Dec '08

Yaboot uses "block-size" with disk-label packages. This patch add block-size to all partitions packages. Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info> --- modules/disk-label.c | 20 +++++++++++++++++++- modules/mac-parts.c | 7 +++++++ modules/pc-parts.c | 7 +++++++ modules/sun-parts.c | 7 +++++++ 4 files changed, 40 insertions(+), 1 deletion(-) Index: openbios-devel/modules/disk-label.c =================================================================== --- openbios-devel.orig/modules/disk-label.c 2008-12-18 21:20:37.000000000 +0100 +++ openbios-devel/modules/disk-label.c 2008-12-18 21:21:43.000000000 +0100 @@ -200,12 +200,30 @@ PUSH(0); } +static void +dlabel_block_size( dlabel_info_t *di ) +{ + xt_t xt; + + if( !di->part_ih ) + goto no_handler; + + xt = find_ih_method("block-size", di->part_ih); + if ( !xt ) + goto no_handler; + + call_package( xt , di->part_ih ); + return; +no_handler: + PUSH(512); +} + NODE_METHODS( dlabel ) = { { "open", dlabel_open }, { "close", dlabel_close }, { "offset", dlabel_offset }, { "load", dlabel_load }, - + { "block-size", dlabel_block_size }, { "read", dlabel_read }, { "write", dlabel_write }, { "seek", dlabel_seek }, Index: openbios-devel/modules/mac-parts.c =================================================================== --- openbios-devel.orig/modules/mac-parts.c 2008-12-18 21:20:37.000000000 +0100 +++ openbios-devel/modules/mac-parts.c 2008-12-18 21:21:43.000000000 +0100 @@ -119,6 +119,12 @@ } static void +macparts_block_size( __attribute__((unused))macparts_info_t *di ) +{ + PUSH(512); +} + +static void macparts_initialize( macparts_info_t *di ) { fword("register-partition-package"); @@ -128,6 +134,7 @@ { "probe", macparts_probe }, { "open", macparts_open }, { "get-info", macparts_get_info }, + { "block-size", macparts_block_size }, { NULL, macparts_initialize }, }; Index: openbios-devel/modules/pc-parts.c =================================================================== --- openbios-devel.orig/modules/pc-parts.c 2008-12-18 21:20:37.000000000 +0100 +++ openbios-devel/modules/pc-parts.c 2008-12-18 21:21:43.000000000 +0100 @@ -186,6 +186,12 @@ } static void +pcparts_block_size( __attribute__((unused))pcparts_info_t *di ) +{ + PUSH(512); +} + +static void pcparts_initialize( pcparts_info_t *di ) { fword("register-partition-package"); @@ -195,6 +201,7 @@ { "probe", pcparts_probe }, { "open", pcparts_open }, { "get-info", pcparts_get_info }, + { "block-size", pcparts_block_size }, { NULL, pcparts_initialize }, }; Index: openbios-devel/modules/sun-parts.c =================================================================== --- openbios-devel.orig/modules/sun-parts.c 2008-12-18 21:20:37.000000000 +0100 +++ openbios-devel/modules/sun-parts.c 2008-12-18 21:21:43.000000000 +0100 @@ -173,6 +173,12 @@ } static void +sunparts_block_size( __attribute__((unused))sunparts_info_t *di ) +{ + PUSH(512); +} + +static void sunparts_initialize( __attribute__((unused))sunparts_info_t *di ) { fword("register-partition-package"); @@ -182,6 +188,7 @@ { "probe", sunparts_probe }, { "open", sunparts_open }, { "get-info", sunparts_get_info }, + { "block-size", sunparts_block_size }, { NULL, sunparts_initialize }, };

2 1

r291 - openbios-devel/modules
by svn＠openbios.org 18 Dec '08

18 Dec '08

Author: blueswirl Date: 2008-12-18 21:44:20 +0100 (Thu, 18 Dec 2008) New Revision: 291 Modified: openbios-devel/modules/disk-label.c openbios-devel/modules/mac-parts.c openbios-devel/modules/pc-parts.c openbios-devel/modules/sun-parts.c Log: Add block-size to partition packages. Yaboot uses "block-size" with disk-label packages. This patch add block-size to all partitions packages. Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info> Modified: openbios-devel/modules/disk-label.c =================================================================== --- openbios-devel/modules/disk-label.c 2008-12-15 20:35:31 UTC (rev 290) +++ openbios-devel/modules/disk-label.c 2008-12-18 20:44:20 UTC (rev 291) @@ -200,12 +200,30 @@ PUSH(0); } +static void +dlabel_block_size( dlabel_info_t *di ) +{ + xt_t xt; + + if( !di->part_ih ) + goto no_handler; + + xt = find_ih_method("block-size", di->part_ih); + if ( !xt ) + goto no_handler; + + call_package( xt , di->part_ih ); + return; +no_handler: + PUSH(512); +} + NODE_METHODS( dlabel ) = { { "open", dlabel_open }, { "close", dlabel_close }, { "offset", dlabel_offset }, { "load", dlabel_load }, - + { "block-size", dlabel_block_size }, { "read", dlabel_read }, { "write", dlabel_write }, { "seek", dlabel_seek }, Modified: openbios-devel/modules/mac-parts.c =================================================================== --- openbios-devel/modules/mac-parts.c 2008-12-15 20:35:31 UTC (rev 290) +++ openbios-devel/modules/mac-parts.c 2008-12-18 20:44:20 UTC (rev 291) @@ -119,6 +119,12 @@ } static void +macparts_block_size( __attribute__((unused))macparts_info_t *di ) +{ + PUSH(512); +} + +static void macparts_initialize( macparts_info_t *di ) { fword("register-partition-package"); @@ -128,6 +134,7 @@ { "probe", macparts_probe }, { "open", macparts_open }, { "get-info", macparts_get_info }, + { "block-size", macparts_block_size }, { NULL, macparts_initialize }, }; Modified: openbios-devel/modules/pc-parts.c =================================================================== --- openbios-devel/modules/pc-parts.c 2008-12-15 20:35:31 UTC (rev 290) +++ openbios-devel/modules/pc-parts.c 2008-12-18 20:44:20 UTC (rev 291) @@ -186,6 +186,12 @@ } static void +pcparts_block_size( __attribute__((unused))pcparts_info_t *di ) +{ + PUSH(512); +} + +static void pcparts_initialize( pcparts_info_t *di ) { fword("register-partition-package"); @@ -195,6 +201,7 @@ { "probe", pcparts_probe }, { "open", pcparts_open }, { "get-info", pcparts_get_info }, + { "block-size", pcparts_block_size }, { NULL, pcparts_initialize }, }; Modified: openbios-devel/modules/sun-parts.c =================================================================== --- openbios-devel/modules/sun-parts.c 2008-12-15 20:35:31 UTC (rev 290) +++ openbios-devel/modules/sun-parts.c 2008-12-18 20:44:20 UTC (rev 291) @@ -173,6 +173,12 @@ } static void +sunparts_block_size( __attribute__((unused))sunparts_info_t *di ) +{ + PUSH(512); +} + +static void sunparts_initialize( __attribute__((unused))sunparts_info_t *di ) { fword("register-partition-package"); @@ -182,6 +188,7 @@ { "probe", sunparts_probe }, { "open", sunparts_open }, { "get-info", sunparts_get_info }, + { "block-size", sunparts_block_size }, { NULL, sunparts_initialize }, };

1 0

r290 - openbios-devel/config/examples
by svn＠openbios.org 15 Dec '08

15 Dec '08

Author: blueswirl Date: 2008-12-15 21:35:31 +0100 (Mon, 15 Dec 2008) New Revision: 290 Modified: openbios-devel/config/examples/cross-ppc_rules.xml openbios-devel/config/examples/cross-sparc32_rules.xml openbios-devel/config/examples/cross-sparc64_rules.xml openbios-devel/config/examples/sparc32_rules.xml openbios-devel/config/examples/sparc64_rules.xml Log: Drop gcc flag -W Modified: openbios-devel/config/examples/cross-ppc_rules.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_rules.xml 2008-12-14 12:56:06 UTC (rev 289) +++ openbios-devel/config/examples/cross-ppc_rules.xml 2008-12-15 20:35:31 UTC (rev 290) @@ -26,7 +26,7 @@ NM := $(TARGET)nm STRIP := $(TARGET)strip RANLIB := $(TARGET)ranlib -CFLAGS := -Os -Wall -W -msoft-float -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin-bcopy -fno-builtin-log2 +CFLAGS := -Os -Wall -msoft-float -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin-bcopy -fno-builtin-log2 CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include Modified: openbios-devel/config/examples/cross-sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_rules.xml 2008-12-14 12:56:06 UTC (rev 289) +++ openbios-devel/config/examples/cross-sparc32_rules.xml 2008-12-15 20:35:31 UTC (rev 290) @@ -22,7 +22,7 @@ NM := $(TARGET)nm STRIP := $(TARGET)strip RANLIB := $(TARGET)ranlib -CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g +CFLAGS := -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g CFLAGS+= -Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes Modified: openbios-devel/config/examples/cross-sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_rules.xml 2008-12-14 12:56:06 UTC (rev 289) +++ openbios-devel/config/examples/cross-sparc64_rules.xml 2008-12-15 20:35:31 UTC (rev 290) @@ -22,7 +22,7 @@ NM := $(TARGET)nm STRIP := $(TARGET)strip RANLIB := $(TARGET)ranlib -CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -g +CFLAGS := -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -g CFLAGS+= -Wa,-xarch=v9b -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany CFLAGS+= -fno-builtin -nostdlib -ffreestanding CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations Modified: openbios-devel/config/examples/sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/sparc32_rules.xml 2008-12-14 12:56:06 UTC (rev 289) +++ openbios-devel/config/examples/sparc32_rules.xml 2008-12-15 20:35:31 UTC (rev 290) @@ -27,7 +27,7 @@ LIBDL_LDFLAGS=-ldl endif -CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g +CFLAGS := -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g CFLAGS+= -Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes Modified: openbios-devel/config/examples/sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/sparc64_rules.xml 2008-12-14 12:56:06 UTC (rev 289) +++ openbios-devel/config/examples/sparc64_rules.xml 2008-12-15 20:35:31 UTC (rev 290) @@ -28,7 +28,7 @@ LIBDL_LDFLAGS=-ldl endif -CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g +CFLAGS := -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g CFLAGS+= -Wa,-xarch=v9b -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes

1 0

r289 - openbios-devel/config/examples
by svn＠openbios.org 14 Dec '08

14 Dec '08

Author: blueswirl Date: 2008-12-14 13:56:06 +0100 (Sun, 14 Dec 2008) New Revision: 289 Modified: openbios-devel/config/examples/cross-ppc_rules.xml openbios-devel/config/examples/cross-sparc32_rules.xml openbios-devel/config/examples/cross-sparc64_rules.xml openbios-devel/config/examples/sparc32_rules.xml openbios-devel/config/examples/sparc64_rules.xml Log: Enable more warnings Enable gcc flags -Wwrite-strings and -Wmissing-prototypes, also enable all warnings on PPC. Modified: openbios-devel/config/examples/cross-ppc_rules.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_rules.xml 2008-12-14 12:54:23 UTC (rev 288) +++ openbios-devel/config/examples/cross-ppc_rules.xml 2008-12-14 12:56:06 UTC (rev 289) @@ -10,6 +10,8 @@ ODIR := obj-$(ARCH) HOSTCC := gcc HOSTCFLAGS := -Os -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) +HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations +HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include # # MOLPATH is needed if you want to build openbios-mol.elf @@ -25,6 +27,8 @@ STRIP := $(TARGET)strip RANLIB := $(TARGET)ranlib CFLAGS := -Os -Wall -W -msoft-float -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin-bcopy -fno-builtin-log2 +CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations +CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include M4 := m4 Modified: openbios-devel/config/examples/cross-sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_rules.xml 2008-12-14 12:54:23 UTC (rev 288) +++ openbios-devel/config/examples/cross-sparc32_rules.xml 2008-12-14 12:56:06 UTC (rev 289) @@ -10,6 +10,8 @@ ODIR := obj-$(ARCH) HOSTCC := gcc HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) +HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations +HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include TARGET=sparc-elf- @@ -23,7 +25,7 @@ CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g CFLAGS+= -Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing +CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-xarch=v8 -Wa,-32 -g Modified: openbios-devel/config/examples/cross-sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_rules.xml 2008-12-14 12:54:23 UTC (rev 288) +++ openbios-devel/config/examples/cross-sparc64_rules.xml 2008-12-14 12:56:06 UTC (rev 289) @@ -10,6 +10,8 @@ ODIR := obj-$(ARCH) HOSTCC := gcc HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) +HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations +HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include TARGET=sparc64-elf- @@ -24,7 +26,7 @@ CFLAGS+= -Wa,-xarch=v9b -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany CFLAGS+= -fno-builtin -nostdlib -ffreestanding CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing +CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-xarch=v9b -Wa,-64 -g Modified: openbios-devel/config/examples/sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/sparc32_rules.xml 2008-12-14 12:54:23 UTC (rev 288) +++ openbios-devel/config/examples/sparc32_rules.xml 2008-12-14 12:56:06 UTC (rev 289) @@ -10,6 +10,8 @@ ODIR := obj-$(ARCH) HOSTCC := gcc HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) +HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations +HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include CC := gcc @@ -28,7 +30,7 @@ CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g CFLAGS+= -Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing +CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-xarch=v8 -Wa,-32 -g Modified: openbios-devel/config/examples/sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/sparc64_rules.xml 2008-12-14 12:54:23 UTC (rev 288) +++ openbios-devel/config/examples/sparc64_rules.xml 2008-12-14 12:56:06 UTC (rev 289) @@ -12,7 +12,7 @@ HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wa,-xarch=v9 -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing +HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include CC := gcc @@ -31,7 +31,7 @@ CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g CFLAGS+= -Wa,-xarch=v9b -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing +CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-xarch=v9b -Wa,-64 -g

1 0

r288 - in openbios-devel: arch/ppc arch/ppc/qemu arch/sparc32 arch/sparc64 drivers fs/grubfs fs/hfsplus include/openbios kernel modules
by svn＠openbios.org 14 Dec '08

14 Dec '08

Author: blueswirl Date: 2008-12-14 13:54:23 +0100 (Sun, 14 Dec 2008) New Revision: 288 Modified: openbios-devel/arch/ppc/kernel.c openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/sparc32/boot.c openbios-devel/arch/sparc32/openprom.h openbios-devel/arch/sparc32/romvec.c openbios-devel/arch/sparc64/boot.c openbios-devel/drivers/esp.c openbios-devel/drivers/ide.c openbios-devel/fs/grubfs/fsys_xfs.c openbios-devel/fs/grubfs/grubfs_fs.c openbios-devel/fs/hfsplus/hfsp_fs.c openbios-devel/include/openbios/fs.h openbios-devel/include/openbios/kernel.h openbios-devel/kernel/bootstrap.c openbios-devel/kernel/dict.c openbios-devel/modules/nvram.c openbios-devel/modules/video.c Log: Warning fixes for Sparc32, Sparc64, PPC Fix warnings that would be caused by gcc flag -Wwrite-strings and -Wmissing-prototypes. Also fix most PPC specific warnings. Modified: openbios-devel/arch/ppc/kernel.c =================================================================== --- openbios-devel/arch/ppc/kernel.c 2008-12-14 10:28:56 UTC (rev 287) +++ openbios-devel/arch/ppc/kernel.c 2008-12-14 12:54:23 UTC (rev 288) @@ -28,8 +28,6 @@ #define MEMORY_SIZE (256*1024) /* 256K ram for hosted system */ #define DICTIONARY_SIZE (512*1024) /* 128K for the dictionary */ -extern unsigned char *dict; -extern cell dicthead; static ucell *memory; /************************************************************************/ Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-12-14 10:28:56 UTC (rev 287) +++ openbios-devel/arch/ppc/qemu/init.c 2008-12-14 12:54:23 UTC (rev 288) @@ -87,7 +87,7 @@ } static void -setenv( char *env, char *value ) +setenv( const char *env, const char *value ) { push_str( value ); push_str( env ); @@ -97,7 +97,7 @@ void arch_of_init( void ) { -#if USE_RTAS +#ifdef USE_RTAS phandle_t ph; #endif int autoboot; @@ -114,7 +114,7 @@ node_methods_init(); -#if USE_RTAS +#ifdef USE_RTAS if( !(ph=find_dev("/rtas")) ) printk("Warning: No /rtas node\n"); else { Modified: openbios-devel/arch/sparc32/boot.c =================================================================== --- openbios-devel/arch/sparc32/boot.c 2008-12-14 10:28:56 UTC (rev 287) +++ openbios-devel/arch/sparc32/boot.c 2008-12-14 12:54:23 UTC (rev 288) @@ -34,8 +34,8 @@ void boot(void) { - char *path = pop_fstr_copy(), *param, *oldpath = path; - char altpath[256]; + char *path = pop_fstr_copy(), *param, altpath[256]; + const char *oldpath = path; int unit = 0; const void *romvec; Modified: openbios-devel/arch/sparc32/openprom.h =================================================================== --- openbios-devel/arch/sparc32/openprom.h 2008-12-14 10:28:56 UTC (rev 287) +++ openbios-devel/arch/sparc32/openprom.h 2008-12-14 12:54:23 UTC (rev 288) @@ -172,10 +172,10 @@ struct linux_nodeops { int (*no_nextnode)(int node); int (*no_child)(int node); - int (*no_proplen)(int node, char *name); - int (*no_getprop)(int node, char *name, char *val); - int (*no_setprop)(int node, char *name, char *val, int len); - const char * (*no_nextprop)(int node, char *name); + int (*no_proplen)(int node, const char *name); + int (*no_getprop)(int node, const char *name, char *val); + int (*no_setprop)(int node, const char *name, char *val, int len); + const char * (*no_nextprop)(int node, const char *name); }; /* More fun PROM structures for device probing. */ Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2008-12-14 10:28:56 UTC (rev 287) +++ openbios-devel/arch/sparc32/romvec.c 2008-12-14 12:54:23 UTC (rev 288) @@ -41,10 +41,10 @@ static int obp_nextnode(int node); static int obp_child(int node); -static int obp_proplen(int node, char *name); -static int obp_getprop(int node, char *name, char *val); -static int obp_setprop(int node, char *name, char *val, int len); -static const char *obp_nextprop(int node, char *name); +static int obp_proplen(int node, const char *name); +static int obp_getprop(int node, const char *name, char *val); +static int obp_setprop(int node, const char *name, char *val, int len); +static const char *obp_nextprop(int node, const char *name); static int obp_devread(int dev_desc, char *buf, int nbytes); static int obp_devseek(int dev_desc, int hi, int lo); @@ -85,7 +85,7 @@ return child; } -static int obp_proplen(int node, char *name) +static int obp_proplen(int node, const char *name) { int notfound; @@ -129,11 +129,11 @@ } #endif -static int obp_getprop(int node, char *name, char *value) +static int obp_getprop(int node, const char *name, char *value) { int notfound, found; int len; - char *str; + const char *str; if (!node) { DPRINTF("obp_getprop(0x0, %s) = -1\n", name); @@ -192,7 +192,7 @@ } } -static const char *obp_nextprop(int node, char *name) +static const char *obp_nextprop(int node, const char *name) { int found; @@ -224,7 +224,7 @@ } static int obp_setprop(__attribute__((unused)) int node, - __attribute__((unused)) char *name, + __attribute__((unused)) const char *name, __attribute__((unused)) char *value, __attribute__((unused)) int len) { Modified: openbios-devel/arch/sparc64/boot.c =================================================================== --- openbios-devel/arch/sparc64/boot.c 2008-12-14 10:28:56 UTC (rev 287) +++ openbios-devel/arch/sparc64/boot.c 2008-12-14 12:54:23 UTC (rev 288) @@ -44,17 +44,17 @@ } else { switch (boot_device) { case 'a': - path = "/obio/SUNW,fdtwo"; + path = strdup("/obio/SUNW,fdtwo"); break; case 'c': - path = "disk"; + path = strdup("disk"); break; default: case 'd': - path = "cdrom"; + path = strdup("cdrom"); break; case 'n': - path = "net"; + path = strdup("net"); break; } } Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2008-12-14 10:28:56 UTC (rev 287) +++ openbios-devel/drivers/esp.c 2008-12-14 12:54:23 UTC (rev 288) @@ -41,7 +41,7 @@ typedef struct sd_private { unsigned int bs; - char *media_str; + const char *media_str; uint32_t sectors; uint8_t media; uint8_t id; @@ -182,7 +182,7 @@ static unsigned int inquiry(esp_private_t *esp, sd_private_t *sd) { - char *media = "UNKNOWN"; + const char *media = "UNKNOWN"; // Setup command = Inquiry memset(esp->buffer, 0, 7); Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2008-12-14 10:28:56 UTC (rev 287) +++ openbios-devel/drivers/ide.c 2008-12-14 12:54:23 UTC (rev 288) @@ -157,7 +157,7 @@ } static void -ob_ide_error(struct ide_drive *drive, unsigned char stat, char *msg) +ob_ide_error(struct ide_drive *drive, unsigned char stat, const char *msg) { struct ide_channel *chan = drive->channel; unsigned char err; @@ -1285,8 +1285,8 @@ { int i, j; - char * nodetemp_chan = "/pci/isa/ide%d"; - char * nodetemp = "/pci/isa/ide%d/%s"; + const char *nodetemp_chan = "/pci/isa/ide%d"; + const char *nodetemp = "/pci/isa/ide%d/%s"; char nodebuff[32]; phandle_t dnode; @@ -1336,7 +1336,7 @@ printk("ide%d: [io ports 0x%x-0x%x,0x%x]\n", i, chan->io_regs[0], chan->io_regs[0] + 7, chan->io_regs[8]); for (j = 0; j < 2; j++) { struct ide_drive *drive = &chan->drives[j]; - char *media = "UNKNOWN"; + const char *media = "UNKNOWN"; if (!drive->present) continue; Modified: openbios-devel/fs/grubfs/fsys_xfs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_xfs.c 2008-12-14 10:28:56 UTC (rev 287) +++ openbios-devel/fs/grubfs/fsys_xfs.c 2008-12-14 12:54:23 UTC (rev 288) @@ -342,10 +342,16 @@ { int namelen = 1; int toread; - static char *usual[2] = {".", ".."}; + static char *usual[2]; static xfs_dir2_sf_entry_t *sfe; - char *name = usual[0]; + char *name; + if (!usual[0]) { + usual[0] = strdup("."); + usual[1] = strdup(".."); + } + name = usual[0]; + if (xfs.dirpos >= xfs.dirmax) { if (xfs.forw == 0) return NULL; Modified: openbios-devel/fs/grubfs/grubfs_fs.c =================================================================== --- openbios-devel/fs/grubfs/grubfs_fs.c 2008-12-14 10:28:56 UTC (rev 287) +++ openbios-devel/fs/grubfs/grubfs_fs.c 2008-12-14 12:54:23 UTC (rev 288) @@ -47,7 +47,7 @@ /************************************************************************/ typedef struct fsys_entry { - char *name; + const char *name; int (*mount_func) (void); int (*read_func) (char *buf, int len); int (*dir_func) (char *dirname); @@ -221,7 +221,7 @@ /* callers responsibility to call free(fs) */ } -static char * +static const char * grubfs_get_fstype( fs_ops_t *fs ) { grubfs_t *gfs = (grubfs_t*)fs->fs_data; Modified: openbios-devel/fs/hfsplus/hfsp_fs.c =================================================================== --- openbios-devel/fs/hfsplus/hfsp_fs.c 2008-12-14 10:28:56 UTC (rev 287) +++ openbios-devel/fs/hfsplus/hfsp_fs.c 2008-12-14 12:54:23 UTC (rev 288) @@ -67,7 +67,9 @@ } while( ret && !record_next(&r) ); if( !ret && pt ) { - char name[256], *s2 = t.path ? t.path : ""; + char name[256]; + const char *s2 = t.path ? t.path : ""; + unicode_uni2asc( name, &r.key.name, sizeof(name)); pt->rec = t.rec; @@ -359,7 +361,7 @@ return get_hfs_vol_name( fs->fd, buf, size ); } -static char * +static const char * get_fstype( fs_ops_t *fs ) { return ("HFS+"); Modified: openbios-devel/include/openbios/fs.h =================================================================== --- openbios-devel/include/openbios/fs.h 2008-12-14 10:28:56 UTC (rev 287) +++ openbios-devel/include/openbios/fs.h 2008-12-14 12:54:23 UTC (rev 288) @@ -43,7 +43,7 @@ int (*lseek)( file_desc_t *file, off_t offset, int whence ); char *(*get_path)( file_desc_t *file, char *buf, int len ); - char *(*get_fstype)( fs_ops_t *fs ); + const char *(*get_fstype)( fs_ops_t *fs ); }; extern fs_ops_t *fs_open( int fs_type, int fd ); Modified: openbios-devel/include/openbios/kernel.h =================================================================== --- openbios-devel/include/openbios/kernel.h 2008-12-14 10:28:56 UTC (rev 287) +++ openbios-devel/include/openbios/kernel.h 2008-12-14 12:54:23 UTC (rev 288) @@ -25,7 +25,7 @@ extern int enterforth( xt_t xt ); extern void panic(const char *error) __attribute__ ((noreturn)); -extern xt_t findword(char *s1); +extern xt_t findword(const char *s1); extern void modules_init( void ); /* arch kernel hooks */ Modified: openbios-devel/kernel/bootstrap.c =================================================================== --- openbios-devel/kernel/bootstrap.c 2008-12-14 10:28:56 UTC (rev 287) +++ openbios-devel/kernel/bootstrap.c 2008-12-14 12:54:23 UTC (rev 288) @@ -53,7 +53,7 @@ /* include path handling */ typedef struct include_path include; struct include_path { - char *path; + const char *path; include *next; }; @@ -137,7 +137,7 @@ relocation_address=reloc_table; } -static void write_dictionary(char *filename) +static void write_dictionary(const char *filename) { FILE *f; unsigned char *write_data, *walk_data; @@ -375,7 +375,7 @@ * generic forth word creator function. */ -static void fcreate(char *word, ucell cfaval) +static void fcreate(const char *word, ucell cfaval) { if (strlen(word) == 0) { printk("WARNING: tried to create unnamed word.\n"); @@ -395,20 +395,20 @@ } -static ucell *buildvariable(char *name, cell defval) +static ucell *buildvariable(const char *name, cell defval) { fcreate(name, DOVAR); /* see dict.h for DOVAR and other CFA ids */ writecell(defval); return (ucell *) (dict + dicthead - sizeof(cell)); } -static void buildconstant(char *name, cell defval) +static void buildconstant(const char *name, cell defval) { fcreate(name, DOCON); /* see dict.h for DOCON and other CFA ids */ writecell(defval); } -static void builddefer(char *name) +static void builddefer(const char *name) { fcreate(name, DODFR); /* see dict.h for DODFR and other CFA ids */ writecell((ucell)0); Modified: openbios-devel/kernel/dict.c =================================================================== --- openbios-devel/kernel/dict.c 2008-12-14 10:28:56 UTC (rev 287) +++ openbios-devel/kernel/dict.c 2008-12-14 12:54:23 UTC (rev 288) @@ -68,7 +68,7 @@ /* fstrcmp - compare null terminated string with forth string. */ -static int fstrcmp(char *s1, ucell fstr) +static int fstrcmp(const char *s1, ucell fstr) { char *s2 = (char*)cell2pointer(fstr); while (*s1) { @@ -84,7 +84,7 @@ * word. */ -xt_t findword(char *s1) +xt_t findword(const char *s1) { ucell tmplfa, len; Modified: openbios-devel/modules/nvram.c =================================================================== --- openbios-devel/modules/nvram.c 2008-12-14 10:28:56 UTC (rev 287) +++ openbios-devel/modules/nvram.c 2008-12-14 12:54:23 UTC (rev 288) @@ -110,7 +110,7 @@ } static int -create_nv_part( int signature, char *name, int size ) +create_nv_part( int signature, const char *name, int size ) { nvpart_t *p = NULL; int fs; Modified: openbios-devel/modules/video.c =================================================================== --- openbios-devel/modules/video.c 2008-12-14 10:28:56 UTC (rev 287) +++ openbios-devel/modules/video.c 2008-12-14 12:54:23 UTC (rev 288) @@ -174,7 +174,7 @@ #ifdef CONFIG_MOL if( video.fb.depth == 8 ) OSI_SetColor( ind, color ); -#elif CONFIG_SPARC32 +#elif defined(CONFIG_SPARC32) if( video.fb.depth == 8 ) { dac[0] = ind << 24; dac[1] = ((color >> 16) & 0xff) << 24; // Red

1 0

r287 - openbios-devel
by svn＠openbios.org 14 Dec '08

14 Dec '08

Author: blueswirl Date: 2008-12-14 11:28:56 +0100 (Sun, 14 Dec 2008) New Revision: 287 Modified: openbios-devel/ Log: Add svn:ignore property Property changes on: openbios-devel ___________________________________________________________________ Added: svn:ignore + obj-* config.xml rules.xml .pc patches

1 0

r286 - openbios-devel/include/openbios
by svn＠openbios.org 14 Dec '08

14 Dec '08

Author: blueswirl Date: 2008-12-14 10:09:48 +0100 (Sun, 14 Dec 2008) New Revision: 286 Modified: openbios-devel/include/openbios/firmware_abi.h Log: Remove spurious svn:executable property Property changes on: openbios-devel/include/openbios/firmware_abi.h ___________________________________________________________________ Deleted: svn:executable - *

1 0

Anthony P Ferranti/Raleigh/IBM is out of the office.
by Anthony P Ferranti 13 Dec '08

13 Dec '08

I will be out of the office starting 12/12/2008 and will not return until 01/05/2009. >From December 15 through December 18 I will be in class and will have limited access to email. After December 18 I will be on vacation through the New year holiday and will respond to your message when I return.

1 0

r285 - in openbios-devel: . arch/amd64 arch/ia64 arch/ppc arch/ppc/briq arch/ppc/mol arch/ppc/pearpc arch/ppc/qemu arch/sparc32 arch/sparc64 arch/unix arch/unix/gui_qt arch/unix/plugins arch/unix/plugins/plugin_qt arch/x86 arch/x86/xbox config/examples config/scripts drivers forth forth/admin forth/bootstrap forth/debugging forth/device forth/lib forth/packages forth/testsuite fs fs/grubfs fs/hfs fs/hfsplus fs/hfsplus/include include/libc include/openbios include/ppc kernel libc libgcc modules
by svn＠openbios.org 13 Dec '08

13 Dec '08

Author: blueswirl Date: 2008-12-13 10:26:41 +0100 (Sat, 13 Dec 2008) New Revision: 285 Modified: openbios-devel/Makefile openbios-devel/README openbios-devel/arch/amd64/Kconfig openbios-devel/arch/amd64/build.xml openbios-devel/arch/amd64/builtin.c openbios-devel/arch/amd64/init.fs openbios-devel/arch/amd64/lib.c openbios-devel/arch/amd64/loadfs.c openbios-devel/arch/amd64/loadfs.h openbios-devel/arch/amd64/plainboot.c openbios-devel/arch/amd64/relocate.h openbios-devel/arch/ia64/Kconfig openbios-devel/arch/ia64/build.xml openbios-devel/arch/ia64/init.fs openbios-devel/arch/ppc/briq/kernel.c openbios-devel/arch/ppc/briq/tree.fs openbios-devel/arch/ppc/build.xml openbios-devel/arch/ppc/misc.S openbios-devel/arch/ppc/mol/console.c openbios-devel/arch/ppc/mol/kernel.c openbios-devel/arch/ppc/mol/mol.c openbios-devel/arch/ppc/mol/prom.c openbios-devel/arch/ppc/mol/tree.fs openbios-devel/arch/ppc/pearpc/console.c openbios-devel/arch/ppc/pearpc/kernel.c openbios-devel/arch/ppc/pearpc/tree.fs openbios-devel/arch/ppc/qemu/kernel.c openbios-devel/arch/ppc/qemu/tree.fs openbios-devel/arch/ppc/timebase.S openbios-devel/arch/sparc32/builtin.c openbios-devel/arch/sparc32/loadfs.c openbios-devel/arch/sparc32/plainboot.c openbios-devel/arch/sparc32/tree.fs openbios-devel/arch/sparc64/builtin.c openbios-devel/arch/sparc64/init.fs openbios-devel/arch/sparc64/loadfs.c openbios-devel/arch/sparc64/plainboot.c openbios-devel/arch/unix/gui_qt/gui-qt.cpp openbios-devel/arch/unix/gui_qt/gui-qt.pro openbios-devel/arch/unix/gui_qt/qt-main.cpp openbios-devel/arch/unix/plugins.c openbios-devel/arch/unix/plugins/Kconfig openbios-devel/arch/unix/plugins/plugin_qt/plugin_qt.cpp openbios-devel/arch/unix/plugins/plugin_qt/plugin_qt.pro openbios-devel/arch/unix/plugins/plugin_qt/qt_main.cpp openbios-devel/arch/x86/Kconfig openbios-devel/arch/x86/boot.h openbios-devel/arch/x86/builtin.c openbios-devel/arch/x86/entry.S openbios-devel/arch/x86/init.fs openbios-devel/arch/x86/lib.c openbios-devel/arch/x86/loadfs.c openbios-devel/arch/x86/loadfs.h openbios-devel/arch/x86/plainboot.c openbios-devel/arch/x86/relocate.h openbios-devel/arch/x86/xbox/console.c openbios-devel/build.xml openbios-devel/config/examples/amd64_config.xml openbios-devel/config/examples/cross-ppc_config.xml openbios-devel/config/examples/cross-sparc32_config.xml openbios-devel/config/examples/cross-sparc64_config.xml openbios-devel/config/examples/ppc_config.xml openbios-devel/config/examples/sparc32_config.xml openbios-devel/config/examples/sparc64_config.xml openbios-devel/config/examples/x86_config.xml openbios-devel/config/scripts/reldir openbios-devel/config/scripts/switch-arch openbios-devel/drivers/Kconfig openbios-devel/drivers/cuda.h openbios-devel/drivers/floppy.c openbios-devel/drivers/obio.h openbios-devel/drivers/pci.fs openbios-devel/drivers/sbus.fs openbios-devel/forth/admin/README openbios-devel/forth/admin/reset.fs openbios-devel/forth/admin/script.fs openbios-devel/forth/admin/security.fs openbios-devel/forth/admin/selftest.fs openbios-devel/forth/admin/userboot.fs openbios-devel/forth/bootstrap/builtin.fs openbios-devel/forth/bootstrap/interpreter.fs openbios-devel/forth/bootstrap/memory.fs openbios-devel/forth/build.xml openbios-devel/forth/debugging/client.fs openbios-devel/forth/debugging/fcode.fs openbios-devel/forth/debugging/firmware.fs openbios-devel/forth/debugging/see.fs openbios-devel/forth/device/README.device openbios-devel/forth/device/display.fs openbios-devel/forth/device/fcode.fs openbios-devel/forth/device/logo.fs openbios-devel/forth/device/missing openbios-devel/forth/device/preof.fs openbios-devel/forth/device/property.fs openbios-devel/forth/device/terminal.fs openbios-devel/forth/device/tree.fs openbios-devel/forth/lib/vocabulary.fs openbios-devel/forth/packages/Kconfig openbios-devel/forth/packages/README openbios-devel/forth/packages/build.xml openbios-devel/forth/packages/terminal-emulator.fs openbios-devel/forth/testsuite/fract.fs openbios-devel/forth/testsuite/framebuffer-test.fs openbios-devel/fs/build.xml openbios-devel/fs/grubfs/Kconfig openbios-devel/fs/grubfs/debug.h openbios-devel/fs/grubfs/fsys_affs.c openbios-devel/fs/grubfs/fsys_ext2fs.c openbios-devel/fs/grubfs/fsys_iso9660.c openbios-devel/fs/hfs/file.c openbios-devel/fs/hfs/low.c openbios-devel/fs/hfs/medium.c openbios-devel/fs/hfs/volume.c openbios-devel/fs/hfs_mdb.h openbios-devel/fs/hfsplus/blockiter.c openbios-devel/fs/hfsplus/btree.c openbios-devel/fs/hfsplus/include/apple.h openbios-devel/fs/hfsplus/include/blockiter.h openbios-devel/fs/hfsplus/include/btree.h openbios-devel/fs/hfsplus/include/hfs.h openbios-devel/fs/hfsplus/include/hfsp.h openbios-devel/fs/hfsplus/include/hfstime.h openbios-devel/fs/hfsplus/include/libhfsp.h openbios-devel/fs/hfsplus/include/record.h openbios-devel/fs/hfsplus/record.c openbios-devel/include/libc/byteorder.h openbios-devel/include/openbios/asm.m4 openbios-devel/include/ppc/asmdefs.h openbios-devel/include/ppc/processor.h openbios-devel/kernel/Kconfig openbios-devel/kernel/primitives.c openbios-devel/libc/ctype.c openbios-devel/libc/string.c openbios-devel/libgcc/__udivmodti4.c openbios-devel/modules/clib.fs Log: Remove unnecessary trailing newlines Modified: openbios-devel/Makefile =================================================================== --- openbios-devel/Makefile 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/Makefile 2008-12-13 09:26:41 UTC (rev 285) @@ -103,4 +103,3 @@ runiso: $(ODIR)/openbios.iso qemu -cdrom $^ - Modified: openbios-devel/README =================================================================== --- openbios-devel/README 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/README 2008-12-13 09:26:41 UTC (rev 285) @@ -130,4 +130,3 @@ Regards, the OpenBIOS team - Modified: openbios-devel/arch/amd64/Kconfig =================================================================== --- openbios-devel/arch/amd64/Kconfig 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/amd64/Kconfig 2008-12-13 09:26:41 UTC (rev 285) @@ -46,5 +46,3 @@ source "forth/Kconfig" source "modules/Kconfig" source "drivers/Kconfig" - - Modified: openbios-devel/arch/amd64/build.xml =================================================================== --- openbios-devel/arch/amd64/build.xml 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/amd64/build.xml 2008-12-13 09:26:41 UTC (rev 285) @@ -3,4 +3,3 @@ <object source="init.fs"/> </dictionary> </build> - Modified: openbios-devel/arch/amd64/builtin.c =================================================================== --- openbios-devel/arch/amd64/builtin.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/amd64/builtin.c 2008-12-13 09:26:41 UTC (rev 285) @@ -23,4 +23,3 @@ info->dict_end=(unsigned long *)((ucell)forth_dictionary + sizeof(forth_dictionary)); } - Modified: openbios-devel/arch/amd64/init.fs =================================================================== --- openbios-devel/arch/amd64/init.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/amd64/init.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -74,4 +74,3 @@ " keyboard" input ; CONSOLE-IN-initializer - Modified: openbios-devel/arch/amd64/lib.c =================================================================== --- openbios-devel/arch/amd64/lib.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/amd64/lib.c 2008-12-13 09:26:41 UTC (rev 285) @@ -54,5 +54,3 @@ { /* Nothing yet */ } - - Modified: openbios-devel/arch/amd64/loadfs.c =================================================================== --- openbios-devel/arch/amd64/loadfs.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/amd64/loadfs.c 2008-12-13 09:26:41 UTC (rev 285) @@ -41,6 +41,3 @@ return fsize; } - - - Modified: openbios-devel/arch/amd64/loadfs.h =================================================================== --- openbios-devel/arch/amd64/loadfs.h 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/amd64/loadfs.h 2008-12-13 09:26:41 UTC (rev 285) @@ -2,6 +2,3 @@ int lfile_read(void *buf, unsigned long len); int file_seek(unsigned long offset); unsigned long file_size(void); - - - Modified: openbios-devel/arch/amd64/plainboot.c =================================================================== --- openbios-devel/arch/amd64/plainboot.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/amd64/plainboot.c 2008-12-13 09:26:41 UTC (rev 285) @@ -19,4 +19,3 @@ info->dict_start=(unsigned long *)FIXED_DICTSTART; info->dict_end=(unsigned long *)FIXED_DICTEND; } - Modified: openbios-devel/arch/amd64/relocate.h =================================================================== --- openbios-devel/arch/amd64/relocate.h 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/amd64/relocate.h 2008-12-13 09:26:41 UTC (rev 285) @@ -1,2 +1 @@ void relocate(struct sys_info *); - Modified: openbios-devel/arch/ia64/Kconfig =================================================================== --- openbios-devel/arch/ia64/Kconfig 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/ia64/Kconfig 2008-12-13 09:26:41 UTC (rev 285) @@ -20,5 +20,3 @@ source "forth/Kconfig" source "modules/Kconfig" source "drivers/Kconfig" - - Modified: openbios-devel/arch/ia64/build.xml =================================================================== --- openbios-devel/arch/ia64/build.xml 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/ia64/build.xml 2008-12-13 09:26:41 UTC (rev 285) @@ -3,4 +3,3 @@ <object source="init.fs"/> </dictionary> </build> - Modified: openbios-devel/arch/ia64/init.fs =================================================================== --- openbios-devel/arch/ia64/init.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/ia64/init.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -74,4 +74,3 @@ " keyboard" input ; CONSOLE-IN-initializer - Modified: openbios-devel/arch/ppc/briq/kernel.c =================================================================== --- openbios-devel/arch/ppc/briq/kernel.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/ppc/briq/kernel.c 2008-12-13 09:26:41 UTC (rev 285) @@ -14,4 +14,3 @@ #include "briq-dict.h" #include "../kernel.c" - Modified: openbios-devel/arch/ppc/briq/tree.fs =================================================================== --- openbios-devel/arch/ppc/briq/tree.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/ppc/briq/tree.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -244,4 +244,3 @@ \ The END \ ------------------------------------------------------------- device-end - Modified: openbios-devel/arch/ppc/build.xml =================================================================== --- openbios-devel/arch/ppc/build.xml 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/ppc/build.xml 2008-12-13 09:26:41 UTC (rev 285) @@ -261,4 +261,3 @@ </executable> </build> - Modified: openbios-devel/arch/ppc/misc.S =================================================================== --- openbios-devel/arch/ppc/misc.S 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/ppc/misc.S 2008-12-13 09:26:41 UTC (rev 285) @@ -72,4 +72,3 @@ srw r3,r3,r5 # MSW = MSW >> count or r4,r4,r7 # LSW |= t2 blr - Modified: openbios-devel/arch/ppc/mol/console.c =================================================================== --- openbios-devel/arch/ppc/mol/console.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/ppc/mol/console.c 2008-12-13 09:26:41 UTC (rev 285) @@ -28,5 +28,3 @@ #include "../../../modules/video.c" #include "../../../modules/console.c" - - Modified: openbios-devel/arch/ppc/mol/kernel.c =================================================================== --- openbios-devel/arch/ppc/mol/kernel.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/ppc/mol/kernel.c 2008-12-13 09:26:41 UTC (rev 285) @@ -14,4 +14,3 @@ #include "mol-dict.h" #include "../kernel.c" - Modified: openbios-devel/arch/ppc/mol/mol.c =================================================================== --- openbios-devel/arch/ppc/mol/mol.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/ppc/mol/mol.c 2008-12-13 09:26:41 UTC (rev 285) @@ -163,4 +163,3 @@ for( i=0; i<size; i++ ) buf[i] = OSI_ReadNVRamByte( i ); } - Modified: openbios-devel/arch/ppc/mol/prom.c =================================================================== --- openbios-devel/arch/ppc/mol/prom.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/ppc/mol/prom.c 2008-12-13 09:26:41 UTC (rev 285) @@ -173,5 +173,3 @@ { return OSI_PromIface1( kPromChangePHandle, old_ph, (int)new_ph ); } - - Modified: openbios-devel/arch/ppc/mol/tree.fs =================================================================== --- openbios-devel/arch/ppc/mol/tree.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/ppc/mol/tree.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -101,4 +101,3 @@ \ The END \ ------------------------------------------------------------- device-end - Modified: openbios-devel/arch/ppc/pearpc/console.c =================================================================== --- openbios-devel/arch/ppc/pearpc/console.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/ppc/pearpc/console.c 2008-12-13 09:26:41 UTC (rev 285) @@ -42,6 +42,3 @@ #include "../../../modules/video.c" #include "../../../modules/console.c" - - - Modified: openbios-devel/arch/ppc/pearpc/kernel.c =================================================================== --- openbios-devel/arch/ppc/pearpc/kernel.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/ppc/pearpc/kernel.c 2008-12-13 09:26:41 UTC (rev 285) @@ -14,4 +14,3 @@ #include "pearpc-dict.h" #include "../kernel.c" - Modified: openbios-devel/arch/ppc/pearpc/tree.fs =================================================================== --- openbios-devel/arch/ppc/pearpc/tree.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/ppc/pearpc/tree.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -244,4 +244,3 @@ \ The END \ ------------------------------------------------------------- device-end - Modified: openbios-devel/arch/ppc/qemu/kernel.c =================================================================== --- openbios-devel/arch/ppc/qemu/kernel.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/ppc/qemu/kernel.c 2008-12-13 09:26:41 UTC (rev 285) @@ -14,4 +14,3 @@ #include "qemu-dict.h" #include "../kernel.c" - Modified: openbios-devel/arch/ppc/qemu/tree.fs =================================================================== --- openbios-devel/arch/ppc/qemu/tree.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/ppc/qemu/tree.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -244,4 +244,3 @@ \ The END \ ------------------------------------------------------------- device-end - Modified: openbios-devel/arch/ppc/timebase.S =================================================================== --- openbios-devel/arch/ppc/timebase.S 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/ppc/timebase.S 2008-12-13 09:26:41 UTC (rev 285) @@ -31,4 +31,3 @@ mtlr r8 /* restore link register */ blr - Modified: openbios-devel/arch/sparc32/builtin.c =================================================================== --- openbios-devel/arch/sparc32/builtin.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/sparc32/builtin.c 2008-12-13 09:26:41 UTC (rev 285) @@ -23,4 +23,3 @@ info->dict_end=(unsigned long *)((ucell)forth_dictionary + sizeof(forth_dictionary)); } - Modified: openbios-devel/arch/sparc32/loadfs.c =================================================================== --- openbios-devel/arch/sparc32/loadfs.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/sparc32/loadfs.c 2008-12-13 09:26:41 UTC (rev 285) @@ -59,6 +59,3 @@ return fsize; } - - - Modified: openbios-devel/arch/sparc32/plainboot.c =================================================================== --- openbios-devel/arch/sparc32/plainboot.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/sparc32/plainboot.c 2008-12-13 09:26:41 UTC (rev 285) @@ -19,4 +19,3 @@ info->dict_start=(unsigned long *)FIXED_DICTSTART; info->dict_end=(unsigned long *)FIXED_DICTEND; } - Modified: openbios-devel/arch/sparc32/tree.fs =================================================================== --- openbios-devel/arch/sparc32/tree.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/sparc32/tree.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -125,4 +125,3 @@ " /options" find-device " disk" encode-string " boot-from" property - Modified: openbios-devel/arch/sparc64/builtin.c =================================================================== --- openbios-devel/arch/sparc64/builtin.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/sparc64/builtin.c 2008-12-13 09:26:41 UTC (rev 285) @@ -23,4 +23,3 @@ info->dict_end=(unsigned long *)((ucell)forth_dictionary + sizeof(forth_dictionary)); } - Modified: openbios-devel/arch/sparc64/init.fs =================================================================== --- openbios-devel/arch/sparc64/init.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/sparc64/init.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -52,4 +52,3 @@ : rmap@ ( virt -- rmentry ) drop 0 ; - Modified: openbios-devel/arch/sparc64/loadfs.c =================================================================== --- openbios-devel/arch/sparc64/loadfs.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/sparc64/loadfs.c 2008-12-13 09:26:41 UTC (rev 285) @@ -59,6 +59,3 @@ return fsize; } - - - Modified: openbios-devel/arch/sparc64/plainboot.c =================================================================== --- openbios-devel/arch/sparc64/plainboot.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/sparc64/plainboot.c 2008-12-13 09:26:41 UTC (rev 285) @@ -19,4 +19,3 @@ info->dict_start=(unsigned long *)FIXED_DICTSTART; info->dict_end=(unsigned long *)FIXED_DICTEND; } - Modified: openbios-devel/arch/unix/gui_qt/gui-qt.cpp =================================================================== --- openbios-devel/arch/unix/gui_qt/gui-qt.cpp 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/unix/gui_qt/gui-qt.cpp 2008-12-13 09:26:41 UTC (rev 285) @@ -126,4 +126,3 @@ std::cout << " key '" << e->text() << "' pressed" << std::endl; } } - Modified: openbios-devel/arch/unix/gui_qt/gui-qt.pro =================================================================== --- openbios-devel/arch/unix/gui_qt/gui-qt.pro 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/unix/gui_qt/gui-qt.pro 2008-12-13 09:26:41 UTC (rev 285) @@ -16,4 +16,3 @@ TARGET = gui_qt HEADERS = $(UIDIR)/gui-qt.h SOURCES = $(UIDIR)/gui-qt.cpp $(UIDIR)/qt-main.cpp - Modified: openbios-devel/arch/unix/gui_qt/qt-main.cpp =================================================================== --- openbios-devel/arch/unix/gui_qt/qt-main.cpp 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/unix/gui_qt/qt-main.cpp 2008-12-13 09:26:41 UTC (rev 285) @@ -95,4 +95,3 @@ } } - Modified: openbios-devel/arch/unix/plugins/Kconfig =================================================================== --- openbios-devel/arch/unix/plugins/Kconfig 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/unix/plugins/Kconfig 2008-12-13 09:26:41 UTC (rev 285) @@ -14,4 +14,3 @@ default n help This plugin needs qt installed. Disable if you don't have qt. - Modified: openbios-devel/arch/unix/plugins/plugin_qt/plugin_qt.cpp =================================================================== --- openbios-devel/arch/unix/plugins/plugin_qt/plugin_qt.cpp 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/unix/plugins/plugin_qt/plugin_qt.cpp 2008-12-13 09:26:41 UTC (rev 285) @@ -126,4 +126,3 @@ std::cout << " key '" << e->text() << "' pressed" << std::endl; } } - Modified: openbios-devel/arch/unix/plugins/plugin_qt/plugin_qt.pro =================================================================== --- openbios-devel/arch/unix/plugins/plugin_qt/plugin_qt.pro 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/unix/plugins/plugin_qt/plugin_qt.pro 2008-12-13 09:26:41 UTC (rev 285) @@ -16,4 +16,3 @@ TARGET = plugin_qt.so HEADERS = $(PLUGINDIR)/plugin_qt/plugin_qt.h SOURCES = $(PLUGINDIR)/plugin_qt/plugin_qt.cpp $(PLUGINDIR)/plugin_qt/qt_main.cpp - Modified: openbios-devel/arch/unix/plugins/plugin_qt/qt_main.cpp =================================================================== --- openbios-devel/arch/unix/plugins/plugin_qt/qt_main.cpp 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/unix/plugins/plugin_qt/qt_main.cpp 2008-12-13 09:26:41 UTC (rev 285) @@ -100,4 +100,3 @@ PLUGIN_DEPENDENCIES("pci") } - Modified: openbios-devel/arch/unix/plugins.c =================================================================== --- openbios-devel/arch/unix/plugins.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/unix/plugins.c 2008-12-13 09:26:41 UTC (rev 285) @@ -195,4 +195,3 @@ // We don't dlclose the handle here since // we want to keep our symbols for later use. } - Modified: openbios-devel/arch/x86/Kconfig =================================================================== --- openbios-devel/arch/x86/Kconfig 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/x86/Kconfig 2008-12-13 09:26:41 UTC (rev 285) @@ -45,5 +45,3 @@ source "forth/Kconfig" source "modules/Kconfig" source "drivers/Kconfig" - - Modified: openbios-devel/arch/x86/boot.h =================================================================== --- openbios-devel/arch/x86/boot.h 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/x86/boot.h 2008-12-13 09:26:41 UTC (rev 285) @@ -11,4 +11,3 @@ int linux_load(struct sys_info *info, const char *file, const char *cmdline); unsigned int start_elf(unsigned long entry_point, unsigned long param); - Modified: openbios-devel/arch/x86/builtin.c =================================================================== --- openbios-devel/arch/x86/builtin.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/x86/builtin.c 2008-12-13 09:26:41 UTC (rev 285) @@ -22,4 +22,3 @@ info->dict_end=(unsigned long *)((ucell)forth_dictionary + sizeof(forth_dictionary)); } - Modified: openbios-devel/arch/x86/entry.S =================================================================== --- openbios-devel/arch/x86/entry.S 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/x86/entry.S 2008-12-13 09:26:41 UTC (rev 285) @@ -296,5 +296,3 @@ _idt: .fill 20, 8, 0 # idt is unitiailzed _idt_end: - - Modified: openbios-devel/arch/x86/init.fs =================================================================== --- openbios-devel/arch/x86/init.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/x86/init.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -75,4 +75,3 @@ " keyboard" input ; CONSOLE-IN-initializer - Modified: openbios-devel/arch/x86/lib.c =================================================================== --- openbios-devel/arch/x86/lib.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/x86/lib.c 2008-12-13 09:26:41 UTC (rev 285) @@ -54,5 +54,3 @@ { /* Nothing yet */ } - - Modified: openbios-devel/arch/x86/loadfs.c =================================================================== --- openbios-devel/arch/x86/loadfs.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/x86/loadfs.c 2008-12-13 09:26:41 UTC (rev 285) @@ -41,6 +41,3 @@ return fsize; } - - - Modified: openbios-devel/arch/x86/loadfs.h =================================================================== --- openbios-devel/arch/x86/loadfs.h 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/x86/loadfs.h 2008-12-13 09:26:41 UTC (rev 285) @@ -2,6 +2,3 @@ int lfile_read(void *buf, unsigned long len); int file_seek(unsigned long offset); unsigned long file_size(void); - - - Modified: openbios-devel/arch/x86/plainboot.c =================================================================== --- openbios-devel/arch/x86/plainboot.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/x86/plainboot.c 2008-12-13 09:26:41 UTC (rev 285) @@ -19,4 +19,3 @@ info->dict_start=(unsigned long *)FIXED_DICTSTART; info->dict_end=(unsigned long *)FIXED_DICTEND; } - Modified: openbios-devel/arch/x86/relocate.h =================================================================== --- openbios-devel/arch/x86/relocate.h 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/x86/relocate.h 2008-12-13 09:26:41 UTC (rev 285) @@ -1,2 +1 @@ void relocate(struct sys_info *); - Modified: openbios-devel/arch/x86/xbox/console.c =================================================================== --- openbios-devel/arch/x86/xbox/console.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/arch/x86/xbox/console.c 2008-12-13 09:26:41 UTC (rev 285) @@ -21,6 +21,3 @@ #include "../../../modules/video.c" #include "../../../modules/console.c" - - - Modified: openbios-devel/build.xml =================================================================== --- openbios-devel/build.xml 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/build.xml 2008-12-13 09:26:41 UTC (rev 285) @@ -11,4 +11,3 @@ <include href="arch/build.xml"/> </project> </xmlmake> - Modified: openbios-devel/config/examples/amd64_config.xml =================================================================== --- openbios-devel/config/examples/amd64_config.xml 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/config/examples/amd64_config.xml 2008-12-13 09:26:41 UTC (rev 285) @@ -69,4 +69,3 @@ <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> </config> - Modified: openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_config.xml 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/config/examples/cross-ppc_config.xml 2008-12-13 09:26:41 UTC (rev 285) @@ -72,4 +72,3 @@ <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> </config> - Modified: openbios-devel/config/examples/cross-sparc32_config.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_config.xml 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/config/examples/cross-sparc32_config.xml 2008-12-13 09:26:41 UTC (rev 285) @@ -74,4 +74,3 @@ <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="false"/> </config> - Modified: openbios-devel/config/examples/cross-sparc64_config.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_config.xml 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/config/examples/cross-sparc64_config.xml 2008-12-13 09:26:41 UTC (rev 285) @@ -74,4 +74,3 @@ <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> </config> - Modified: openbios-devel/config/examples/ppc_config.xml =================================================================== --- openbios-devel/config/examples/ppc_config.xml 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/config/examples/ppc_config.xml 2008-12-13 09:26:41 UTC (rev 285) @@ -68,4 +68,3 @@ <option name="CONFIG_DRIVER_ADB" type="boolean" value="true"/> </config> - Modified: openbios-devel/config/examples/sparc32_config.xml =================================================================== --- openbios-devel/config/examples/sparc32_config.xml 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/config/examples/sparc32_config.xml 2008-12-13 09:26:41 UTC (rev 285) @@ -74,4 +74,3 @@ <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/> </config> - Modified: openbios-devel/config/examples/sparc64_config.xml =================================================================== --- openbios-devel/config/examples/sparc64_config.xml 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/config/examples/sparc64_config.xml 2008-12-13 09:26:41 UTC (rev 285) @@ -74,4 +74,3 @@ <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> </config> - Modified: openbios-devel/config/examples/x86_config.xml =================================================================== --- openbios-devel/config/examples/x86_config.xml 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/config/examples/x86_config.xml 2008-12-13 09:26:41 UTC (rev 285) @@ -71,4 +71,3 @@ <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="false"/> </config> - Modified: openbios-devel/config/scripts/reldir =================================================================== --- openbios-devel/config/scripts/reldir 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/config/scripts/reldir 2008-12-13 09:26:41 UTC (rev 285) @@ -8,4 +8,3 @@ ROOT=$( echo $(pwd) | sed "s,$//*[^/][^/]*$\{$x\}/*\$,," ) RELNAME=$( echo $(pwd) | sed "s,^$ROOT/*,,g" ) echo $RELNAME - Modified: openbios-devel/config/scripts/switch-arch =================================================================== --- openbios-devel/config/scripts/switch-arch 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/config/scripts/switch-arch 2008-12-13 09:26:41 UTC (rev 285) @@ -12,4 +12,3 @@ rm -f config.xml ln -s config/examples/${ARCH}_rules.xml rules.xml ln -s config/examples/${ARCH}_config.xml config.xml - Modified: openbios-devel/drivers/Kconfig =================================================================== --- openbios-devel/drivers/Kconfig 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/drivers/Kconfig 2008-12-13 09:26:41 UTC (rev 285) @@ -37,4 +37,3 @@ Debug IDE driver endmenu - Modified: openbios-devel/drivers/cuda.h =================================================================== --- openbios-devel/drivers/cuda.h 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/drivers/cuda.h 2008-12-13 09:26:41 UTC (rev 285) @@ -16,5 +16,3 @@ cuda_t *cuda_init (char *path, uint32_t base); - - Modified: openbios-devel/drivers/floppy.c =================================================================== --- openbios-devel/drivers/floppy.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/drivers/floppy.c 2008-12-13 09:26:41 UTC (rev 285) @@ -1116,4 +1116,3 @@ floppy_init(); return 0; } - Modified: openbios-devel/drivers/obio.h =================================================================== --- openbios-devel/drivers/obio.h 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/drivers/obio.h 2008-12-13 09:26:41 UTC (rev 285) @@ -166,4 +166,3 @@ #define SUN4M_INT_SERIAL 0x00008000 /* serial ports */ #define SUN4M_INT_KBDMS 0x00004000 /* keyboard/mouse */ #define SUN4M_INT_SBUSBITS 0x00003F80 /* sbus int bits */ - Modified: openbios-devel/drivers/pci.fs =================================================================== --- openbios-devel/drivers/pci.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/drivers/pci.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -34,4 +34,3 @@ [THEN] - Modified: openbios-devel/drivers/sbus.fs =================================================================== --- openbios-devel/drivers/sbus.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/drivers/sbus.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -16,4 +16,3 @@ " ," pocket tmpstrcat >r rot pocket tohexstr r> tmpstrcat drop ; - Modified: openbios-devel/forth/admin/README =================================================================== --- openbios-devel/forth/admin/README 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/admin/README 2008-12-13 09:26:41 UTC (rev 285) @@ -1,5 +1,3 @@ \ This directory contains code that implements \ the Administration command group \ (Chapter 7.4 in the IEEE 1275-1994) - - Modified: openbios-devel/forth/admin/reset.fs =================================================================== --- openbios-devel/forth/admin/reset.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/admin/reset.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -10,5 +10,3 @@ \ OpenBOOT knows reset as well. : reset reset-all ; - - Modified: openbios-devel/forth/admin/script.fs =================================================================== --- openbios-devel/forth/admin/script.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/admin/script.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -14,4 +14,3 @@ : nvrun ( -- ) ; - Modified: openbios-devel/forth/admin/security.fs =================================================================== --- openbios-devel/forth/admin/security.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/admin/security.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -8,4 +8,3 @@ : security-#badlogins ( -- n ) ; - Modified: openbios-devel/forth/admin/selftest.fs =================================================================== --- openbios-devel/forth/admin/selftest.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/admin/selftest.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -47,4 +47,3 @@ ?active-package test-sub-devs active-package! ; - Modified: openbios-devel/forth/admin/userboot.fs =================================================================== --- openbios-devel/forth/admin/userboot.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/admin/userboot.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -16,5 +16,3 @@ \ : diag-switch? ( -- diag? ) \ ; - - Modified: openbios-devel/forth/bootstrap/builtin.fs =================================================================== --- openbios-devel/forth/bootstrap/builtin.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/bootstrap/builtin.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -26,5 +26,3 @@ 0 ['] source-id (to) \ builtin terminal has id 0 ; - - Modified: openbios-devel/forth/bootstrap/interpreter.fs =================================================================== --- openbios-devel/forth/bootstrap/interpreter.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/bootstrap/interpreter.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -171,5 +171,3 @@ ; : eval evaluate ; - - Modified: openbios-devel/forth/bootstrap/memory.fs =================================================================== --- openbios-devel/forth/bootstrap/memory.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/bootstrap/memory.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -214,5 +214,3 @@ then ; - - Modified: openbios-devel/forth/build.xml =================================================================== --- openbios-devel/forth/build.xml 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/build.xml 2008-12-13 09:26:41 UTC (rev 285) @@ -11,4 +11,3 @@ <include href="packages/build.xml"/> <include href="system/build.xml"/> </build> - Modified: openbios-devel/forth/debugging/client.fs =================================================================== --- openbios-devel/forth/debugging/client.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/debugging/client.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -108,4 +108,3 @@ : value>sym ( n1 -- n1 false | n2 addr len true ) ; - Modified: openbios-devel/forth/debugging/fcode.fs =================================================================== --- openbios-devel/forth/debugging/fcode.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/debugging/fcode.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -28,4 +28,3 @@ : apply ( ... "method-name< >device-specifier< >" -- ??? ) ; - Modified: openbios-devel/forth/debugging/firmware.fs =================================================================== --- openbios-devel/forth/debugging/firmware.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/debugging/firmware.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -80,4 +80,3 @@ : resume ( -- ) ; - Modified: openbios-devel/forth/debugging/see.fs =================================================================== --- openbios-devel/forth/debugging/see.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/debugging/see.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -111,4 +111,3 @@ ; : see ' (see) ; - Modified: openbios-devel/forth/device/README.device =================================================================== --- openbios-devel/forth/device/README.device 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/device/README.device 2008-12-13 09:26:41 UTC (rev 285) @@ -20,4 +20,3 @@ 2003/11/12 Stefan Reinauer <stepan(a)openbios.org> - Modified: openbios-devel/forth/device/display.fs =================================================================== --- openbios-devel/forth/device/display.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/device/display.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -364,4 +364,3 @@ to foreground-color to background-color ; - Modified: openbios-devel/forth/device/fcode.fs =================================================================== --- openbios-devel/forth/device/fcode.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/device/fcode.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -517,5 +517,3 @@ fcode-offset drop postpone endof ; immediate - - Modified: openbios-devel/forth/device/logo.fs =================================================================== --- openbios-devel/forth/device/logo.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/device/logo.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -96,4 +96,3 @@ 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, value (romlogo-64x64) - Modified: openbios-devel/forth/device/missing =================================================================== --- openbios-devel/forth/device/missing 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/device/missing 2008-12-13 09:26:41 UTC (rev 285) @@ -36,4 +36,3 @@ * diagnostic-mode? * suspend-fcode * set-args - Modified: openbios-devel/forth/device/preof.fs =================================================================== --- openbios-devel/forth/device/preof.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/device/preof.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -47,4 +47,3 @@ : group-code non-implemented ; : probe non-implemented ; : probe-virtual non-implemented ; - Modified: openbios-devel/forth/device/property.fs =================================================================== --- openbios-devel/forth/device/property.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/device/property.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -321,4 +321,3 @@ : model ( str len -- ) encode-string " model" property ; - Modified: openbios-devel/forth/device/terminal.fs =================================================================== --- openbios-devel/forth/device/terminal.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/device/terminal.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -253,4 +253,3 @@ ; ['] (term-emit) to fb-emit - Modified: openbios-devel/forth/device/tree.fs =================================================================== --- openbios-devel/forth/device/tree.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/device/tree.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -63,4 +63,3 @@ \ END finish-device - Modified: openbios-devel/forth/lib/vocabulary.fs =================================================================== --- openbios-devel/forth/lib/vocabulary.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/lib/vocabulary.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -151,5 +151,3 @@ ; true to vocabularies? - - Modified: openbios-devel/forth/packages/Kconfig =================================================================== --- openbios-devel/forth/packages/Kconfig 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/packages/Kconfig 2008-12-13 09:26:41 UTC (rev 285) @@ -14,4 +14,3 @@ config PKG_TERMINAL_EMULATOR bool "Terminal Emulator" default y - Modified: openbios-devel/forth/packages/README =================================================================== --- openbios-devel/forth/packages/README 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/packages/README 2008-12-13 09:26:41 UTC (rev 285) @@ -9,4 +9,3 @@ * deblocker * obp-tftp * - Modified: openbios-devel/forth/packages/build.xml =================================================================== --- openbios-devel/forth/packages/build.xml 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/packages/build.xml 2008-12-13 09:26:41 UTC (rev 285) @@ -17,4 +17,3 @@ </dictionary> </build> - Modified: openbios-devel/forth/packages/terminal-emulator.fs =================================================================== --- openbios-devel/forth/packages/terminal-emulator.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/packages/terminal-emulator.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -22,4 +22,3 @@ \ clean up afterwards device-end - Modified: openbios-devel/forth/testsuite/fract.fs =================================================================== --- openbios-devel/forth/testsuite/fract.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/testsuite/fract.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -33,4 +33,3 @@ cr drop 5de +loop ; - Modified: openbios-devel/forth/testsuite/framebuffer-test.fs =================================================================== --- openbios-devel/forth/testsuite/framebuffer-test.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/forth/testsuite/framebuffer-test.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -8,6 +8,3 @@ ; test-screen - - - Modified: openbios-devel/fs/build.xml =================================================================== --- openbios-devel/fs/build.xml 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/build.xml 2008-12-13 09:26:41 UTC (rev 285) @@ -10,4 +10,3 @@ <include href="hfsplus/build.xml"/> </build> - Modified: openbios-devel/fs/grubfs/Kconfig =================================================================== --- openbios-devel/fs/grubfs/Kconfig 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/grubfs/Kconfig 2008-12-13 09:26:41 UTC (rev 285) @@ -81,4 +81,3 @@ default n help Include Amiga FFS filesystem support - Modified: openbios-devel/fs/grubfs/debug.h =================================================================== --- openbios-devel/fs/grubfs/debug.h 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/grubfs/debug.h 2008-12-13 09:26:41 UTC (rev 285) @@ -1,3 +1 @@ /* for grub compatibility */ - - Modified: openbios-devel/fs/grubfs/fsys_affs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_affs.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/grubfs/fsys_affs.c 2008-12-13 09:26:41 UTC (rev 285) @@ -710,4 +710,3 @@ } } #endif - Modified: openbios-devel/fs/grubfs/fsys_ext2fs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_ext2fs.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/grubfs/fsys_ext2fs.c 2008-12-13 09:26:41 UTC (rev 285) @@ -806,4 +806,3 @@ } #endif /* FSYS_EXT2_FS */ - Modified: openbios-devel/fs/grubfs/fsys_iso9660.c =================================================================== --- openbios-devel/fs/grubfs/fsys_iso9660.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/grubfs/fsys_iso9660.c 2008-12-13 09:26:41 UTC (rev 285) @@ -333,4 +333,3 @@ } #endif /* FSYS_ISO9660 */ - Modified: openbios-devel/fs/hfs/file.c =================================================================== --- openbios-devel/fs/hfs/file.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/hfs/file.c 2008-12-13 09:26:41 UTC (rev 285) @@ -188,4 +188,3 @@ fail: return -1; } - Modified: openbios-devel/fs/hfs/low.c =================================================================== --- openbios-devel/fs/hfs/low.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/hfs/low.c 2008-12-13 09:26:41 UTC (rev 285) @@ -154,4 +154,3 @@ fail: return -1; } - Modified: openbios-devel/fs/hfs/medium.c =================================================================== --- openbios-devel/fs/hfs/medium.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/hfs/medium.c 2008-12-13 09:26:41 UTC (rev 285) @@ -81,4 +81,3 @@ fail: return found; } - Modified: openbios-devel/fs/hfs/volume.c =================================================================== --- openbios-devel/fs/hfs/volume.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/hfs/volume.c 2008-12-13 09:26:41 UTC (rev 285) @@ -588,5 +588,3 @@ fail: return -1; } - - Modified: openbios-devel/fs/hfs_mdb.h =================================================================== --- openbios-devel/fs/hfs_mdb.h 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/hfs_mdb.h 2008-12-13 09:26:41 UTC (rev 285) @@ -107,4 +107,3 @@ #endif /* _H_HFS_MDB */ - Modified: openbios-devel/fs/hfsplus/blockiter.c =================================================================== --- openbios-devel/fs/hfsplus/blockiter.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/hfsplus/blockiter.c 2008-12-13 09:26:41 UTC (rev 285) @@ -138,4 +138,3 @@ fail: return -1; } - Modified: openbios-devel/fs/hfsplus/btree.c =================================================================== --- openbios-devel/fs/hfsplus/btree.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/hfsplus/btree.c 2008-12-13 09:26:41 UTC (rev 285) @@ -369,4 +369,3 @@ } #endif - Modified: openbios-devel/fs/hfsplus/include/apple.h =================================================================== --- openbios-devel/fs/hfsplus/include/apple.h 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/hfsplus/include/apple.h 2008-12-13 09:26:41 UTC (rev 285) @@ -108,4 +108,3 @@ # define HFS_FNDR_HASBUNDLE (1 << 13) # define HFS_FNDR_ISINVISIBLE (1 << 14) # define HFS_FNDR_ISALIAS (1 << 15) - Modified: openbios-devel/fs/hfsplus/include/blockiter.h =================================================================== --- openbios-devel/fs/hfsplus/include/blockiter.h 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/hfsplus/include/blockiter.h 2008-12-13 09:26:41 UTC (rev 285) @@ -56,5 +56,3 @@ { return b->e->start_block + b->block; } - - Modified: openbios-devel/fs/hfsplus/include/btree.h =================================================================== --- openbios-devel/fs/hfsplus/include/btree.h 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/hfsplus/include/btree.h 2008-12-13 09:26:41 UTC (rev 285) @@ -47,4 +47,3 @@ /* Dump all the btree information to stdout */ extern void btree_print(btree* bt); #endif - Modified: openbios-devel/fs/hfsplus/include/hfs.h =================================================================== --- openbios-devel/fs/hfsplus/include/hfs.h 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/hfsplus/include/hfs.h 2008-12-13 09:26:41 UTC (rev 285) @@ -29,4 +29,3 @@ /* A sector for Apple is always 512 bytes */ #define HFS_BLOCKSZ_BITS 9 /* 1<<9 == 512 */ #define HFS_VOLHEAD_SIG 0x4244 /* 'BD' */ - Modified: openbios-devel/fs/hfsplus/include/hfsp.h =================================================================== --- openbios-devel/fs/hfsplus/include/hfsp.h 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/hfsplus/include/hfsp.h 2008-12-13 09:26:41 UTC (rev 285) @@ -302,4 +302,3 @@ hfsp_cat_thread thread; } u; } hfsp_cat_entry; - Modified: openbios-devel/fs/hfsplus/include/hfstime.h =================================================================== --- openbios-devel/fs/hfsplus/include/hfstime.h 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/hfsplus/include/hfstime.h 2008-12-13 09:26:41 UTC (rev 285) @@ -31,4 +31,3 @@ /* return the given apple time as UNIX time */ extern char* get_atime(UInt32 atime); - Modified: openbios-devel/fs/hfsplus/include/libhfsp.h =================================================================== --- openbios-devel/fs/hfsplus/include/libhfsp.h 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/hfsplus/include/libhfsp.h 2008-12-13 09:26:41 UTC (rev 285) @@ -198,6 +198,3 @@ } record; /* Functions on records are defined in record.h */ - - - Modified: openbios-devel/fs/hfsplus/include/record.h =================================================================== --- openbios-devel/fs/hfsplus/include/record.h 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/hfsplus/include/record.h 2008-12-13 09:26:41 UTC (rev 285) @@ -77,5 +77,3 @@ /* Dump all the record information to stdout */ extern void record_print(record* r); #endif - - Modified: openbios-devel/fs/hfsplus/record.c =================================================================== --- openbios-devel/fs/hfsplus/record.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/fs/hfsplus/record.c 2008-12-13 09:26:41 UTC (rev 285) @@ -756,4 +756,3 @@ } #endif - Modified: openbios-devel/include/libc/byteorder.h =================================================================== --- openbios-devel/include/libc/byteorder.h 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/include/libc/byteorder.h 2008-12-13 09:26:41 UTC (rev 285) @@ -59,4 +59,3 @@ #endif #endif - Modified: openbios-devel/include/openbios/asm.m4 =================================================================== --- openbios-devel/include/openbios/asm.m4 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/include/openbios/asm.m4 2008-12-13 09:26:41 UTC (rev 285) @@ -135,4 +135,3 @@ define([$1]b,$1_[]$1_curnum[] ) $1[]_[]$1_curnum[]dnl ]) - Modified: openbios-devel/include/ppc/asmdefs.h =================================================================== --- openbios-devel/include/ppc/asmdefs.h 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/include/ppc/asmdefs.h 2008-12-13 09:26:41 UTC (rev 285) @@ -87,4 +87,3 @@ #define BIT(n) (1<<(31-(n))) #endif /* _H_ASMDEFS */ - Modified: openbios-devel/include/ppc/processor.h =================================================================== --- openbios-devel/include/ppc/processor.h 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/include/ppc/processor.h 2008-12-13 09:26:41 UTC (rev 285) @@ -401,4 +401,3 @@ #define SPRNUM_FLIP( v ) ( (((v)>>5) & 0x1f) | (((v)<<5) & 0x3e0) ) #endif /* _H_PROCESSOR */ - Modified: openbios-devel/kernel/Kconfig =================================================================== --- openbios-devel/kernel/Kconfig 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/kernel/Kconfig 2008-12-13 09:26:41 UTC (rev 285) @@ -86,4 +86,3 @@ use vga textmode and keyboard console endmenu - Modified: openbios-devel/kernel/primitives.c =================================================================== --- openbios-devel/kernel/primitives.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/kernel/primitives.c 2008-12-13 09:26:41 UTC (rev 285) @@ -145,4 +145,3 @@ do_include, /* $include */ do_encode_file, /* $encode-file */ }; - Modified: openbios-devel/libc/ctype.c =================================================================== --- openbios-devel/libc/ctype.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/libc/ctype.c 2008-12-13 09:26:41 UTC (rev 285) @@ -32,5 +32,3 @@ _U,_U,_U,_U,_U,_U,_U,_P,_U,_U,_U,_U,_U,_U,_U,_L, /* 208-223 */ _L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L,_L, /* 224-239 */ _L,_L,_L,_L,_L,_L,_L,_P,_L,_L,_L,_L,_L,_L,_L,_L}; /* 240-255 */ - - Modified: openbios-devel/libc/string.c =================================================================== --- openbios-devel/libc/string.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/libc/string.c 2008-12-13 09:26:41 UTC (rev 285) @@ -511,5 +511,3 @@ } return __res; } - - Modified: openbios-devel/libgcc/__udivmodti4.c =================================================================== --- openbios-devel/libgcc/__udivmodti4.c 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/libgcc/__udivmodti4.c 2008-12-13 09:26:41 UTC (rev 285) @@ -29,4 +29,3 @@ return quot; } - Modified: openbios-devel/modules/clib.fs =================================================================== --- openbios-devel/modules/clib.fs 2008-12-11 20:30:53 UTC (rev 284) +++ openbios-devel/modules/clib.fs 2008-12-13 09:26:41 UTC (rev 285) @@ -34,4 +34,3 @@ swap ['] (lit) , , ['] (lit) , , ['] call , is-func-end ; -

1 0

r284 - in openbios-devel: arch/amd64 arch/ppc arch/ppc/briq arch/ppc/mol arch/ppc/pearpc arch/sparc32 arch/sparc64 arch/unix arch/unix/gui_qt arch/unix/plugins/plugin_pci arch/unix/plugins/plugin_qt arch/x86 arch/x86/xbox drivers fs fs/grubfs fs/hfs fs/hfsplus fs/hfsplus/include include include/amd64 include/ia64 include/libc include/openbios include/ppc include/unix include/x86 kernel kernel/include libc modules
by svn＠openbios.org 11 Dec '08

11 Dec '08

Author: blueswirl Date: 2008-12-11 21:30:53 +0100 (Thu, 11 Dec 2008) New Revision: 284 Modified: openbios-devel/arch/amd64/boot.c openbios-devel/arch/amd64/console.c openbios-devel/arch/amd64/context.c openbios-devel/arch/amd64/elfload.c openbios-devel/arch/amd64/lib.c openbios-devel/arch/amd64/linux_load.c openbios-devel/arch/amd64/loadfs.c openbios-devel/arch/amd64/multiboot.c openbios-devel/arch/amd64/multiboot.h openbios-devel/arch/amd64/openbios.c openbios-devel/arch/amd64/openbios.h openbios-devel/arch/amd64/segment.c openbios-devel/arch/amd64/switch.S openbios-devel/arch/amd64/sys_info.c openbios-devel/arch/ppc/briq/briq.c openbios-devel/arch/ppc/briq/briq.h openbios-devel/arch/ppc/briq/init.c openbios-devel/arch/ppc/briq/kernel.c openbios-devel/arch/ppc/briq/main.c openbios-devel/arch/ppc/briq/methods.c openbios-devel/arch/ppc/briq/tree.c openbios-devel/arch/ppc/briq/vfd.c openbios-devel/arch/ppc/kernel.c openbios-devel/arch/ppc/kernel.h openbios-devel/arch/ppc/misc.S openbios-devel/arch/ppc/mmutypes.h openbios-devel/arch/ppc/mol/console.c openbios-devel/arch/ppc/mol/init.c openbios-devel/arch/ppc/mol/kernel.c openbios-devel/arch/ppc/mol/main.c openbios-devel/arch/ppc/mol/methods.c openbios-devel/arch/ppc/mol/mol.c openbios-devel/arch/ppc/mol/mol.h openbios-devel/arch/ppc/mol/osi-blk.c openbios-devel/arch/ppc/mol/osi-scsi.c openbios-devel/arch/ppc/mol/prom.c openbios-devel/arch/ppc/mol/prom.h openbios-devel/arch/ppc/mol/pseudodisk.c openbios-devel/arch/ppc/mol/tree.c openbios-devel/arch/ppc/ofmem.c openbios-devel/arch/ppc/osi.h openbios-devel/arch/ppc/osi_calls.h openbios-devel/arch/ppc/pearpc/init.c openbios-devel/arch/ppc/pearpc/kernel.c openbios-devel/arch/ppc/pearpc/main.c openbios-devel/arch/ppc/pearpc/methods.c openbios-devel/arch/ppc/pearpc/pearpc.c openbios-devel/arch/ppc/pearpc/pearpc.h openbios-devel/arch/ppc/pearpc/tree.c openbios-devel/arch/ppc/pearpc/vfd.c openbios-devel/arch/ppc/start.S openbios-devel/arch/sparc32/linux_load.c openbios-devel/arch/sparc32/loadfs.c openbios-devel/arch/sparc32/openbios.c openbios-devel/arch/sparc32/switch.S openbios-devel/arch/sparc64/boot.c openbios-devel/arch/sparc64/console.c openbios-devel/arch/sparc64/entry.S openbios-devel/arch/sparc64/linux_load.c openbios-devel/arch/sparc64/loadfs.c openbios-devel/arch/sparc64/openbios.c openbios-devel/arch/sparc64/openbios.h openbios-devel/arch/unix/blk.c openbios-devel/arch/unix/boot.c openbios-devel/arch/unix/gui_qt/gui-qt.cpp openbios-devel/arch/unix/gui_qt/gui-qt.h openbios-devel/arch/unix/gui_qt/qt-main.cpp openbios-devel/arch/unix/plugins/plugin_pci/plugin_pci.c openbios-devel/arch/unix/plugins/plugin_qt/pciconfig.h openbios-devel/arch/unix/plugins/plugin_qt/plugin_qt.cpp openbios-devel/arch/unix/plugins/plugin_qt/plugin_qt.h openbios-devel/arch/unix/plugins/plugin_qt/qt_main.cpp openbios-devel/arch/unix/unix.c openbios-devel/arch/x86/boot.c openbios-devel/arch/x86/console.c openbios-devel/arch/x86/context.c openbios-devel/arch/x86/elfload.c openbios-devel/arch/x86/entry.S openbios-devel/arch/x86/exception.c openbios-devel/arch/x86/forthload.c openbios-devel/arch/x86/lib.c openbios-devel/arch/x86/linux_load.c openbios-devel/arch/x86/loadfs.c openbios-devel/arch/x86/multiboot.c openbios-devel/arch/x86/multiboot.h openbios-devel/arch/x86/openbios.c openbios-devel/arch/x86/openbios.h openbios-devel/arch/x86/segment.c openbios-devel/arch/x86/sys_info.c openbios-devel/arch/x86/xbox/console.c openbios-devel/arch/x86/xbox/methods.c openbios-devel/drivers/adb.c openbios-devel/drivers/adb.h openbios-devel/drivers/floppy.c openbios-devel/drivers/ide.c openbios-devel/drivers/ide.h openbios-devel/drivers/kbd.c openbios-devel/drivers/kbd.h openbios-devel/drivers/pci.c openbios-devel/drivers/scsi.h openbios-devel/drivers/timer.c openbios-devel/drivers/vga.h openbios-devel/drivers/vga_load_regs.c openbios-devel/fs/grubfs/defs.h openbios-devel/fs/grubfs/dir.h openbios-devel/fs/grubfs/disk_inode_ffs.h openbios-devel/fs/grubfs/filesys.h openbios-devel/fs/grubfs/fs.h openbios-devel/fs/grubfs/fsys_affs.c openbios-devel/fs/grubfs/fsys_ext2fs.c openbios-devel/fs/grubfs/fsys_fat.c openbios-devel/fs/grubfs/fsys_ffs.c openbios-devel/fs/grubfs/fsys_iso9660.c openbios-devel/fs/grubfs/fsys_jfs.c openbios-devel/fs/grubfs/fsys_minix.c openbios-devel/fs/grubfs/fsys_ntfs.c openbios-devel/fs/grubfs/fsys_reiserfs.c openbios-devel/fs/grubfs/fsys_vstafs.c openbios-devel/fs/grubfs/fsys_xfs.c openbios-devel/fs/grubfs/glue.h openbios-devel/fs/grubfs/grubfs_fs.c openbios-devel/fs/grubfs/jfs.h openbios-devel/fs/grubfs/ufs_fs.h openbios-devel/fs/grubfs/xfs.h openbios-devel/fs/hfs/block.c openbios-devel/fs/hfs/hfs.c openbios-devel/fs/hfs/hfs_fs.c openbios-devel/fs/hfs_mdb.h openbios-devel/fs/hfsplus/blockiter.c openbios-devel/fs/hfsplus/btree.c openbios-devel/fs/hfsplus/hfsp_fs.c openbios-devel/fs/hfsplus/include/apple.h openbios-devel/fs/hfsplus/include/blockiter.h openbios-devel/fs/hfsplus/include/btree.h openbios-devel/fs/hfsplus/include/hfs.h openbios-devel/fs/hfsplus/include/hfsp.h openbios-devel/fs/hfsplus/include/hfstime.h openbios-devel/fs/hfsplus/include/libhfsp.h openbios-devel/fs/hfsplus/include/record.h openbios-devel/fs/hfsplus/include/unicode.h openbios-devel/fs/hfsplus/include/volume.h openbios-devel/fs/hfsplus/libhfsp.c openbios-devel/fs/hfsplus/record.c openbios-devel/fs/hfsplus/unicode.c openbios-devel/fs/hfsplus/volume.c openbios-devel/fs/ioglue.c openbios-devel/include/a.out.h openbios-devel/include/amd64/io.h openbios-devel/include/elf_boot.h openbios-devel/include/ia64/io.h openbios-devel/include/libc/diskio.h openbios-devel/include/libc/stdlib.h openbios-devel/include/libc/string.h openbios-devel/include/libc/vsprintf.h openbios-devel/include/mconfig.h openbios-devel/include/ofmem.h openbios-devel/include/openbios/bindings.h openbios-devel/include/openbios/config.h openbios-devel/include/openbios/drivers.h openbios-devel/include/openbios/elfload.h openbios-devel/include/openbios/fs.h openbios-devel/include/openbios/kernel.h openbios-devel/include/openbios/nvram.h openbios-devel/include/openbios/of.h openbios-devel/include/ppc/asmdefs.h openbios-devel/include/ppc/processor.h openbios-devel/include/sys_info.h openbios-devel/include/unix/plugin_pci.h openbios-devel/include/unix/plugins.h openbios-devel/include/x86/io.h openbios-devel/kernel/bootstrap.c openbios-devel/kernel/cross.h openbios-devel/kernel/dict.c openbios-devel/kernel/forth.c openbios-devel/kernel/include/dict.h openbios-devel/kernel/internal.c openbios-devel/kernel/primitives.c openbios-devel/libc/diskio.c openbios-devel/libc/extra.c openbios-devel/libc/misc.c openbios-devel/libc/vsprintf.c openbios-devel/modules/bindings.c openbios-devel/modules/client.c openbios-devel/modules/cmdline.c openbios-devel/modules/console.c openbios-devel/modules/deblocker.c openbios-devel/modules/disk-label.c openbios-devel/modules/elfload.c openbios-devel/modules/filesystems.c openbios-devel/modules/init.c openbios-devel/modules/ipchecksum.c openbios-devel/modules/linuxbios.c openbios-devel/modules/linuxbios.h openbios-devel/modules/mac-parts.c openbios-devel/modules/mac-parts.h openbios-devel/modules/modules.h openbios-devel/modules/nvram.c openbios-devel/modules/pc-parts.c openbios-devel/modules/sun-parts.c openbios-devel/modules/video.c Log: Delete extra whitespace at the end of line, which annoys quilt Modified: openbios-devel/arch/amd64/boot.c =================================================================== --- openbios-devel/arch/amd64/boot.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/amd64/boot.c 2008-12-11 20:30:53 UTC (rev 284) @@ -14,14 +14,14 @@ void boot(void); -struct sys_info sys_info; +struct sys_info sys_info; void boot(void) { char *path=pop_fstr_copy(), *param; - + // char *param="root=/dev/hda2 console=ttyS0,115200n8 console=tty0"; - + if(!path) { printk("[x86] Booting default not supported.\n"); return; @@ -32,7 +32,7 @@ *param = '\0'; param++; } - + printk("[x86] Booting file '%s' with parameters '%s'\n",path, param); if (elf_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) Modified: openbios-devel/arch/amd64/console.c =================================================================== --- openbios-devel/arch/amd64/console.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/amd64/console.c 2008-12-11 20:30:53 UTC (rev 284) @@ -200,7 +200,7 @@ static void video_putchar(int c) { int p=1; - + if (c == '\n' || c == '\r') { video_newline(); return; @@ -228,7 +228,7 @@ static void video_cls(void) { int i; - + for (i = 0; i < 2 * COLUMNS * LINES;) { video[i++] = 0; video[i++] = ATTRIBUTE; Modified: openbios-devel/arch/amd64/context.c =================================================================== --- openbios-devel/arch/amd64/context.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/amd64/context.c 2008-12-11 20:30:53 UTC (rev 284) @@ -17,7 +17,7 @@ void __exit_context(void); /* assembly routine */ /* - * Main context structure + * Main context structure * It is placed at the bottom of our stack, and loaded by assembly routine * to start us up. */ Modified: openbios-devel/arch/amd64/elfload.c =================================================================== --- openbios-devel/arch/amd64/elfload.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/amd64/elfload.c 2008-12-11 20:30:53 UTC (rev 284) @@ -153,7 +153,7 @@ } bytes += phdr[i].p_filesz; debug("clearing... "); - memset(phys_to_virt(phdr[i].p_paddr + phdr[i].p_filesz), 0, + memset(phys_to_virt(phdr[i].p_paddr + phdr[i].p_filesz), 0, phdr[i].p_memsz - phdr[i].p_filesz); if (phdr[i].p_offset <= checksum_offset && phdr[i].p_offset + phdr[i].p_filesz >= checksum_offset+2) { @@ -356,7 +356,7 @@ if (!load_segments(phdr, ehdr.e_phnum, checksum_offset)) goto out; - + if (checksum_offset) { if (!verify_image(&ehdr, phdr, ehdr.e_phnum, checksum)) goto out; Modified: openbios-devel/arch/amd64/lib.c =================================================================== --- openbios-devel/arch/amd64/lib.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/amd64/lib.c 2008-12-11 20:30:53 UTC (rev 284) @@ -15,7 +15,7 @@ #include "openbios/kernel.h" /* Format a string and print it on the screen, just like the libc - * function printf. + * function printf. */ int printk( const char *fmt, ... ) { Modified: openbios-devel/arch/amd64/linux_load.c =================================================================== --- openbios-devel/arch/amd64/linux_load.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/amd64/linux_load.c 2008-12-11 20:30:53 UTC (rev 284) @@ -123,7 +123,7 @@ uint16_t ramdisk_flags; /* 0x1f8 */ #define RAMDISK_IMAGE_START_MASK 0x07FF #define RAMDISK_PROMPT_FLAG 0x8000 -#define RAMDISK_LOAD_FLAG 0x4000 +#define RAMDISK_LOAD_FLAG 0x4000 uint8_t reserved8[2]; /* 0x1fa */ uint16_t orig_root_dev; /* 0x1fc */ uint8_t reserved9[1]; /* 0x1fe */ @@ -464,7 +464,7 @@ max = hdr->initrd_addr_max; else max = 0x38000000; /* Hardcoded value for older kernels */ - + /* FILO itself is at the top of RAM. (relocated) * So, try putting initrd just below us. */ end = virt_to_phys(_start); @@ -520,9 +520,9 @@ outb(0, 0xf0); outb(0, 0xf1); - /* we're getting screwed again and again by this problem of the 8259. - * so we're going to leave this lying around for inclusion into - * crt0.S on an as-needed basis. + /* we're getting screwed again and again by this problem of the 8259. + * so we're going to leave this lying around for inclusion into + * crt0.S on an as-needed basis. * * well, that went ok, I hope. Now we have to reprogram the interrupts :-( * we put them right after the intel-reserved hardware interrupts, at @@ -565,8 +565,8 @@ linux_gdt[2] = gdt[FLAT_CODE]; linux_gdt[3] = gdt[FLAT_DATA]; /* 2.6 kernel uses 12 and 13, but head.S uses backward-compatible - * segments (2 and 3), so it SHOULD not be a problem. - * However, some distro kernels (eg. RH9) with backported threading + * segments (2 and 3), so it SHOULD not be a problem. + * However, some distro kernels (eg. RH9) with backported threading * patch use 12 and 13 also when booting... */ linux_gdt[12] = gdt[FLAT_CODE]; linux_gdt[13] = gdt[FLAT_DATA]; @@ -594,7 +594,7 @@ params->orig_x = cursor_x; params->orig_y = cursor_y; #endif - + /* Go... */ ctx = switch_to(ctx); Modified: openbios-devel/arch/amd64/loadfs.c =================================================================== --- openbios-devel/arch/amd64/loadfs.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/amd64/loadfs.c 2008-12-11 20:30:53 UTC (rev 284) @@ -27,18 +27,18 @@ unsigned long file_size(void) { llong fpos, fsize; - + /* save current position */ fpos=tell(load_fd); /* go to end of file and get position */ seek_io(load_fd, -1); fsize=tell(load_fd); - + /* go back to old position */ seek_io(load_fd, 0); seek_io(load_fd, fpos); - + return fsize; } Modified: openbios-devel/arch/amd64/multiboot.c =================================================================== --- openbios-devel/arch/amd64/multiboot.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/amd64/multiboot.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,6 +1,6 @@ /* Support for Multiboot */ -#include "openbios/config.h" +#include "openbios/config.h" #include "asm/io.h" #include "sys_info.h" #include "multiboot.h" @@ -9,7 +9,7 @@ #ifdef CONFIG_DEBUG_BOOT #define debug printk #else -#define debug(x...) +#define debug(x...) #endif struct mbheader { @@ -62,11 +62,11 @@ printf("Multiboot: no dictionary\n"); return; } - + mod = (module_t *) mbinfo->mods_addr; info->dict_start=(unsigned long *)mod->mod_start; info->dict_end=(unsigned long *)mod->mod_end; - + if (mbinfo->flags & MULTIBOOT_MMAP_VALID) { /* convert mmap records */ mbmem = phys_to_virt(mbinfo->mmap_addr); Modified: openbios-devel/arch/amd64/multiboot.h =================================================================== --- openbios-devel/arch/amd64/multiboot.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/amd64/multiboot.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,5 +1,5 @@ -/* multiboot.h - * tag: header for multiboot +/* multiboot.h + * tag: header for multiboot * * Copyright (C) 2003-2004 Stefan Reinauer * Modified: openbios-devel/arch/amd64/openbios.c =================================================================== --- openbios-devel/arch/amd64/openbios.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/amd64/openbios.c 2008-12-11 20:30:53 UTC (rev 284) @@ -24,7 +24,7 @@ static void init_memory(void) { /* push start and end of available memory to the stack - * so that the forth word QUIT can initialize memory + * so that the forth word QUIT can initialize memory * management. For now we use hardcoded memory between * 0x10000 and 0x9ffff (576k). If we need more memory * than that we have serious bloat. @@ -60,11 +60,11 @@ #endif collect_sys_info(&sys_info); - + dict=intdict; load_dictionary((char *)sys_info.dict_start, sys_info.dict_end-sys_info.dict_start); - + relocate(&sys_info); #ifdef CONFIG_DEBUG_CONSOLE @@ -83,7 +83,7 @@ PUSH_xt( bind_noname_func(arch_init) ); fword("PREPOST-initializer"); - + PC = (ucell)findword("initialize-of"); if (!PC) { Modified: openbios-devel/arch/amd64/openbios.h =================================================================== --- openbios-devel/arch/amd64/openbios.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/amd64/openbios.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2004/01/15 16:14:05 samuel> * Time-stamp: <2004/01/15 16:14:05 samuel> - * + * * <openbios.h> - * - * - * + * + * + * * Copyright (C) 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #ifndef _H_OPENBIOS Modified: openbios-devel/arch/amd64/segment.c =================================================================== --- openbios-devel/arch/amd64/segment.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/amd64/segment.c 2008-12-11 20:30:53 UTC (rev 284) @@ -22,7 +22,7 @@ unsigned int base; } __attribute__((packed)); -/* How far the virtual address (used in C) is different from physical +/* How far the virtual address (used in C) is different from physical * address. Since we start in flat mode, the initial value is zero. */ unsigned long virt_offset = 0; @@ -108,7 +108,7 @@ "movw %5, %%gs\n\t" "movw %5, %%ss\n" : "=&S" (d0), "=&D" (d1), "=&c" (d2) - : "m" (gdtarg), "n" (RELOC_CS), "q" ((unsigned short) RELOC_DS), + : "m" (gdtarg), "n" (RELOC_CS), "q" ((unsigned short) RELOC_DS), "0" (&_start), "1" (new_base), "2" (prog_size)); virt_offset = new_offset; Modified: openbios-devel/arch/amd64/switch.S =================================================================== --- openbios-devel/arch/amd64/switch.S 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/amd64/switch.S 2008-12-11 20:30:53 UTC (rev 284) @@ -6,7 +6,7 @@ /* * Entry point * We start execution from here. - * It is assumed that CPU is in 32-bit protected mode and + * It is assumed that CPU is in 32-bit protected mode and * all segments are 4GB and base zero (flat model). */ entry: @@ -28,7 +28,7 @@ * switches the stack, and restores everything from the new stack. * This function takes no argument. New stack pointer is * taken from global variable __context, and old stack pointer - * is also saved to __context. This way we can just jump to + * is also saved to __context. This way we can just jump to * this routine to get back to the original context. * * Call this routine with lcall or pushl %cs; call. @@ -51,7 +51,7 @@ xchgl %eax, 64(%esp) movl %eax, 60(%esp) #endif - + /* At this point we don't know if we are on flat segment * or relocated. So compute the address offset from %eip. * Assuming CS.base==DS.base==SS.base. @@ -62,7 +62,7 @@ /* Interrupts are not allowed... */ cli - + /* Current context pointer is our stack pointer */ movl %esp, %esi Modified: openbios-devel/arch/amd64/sys_info.c =================================================================== --- openbios-devel/arch/amd64/sys_info.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/amd64/sys_info.c 2008-12-11 20:30:53 UTC (rev 284) @@ -7,7 +7,7 @@ #ifdef CONFIG_DEBUG_BOOT #define debug printk #else -#define debug(x...) +#define debug(x...) #endif void collect_multiboot_info(struct sys_info *); Modified: openbios-devel/arch/ppc/briq/briq.c =================================================================== --- openbios-devel/arch/ppc/briq/briq.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/briq/briq.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,19 +1,19 @@ -/* +/* * Creation Date: <2004/08/28 18:38:22 greg> * Time-stamp: <2004/08/28 18:38:22 greg> - * + * * <briq.c> - * + * * Copyright (C) 2004, Greg Watson - * + * * derived from mol.c * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -114,7 +114,7 @@ { if( !tty_avail() ) return 0; - + if( ttychar < 0 ) ttychar = inb(UART_BASE); return (ttychar >= 0); @@ -167,7 +167,7 @@ { printk (" "); } - } + } } Modified: openbios-devel/arch/ppc/briq/briq.h =================================================================== --- openbios-devel/arch/ppc/briq/briq.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/briq/briq.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,15 +1,15 @@ -/* +/* * Creation Date: <2004/08/28 17:50:12 stepan> * Time-stamp: <2004/08/28 17:50:12 stepan> - * + * * <briq.h> - * + * * Copyright (C) 2004 Stefan Reinauer - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #ifndef _H_BRIQ Modified: openbios-devel/arch/ppc/briq/init.c =================================================================== --- openbios-devel/arch/ppc/briq/init.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/briq/init.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,22 +1,22 @@ -/* +/* * Creation Date: <2004/08/28 18:38:22 greg> * Time-stamp: <2004/08/28 18:38:22 greg> - * + * * <init.c> - * + * * Initialization for briq * * Copyright (C) 2004 Greg Watson * * based on mol/init.c: - * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Samuel & David Rydh + * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Samuel & David Rydh * (samuel(a)ibrium.se, dary(a)lindesign.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #include "openbios/config.h" @@ -63,7 +63,7 @@ printk("\n"); printk("=============================================================\n"); printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); - + ofmem_init(); initialize_forth(); /* won't return */ @@ -88,7 +88,7 @@ phandle_t ph; #endif int autoboot; - + devtree_init(); node_methods_init(); nvram_init("/pci/mac-io/nvram"); Modified: openbios-devel/arch/ppc/briq/kernel.c =================================================================== --- openbios-devel/arch/ppc/briq/kernel.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/briq/kernel.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,15 +1,15 @@ -/* +/* * Creation Date: <2004/08/28 18:03:25 stepan> * Time-stamp: <2004/08/28 18:03:25 stepan> - * + * * <briq/kernel.c> - * + * * Copyright (C) 2004 Stefan Reinauer - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "briq-dict.h" Modified: openbios-devel/arch/ppc/briq/main.c =================================================================== --- openbios-devel/arch/ppc/briq/main.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/briq/main.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,18 +1,18 @@ -/* +/* * Creation Date: <2004/08/28 18:38:22 greg> * Time-stamp: <2004/08/28 18:38:22 greg> - * + * * <main.c> - * + * * Copyright (C) 2004 Greg Watson - * - * Based on MOL specific code which is + * + * Based on MOL specific code which is * Copyright (C) 2002, 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ @@ -65,7 +65,7 @@ s = MIN( phdr[i].p_filesz, phdr[i].p_memsz ); seek_io( fd, elf_offs + phdr[i].p_offset ); - /* printk("filesz: %08lX memsz: %08lX p_offset: %08lX p_vaddr %08lX\n", + /* printk("filesz: %08lX memsz: %08lX p_offset: %08lX p_vaddr %08lX\n", phdr[i].p_filesz, phdr[i].p_memsz, phdr[i].p_offset, phdr[i].p_vaddr ); */ @@ -90,7 +90,7 @@ #endif flush_icache_range( addr, addr+s ); - /*printk("ELF ROM-section loaded at %08lX (size %08lX)\n", + /*printk("ELF ROM-section loaded at %08lX (size %08lX)\n", (ulong)phdr[i].p_vaddr, (ulong)phdr[i].p_memsz );*/ } free( phdr ); @@ -102,8 +102,8 @@ encode_bootpath( const char *spec, const char *args ) { phandle_t chosen_ph = find_dev("/chosen"); - set_property( chosen_ph, "bootpath", spec, strlen(spec)+1 ); - set_property( chosen_ph, "bootargs", args, strlen(args)+1 ); + set_property( chosen_ph, "bootpath", spec, strlen(spec)+1 ); + set_property( chosen_ph, "bootargs", args, strlen(args)+1 ); } /************************************************************************/ Modified: openbios-devel/arch/ppc/briq/methods.c =================================================================== --- openbios-devel/arch/ppc/briq/methods.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/briq/methods.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,21 +1,21 @@ -/* +/* * Creation Date: <2004/08/28 18:38:22 greg> * Time-stamp: <2004/08/28 18:38:22 greg> - * + * * <methods.c> - * + * * Misc device node methods * * Copyright (C) 2004 Greg Watson - * + * * Based on MOL specific code which is - * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -38,7 +38,7 @@ int physbase = POP(); int s=0x1000, size = (int)of_rtas_end - (int)of_rtas_start; ulong virt; - + while( s < size ) s += 0x1000; virt = ofmem_claim_virt( 0, s, 0x1000 ); @@ -74,7 +74,7 @@ strncpy_nopad( s, addr, len ); s[len]=0; - + printk( "%s", s ); //vfd_draw_str( s ); free( s ); @@ -137,7 +137,7 @@ /* ( -- ) */ static void -ciface_quiesce( ulong args[], ulong ret[] ) +ciface_quiesce( ulong args[], ulong ret[] ) { #if 0 ulong msr; @@ -151,12 +151,12 @@ /* ( -- ms ) */ static void -ciface_milliseconds( ulong args[], ulong ret[] ) +ciface_milliseconds( ulong args[], ulong ret[] ) { extern unsigned long get_timer_freq(); static ulong mticks=0, usecs=0; ulong t; - + asm volatile("mftb %0" : "=r" (t) : ); if( mticks ) usecs += get_timer_freq() / 1000000 * ( t-mticks ); @@ -189,7 +189,7 @@ int size = POP(); int phys = POP(); int ret = ofmem_claim_phys( phys, size, align ); - + if( ret == -1 ) { printk("MEM: claim failure\n"); throw( -13 ); @@ -230,7 +230,7 @@ } /* ( phys virt size mode -- [ret???] ) */ -static void +static void mmu_map( void ) { int mode = POP(); @@ -238,7 +238,7 @@ int virt = POP(); int phys = POP(); int ret; - + /* printk("mmu_map: %x %x %x %x\n", phys, virt, size, mode ); */ ret = ofmem_map( phys, virt, size, mode ); Modified: openbios-devel/arch/ppc/briq/tree.c =================================================================== --- openbios-devel/arch/ppc/briq/tree.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/briq/tree.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2004/08/28 18:38:22 greg> * Time-stamp: <2004/08/28 18:38:22 greg> - * + * * <tree.c> - * + * * device tree setup - * + * * Copyright (C) 2004 Greg Watson - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" Modified: openbios-devel/arch/ppc/briq/vfd.c =================================================================== --- openbios-devel/arch/ppc/briq/vfd.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/briq/vfd.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2004/08/28 17:29:43 greg> * Time-stamp: <2004/08/28 17:29:43 greg> - * + * * <vfd.c> - * + * * Simple text console - * + * * Copyright (C) 2004 Greg Watson - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #include "openbios/config.h" @@ -21,14 +21,14 @@ static int vfd_is_open; static int -vfd_init( void ) +vfd_init( void ) { vfd_is_open = 1; return 0; } void -vfd_close( void ) +vfd_close( void ) { } Modified: openbios-devel/arch/ppc/kernel.c =================================================================== --- openbios-devel/arch/ppc/kernel.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/kernel.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,20 +1,20 @@ -/* +/* * Creation Date: <2003/10/25 14:07:17 samuel> * Time-stamp: <2004/08/28 17:48:19 stepan> - * + * * <kernel.c> - * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) * Copyright (C) 2003, 2004 Stefan Reinauer - * + * * Based upon unix.c (from OpenBIOS): * * Copyright (C) 2003 Patrick Mauritz, Stefan Reinauer - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -46,7 +46,7 @@ printk("panic: segmentation violation at %x\n", (int)segv_addr); printk("dict=0x%x here=0x%x(dict+0x%x) pc=0x%x(dict+0x%x)\n", - (int)dict, (int)(dict + dicthead), dicthead, + (int)dict, (int)(dict + dicthead), dicthead, PC, PC - (ucell) dict); printk("dstackcnt=%d rstackcnt=%d instruction=%x\n", dstackcnt, rstackcnt, addr); @@ -60,7 +60,7 @@ return -1; } -/* +/* * allocate memory and prepare engine for memory management. */ Modified: openbios-devel/arch/ppc/kernel.h =================================================================== --- openbios-devel/arch/ppc/kernel.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/kernel.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,15 +1,15 @@ -/* +/* * Creation Date: <2004/08/28 17:50:12 stepan> * Time-stamp: <2004/08/28 17:50:12 stepan> - * + * * <kernel.h> - * + * * Copyright (C) 2004 Stefan Reinauer - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #ifndef __KERNEL_H__ Modified: openbios-devel/arch/ppc/misc.S =================================================================== --- openbios-devel/arch/ppc/misc.S 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/misc.S 2008-12-11 20:30:53 UTC (rev 284) @@ -1,11 +1,11 @@ -/* +/* * Creation Date: <2002/10/20 15:54:50 samuel> * Time-stamp: <2002/10/20 15:57:21 samuel> - * + * * <misc.S> - * + * * Low-level stuff - * + * * Copyright (C) 2002, 2003 Samuel Rydh (samuel(a)ibrium.se) * * Based upon misc.S from the the linux kernel with the following @@ -13,11 +13,11 @@ * * Copyright (C) 1995-1996 Gary Thomas (gdt(a)linuxppc.org), * Cort Dougan (cort(a)cs.nmt.edu), Paul Mackerras - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #include "asm/asmdefs.h" @@ -26,7 +26,7 @@ /* * Extended precision shifts. - * + * * Updated to be valid for shift counts from 0 to 63 inclusive. * -- Gabriel * @@ -34,12 +34,12 @@ * R5 has shift count * result in R3/R4 * - * ashrdi3: arithmetic right shift (sign propagation) - * lshrdi3: logical right shift + * ashrdi3: arithmetic right shift (sign propagation) + * lshrdi3: logical right shift * ashldi3: left shift */ -GLOBL(__ashrdi3): - subfic r6,r5,32 +GLOBL(__ashrdi3): + subfic r6,r5,32 srw r4,r4,r5 # LSW = count > 31 ? 0 : LSW >> count addi r7,r5,32 # could be xori, or addi with -32 slw r6,r3,r6 # t1 = count > 31 ? 0 : MSW << (32-count) @@ -51,8 +51,8 @@ or r4,r4,r7 # LSW |= t2 blr -GLOBL(__ashldi3): - subfic r6,r5,32 +GLOBL(__ashldi3): + subfic r6,r5,32 slw r3,r3,r5 # MSW = count > 31 ? 0 : MSW << count addi r7,r5,32 # could be xori, or addi with -32 srw r6,r4,r6 # t1 = count > 31 ? 0 : LSW >> (32-count) @@ -62,14 +62,14 @@ or r3,r3,r7 # MSW |= t2 blr -GLOBL(__lshrdi3): - subfic r6,r5,32 +GLOBL(__lshrdi3): + subfic r6,r5,32 srw r4,r4,r5 # LSW = count > 31 ? 0 : LSW >> count addi r7,r5,32 # could be xori, or addi with -32 slw r6,r3,r6 # t1 = count > 31 ? 0 : MSW << (32-count) srw r7,r3,r7 # t2 = count < 32 ? 0 : MSW >> (count-32) or r4,r4,r6 # LSW |= t1 srw r3,r3,r5 # MSW = MSW >> count - or r4,r4,r7 # LSW |= t2 + or r4,r4,r7 # LSW |= t2 blr - + Modified: openbios-devel/arch/ppc/mmutypes.h =================================================================== --- openbios-devel/arch/ppc/mmutypes.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/mmutypes.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,19 +1,19 @@ -/* +/* * Creation Date: <2002/01/13 13:53:14 samuel> * Time-stamp: <2002/01/27 19:56:11 samuel> - * + * * <mmutypes.h> - * + * * MMU definitions - * + * * Most of these declarations originate from the Linux Kernel * * Copyright (C) 2002 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #ifndef _H_MMUTYPES Modified: openbios-devel/arch/ppc/mol/console.c =================================================================== --- openbios-devel/arch/ppc/mol/console.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/mol/console.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,18 +1,18 @@ -/* +/* * Creation Date: <2002/10/29 18:59:05 samuel> * Time-stamp: <2003/12/28 22:51:11 samuel> - * + * * <console.c> - * + * * Simple text console - * + * * Copyright (C) 2002, 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) * Copyright (C) 2005 Stefan Reinauer <stepan(a)openbios.org> - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #include "openbios/config.h" Modified: openbios-devel/arch/ppc/mol/init.c =================================================================== --- openbios-devel/arch/ppc/mol/init.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/mol/init.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,18 +1,18 @@ -/* +/* * Creation Date: <1999/11/16 00:49:26 samuel> * Time-stamp: <2004/04/12 16:26:50 samuel> - * + * * <init.c> - * + * * Initialization - * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Samuel & David Rydh + * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Samuel & David Rydh # (samuel(a)ibrium.se, dary(a)lindesign.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #include "openbios/config.h" @@ -58,7 +58,7 @@ printk("\n"); printk("=============================================================\n"); printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); - + ofmem_init(); initialize_forth(); /* won't return */ @@ -81,7 +81,7 @@ { mol_phandle_t ph; int autoboot; - + devtree_init(); node_methods_init(); nvram_init("/pci/mac-io/nvram"); Modified: openbios-devel/arch/ppc/mol/kernel.c =================================================================== --- openbios-devel/arch/ppc/mol/kernel.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/mol/kernel.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,15 +1,15 @@ -/* +/* * Creation Date: <2004/08/28 18:03:25 stepan> * Time-stamp: <2004/08/28 18:03:25 stepan> - * + * * <mol/kernel.c> - * + * * Copyright (C) 2004 Stefan Reinauer - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "mol-dict.h" Modified: openbios-devel/arch/ppc/mol/main.c =================================================================== --- openbios-devel/arch/ppc/mol/main.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/mol/main.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2002/10/02 22:24:24 samuel> * Time-stamp: <2004/03/27 01:57:55 samuel> - * + * * <main.c> - * - * - * + * + * + * * Copyright (C) 2002, 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ @@ -71,7 +71,7 @@ s = MIN( phdr[i].p_filesz, phdr[i].p_memsz ); seek_io( fd, elf_offs + phdr[i].p_offset ); - /* printk("filesz: %08lX memsz: %08lX p_offset: %08lX p_vaddr %08lX\n", + /* printk("filesz: %08lX memsz: %08lX p_offset: %08lX p_vaddr %08lX\n", phdr[i].p_filesz, phdr[i].p_memsz, phdr[i].p_offset, phdr[i].p_vaddr ); */ @@ -94,7 +94,7 @@ } flush_icache_range( addr, addr+s ); - /* printk("ELF ROM-section loaded at %08lX (size %08lX)\n", + /* printk("ELF ROM-section loaded at %08lX (size %08lX)\n", (ulong)phdr[i].p_vaddr, (ulong)phdr[i].p_memsz );*/ } free( phdr ); @@ -157,7 +157,7 @@ nw_dec_calibration = OSI_MticksToUsecs(0xfffff*47)/60; memcpy( start + s, timer_calib_start, timer_calib_end - timer_calib_start ); - printk("Timer calibration fix: %d.%02d MHz [%ld]\n", + printk("Timer calibration fix: %d.%02d MHz [%ld]\n", hz/1000, (hz/10)%100, nw_dec_calibration ); break; } @@ -170,20 +170,20 @@ int lszz_offs, lszz_size; ulong entry, data[2]; phandle_t ph; - + lszz_offs = load_elf_rom( &entry, fd ); seek_io( fd, -1 ); lszz_size = tell(fd) - lszz_offs; seek_io( fd, lszz_offs ); - /* printk("Compressed ROM image: offset %08X, size %08X loaded at %08x\n", + /* printk("Compressed ROM image: offset %08X, size %08X loaded at %08x\n", lszz_offs, lszz_size, ROM_BASE ); */ if( ofmem_claim(ROM_BASE, lszz_size, 0) == -1 ) fatal_error("Claim failure (lszz)!\n"); - + read_io( fd, (char*)ROM_BASE, lszz_size ); - + /* Fix the /rom/macos/AAPL,toolbox-image,lzss property (phys, size) */ #if 0 if( (ph=prom_create_node("/rom/macos/")) == -1 ) @@ -195,7 +195,7 @@ data[1] = lszz_size; set_property( ph, "AAPL,toolbox-image,lzss", (char*)data, sizeof(data) ); - /* The 7.8 rom (MacOS 9.2) uses AAPL,toolbox-parcels instead of + /* The 7.8 rom (MacOS 9.2) uses AAPL,toolbox-parcels instead of * AAPL,toolbox-image,lzss. It probably doesn't hurt to have it * always present (we don't have an easy way to determine ROM version...) */ @@ -208,7 +208,7 @@ { char *s, buf[128]; int found = 0; - + if( fast ) { int ind; found = !reopen( fd, "\\\\:tbxi" ); @@ -233,8 +233,8 @@ encode_bootpath( const char *spec, const char *args ) { phandle_t chosen_ph = find_dev("/chosen"); - set_property( chosen_ph, "bootpath", spec, strlen(spec)+1 ); - set_property( chosen_ph, "bootargs", args, strlen(args)+1 ); + set_property( chosen_ph, "bootpath", spec, strlen(spec)+1 ); + set_property( chosen_ph, "bootargs", args, strlen(args)+1 ); } static char * Modified: openbios-devel/arch/ppc/mol/methods.c =================================================================== --- openbios-devel/arch/ppc/mol/methods.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/mol/methods.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/10/18 13:24:29 samuel> * Time-stamp: <2004/03/27 02:00:30 samuel> - * + * * <methods.c> - * + * * Misc device node methods - * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -30,7 +30,7 @@ DECLARE_NODE( powermgt, INSTALL_OPEN, 0, "/pci/pci-bridge/mac-io/power-mgt" ); /* ( -- ) */ -static void +static void set_hybernot_flag( void ) { } @@ -53,7 +53,7 @@ int physbase = POP(); int s=0x1000, size = (int)of_rtas_end - (int)of_rtas_start; ulong virt; - + while( s < size ) s += 0x1000; virt = ofmem_claim_virt( 0, s, 0x1000 ); @@ -89,7 +89,7 @@ strncpy_nopad( s, addr, len ); s[len]=0; - + /* printk( "%s", s ); */ console_draw_str( s ); free( s ); @@ -159,7 +159,7 @@ char keytable[32]; } kbd_state_t; -static const uchar adb_ascii_table[128] = +static const uchar adb_ascii_table[128] = /* 0x00 */ "asdfhgzxcv`bqwer" /* 0x10 */ "yt123465=97-80]o" /* 0x20 */ "u[ip\nlj'k;\\,/nm." @@ -169,7 +169,7 @@ /* 0x60 */ " " /* 0x70 */ " "; -static const uchar adb_shift_table[128] = +static const uchar adb_shift_table[128] = /* 0x00 */ "ASDFHGZXCV~BQWER" /* 0x10 */ "YT!@#$^%+(&_*)}O" /* 0x20 */ "U{IP\nLJ\"K:|<?NM>" @@ -179,7 +179,7 @@ /* 0x60 */ " " /* 0x70 */ " "; -DECLARE_NODE( kbd, INSTALL_OPEN, sizeof(kbd_state_t), +DECLARE_NODE( kbd, INSTALL_OPEN, sizeof(kbd_state_t), "/psuedo-hid/keyboard", "/mol/mol-keyboard", "/mol/keyboard" @@ -203,7 +203,7 @@ int ret=0, len = POP(); char *p = (char*)POP(); int key; - + if( !p || !len ) { PUSH( -1 ); return; @@ -214,12 +214,12 @@ ks->save_key = 0; RET( 1 ); } - OSI_USleep(1); /* be nice */ + OSI_USleep(1); /* be nice */ for( ; (key=OSI_GetAdbKey()) >= 0 ; ) { int code = (key & 0x7f); int down = !(key & 0x80); - + if( code == 0x36 /* ctrl */ ) { ks->cntrl = down; continue; @@ -273,7 +273,7 @@ /* ( -- ) */ static void -ciface_quiesce( ulong args[], ulong ret[] ) +ciface_quiesce( ulong args[], ulong ret[] ) { #if 0 ulong msr; @@ -290,11 +290,11 @@ /* ( -- ms ) */ static void -ciface_milliseconds( ulong args[], ulong ret[] ) +ciface_milliseconds( ulong args[], ulong ret[] ) { static ulong mticks=0, usecs=0; ulong t; - + asm volatile("mftb %0" : "=r" (t) : ); if( mticks ) usecs += OSI_MticksToUsecs( t-mticks ); @@ -327,7 +327,7 @@ int size = POP(); int phys = POP(); int ret = ofmem_claim_phys( phys, size, align ); - + if( ret == -1 ) { printk("MEM: claim failure\n"); throw( -13 ); @@ -368,7 +368,7 @@ } /* ( phys virt size mode -- [ret???] ) */ -static void +static void mmu_map( void ) { int mode = POP(); @@ -376,7 +376,7 @@ int virt = POP(); int phys = POP(); int ret; - + /* printk("mmu_map: %x %x %x %x\n", phys, virt, size, mode ); */ ret = ofmem_map( phys, virt, size, mode ); Modified: openbios-devel/arch/ppc/mol/mol.c =================================================================== --- openbios-devel/arch/ppc/mol/mol.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/mol/mol.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/12/19 18:46:21 samuel> * Time-stamp: <2004/04/12 16:27:12 samuel> - * + * * <mol.c> - * - * - * + * + * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -96,7 +96,7 @@ { if( !tty_avail() ) return 0; - + if( ttychar < 0 ) ttychar = OSI_TTYGetc(); if( ttychar < 0 ) Modified: openbios-devel/arch/ppc/mol/mol.h =================================================================== --- openbios-devel/arch/ppc/mol/mol.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/mol/mol.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/12/20 00:20:12 samuel> * Time-stamp: <2004/03/27 01:52:50 samuel> - * + * * <mol.h> - * - * - * + * + * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #ifndef _H_MOL Modified: openbios-devel/arch/ppc/mol/osi-blk.c =================================================================== --- openbios-devel/arch/ppc/mol/osi-blk.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/mol/osi-blk.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/12/07 19:08:33 samuel> * Time-stamp: <2004/01/07 19:38:36 samuel> - * + * * <osi-blk.c> - * + * * OSI-block interface - * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -64,7 +64,7 @@ int i, n = POP(); int blk = POP(); char *dest = (char*)POP(); - + /* printk("osiblk_read_blocks %x block=%d n=%d\n", (int)dest, blk, n ); */ for( i=0; i<n; ) { Modified: openbios-devel/arch/ppc/mol/osi-scsi.c =================================================================== --- openbios-devel/arch/ppc/mol/osi-scsi.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/mol/osi-scsi.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/12/11 21:23:54 samuel> * Time-stamp: <2004/01/07 19:38:45 samuel> - * + * * <osi-scsi.c> - * + * * SCSI device node - * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -105,7 +105,7 @@ char *dest = (char*)POP(); unsigned char cmd[10]; int len = nblks * sd->info->blocksize; - + memset( dest, 0, len ); /* printk("READ: blk: %d length %d\n", blk, len ); */ @@ -190,7 +190,7 @@ continue; } break; - } + } info->valid = 1; return 0; Modified: openbios-devel/arch/ppc/mol/prom.c =================================================================== --- openbios-devel/arch/ppc/mol/prom.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/mol/prom.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2002/10/03 20:55:02 samuel> * Time-stamp: <2002/10/29 13:00:23 samuel> - * + * * <prom.c> - * + * * oftree interface - * + * * Copyright (C) 2002, 2003 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #include "openbios/config.h" @@ -69,7 +69,7 @@ /* ret: prop len or -1 if error */ int -prom_get_prop_by_path( const char *path, const char *name, char *buf, long buflen ) +prom_get_prop_by_path( const char *path, const char *name, char *buf, long buflen ) { mol_phandle_t ph = prom_find_device(path); return (ph != -1)? prom_get_prop( ph, name, buf, buflen) : -1; @@ -105,12 +105,12 @@ if( !path ) return -1; - + if( (ph=OSI_PromPathIface( kPromFindDevice, path )) != -1 ) return ph; else if( path[0] == '/' ) return -1; - + /* might be an alias */ if( !(p=strpbrk(path, "@:/")) ) p = (char*)path + strlen(path); @@ -126,7 +126,7 @@ printk("Error: aliases must be absolute!\n"); return -1; } - ph = OSI_PromPathIface( kPromFindDevice, buf2 ); + ph = OSI_PromPathIface( kPromFindDevice, buf2 ); return ph; } Modified: openbios-devel/arch/ppc/mol/prom.h =================================================================== --- openbios-devel/arch/ppc/mol/prom.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/mol/prom.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2002/10/03 21:07:27 samuel> * Time-stamp: <2003/10/22 22:45:26 samuel> - * + * * <prom.h> - * + * * device tree interface - * + * * Copyright (C) 2002, 2003 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #ifndef _H_PROM Modified: openbios-devel/arch/ppc/mol/pseudodisk.c =================================================================== --- openbios-devel/arch/ppc/mol/pseudodisk.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/mol/pseudodisk.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/11/26 16:55:47 samuel> * Time-stamp: <2004/01/07 19:41:54 samuel> - * + * * <pseudodisk.c> - * + * * pseudodisk (contains files exported from linux) - * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -77,7 +77,7 @@ int len = POP(); char *dest = (char*)POP(); int cnt; - + if( pb->fd < 0 ) { memset( dest, 0, len ); PUSH(len); @@ -119,9 +119,9 @@ if( pos_lo == -1 ) pos_lo = pb->size; } - + pb->seekpos = pos_lo; - + PUSH(0); /* ??? */ } Modified: openbios-devel/arch/ppc/mol/tree.c =================================================================== --- openbios-devel/arch/ppc/mol/tree.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/mol/tree.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/11/18 14:55:05 samuel> * Time-stamp: <2004/03/27 02:03:55 samuel> - * + * * <tree.c> - * + * * device tree setup - * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -30,7 +30,7 @@ char name[40], path[80]; int exists; phandle_t ph; - + if( !molph ) return; @@ -73,7 +73,7 @@ set_int_property( ph, "MOL,phandle", molph ); copy_node( prom_child(molph) ); - + if( !exists ) fword("finish-device"); else @@ -128,7 +128,7 @@ if( (map=(int*)get_property(ph, "interrupt-map", &len)) ) { int i, acells = get_int_property(ph, "#address-cells", NULL); int icells = get_int_property(ph, "#interrupt-cells", NULL); - + len /= sizeof(int); for( i=0; i<len; i++ ) { phandle_t ch_ph; @@ -147,7 +147,7 @@ } } /* delete MOL,phandle properties */ - for( ph=0; (ph=dt_iterate(ph)) ; ) { + for( ph=0; (ph=dt_iterate(ph)) ; ) { push_str("MOL,phandle"); PUSH_ph(ph); fword("(delete-property)"); Modified: openbios-devel/arch/ppc/ofmem.c =================================================================== --- openbios-devel/arch/ppc/ofmem.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/ofmem.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,18 +1,18 @@ -/* +/* * Creation Date: <1999/11/07 19:02:11 samuel> * Time-stamp: <2004/01/07 19:42:36 samuel> - * + * * <ofmem.c> - * + * * OF Memory manager - * + * * Copyright (C) 1999-2004 Samuel Rydh (samuel(a)ibrium.se) * Copyright (C) 2004 Stefan Reinauer - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ /* TODO: Clean up MOLisms in a decent way */ @@ -44,14 +44,14 @@ * * Physical * - * 0x00000000 Exception vectors + * 0x00000000 Exception vectors * 0x00004000 Free space * 0x01e00000 Open Firmware (us) * 0x01f00000 OF allocations * 0x01ff0000 PTE Hash * 0x02000000- Free space * - * Allocations grow downwards from 0x01e00000 + * Allocations grow downwards from 0x01e00000 * ****************************************************************/ @@ -104,7 +104,7 @@ /************************************************************************/ void * -malloc( int size ) +malloc( int size ) { alloc_desc_t *d, **pp; char *ret; @@ -114,11 +114,11 @@ if( !ofmem.next_malloc ) ofmem.next_malloc = (char*)OF_MALLOC_BASE; - + if( size & 3 ) size += 4 - (size & 3); size += sizeof(alloc_desc_t); - + /* look in the freelist */ for( pp=&ofmem.mfree; *pp && (**pp).size < size; pp = &(**pp).next ) ; @@ -154,7 +154,7 @@ /* it is legal to free NULL pointers (size zero allocations) */ if( !ptr ) return; - + d = (alloc_desc_t*)(ptr - sizeof(alloc_desc_t)); d->next = ofmem.mfree; @@ -166,11 +166,11 @@ } void * -realloc( void *ptr, size_t size ) +realloc( void *ptr, size_t size ) { alloc_desc_t *d = (alloc_desc_t*)(ptr - sizeof(alloc_desc_t)); char *p; - + if( !ptr ) return malloc( size ); if( !size ) { @@ -199,13 +199,13 @@ } static void -print_phys_range() +print_phys_range() { print_range( ofmem.phys_range, "phys" ); } static void -print_virt_range() +print_virt_range() { print_range( ofmem.virt_range, "virt" ); } @@ -259,7 +259,7 @@ add_entry_( ulong ea, ulong size, range_t **r ) { range_t *nr; - + for( ; *r && (**r).start < ea; r=&(**r).next ) ; nr = (range_t*)malloc( sizeof(range_t) ); @@ -312,17 +312,17 @@ { ulong base = min; range_t *r2; - + if( (align & (align-1)) ) { printk("bad alignment %ld\n", align); align = 0x1000; } if( !align ) align = 0x1000; - + base = reverse ? max - size : min; r2 = reverse ? NULL : r; - + for( ;; ) { if( !reverse ) { base = (base + align - 1) & ~(align-1); @@ -395,7 +395,7 @@ add_entry( virt, size, &ofmem.virt_range ); return virt; } - + virt = find_area( align, size, ofmem.virt_range, min, max, reverse ); if( virt == (ulong)-1 ) { printk("ofmem_claim_virt - out of space\n"); @@ -451,7 +451,7 @@ } if( size & 0xfff ) size = (size + 0xfff) & ~0xfff; - + /* printk("...free memory found... phys: %08lX, virt: %08lX, size %lX\n", phys, virt, size ); */ ofmem_map( phys, virt, size, def_memmode(phys) ); return virt + offs; @@ -466,7 +466,7 @@ split_trans( ulong virt ) { translation_t *t, *t2; - + for( t=ofmem.trans; t; t=t->next ) { if( virt > t->virt && virt < t->virt + t->size-1 ) { t2 = (translation_t*)malloc( sizeof(translation_t) ); @@ -485,7 +485,7 @@ map_page_range( ulong virt, ulong phys, ulong size, int mode ) { translation_t *t, **tt; - + split_trans( virt ); split_trans( virt + size ); @@ -523,9 +523,9 @@ int ofmem_map( ulong phys, ulong virt, ulong size, int mode ) { - /* printk("+ofmem_map: %08lX --> %08lX (size %08lX, mode 0x%02X)\n", + /* printk("+ofmem_map: %08lX --> %08lX (size %08lX, mode 0x%02X)\n", virt, phys, size, mode ); */ - + if( (phys & 0xfff) || (virt & 0xfff) || (size & 0xfff) ) { printk("ofmem_map: Bad parameters (%08lX %08lX %08lX)\n", phys, virt, size ); phys &= ~0xfff; @@ -548,7 +548,7 @@ ofmem_translate( ulong virt, ulong *mode ) { translation_t *t; - + for( t=ofmem.trans; t && t->virt <= virt ; t=t->next ) { ulong offs; if( t->virt + t->size - 1 < virt ) @@ -611,7 +611,7 @@ ulong *upte, cmp, hash1; int i, vsid, found; mPTE_t *pp; - + vsid = (ea>>28) + SEGR_BASE; cmp = BIT(0) | (vsid << 7) | ((ea & 0x0fffffff) >> 22); @@ -621,7 +621,7 @@ pp = (mPTE_t*)(HASH_BASE + (hash1 << 6)); upte = (ulong*)pp; - + /* replace old translation */ for( found=0, i=0; !found && i<8; i++ ) if( cmp == upte[i*2] ) @@ -651,7 +651,7 @@ int mode; asm volatile("mfdar %0" : "=r" (dar) : ); - asm volatile("mfdsisr %0" : "=r" (dsisr) : ); + asm volatile("mfdsisr %0" : "=r" (dsisr) : ); //printk("dsi-exception @ %08lx <%08lx>\n", dar, dsisr ); hash_page( dar, ea_to_phys(dar, &mode), mode ); } @@ -663,7 +663,7 @@ int mode; asm volatile("mfsrr0 %0" : "=r" (nip) : ); - asm volatile("mfsrr1 %0" : "=r" (srr1) : ); + asm volatile("mfsrr1 %0" : "=r" (srr1) : ); //printk("isi-exception @ %08lx <%08lx>\n", nip, srr1 ); hash_page( nip, ea_to_phys(nip, &mode), mode ); Modified: openbios-devel/arch/ppc/osi.h =================================================================== --- openbios-devel/arch/ppc/osi.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/osi.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,19 +1,19 @@ -/* +/* * Creation Date: <1999/03/18 03:19:43 samuel> * Time-stamp: <2003/12/26 16:58:19 samuel> - * + * * <os_interface.h> - * + * * This file includes definitions for drivers * running in the "emulated" OS. (Mainly the 'sc' * mechanism of communicating) - * + * * Copyright (C) 1999, 2000, 2001, 2002, 2003 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #ifndef _H_OSI Modified: openbios-devel/arch/ppc/osi_calls.h =================================================================== --- openbios-devel/arch/ppc/osi_calls.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/osi_calls.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2002/06/16 01:40:57 samuel> * Time-stamp: <2003/12/26 17:02:09 samuel> - * + * * <osi_calls.h> - * + * * OSI call inlines - * + * * Copyright (C) 2002, 2003 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #ifndef _H_OSI_CALLS @@ -43,7 +43,7 @@ register unsigned long dreg(r3); \ register unsigned long dreg(r4); \ register unsigned long dreg(r5) \ - ,##input_regs ; + ,##input_regs ; #define _oc_syscall( number, extra_ret_regs... ) \ __oc_r3 = OSI_SC_MAGIC_R3; \ @@ -90,7 +90,7 @@ ,## inputregs \ : "memory", \ "r4", "r5", "r6", "r7", "r8", "r9" ); -#endif +#endif /************************************************************************/ @@ -339,14 +339,14 @@ /* NVRAM */ static inline _osi_call0( int, OSI_NVRamSize, OSI_NVRAM_SIZE ); static inline _osi_call1( int, OSI_ReadNVRamByte, OSI_READ_NVRAM_BYTE, int, offs ); -static inline _osi_call2( int, OSI_WriteNVRamByte, OSI_WRITE_NVRAM_BYTE, int, offs, +static inline _osi_call2( int, OSI_WriteNVRamByte, OSI_WRITE_NVRAM_BYTE, int, offs, unsigned char, ch ); /* keyboard stuff */ static inline _osi_call0_w1( int, OSI_GetAdbKey2, OSI_GET_ADB_KEY, int *, raw_key ); static inline _osi_call1( int, OSI_KbdCntrl, OSI_KBD_CNTRL, int, cmd ); -static inline int OSI_GetAdbKey( void ) +static inline int OSI_GetAdbKey( void ) { int dummy_raw_key; return OSI_GetAdbKey2( &dummy_raw_key ); } static inline _osi_call2( int, OSI_MapAdbKey, OSI_MAP_ADB_KEY, int, keycode, int, adbkey ) static inline _osi_call1( int, OSI_KeycodeToAdb, OSI_KEYCODE_TO_ADB, int, keycode ); @@ -387,12 +387,12 @@ static inline _osi_call2_w4( int, OSI_ABlkDiskInfo, OSI_ABLK_DISK_INFO, int, channel, int, unit, struct ablk_disk_info *, retinfo ); static inline _osi_call1( int, OSI_ABlkKick, OSI_ABLK_KICK, int, channel ); -static inline _osi_call1_w1w1w1( int, OSI_ABlkIRQAck, OSI_ABLK_IRQ_ACK, int, channel, int *, req_count, +static inline _osi_call1_w1w1w1( int, OSI_ABlkIRQAck, OSI_ABLK_IRQ_ACK, int, channel, int *, req_count, int *, active, int *, events ); static inline _osi_call3( int, OSI_ABlkRingSetup, OSI_ABLK_RING_SETUP, int, channel, int, mphys, int, n_el ); static inline _osi_call2( int, OSI_ABlkCntrl, OSI_ABLK_CNTRL, int, channel, int, cmd ); static inline _osi_call3( int, OSI_ABlkCntrl1, OSI_ABLK_CNTRL, int, channel, int, cmd, int, param ); -static inline _osi_call5( int, OSI_ABlkSyncRead, OSI_ABLK_SYNC_READ, int, channel, int, unit, +static inline _osi_call5( int, OSI_ABlkSyncRead, OSI_ABLK_SYNC_READ, int, channel, int, unit, int, blk, ulong, mphys, int, size ); static inline _osi_call5( int, OSI_ABlkSyncWrite, OSI_ABLK_SYNC_WRITE, int, channel, int, unit, int, blk, ulong, mphys, int, size ); @@ -403,7 +403,7 @@ /* enet2 */ static inline _osi_call0( int, OSI_Enet2Open, OSI_ENET2_OPEN ); static inline _osi_call0( int, OSI_Enet2Close, OSI_ENET2_CLOSE ); -static inline _osi_call3( int, OSI_Enet2RingSetup, OSI_ENET2_RING_SETUP, int, which_ring, +static inline _osi_call3( int, OSI_Enet2RingSetup, OSI_ENET2_RING_SETUP, int, which_ring, int, ring_mphys, int, n_el ); static inline _osi_call2( int, OSI_Enet2Cntrl1, OSI_ENET2_CNTRL, int, cmd, int, param ); static inline _osi_call1( int, OSI_Enet2Cntrl, OSI_ENET2_CNTRL, int, cmd ); @@ -411,7 +411,7 @@ static inline _osi_call0_w2( int, OSI_Enet2GetHWAddr__, OSI_ENET2_GET_HWADDR, ulong *, retbuf ); static inline int OSI_Enet2GetHWAddr( unsigned char *addr ) { - int ret; + int ret; ulong buf[2]; ret = OSI_Enet2GetHWAddr__( buf ); Modified: openbios-devel/arch/ppc/pearpc/init.c =================================================================== --- openbios-devel/arch/ppc/pearpc/init.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/pearpc/init.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,23 +1,23 @@ -/* +/* * Creation Date: <2004/08/28 18:38:22 greg> * Time-stamp: <2004/08/28 18:38:22 greg> - * + * * <init.c> - * + * * Initialization for pearpc * * Copyright (C) 2004 Greg Watson * Copyright (C) 2005 Stefan Reinauer * * based on mol/init.c: - * - * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Samuel & David Rydh + * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Samuel & David Rydh * (samuel(a)ibrium.se, dary(a)lindesign.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #include "openbios/config.h" @@ -66,7 +66,7 @@ printk("\n"); printk("=============================================================\n"); printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); - + ofmem_init(); initialize_forth(); /* won't return */ @@ -91,7 +91,7 @@ phandle_t ph; #endif int autoboot; - + devtree_init(); nvram_init("/pci/mac-io/nvram"); modules_init(); @@ -108,7 +108,7 @@ node_methods_init(); init_video(); - + #if USE_RTAS if( !(ph=find_dev("/rtas")) ) printk("Warning: No /rtas node\n"); Modified: openbios-devel/arch/ppc/pearpc/kernel.c =================================================================== --- openbios-devel/arch/ppc/pearpc/kernel.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/pearpc/kernel.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,15 +1,15 @@ -/* +/* * Creation Date: <2004/08/28 18:03:25 stepan> * Time-stamp: <2004/08/28 18:03:25 stepan> - * + * * <pearpc/kernel.c> - * + * * Copyright (C) 2005 Stefan Reinauer - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "pearpc-dict.h" Modified: openbios-devel/arch/ppc/pearpc/main.c =================================================================== --- openbios-devel/arch/ppc/pearpc/main.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/pearpc/main.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,18 +1,18 @@ -/* +/* * Creation Date: <2004/08/28 18:38:22 greg> * Time-stamp: <2004/08/28 18:38:22 greg> - * + * * <main.c> - * + * * Copyright (C) 2004 Greg Watson - * - * Based on MOL specific code which is + * + * Based on MOL specific code which is * Copyright (C) 2002, 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ @@ -65,7 +65,7 @@ s = MIN( phdr[i].p_filesz, phdr[i].p_memsz ); seek_io( fd, elf_offs + phdr[i].p_offset ); - /* printk("filesz: %08lX memsz: %08lX p_offset: %08lX p_vaddr %08lX\n", + /* printk("filesz: %08lX memsz: %08lX p_offset: %08lX p_vaddr %08lX\n", phdr[i].p_filesz, phdr[i].p_memsz, phdr[i].p_offset, phdr[i].p_vaddr ); */ @@ -90,7 +90,7 @@ #endif flush_icache_range( addr, addr+s ); - /*printk("ELF ROM-section loaded at %08lX (size %08lX)\n", + /*printk("ELF ROM-section loaded at %08lX (size %08lX)\n", (ulong)phdr[i].p_vaddr, (ulong)phdr[i].p_memsz );*/ } free( phdr ); @@ -102,8 +102,8 @@ encode_bootpath( const char *spec, const char *args ) { phandle_t chosen_ph = find_dev("/chosen"); - set_property( chosen_ph, "bootpath", spec, strlen(spec)+1 ); - set_property( chosen_ph, "bootargs", args, strlen(args)+1 ); + set_property( chosen_ph, "bootpath", spec, strlen(spec)+1 ); + set_property( chosen_ph, "bootargs", args, strlen(args)+1 ); } /************************************************************************/ Modified: openbios-devel/arch/ppc/pearpc/methods.c =================================================================== --- openbios-devel/arch/ppc/pearpc/methods.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/pearpc/methods.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,21 +1,21 @@ -/* +/* * Creation Date: <2004/08/28 18:38:22 greg> * Time-stamp: <2004/08/28 18:38:22 greg> - * + * * <methods.c> - * + * * Misc device node methods * * Copyright (C) 2004 Greg Watson - * + * * Based on MOL specific code which is - * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -38,7 +38,7 @@ int physbase = POP(); int s=0x1000, size = (int)of_rtas_end - (int)of_rtas_start; ulong virt; - + while( s < size ) s += 0x1000; virt = ofmem_claim_virt( 0, s, 0x1000 ); @@ -74,11 +74,11 @@ strncpy_nopad( s, addr, len ); s[len]=0; - + printk( "%s", s ); //vfd_draw_str( s ); console_draw_str( s ); - + free( s ); PUSH( len ); @@ -139,7 +139,7 @@ /* ( -- ) */ static void -ciface_quiesce( ulong args[], ulong ret[] ) +ciface_quiesce( ulong args[], ulong ret[] ) { #if 0 ulong msr; @@ -153,12 +153,12 @@ /* ( -- ms ) */ static void -ciface_milliseconds( ulong args[], ulong ret[] ) +ciface_milliseconds( ulong args[], ulong ret[] ) { extern unsigned long get_timer_freq(); static ulong mticks=0, usecs=0; ulong t; - + asm volatile("mftb %0" : "=r" (t) : ); if( mticks ) usecs += get_timer_freq() / 1000000 * ( t-mticks ); @@ -191,7 +191,7 @@ int size = POP(); int phys = POP(); int ret = ofmem_claim_phys( phys, size, align ); - + if( ret == -1 ) { printk("MEM: claim failure\n"); throw( -13 ); @@ -232,7 +232,7 @@ } /* ( phys virt size mode -- [ret???] ) */ -static void +static void mmu_map( void ) { int mode = POP(); @@ -240,7 +240,7 @@ int virt = POP(); int phys = POP(); int ret; - + /* printk("mmu_map: %x %x %x %x\n", phys, virt, size, mode ); */ ret = ofmem_map( phys, virt, size, mode ); Modified: openbios-devel/arch/ppc/pearpc/pearpc.c =================================================================== --- openbios-devel/arch/ppc/pearpc/pearpc.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/pearpc/pearpc.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,19 +1,19 @@ -/* +/* * Creation Date: <2004/08/28 18:38:22 greg> * Time-stamp: <2004/08/28 18:38:22 greg> - * + * * <pearpc.c> - * + * * Copyright (C) 2004, Greg Watson - * + * * derived from mol.c * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -116,7 +116,7 @@ { if( !tty_avail() ) return 0; - + if( ttychar < 0 ) ttychar = inb(UART_BASE); return (ttychar >= 0); @@ -172,7 +172,7 @@ { printk (" "); } - } + } } Modified: openbios-devel/arch/ppc/pearpc/pearpc.h =================================================================== --- openbios-devel/arch/ppc/pearpc/pearpc.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/pearpc/pearpc.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,15 +1,15 @@ -/* +/* * Creation Date: <2004/08/28 17:50:12 stepan> * Time-stamp: <2004/08/28 17:50:12 stepan> - * + * * <pearpc.h> - * + * * Copyright (C) 2005 Stefan Reinauer - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #ifndef _H_PEARPC Modified: openbios-devel/arch/ppc/pearpc/tree.c =================================================================== --- openbios-devel/arch/ppc/pearpc/tree.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/pearpc/tree.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2004/08/28 18:38:22 greg> * Time-stamp: <2004/08/28 18:38:22 greg> - * + * * <tree.c> - * + * * device tree setup - * + * * Copyright (C) 2004 Greg Watson - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" Modified: openbios-devel/arch/ppc/pearpc/vfd.c =================================================================== --- openbios-devel/arch/ppc/pearpc/vfd.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/pearpc/vfd.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2004/08/28 17:29:43 greg> * Time-stamp: <2004/08/28 17:29:43 greg> - * + * * <vfd.c> - * + * * Simple text console - * + * * Copyright (C) 2004 Greg Watson - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #include "openbios/config.h" @@ -21,14 +21,14 @@ static int vfd_is_open; static int -vfd_init( void ) +vfd_init( void ) { vfd_is_open = 1; return 0; } void -vfd_close( void ) +vfd_close( void ) { } Modified: openbios-devel/arch/ppc/start.S =================================================================== --- openbios-devel/arch/ppc/start.S 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/ppc/start.S 2008-12-11 20:30:53 UTC (rev 284) @@ -1,23 +1,23 @@ -/* +/* * Creation Date: <2001/06/16 21:30:18 samuel> * Time-stamp: <2003/04/04 16:32:06 samuel> - * + * * <init.S> - * + * * Asm glue for ELF images run inside MOL - * + * * Copyright (C) 2001, 2002, 2003 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #include "asm/asmdefs.h" #include "asm/processor.h" #include "osi.h" - + /************************************************************************/ /* Macros */ /************************************************************************/ @@ -73,8 +73,8 @@ .space 32*1024 // 32 K exception stack estack: .space 128 - - + + /************************************************************************/ /* entry */ /************************************************************************/ @@ -83,7 +83,7 @@ GLOBL(_start): li r0,0 mtmsr r0 - + lis r1,HA(estack) addi r1,r1,LO(estack) mtsprg0 r1 // setup exception stack @@ -122,7 +122,7 @@ /* According to IEEE 1275, PPC bindings: - * + * * MSR = FP, ME + (DR|IR) * r1 = stack (32 K + 32 bytes link area above) * r5 = clint interface handler @@ -156,7 +156,7 @@ lwz r0,20(r1) mtlr r0 addi r1,r1,16 - // XXX: should restore r12-r31 etc.. + // XXX: should restore r12-r31 etc.. // we should not really come here though blr @@ -191,7 +191,7 @@ lwz r0,16(r1) lwz r1,8(r1) // restore caller stack blr - + /* rtas glue (must be reloctable) */ GLOBL(of_rtas_start): /* r3 = argument buffer, r4 = of_rtas_start */ @@ -276,12 +276,12 @@ mtctr r3 bctrl b exception_return - + ILLEGAL_VECTOR( 0x500 ) ILLEGAL_VECTOR( 0x600 ) ILLEGAL_VECTOR( 0x700 ) -VECTOR( 0x800, "FPU" ): +VECTOR( 0x800, "FPU" ): mtsprg1 r3 mfsrr1 r3 ori r3,r3,0x2000 Modified: openbios-devel/arch/sparc32/linux_load.c =================================================================== --- openbios-devel/arch/sparc32/linux_load.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/sparc32/linux_load.c 2008-12-11 20:30:53 UTC (rev 284) @@ -123,7 +123,7 @@ uint16_t ramdisk_flags; /* 0x1f8 */ #define RAMDISK_IMAGE_START_MASK 0x07FF #define RAMDISK_PROMPT_FLAG 0x8000 -#define RAMDISK_LOAD_FLAG 0x4000 +#define RAMDISK_LOAD_FLAG 0x4000 uint8_t reserved8[2]; /* 0x1fa */ uint16_t orig_root_dev; /* 0x1fc */ uint8_t reserved9[1]; /* 0x1fe */ Modified: openbios-devel/arch/sparc32/loadfs.c =================================================================== --- openbios-devel/arch/sparc32/loadfs.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/sparc32/loadfs.c 2008-12-11 20:30:53 UTC (rev 284) @@ -17,7 +17,7 @@ { if(load_fd==-1) return; - + close_io(load_fd); load_fd=-1; } @@ -42,7 +42,7 @@ unsigned long file_size(void) { llong fpos, fsize; - + if (load_fd < 0) return 0; @@ -52,11 +52,11 @@ /* go to end of file and get position */ seek_io(load_fd, -1); fsize=tell(load_fd); - + /* go back to old position */ seek_io(load_fd, 0); seek_io(load_fd, fpos); - + return fsize; } Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/sparc32/openbios.c 2008-12-11 20:30:53 UTC (rev 284) @@ -168,7 +168,7 @@ load_dictionary((char *)sys_info.dict_start, (unsigned long)sys_info.dict_end - (unsigned long)sys_info.dict_start); - + #ifdef CONFIG_DEBUG_BOOT printk("forth started.\n"); printk("initializing memory..."); Modified: openbios-devel/arch/sparc32/switch.S =================================================================== --- openbios-devel/arch/sparc32/switch.S 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/sparc32/switch.S 2008-12-11 20:30:53 UTC (rev 284) @@ -66,7 +66,7 @@ set (PSR_PS | PSR_S | PSR_PIL | PSR_EF), %g2 wr %g2, 0x0, %psr #endif - + /* Load all registers */ set __context, %g1 Modified: openbios-devel/arch/sparc64/boot.c =================================================================== --- openbios-devel/arch/sparc64/boot.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/sparc64/boot.c 2008-12-11 20:30:53 UTC (rev 284) @@ -22,7 +22,7 @@ { char *path=pop_fstr_copy(), *param; char altpath[256]; - + if (kernel_size) { void (*entry)(unsigned long p1, unsigned long p2, unsigned long p3, unsigned long p4, unsigned long p5); @@ -75,7 +75,7 @@ POP(); param = pop_fstr_copy(); } - + printk("[sparc64] Booting file '%s' ", path); if (param) printk("with parameters '%s'\n", param); Modified: openbios-devel/arch/sparc64/console.c =================================================================== --- openbios-devel/arch/sparc64/console.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/sparc64/console.c 2008-12-11 20:30:53 UTC (rev 284) @@ -201,7 +201,7 @@ static void video_putchar(int c) { int p=1; - + if (c == '\n' || c == '\r') { video_newline(); return; @@ -229,7 +229,7 @@ static void video_cls(void) { int i; - + for (i = 0; i < 2 * COLUMNS * LINES;) { video[i++] = 0; video[i++] = ATTRIBUTE; Modified: openbios-devel/arch/sparc64/entry.S =================================================================== --- openbios-devel/arch/sparc64/entry.S 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/sparc64/entry.S 2008-12-11 20:30:53 UTC (rev 284) @@ -199,7 +199,7 @@ bne 1b nop #endif - + membar #Sync setx _start, %g7, %g4 Modified: openbios-devel/arch/sparc64/linux_load.c =================================================================== --- openbios-devel/arch/sparc64/linux_load.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/sparc64/linux_load.c 2008-12-11 20:30:53 UTC (rev 284) @@ -123,7 +123,7 @@ uint16_t ramdisk_flags; /* 0x1f8 */ #define RAMDISK_IMAGE_START_MASK 0x07FF #define RAMDISK_PROMPT_FLAG 0x8000 -#define RAMDISK_LOAD_FLAG 0x4000 +#define RAMDISK_LOAD_FLAG 0x4000 uint8_t reserved8[2]; /* 0x1fa */ uint16_t orig_root_dev; /* 0x1fc */ uint8_t reserved9[1]; /* 0x1fe */ Modified: openbios-devel/arch/sparc64/loadfs.c =================================================================== --- openbios-devel/arch/sparc64/loadfs.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/sparc64/loadfs.c 2008-12-11 20:30:53 UTC (rev 284) @@ -17,7 +17,7 @@ { if(load_fd==-1) return; - + close_io(load_fd); load_fd=-1; } @@ -42,7 +42,7 @@ unsigned long file_size(void) { llong fpos, fsize; - + if (load_fd < 0) return 0; @@ -52,11 +52,11 @@ /* go to end of file and get position */ seek_io(load_fd, -1); fsize=tell(load_fd); - + /* go back to old position */ seek_io(load_fd, 0); seek_io(load_fd, fpos); - + return fsize; } Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/sparc64/openbios.c 2008-12-11 20:30:53 UTC (rev 284) @@ -898,12 +898,12 @@ #endif collect_sys_info(&sys_info); - + dict=intdict; load_dictionary((char *)sys_info.dict_start, (unsigned long)sys_info.dict_end - (unsigned long)sys_info.dict_start); - + #ifdef CONFIG_DEBUG_BOOT printk("forth started.\n"); printk("initializing memory..."); @@ -917,7 +917,7 @@ PUSH_xt( bind_noname_func(arch_init) ); fword("PREPOST-initializer"); - + PC = (ucell)findword("initialize-of"); if (!PC) { Modified: openbios-devel/arch/sparc64/openbios.h =================================================================== --- openbios-devel/arch/sparc64/openbios.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/sparc64/openbios.h 2008-12-11 20:30:53 UTC (rev 284) @@ -3,9 +3,9 @@ * Time-stamp: <2004/01/15 16:14:05 samuel> * * <openbios.h> - * - * * + * + * * Copyright (C) 2004 Samuel Rydh (samuel(a)ibrium.se) * * This program is free software; you can redistribute it and/or Modified: openbios-devel/arch/unix/blk.c =================================================================== --- openbios-devel/arch/unix/blk.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/unix/blk.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,14 +1,14 @@ -/* +/* * <arch/unix/blk.c> - * - * block device emulation for unix hosts - * + * + * block device emulation for unix hosts + * * Copyright (C) 2004 Stefan Reinauer <stepan(a)openbios.org> - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -60,9 +60,9 @@ cell i, n = POP(); cell blk = POP(); char *dest = (char*)POP(); - + // printk("blk_read_blocks %x block=%d n=%d\n", (ucell)dest, blk, n ); - + for( i=0; i<n; ) { char buf[4096]; ucell m = MIN( n-i, sizeof(buf)/512 ); Modified: openbios-devel/arch/unix/boot.c =================================================================== --- openbios-devel/arch/unix/boot.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/unix/boot.c 2008-12-11 20:30:53 UTC (rev 284) @@ -37,12 +37,12 @@ } (ullong *)entry = ehdr.e_entry; - + lszz_offs = elf_offs; for( i=0; i<ehdr.e_phnum; i++ ) { s = MIN( phdr[i].p_filesz, phdr[i].p_memsz ); seek_io( fd, elf_offs + phdr[i].p_offset ); - /* printk("filesz: %08lX memsz: %08lX p_offset: %08lX p_vaddr %08lX\n", + /* printk("filesz: %08lX memsz: %08lX p_offset: %08lX p_vaddr %08lX\n", phdr[i].p_filesz, phdr[i].p_memsz, phdr[i].p_offset, phdr[i].p_vaddr ); */ if( phdr[i].p_vaddr != phdr[i].p_paddr ) @@ -56,7 +56,7 @@ } free( phdr ); return entry; -#else +#else return NULL; #endif } @@ -66,7 +66,7 @@ { char *path=pop_fstr_copy(); void *entry; - + if(!path) { printk("[unix] Booting default not supported.\n"); return; Modified: openbios-devel/arch/unix/gui_qt/gui-qt.cpp =================================================================== --- openbios-devel/arch/unix/gui_qt/gui-qt.cpp 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/unix/gui_qt/gui-qt.cpp 2008-12-11 20:30:53 UTC (rev 284) @@ -1,5 +1,5 @@ /* tag: qt user interface fb class - * + * * Copyright (C) 2003-2004 Stefan Reinauer * * See the file "COPYING" for further information about @@ -15,22 +15,22 @@ static const int sizey=480; static const int depth=8; -static unsigned char color[256][3]={ - { 0x00, 0x00, 0x00 }, - { 0x00, 0x00, 0xaa }, - { 0x00, 0xaa, 0x00 }, - { 0x00, 0xaa, 0xaa }, - { 0xaa, 0x00, 0x00 }, - { 0xaa, 0x00, 0xaa }, - { 0xaa, 0x55, 0x00 }, - { 0xaa, 0xaa, 0xaa }, - { 0x55, 0x55, 0x55 }, - { 0x55, 0x55, 0xff }, - { 0x55, 0xff, 0x55 }, - { 0x55, 0xff, 0xff }, - { 0xff, 0x55, 0x55 }, - { 0xff, 0x55, 0xff }, - { 0xff, 0xff, 0x55 }, +static unsigned char color[256][3]={ + { 0x00, 0x00, 0x00 }, + { 0x00, 0x00, 0xaa }, + { 0x00, 0xaa, 0x00 }, + { 0x00, 0xaa, 0xaa }, + { 0xaa, 0x00, 0x00 }, + { 0xaa, 0x00, 0xaa }, + { 0xaa, 0x55, 0x00 }, + { 0xaa, 0xaa, 0xaa }, + { 0x55, 0x55, 0x55 }, + { 0x55, 0x55, 0xff }, + { 0x55, 0xff, 0x55 }, + { 0x55, 0xff, 0xff }, + { 0xff, 0x55, 0x55 }, + { 0xff, 0x55, 0xff }, + { 0xff, 0xff, 0x55 }, { 0xff, 0xff, 0xff }, }; @@ -43,20 +43,20 @@ QPopupMenu *file = new QPopupMenu (this); file->insertItem( "E&xit", this, SLOT(quit()), CTRL+Key_Q ); - + QPopupMenu *help = new QPopupMenu( this ); help->insertItem("&About OpenBIOS", this, SLOT(about()), CTRL+Key_H ); help->insertItem( "About &Qt", this, SLOT(aboutQt()) ); - + menu = new QMenuBar( this ); Q_CHECK_PTR( menu ); menu->insertItem( "&File", file ); menu->insertSeparator(); menu->insertItem( "&Help", help ); menu->setSeparator( QMenuBar::InWindowsStyle ); - + setFixedSize(sizex,sizey+menu->heightForWidth(sizex)); - + buffer.create(sizex, sizey, depth, 256); for (int i=16; i < 256; i++) { @@ -64,16 +64,16 @@ color[i][1]=i; color[i][2]=i; } - + for (int i=0; i< 256; i++) buffer.setColor(i, qRgb(color[i][0], color[i][1], color[i][2])); - + buffer.fill( 0 ); - + updatetimer=new QTimer(this); connect( updatetimer, SIGNAL(timeout()), this, SLOT(update()) ); updatetimer->start(200,FALSE); - + setMouseTracking( TRUE ); } @@ -98,10 +98,10 @@ } void FrameBufferWidget::aboutQt() -{ +{ QMessageBox::aboutQt( this, "OpenBIOS" ); -} - +} + void FrameBufferWidget::quit() { extern volatile int gui_running; Modified: openbios-devel/arch/unix/gui_qt/gui-qt.h =================================================================== --- openbios-devel/arch/unix/gui_qt/gui-qt.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/unix/gui_qt/gui-qt.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,5 +1,5 @@ /* tag: qt user interface fb class description - * + * * Copyright (C) 2003-2004 Stefan Reinauer <stepan(a)openbios.org> * * See the file "COPYING" for further information about @@ -24,7 +24,7 @@ public: FrameBufferWidget(QWidget *parent=0, const char *name=0); unsigned char *getFrameBuffer(void); - + public slots: void quit(); void about(); Modified: openbios-devel/arch/unix/gui_qt/qt-main.cpp =================================================================== --- openbios-devel/arch/unix/gui_qt/qt-main.cpp 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/unix/gui_qt/qt-main.cpp 2008-12-11 20:30:53 UTC (rev 284) @@ -1,5 +1,5 @@ /* tag: openbios qt user interface - * + * * Copyright (C) 2003-2004 Stefan Reinauer * * See the file "COPYING" for further information about @@ -28,19 +28,19 @@ void *gui_thread(void *ptr) { threaddata *td=(threaddata *)ptr; - + QApplication a(td->argc, td->argv); FrameBufferWidget w; a.setMainWidget(&w); w.show(); - + fb=w.getFrameBuffer(); gui_running=-1; a.exec(); gui_running=0; - + return 0; } @@ -56,11 +56,11 @@ printf("Initializing \"framebuffer\" plugin..."); #endif pthread_create(&mythread, NULL, gui_thread, &mytd); - while (!fb) + while (!fb) usleep(20); #if 0 - + /* now we have the framebuffer start address. * updating pci config space to reflect this */ @@ -80,14 +80,14 @@ *(u32 *)(pci_config_space+0x34)=0; #endif *(u32 *)(pci_config_space+0x30)=(u32)((unsigned long)qt_fcode&0xffffffff); - + /* FIXME: we need to put the fcode image for this * device to the rom resource, once it exists */ - + /* register pci device to be available to beginagain */ pci_register_device(0, 2, 0, pci_config_space); -#endif +#endif #ifdef DEBUG printf("done.\n"); #endif Modified: openbios-devel/arch/unix/plugins/plugin_pci/plugin_pci.c =================================================================== --- openbios-devel/arch/unix/plugins/plugin_pci/plugin_pci.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/unix/plugins/plugin_pci/plugin_pci.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,5 +1,5 @@ /* tag: openbios pci plugin - * + * * Copyright (C) 2003 Stefan Reinauer * * See the file "COPYING" for further information about @@ -34,7 +34,7 @@ } /* - * IO functions. These manage all the magic of providing a PCI + * IO functions. These manage all the magic of providing a PCI * compatible interface to OpenBIOS' unix version of the kernel. */ Modified: openbios-devel/arch/unix/plugins/plugin_qt/pciconfig.h =================================================================== --- openbios-devel/arch/unix/plugins/plugin_qt/pciconfig.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/unix/plugins/plugin_qt/pciconfig.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,5 +1,5 @@ /* tag: pci config space dump for qt plugin's pci device. - * + * * Copyright (C) 2003 Stefan Reinauer * * See the file "COPYING" for further information about Modified: openbios-devel/arch/unix/plugins/plugin_qt/plugin_qt.cpp =================================================================== --- openbios-devel/arch/unix/plugins/plugin_qt/plugin_qt.cpp 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/unix/plugins/plugin_qt/plugin_qt.cpp 2008-12-11 20:30:53 UTC (rev 284) @@ -1,5 +1,5 @@ /* tag: qt plugin framebuffer class - * + * * Copyright (C) 2003 Stefan Reinauer * * See the file "COPYING" for further information about @@ -15,22 +15,22 @@ static const int sizey=480; static const int depth=8; -static unsigned char color[256][3]={ - { 0x00, 0x00, 0x00 }, - { 0x00, 0x00, 0xaa }, - { 0x00, 0xaa, 0x00 }, - { 0x00, 0xaa, 0xaa }, - { 0xaa, 0x00, 0x00 }, - { 0xaa, 0x00, 0xaa }, - { 0xaa, 0x55, 0x00 }, - { 0xaa, 0xaa, 0xaa }, - { 0x55, 0x55, 0x55 }, - { 0x55, 0x55, 0xff }, - { 0x55, 0xff, 0x55 }, - { 0x55, 0xff, 0xff }, - { 0xff, 0x55, 0x55 }, - { 0xff, 0x55, 0xff }, - { 0xff, 0xff, 0x55 }, +static unsigned char color[256][3]={ + { 0x00, 0x00, 0x00 }, + { 0x00, 0x00, 0xaa }, + { 0x00, 0xaa, 0x00 }, + { 0x00, 0xaa, 0xaa }, + { 0xaa, 0x00, 0x00 }, + { 0xaa, 0x00, 0xaa }, + { 0xaa, 0x55, 0x00 }, + { 0xaa, 0xaa, 0xaa }, + { 0x55, 0x55, 0x55 }, + { 0x55, 0x55, 0xff }, + { 0x55, 0xff, 0x55 }, + { 0x55, 0xff, 0xff }, + { 0xff, 0x55, 0x55 }, + { 0xff, 0x55, 0xff }, + { 0xff, 0xff, 0x55 }, { 0xff, 0xff, 0xff }, }; @@ -43,20 +43,20 @@ QPopupMenu *file = new QPopupMenu (this); file->insertItem( "E&xit", this, SLOT(quit()), CTRL+Key_Q ); - + QPopupMenu *help = new QPopupMenu( this ); help->insertItem("&About OpenBIOS", this, SLOT(about()), CTRL+Key_H ); help->insertItem( "About &Qt", this, SLOT(aboutQt()) ); - + menu = new QMenuBar( this ); Q_CHECK_PTR( menu ); menu->insertItem( "&File", file ); menu->insertSeparator(); menu->insertItem( "&Help", help ); menu->setSeparator( QMenuBar::InWindowsStyle ); - + setFixedSize(sizex,sizey+menu->heightForWidth(sizex)); - + buffer.create(sizex, sizey, depth, 256); for (int i=16; i < 256; i++) { @@ -64,16 +64,16 @@ color[i][1]=i; color[i][2]=i; } - + for (int i=0; i< 256; i++) buffer.setColor(i, qRgb(color[i][0], color[i][1], color[i][2])); - + buffer.fill( 0 ); - + updatetimer=new QTimer(this); connect( updatetimer, SIGNAL(timeout()), this, SLOT(update()) ); updatetimer->start(200,FALSE); - + setMouseTracking( TRUE ); } @@ -98,10 +98,10 @@ } void FrameBufferWidget::aboutQt() -{ +{ QMessageBox::aboutQt( this, "OpenBIOS" ); -} - +} + void FrameBufferWidget::quit() { extern volatile int gui_running; Modified: openbios-devel/arch/unix/plugins/plugin_qt/plugin_qt.h =================================================================== --- openbios-devel/arch/unix/plugins/plugin_qt/plugin_qt.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/unix/plugins/plugin_qt/plugin_qt.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,5 +1,5 @@ /* tag: qt plugin framebuffer class description - * + * * Copyright (C) 2003 Stefan Reinauer * * See the file "COPYING" for further information about @@ -24,7 +24,7 @@ public: FrameBufferWidget(QWidget *parent=0, const char *name=0); unsigned char *getFrameBuffer(void); - + public slots: void quit(); void about(); Modified: openbios-devel/arch/unix/plugins/plugin_qt/qt_main.cpp =================================================================== --- openbios-devel/arch/unix/plugins/plugin_qt/qt_main.cpp 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/unix/plugins/plugin_qt/qt_main.cpp 2008-12-11 20:30:53 UTC (rev 284) @@ -1,5 +1,5 @@ /* tag: openbios qt plugin skeleton - * + * * Copyright (C) 2003 Stefan Reinauer * * See the file "COPYING" for further information about @@ -30,19 +30,19 @@ void *gui_thread(void *ptr) { threaddata *td=(threaddata *)ptr; - + QApplication a(td->argc, td->argv); FrameBufferWidget w; a.setMainWidget(&w); w.show(); - + fb=w.getFrameBuffer(); gui_running=-1; a.exec(); gui_running=0; - + return 0; } @@ -58,7 +58,7 @@ printf("Initializing \"framebuffer\" plugin..."); #endif pthread_create(&mythread, NULL, gui_thread, &mytd); - while (!fb) + while (!fb) usleep(20); /* now we have the framebuffer start address. @@ -80,14 +80,14 @@ *(u32 *)(pci_config_space+0x34)=0; #endif *(u32 *)(pci_config_space+0x30)=(u32)((unsigned long)qt_fcode&0xffffffff); - + /* FIXME: we need to put the fcode image for this * device to the rom resource, once it exists */ - + /* register pci device to be available to beginagain */ pci_register_device(0, 2, 0, pci_config_space); - + #ifdef DEBUG printf("done.\n"); #endif Modified: openbios-devel/arch/unix/unix.c =================================================================== --- openbios-devel/arch/unix/unix.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/unix/unix.c 2008-12-11 20:30:53 UTC (rev 284) @@ -37,7 +37,7 @@ #define MEMORY_SIZE (4*1024*1024) /* 4M ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256k for the dictionary */ - + #if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS==64) #define lseek lseek64 #define __LFS O_LARGEFILE @@ -155,7 +155,7 @@ if (ior) return ior->inb(reg); #endif - + printk("TRAP: io byte read @0x%x", reg); return 0xff; } @@ -302,7 +302,7 @@ exit(1); } -/* +/* * allocate memory and prepare engine for memory management. */ @@ -327,9 +327,9 @@ void exception(__attribute__((unused)) cell no) { - /* - * this is a noop since the dictionary has to take care - * itself of errors it generates outside of the bootstrap + /* + * this is a noop since the dictionary has to take care + * itself of errors it generates outside of the bootstrap */ } @@ -339,17 +339,17 @@ modules_init(); if(diskemu!=-1) blk_init(); - + device_end(); bind_func("platform-boot", boot); } -int +int read_from_disk( int channel, int unit, int blk, unsigned long mphys, int size ) { // channels and units not supported yet. unsigned char *buf=(unsigned char *)mphys; - + if(diskemu==-1) return -1; @@ -461,7 +461,7 @@ } memset(dict, 0, DICTIONARY_SIZE); - + if (!segfault) { if (verbose) printk("Installing SIGSEGV handler..."); @@ -536,7 +536,7 @@ printk( const char *fmt, ... ) { int i; - + va_list args; va_start( args, fmt ); i = vprintf(fmt, args ); Modified: openbios-devel/arch/x86/boot.c =================================================================== --- openbios-devel/arch/x86/boot.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/x86/boot.c 2008-12-11 20:30:53 UTC (rev 284) @@ -20,12 +20,12 @@ void boot(void); -struct sys_info sys_info; +struct sys_info sys_info; void boot(void) { char *path=pop_fstr_copy(), *param; - + if(!path) { printk("[x86] Booting default not supported.\n"); return; @@ -36,7 +36,7 @@ *param = '\0'; param++; } - + printk("[x86] Booting file '%s' with parameters '%s'\n",path, param); if (elf_load(&sys_info, path, param) != LOADER_NOT_SUPPORT) @@ -45,7 +45,7 @@ goto loaded; if (forth_load(&sys_info, path, param) != LOADER_NOT_SUPPORT) goto loaded; - + printk("Unsupported image format\n"); loaded: Modified: openbios-devel/arch/x86/console.c =================================================================== --- openbios-devel/arch/x86/console.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/x86/console.c 2008-12-11 20:30:53 UTC (rev 284) @@ -200,7 +200,7 @@ static void video_putchar(int c) { int p=1; - + if (c == '\n' || c == '\r') { video_newline(); return; @@ -228,7 +228,7 @@ static void video_cls(void) { int i; - + for (i = 0; i < 2 * COLUMNS * LINES;) { video[i++] = 0; video[i++] = ATTRIBUTE; Modified: openbios-devel/arch/x86/context.c =================================================================== --- openbios-devel/arch/x86/context.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/x86/context.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,5 +1,5 @@ /* tag: x86 context switching - * + * * 2003-10 by SONE Takeshi * * See the file "COPYING" for further information about @@ -22,7 +22,7 @@ void __exit_context(void); /* assembly routine */ /* - * Main context structure + * Main context structure * It is placed at the bottom of our stack, and loaded by assembly routine * to start us up. */ Modified: openbios-devel/arch/x86/elfload.c =================================================================== --- openbios-devel/arch/x86/elfload.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/x86/elfload.c 2008-12-11 20:30:53 UTC (rev 284) @@ -159,7 +159,7 @@ } bytes += phdr[i].p_filesz; debug("clearing... "); - memset(phys_to_virt(phdr[i].p_paddr + phdr[i].p_filesz), 0, + memset(phys_to_virt(phdr[i].p_paddr + phdr[i].p_filesz), 0, phdr[i].p_memsz - phdr[i].p_filesz); if (phdr[i].p_offset <= checksum_offset && phdr[i].p_offset + phdr[i].p_filesz >= checksum_offset+2) { @@ -362,7 +362,7 @@ if (!load_segments(phdr, ehdr.e_phnum, checksum_offset)) goto out; - + if (checksum_offset) { if (!verify_image(&ehdr, phdr, ehdr.e_phnum, checksum)) goto out; Modified: openbios-devel/arch/x86/entry.S =================================================================== --- openbios-devel/arch/x86/entry.S 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/x86/entry.S 2008-12-11 20:30:53 UTC (rev 284) @@ -6,7 +6,7 @@ /* * Entry point * We start execution from here. - * It is assumed that CPU is in 32-bit protected mode and + * It is assumed that CPU is in 32-bit protected mode and * all segments are 4GB and base zero (flat model). */ entry: @@ -28,7 +28,7 @@ * switches the stack, and restores everything from the new stack. * This function takes no argument. New stack pointer is * taken from global variable __context, and old stack pointer - * is also saved to __context. This way we can just jump to + * is also saved to __context. This way we can just jump to * this routine to get back to the original context. * * Call this routine with lcall or pushl %cs; call. @@ -51,7 +51,7 @@ xchgl %eax, 64(%esp) movl %eax, 60(%esp) #endif - + /* At this point we don't know if we are on flat segment * or relocated. So compute the address offset from %eip. * Assuming CS.base==DS.base==SS.base. @@ -62,7 +62,7 @@ /* Interrupts are not allowed... */ cli - + /* Current context pointer is our stack pointer */ movl %esp, %esi @@ -119,7 +119,7 @@ * initialize exception handler. All exceptions end up in the same * C function. */ - + init_exceptions: pushl %ebx pushl %edi @@ -141,7 +141,7 @@ /* Load the Interrupt descriptor table */ lidt idtarg - + movl $0, %eax popl %edi popl %ebx Modified: openbios-devel/arch/x86/exception.c =================================================================== --- openbios-devel/arch/x86/exception.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/x86/exception.c 2008-12-11 20:30:53 UTC (rev 284) @@ -54,12 +54,12 @@ void x86_exception(struct eregs *info) { if(info->vector <= 18) { - printk("\nUnexpected Exception: %s", + printk("\nUnexpected Exception: %s", exception_names[info->vector]); } else { printk("\nUnexpected Exception: %d", info->vector); } - + printk( " @ %02x:%08lx - Halting\n" "Code: %d eflags: %08lx\n" @@ -67,7 +67,7 @@ "edi: %08lx esi: %08lx ebp: %08lx esp: %08lx\n", info->cs, (unsigned long)info->eip, info->error_code, (unsigned long)info->eflags, - (unsigned long)info->eax, (unsigned long)info->ebx, + (unsigned long)info->eax, (unsigned long)info->ebx, (unsigned long)info->ecx, (unsigned long)info->edx, (unsigned long)info->edi, (unsigned long)info->esi, (unsigned long)info->ebp, (unsigned long)info->esp); @@ -83,7 +83,7 @@ PC=findword("outer-interpreter"); info->eip=(uint32_t)&do_nothing; - + /* for (;;) asm("hlt;"); Modified: openbios-devel/arch/x86/forthload.c =================================================================== --- openbios-devel/arch/x86/forthload.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/x86/forthload.c 2008-12-11 20:30:53 UTC (rev 284) @@ -38,10 +38,10 @@ } forthsize = file_size(); - + forthtext = malloc(forthsize+1); file_seek(0); - + printk("Loading forth source ..."); if (lfile_read(forthtext, forthsize) != forthsize) { printk("Can't read forth text\n"); Modified: openbios-devel/arch/x86/lib.c =================================================================== --- openbios-devel/arch/x86/lib.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/x86/lib.c 2008-12-11 20:30:53 UTC (rev 284) @@ -15,7 +15,7 @@ #include "openbios/kernel.h" /* Format a string and print it on the screen, just like the libc - * function printf. + * function printf. */ int printk( const char *fmt, ... ) { Modified: openbios-devel/arch/x86/linux_load.c =================================================================== --- openbios-devel/arch/x86/linux_load.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/x86/linux_load.c 2008-12-11 20:30:53 UTC (rev 284) @@ -124,7 +124,7 @@ uint16_t ramdisk_flags; /* 0x1f8 */ #define RAMDISK_IMAGE_START_MASK 0x07FF #define RAMDISK_PROMPT_FLAG 0x8000 -#define RAMDISK_LOAD_FLAG 0x4000 +#define RAMDISK_LOAD_FLAG 0x4000 uint8_t reserved8[2]; /* 0x1fa */ uint16_t orig_root_dev; /* 0x1fc */ uint8_t reserved9[1]; /* 0x1fe */ @@ -465,7 +465,7 @@ max = hdr->initrd_addr_max; else max = 0x38000000; /* Hardcoded value for older kernels */ - + /* FILO itself is at the top of RAM. (relocated) * So, try putting initrd just below us. */ end = virt_to_phys(_start); @@ -521,9 +521,9 @@ outb(0, 0xf0); outb(0, 0xf1); - /* we're getting screwed again and again by this problem of the 8259. - * so we're going to leave this lying around for inclusion into - * crt0.S on an as-needed basis. + /* we're getting screwed again and again by this problem of the 8259. + * so we're going to leave this lying around for inclusion into + * crt0.S on an as-needed basis. * * well, that went ok, I hope. Now we have to reprogram the interrupts :-( * we put them right after the intel-reserved hardware interrupts, at @@ -566,8 +566,8 @@ linux_gdt[2] = gdt[FLAT_CODE]; linux_gdt[3] = gdt[FLAT_DATA]; /* 2.6 kernel uses 12 and 13, but head.S uses backward-compatible - * segments (2 and 3), so it SHOULD not be a problem. - * However, some distro kernels (eg. RH9) with backported threading + * segments (2 and 3), so it SHOULD not be a problem. + * However, some distro kernels (eg. RH9) with backported threading * patch use 12 and 13 also when booting... */ linux_gdt[12] = gdt[FLAT_CODE]; linux_gdt[13] = gdt[FLAT_DATA]; @@ -595,7 +595,7 @@ params->orig_x = cursor_x; params->orig_y = cursor_y; #endif - + /* Go... */ ctx = switch_to(ctx); Modified: openbios-devel/arch/x86/loadfs.c =================================================================== --- openbios-devel/arch/x86/loadfs.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/x86/loadfs.c 2008-12-11 20:30:53 UTC (rev 284) @@ -27,18 +27,18 @@ unsigned long file_size(void) { llong fpos, fsize; - + /* save current position */ fpos=tell(load_fd); /* go to end of file and get position */ seek_io(load_fd, -1); fsize=tell(load_fd); - + /* go back to old position */ seek_io(load_fd, 0); seek_io(load_fd, fpos); - + return fsize; } Modified: openbios-devel/arch/x86/multiboot.c =================================================================== --- openbios-devel/arch/x86/multiboot.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/x86/multiboot.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,6 +1,6 @@ /* Support for Multiboot */ -#include "openbios/config.h" +#include "openbios/config.h" #include "asm/io.h" #include "sys_info.h" #include "multiboot.h" @@ -8,7 +8,7 @@ #ifdef CONFIG_DEBUG_BOOT #define debug printk #else -#define debug(x...) +#define debug(x...) #endif struct mbheader { @@ -61,13 +61,13 @@ printk("multiboot: no dictionary\n"); return; } - + mod = (module_t *) mbinfo->mods_addr; info->dict_start=(unsigned long *)mod->mod_start; info->dict_end=(unsigned long *)mod->mod_end; - debug("multiboot: dictionary at %x-%x\n", + debug("multiboot: dictionary at %x-%x\n", info->dict_start, info->dict_end); - + if (mbinfo->flags & MULTIBOOT_MMAP_VALID) { /* convert mmap records */ mbmem = phys_to_virt(mbinfo->mmap_addr); Modified: openbios-devel/arch/x86/multiboot.h =================================================================== --- openbios-devel/arch/x86/multiboot.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/x86/multiboot.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,5 +1,5 @@ -/* multiboot.h - * tag: header for multiboot +/* multiboot.h + * tag: header for multiboot * * Copyright (C) 2003 Stefan Reinauer * Modified: openbios-devel/arch/x86/openbios.c =================================================================== --- openbios-devel/arch/x86/openbios.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/x86/openbios.c 2008-12-11 20:30:53 UTC (rev 284) @@ -24,7 +24,7 @@ static void init_memory(void) { /* push start and end of available memory to the stack - * so that the forth word QUIT can initialize memory + * so that the forth word QUIT can initialize memory * management. For now we use hardcoded memory between * 0x10000 and 0x9ffff (576k). If we need more memory * than that we have serious bloat. @@ -70,12 +70,12 @@ #endif collect_sys_info(&sys_info); - + dict=intdict; load_dictionary((char *)sys_info.dict_start, (unsigned long)sys_info.dict_end - (unsigned long)sys_info.dict_start); - + relocate(&sys_info); #ifdef CONFIG_DEBUG_CONSOLE_VGA @@ -94,7 +94,7 @@ PUSH_xt( bind_noname_func(arch_init) ); fword("PREPOST-initializer"); - + PC = (ucell)findword("initialize-of"); if (!PC) { Modified: openbios-devel/arch/x86/openbios.h =================================================================== --- openbios-devel/arch/x86/openbios.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/x86/openbios.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2004/01/15 16:14:05 samuel> * Time-stamp: <2004/01/15 16:14:05 samuel> - * + * * <openbios.h> - * - * - * + * + * + * * Copyright (C) 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #ifndef _H_OPENBIOS Modified: openbios-devel/arch/x86/segment.c =================================================================== --- openbios-devel/arch/x86/segment.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/x86/segment.c 2008-12-11 20:30:53 UTC (rev 284) @@ -22,7 +22,7 @@ unsigned int base; } __attribute__((packed)); -/* How far the virtual address (used in C) is different from physical +/* How far the virtual address (used in C) is different from physical * address. Since we start in flat mode, the initial value is zero. */ unsigned long virt_offset = 0; @@ -108,7 +108,7 @@ "movw %5, %%gs\n\t" "movw %5, %%ss\n" : "=&S" (d0), "=&D" (d1), "=&c" (d2) - : "m" (gdtarg), "n" (RELOC_CS), "q" ((unsigned short) RELOC_DS), + : "m" (gdtarg), "n" (RELOC_CS), "q" ((unsigned short) RELOC_DS), "0" (&_start), "1" (new_base), "2" (prog_size)); virt_offset = new_offset; Modified: openbios-devel/arch/x86/sys_info.c =================================================================== --- openbios-devel/arch/x86/sys_info.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/x86/sys_info.c 2008-12-11 20:30:53 UTC (rev 284) @@ -6,7 +6,7 @@ #ifdef CONFIG_DEBUG_BOOT #define debug printk #else -#define debug(x...) +#define debug(x...) #endif void collect_multiboot_info(struct sys_info *); Modified: openbios-devel/arch/x86/xbox/console.c =================================================================== --- openbios-devel/arch/x86/xbox/console.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/x86/xbox/console.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,7 +1,7 @@ /* * Xbox framebuffer - Video + Console * - * Copyright (C) 2005 Ed Schouten <ed(a)fxq.nl>, + * Copyright (C) 2005 Ed Schouten <ed(a)fxq.nl>, * Stefan Reinauer <stepan(a)openbios.org> * * This program is free software; you can redistribute it and/or modify Modified: openbios-devel/arch/x86/xbox/methods.c =================================================================== --- openbios-devel/arch/x86/xbox/methods.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/arch/x86/xbox/methods.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,21 +1,21 @@ -/* +/* * Creation Date: <2004/08/28 18:38:22 greg> * Time-stamp: <2004/08/28 18:38:22 greg> - * + * * <methods.c> - * + * * Misc device node methods * * Copyright (C) 2004 Greg Watson - * + * * Based on MOL specific code which is - * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -39,11 +39,11 @@ strncpy_nopad( s, addr, len ); s[len]=0; - + printk( "%s", s ); //vfd_draw_str( s ); console_draw_str( s ); - + free( s ); PUSH( len ); Modified: openbios-devel/drivers/adb.c =================================================================== --- openbios-devel/drivers/adb.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/drivers/adb.c 2008-12-11 20:30:53 UTC (rev 284) @@ -2,7 +2,7 @@ * <adbkbd.c> * * Open Hack'Ware BIOS ADB keyboard support, ported to OpenBIOS - * + * * Copyright (c) 2005 Jocelyn Mayer * Copyright (c) 2005 Stefan Reinauer * @@ -516,7 +516,7 @@ int len, key, i; len=POP(); addr=(char *)POP(); - + for (i = 0; i < len; i++) { key = adb_kbd_read(my_adb_dev); if (key == -1 || key == -2) Modified: openbios-devel/drivers/adb.h =================================================================== --- openbios-devel/drivers/adb.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/drivers/adb.h 2008-12-11 20:30:53 UTC (rev 284) @@ -2,7 +2,7 @@ * ADB bus definitions for Open Hack'Ware * * Copyright (c) 2004-2005 Jocelyn Mayer - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License V2 * as published by the Free Software Foundation @@ -76,7 +76,7 @@ static inline int adb_reset (adb_bus_t *bus) { adb_dev_t fake_device; - + memset(&fake_device, 0, sizeof(adb_dev_t)); fake_device.bus = bus; Modified: openbios-devel/drivers/floppy.c =================================================================== --- openbios-devel/drivers/floppy.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/drivers/floppy.c 2008-12-11 20:30:53 UTC (rev 284) @@ -15,7 +15,7 @@ #define printk_debug printk #define printk_err printk -#ifndef FD_BASE +#ifndef FD_BASE #define FD_BASE 0x3f0 #endif @@ -198,7 +198,7 @@ unsigned track; } drive_state[1]; -struct floppy_fdc_state { +struct floppy_fdc_state { int in_sync; int spec1; /* spec1 value last used */ int spec2; /* spec2 value last used */ @@ -241,7 +241,7 @@ { int counter, status; for (counter = 0; counter < 10000; counter++) { - status = inb(FD_STATUS); + status = inb(FD_STATUS); if (status & STATUS_READY) { return status; } @@ -312,7 +312,7 @@ int i, status; for(i = 0; i < count; i++) { if ((status = output_byte(cmd[i])) < 0) { - printk_err("full command not acceppted, status =%x\n", + printk_err("full command not acceppted, status =%x\n", status); return -1; } @@ -325,11 +325,11 @@ int i, status; if ((status = output_byte(cmd[0])) < 0) return -1; - if (need_more_output() != MORE_OUTPUT) + if (need_more_output() != MORE_OUTPUT) return -1; for(i = 1; i < count; i++) { if ((status = output_byte(cmd[i])) < 0) { - printk_err("full new command not acceppted, status =%d\n", + printk_err("full new command not acceppted, status =%d\n", status); return -1; } @@ -351,12 +351,12 @@ else { int max_sensei = 4; do { - if (output_byte(FD_SENSEI) < 0) + if (output_byte(FD_SENSEI) < 0) break; nr = result(reply_buffer, MAX_REPLIES); if (nr == 2) { pcn = reply_buffer[1]; - printk_debug("SENSEI %02x %02x\n", + printk_debug("SENSEI %02x %02x\n", reply_buffer[0], reply_buffer[1]); } #if 0 @@ -367,7 +367,7 @@ status = inb(FD_STATUS); printk_debug("status = %x, reply_buffer=", status); for(i = 0; i < nr; i++) { - printk_debug(" %x", + printk_debug(" %x", reply_buffer[i]); } printk_debug("\n"); @@ -404,7 +404,7 @@ mdelay(DRIVE_H1440_SPINUP); status = inb(FD_STATUS); - printk_debug("set_drive status = %02x, new_dor = %02x\n", + printk_debug("set_drive status = %02x, new_dor = %02x\n", status, new_dor); if (status != STATUS_READY) { printk_err("set_drive bad status\n"); @@ -449,7 +449,7 @@ mdelay(5); } /* fdc_dtr */ -static int fdc_configure(int use_implied_seek, int use_fifo, +static int fdc_configure(int use_implied_seek, int use_fifo, unsigned fifo_threshold, unsigned precompensation) { unsigned config_bits; @@ -473,7 +473,7 @@ if (output_new_command(cmd, 4) < 0) return 0; return 1; -} +} #define NOMINAL_DTR 500 /* Issue a "SPECIFY" command to set the step rate time, head unload time, @@ -542,7 +542,7 @@ } if (srt > 0xf) { srt = 0xf; - } + } hlt = (head_load_time*scale_dtr/2 + NOMINAL_DTR - 1)/NOMINAL_DTR; if (hlt < 0x01) @@ -604,7 +604,7 @@ printk_debug("fdc_bytes: %02x %02x xx %02x %02x %02x xx %02x\n", inb(FD_BASE + 0), inb(FD_BASE + 1), - inb(FD_BASE + 3), inb(FD_BASE + 4), inb(FD_BASE + 5), + inb(FD_BASE + 3), inb(FD_BASE + 4), inb(FD_BASE + 5), inb(FD_BASE + 7)); printk_debug("status=%x\n", inb(FD_STATUS)); @@ -641,9 +641,9 @@ nr = result(reply, MAX_REPLIES); /* Now see if we have succeeded in our seek */ - success = + success = /* We have the right size result */ - (nr == 2) && + (nr == 2) && /* The command didn't terminate in error */ ((reply[0] & ST0_INTR) == ST0_INTR_OK) && /* We finished a seek */ @@ -670,14 +670,14 @@ if (old_track == track) { return 1; } - + /* Compute the distance we are about to move, - * We need to know this so we know how long to sleep... + * We need to know this so we know how long to sleep... */ distance = (old_track > track)?(old_track - track):(track - old_track); distance += 1; - + /* Send the seek command to the controller. * We don't have interrupts or anything we can poll * so we have to guess when it is done. @@ -687,7 +687,7 @@ cmd[2] = track; if (output_command(cmd, 3) < 0) return 0; - + /* Sleep for the time it takes to step throuhg distance tracks. */ mdelay(distance*DRIVE_H1440_SRT/1000); @@ -701,9 +701,9 @@ nr = result(reply, MAX_REPLIES); /* Now see if we have succeeded in our seek */ - success = + success = /* We have the right size result */ - (nr == 2) && + (nr == 2) && /* The command didn't terminate in error */ ((reply[0] & ST0_INTR) == ST0_INTR_OK) && /* We finished a seek */ @@ -740,7 +740,7 @@ result_ok = 1; } /* Or did we get just an overflow error */ - else if (((results[0] & ST0_INTR) == ST0_INTR_ERROR) && + else if (((results[0] & ST0_INTR) == ST0_INTR_ERROR) && (results[1]== ST1_OR) && (results[2] == 0)) { result_ok = 1; @@ -835,7 +835,7 @@ } } bytes_read = i; - + /* The result stage begins when STATUS_NON_DMA is cleared */ while((status = inb(FD_STATUS)) & STATUS_NON_DMA) { /* We get extra bytes in the fifo past @@ -854,7 +854,7 @@ ret = length; } } - + if (ret < 0) { printk_debug("ret = %d\n", ret); printk_debug("bytes_read = %d\n", bytes_read); @@ -919,7 +919,7 @@ { int bytes, ret; unsigned char reply_buffer[MAX_REPLIES]; - + ret = output_byte(FD_DUMPREGS); /* 82072 and better know DUMPREGS */ if (ret < 0) return FDC_NONE; @@ -952,7 +952,7 @@ bytes = result(reply_buffer, MAX_REPLIES); if ((bytes == 1) && (reply_buffer[0] == 0x80)){ printk_info("FDC is a pre-1991 82077\n"); - return FDC_82077_ORIG; /* Pre-1991 82077, doesn't know + return FDC_82077_ORIG; /* Pre-1991 82077, doesn't know * LOCK/UNLOCK */ } if ((bytes != 1) || (reply_buffer[0] != 0x00)) { @@ -1021,7 +1021,7 @@ fdc_dtr(DISK_H1440_RATE); /* program data rate via ccr */ collect_interrupt(); - fdc_configure(USE_IMPLIED_SEEK, USE_FIFO, FIFO_THRESHOLD, + fdc_configure(USE_IMPLIED_SEEK, USE_FIFO, FIFO_THRESHOLD, TRACK_PRECOMPENSATION); fdc_specify(DRIVE_H1440_HLT, DRIVE_H1440_HUT, DRIVE_H1440_SRT); set_drive(FD_DRIVE); Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/drivers/ide.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,6 +1,6 @@ /* * OpenBIOS polled ide driver - * + * * Copyright (C) 2004 Jens Axboe <axboe(a)suse.de> * Copyright (C) 2005 Stefan Reinauer <stepan(a)openbios.org> * @@ -374,7 +374,7 @@ cmd->stat = stat; return 1; } - + ob_ide_write_registers(drive, cmd); /* @@ -1123,7 +1123,7 @@ /* * The following functions are interfacing with OpenBIOS. They * are device node methods. Thus they have to do proper stack handling. - * + * */ /* @@ -1148,7 +1148,7 @@ #ifdef CONFIG_DEBUG_IDE printk("ob_ide_read_blocks %x block=%d n=%d\n", (unsigned long)dest, blk, n ); #endif - + while (n) { int len = n; if (len > drive->max_sectors) @@ -1179,10 +1179,10 @@ { int props[3]; phandle_t ph=get_cur_dev(); - + push_str("block"); fword("device-type"); - + // Set dummy reg properties props[0] = __cpu_to_be32(0); props[1] = __cpu_to_be32(0); props[2] = __cpu_to_be32(0); set_property(ph, "reg", (char *)&props, 3*sizeof(int)); @@ -1206,7 +1206,7 @@ ph=(phandle_t)POP(); idename=get_property(ph, "name", &len); idx[1]=idename[3]-0x30; - + #ifdef CONFIG_DEBUG_IDE printk("opening channel %d unit %d\n", idx[1], idx[0]); #endif @@ -1223,7 +1223,7 @@ fword("my-args"); PUSH_ph( ph ); fword("interpose"); - + RET ( -ret ); } @@ -1255,17 +1255,17 @@ /* set device type */ push_str("ide"); fword("device-type"); - + idename=get_property(ph, "name", &len); devnum=idename[3]-0x30; - + /* Create interrupt properties. */ props[0]=14; props[1]=0; set_property(ph, "interrupts", (char *)&props, 2*sizeof(int)); - - props[0] = __cpu_to_be32(io_ports[devnum]); + + props[0] = __cpu_to_be32(io_ports[devnum]); props[1] = __cpu_to_be32(1); props[2] = __cpu_to_be32(8); - props[3] = __cpu_to_be32(ctl_ports[devnum]); + props[3] = __cpu_to_be32(ctl_ports[devnum]); props[4] = __cpu_to_be32(1); props[5] = __cpu_to_be32(2); set_property(ph, "reg", (char *)&props, 6*sizeof(int)); } @@ -1335,7 +1335,7 @@ printk("ide%d: [io ports 0x%x-0x%x,0x%x]\n", i, chan->io_regs[0], chan->io_regs[0] + 7, chan->io_regs[8]); for (j = 0; j < 2; j++) { - struct ide_drive *drive = &chan->drives[j]; + struct ide_drive *drive = &chan->drives[j]; char *media = "UNKNOWN"; if (!drive->present) Modified: openbios-devel/drivers/ide.h =================================================================== --- openbios-devel/drivers/ide.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/drivers/ide.h 2008-12-11 20:30:53 UTC (rev 284) @@ -189,7 +189,7 @@ */ struct ata_command ata_cmd; struct atapi_command atapi_cmd; - + }; enum { Modified: openbios-devel/drivers/kbd.c =================================================================== --- openbios-devel/drivers/kbd.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/drivers/kbd.c 2008-12-11 20:30:53 UTC (rev 284) @@ -2,7 +2,7 @@ * <kbd.c> * * Open Hack'Ware BIOS generic keyboard input translation. - * + * * Copyright (c) 2005 Jocelyn Mayer * * This program is free software; you can redistribute it and/or Modified: openbios-devel/drivers/kbd.h =================================================================== --- openbios-devel/drivers/kbd.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/drivers/kbd.h 2008-12-11 20:30:53 UTC (rev 284) @@ -2,7 +2,7 @@ * <kbd.h> * * Open Hack'Ware BIOS generic keyboard management definitions. - * + * * Copyright (c) 2005 Jocelyn Mayer * * This program is free software; you can redistribute it and/or @@ -25,7 +25,7 @@ typedef struct keymap_t keymap_t; struct kbd_t { uint32_t mod_state; - /* Modifier state + /* Modifier state * 0x00 kk ll rr * | | | | * Not used for now -+ | | | Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/drivers/pci.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,12 +1,12 @@ /* * OpenBIOS pci driver - * - * This driver is compliant to the + * + * This driver is compliant to the * PCI bus binding to IEEE 1275-1994 Rev 2.1 * * (C) 2004 Stefan Reinauer <stepan(a)openbios.org> * (C) 2005 Ed Schouten <ed(a)fxq.nl> - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 @@ -1274,23 +1274,23 @@ rev = pci_config_read8(addr, PCI_REVISION_ID); /* create properties as described in 2.5 */ - + printk("%s\n", pci_dev->name); set_int_property(dev, "vendor-id", vendor_id); set_int_property(dev, "device-id", device_id); set_int_property(dev, "revision-id", rev); - - set_int_property(dev, "interrupts", + + set_int_property(dev, "interrupts", pci_config_read8(addr, PCI_INTERRUPT_LINE)); - + set_int_property(dev, "min-grant", pci_config_read8(addr, PCI_MIN_GNT)); set_int_property(dev, "max-latency", pci_config_read8(addr, PCI_MAX_LAT)); status=pci_config_read16(addr, PCI_STATUS); - - set_int_property(dev, "devsel-speed", + + set_int_property(dev, "devsel-speed", (status&PCI_STATUS_DEVSEL_MASK)>>10); - + if(status&PCI_STATUS_FAST_BACK) set_bool_property(dev, "fast-back-to-back"); if(status&PCI_STATUS_66MHZ) @@ -1299,15 +1299,15 @@ set_bool_property(dev, "udf-supported"); id=pci_config_read16(addr, PCI_SUBSYSTEM_VENDOR_ID); - if(id) + if(id) set_int_property(dev, "subsystem-vendor-id", id); id=pci_config_read16(addr, PCI_SUBSYSTEM_ID); - if(id) + if(id) set_int_property(dev, "subsystem-id", id); - set_int_property(dev, "cache-line-size", + set_int_property(dev, "cache-line-size", pci_config_read16(addr, PCI_CACHE_LINE_SIZE)); - + if (pci_dev->type) { push_str(pci_dev->type); fword("encode-string"); @@ -1492,13 +1492,13 @@ pci_dev = pci_find_device(class, subclass, iface, vid, did); #ifdef CONFIG_DEBUG_PCI - printk("%x:%x.%x - %x:%x - ", bus, devnum, fn, + printk("%x:%x.%x - %x:%x - ", bus, devnum, fn, vid, did); #endif htype = pci_config_read8(addr, PCI_HEADER_TYPE); if (fn == 0) is_multi = htype & 0x80; - + activate_device(path); dbus=get_cur_dev(); Modified: openbios-devel/drivers/scsi.h =================================================================== --- openbios-devel/drivers/scsi.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/drivers/scsi.h 2008-12-11 20:30:53 UTC (rev 284) @@ -160,7 +160,7 @@ #define TYPE_WORM 0x04 /* Treated as ROM by our system */ #define TYPE_ROM 0x05 #define TYPE_SCANNER 0x06 -#define TYPE_MOD 0x07 /* Magneto-optical disk - +#define TYPE_MOD 0x07 /* Magneto-optical disk - * - treated as TYPE_DISK */ #define TYPE_MEDIUM_CHANGER 0x08 #define TYPE_COMM 0x09 /* Communications device */ @@ -247,7 +247,7 @@ * of the file. * --------------------------------------------------------------------------- * Local variables: - * c-indent-level: 4 + * c-indent-level: 4 * c-brace-imaginary-offset: 0 * c-brace-offset: -4 * c-argdecl-indent: 4 Modified: openbios-devel/drivers/timer.c =================================================================== --- openbios-devel/drivers/timer.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/drivers/timer.c 2008-12-11 20:30:53 UTC (rev 284) @@ -42,9 +42,9 @@ unsigned long ticks = 0; unsigned char portb = inb(PPC_PORTB); - /* - * Read the timer, and hope it hasn't wrapped around - * (call this again within 54ms), then restart it + /* + * Read the timer, and hope it hasn't wrapped around + * (call this again within 54ms), then restart it */ outb(TIMER2_SEL | LATCH_COUNT, TIMER_MODE_PORT); ticks = inb(TIMER2_PORT); @@ -54,9 +54,9 @@ outb(0, TIMER2_PORT); outb(0, TIMER2_PORT); - /* - * Check if the timer was running. If not, - * result is rubbish and need to start it + /* + * Check if the timer was running. If not, + * result is rubbish and need to start it */ if (portb & PPCB_T2GATE) { totticks += (0x10000 - ticks); Modified: openbios-devel/drivers/vga.h =================================================================== --- openbios-devel/drivers/vga.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/drivers/vga.h 2008-12-11 20:30:53 UTC (rev 284) @@ -9,7 +9,7 @@ * Based on VGA info at http://www.goodnet.com/~tinara/FreeVGA/home.htm * Based on VESA framebuffer (c) 1998 Gerd Knorr <kraxel(a)goldbach.in-berlin.de> * - */ + */ #ifndef VGA_H_INCL #define VGA_H_INCL 1 @@ -164,7 +164,7 @@ /* * vga register parameters - * these are copied to the + * these are copied to the * registers. * */ @@ -187,8 +187,8 @@ struct fb_bitfield { __u32 offset; /* beginning of bitfield */ __u32 length; /* length of bitfield */ - __u32 msb_right; /* != 0 : Most significant bit is */ - /* right */ + __u32 msb_right; /* != 0 : Most significant bit is */ + /* right */ }; struct screeninfo { @@ -205,7 +205,7 @@ struct fb_bitfield red; /* bitfield in fb mem if true color, */ struct fb_bitfield green; /* else only length is significant */ struct fb_bitfield blue; - struct fb_bitfield transp; /* transparency */ + struct fb_bitfield transp; /* transparency */ __u32 nonstd; /* != 0 Non standard pixel format */ Modified: openbios-devel/drivers/vga_load_regs.c =================================================================== --- openbios-devel/drivers/vga_load_regs.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/drivers/vga_load_regs.c 2008-12-11 20:30:53 UTC (rev 284) @@ -42,7 +42,7 @@ } u8 read_att_b(u16 addr) { inb(IS1_RC); - inb(0x80); + inb(0x80); outb(addr,ATT_IW); return inb(ATT_R); } @@ -131,7 +131,7 @@ 48, 16, 39, 8, // margins left,right,upper,lower 96, // hsync length - 2, // vsync length + 2, // vsync length 0, // sync polarity 0, // non interlaced, single mode {0,0,0,0,0,0} // compatibility @@ -144,7 +144,7 @@ static int vga_decode_var(const struct screeninfo *var, struct vga_par *par) { - u8 VgaAttributeTable[16] = + u8 VgaAttributeTable[16] = { 0x000, 0x001, 0x002, 0x003, 0x004, 0x005, 0x014, 0x007, 0x038, 0x039, 0x03A, 0x03B, 0x03C, 0x03D, 0x03E, 0x03F}; u32 xres, right, hslen, left, xtotal; @@ -272,7 +272,7 @@ par->crtc[CRTC_OFFSET] = vxres >> 1; // put the underline off of the character, necessary in alpha color mode - par->crtc[CRTC_UNDERLINE] = 0x1f; + par->crtc[CRTC_UNDERLINE] = 0x1f; par->crtc[CRTC_MODE] = rMode | 0xA3; // word mode par->crtc[CRTC_LINE_COMPARE] = 0xFF; @@ -292,22 +292,22 @@ par->atc[ATC_PLANE_ENABLE] = 0x0F; par->atc[ATC_PEL] = xoffset & 7; par->atc[ATC_COLOR_PAGE] = 0x00; - + par->misc = 0x67; /* enable CPU, ports 0x3Dx, positive sync*/ if (var->sync & SYNC_HOR_HIGH_ACT) par->misc &= ~0x40; if (var->sync & SYNC_VERT_HIGH_ACT) par->misc &= ~0x80; - + par->seq[SEQ_CLOCK_MODE] = 0x01; //8-bit char; 0x01=alpha mode par->seq[SEQ_PLANE_WRITE] = 0x03; // just char/attr plane par->seq[SEQ_CHARACTER_MAP] = 0x00; par->seq[SEQ_MEMORY_MODE] = 0x02; // A/G bit not used in stpc; O/E on, C4 off - + par->gdc[GDC_SR_VALUE] = 0x00; // bits set in the SR_EN regs will enable set/reset action // based on the bit settings in the SR_VAL register - par->gdc[GDC_SR_ENABLE] = 0x00; + par->gdc[GDC_SR_ENABLE] = 0x00; par->gdc[GDC_COMPARE_VALUE] = 0x00; par->gdc[GDC_DATA_ROTATE] = 0x00; par->gdc[GDC_PLANE_READ] = 0; @@ -333,7 +333,7 @@ * * Write the data in the vga parameter structure * to the vga registers, along with other default - * settings. + * settings. * */ static int vga_set_regs(const struct vga_par *par) @@ -342,7 +342,7 @@ /* update misc output register */ outb(par->misc, MIS_W); - + /* synchronous reset on */ outb(0x00, SEQ_I); outb(0x00, SEQ_D); @@ -354,11 +354,11 @@ outb(i, SEQ_I); outb(par->seq[i], SEQ_D); } - + /* synchronous reset off */ outb(0x00, SEQ_I); outb(0x03, SEQ_D); - + /* deprotect CRT registers 0-7 */ outb(0x11, CRT_IC); outb(par->crtc[0x11], CRT_DC); @@ -373,7 +373,7 @@ outb(i, GRA_I); outb(par->gdc[i], GRA_D); } - + /* write attribute controller registers */ for (i = 0; i < ATT_C; i++) { inb(IS1_RC); /* reset flip-flop */ @@ -412,7 +412,7 @@ // turn on display, disable access to attr palette inb(IS1_RC); outb(0x20, ATT_IW); - + return 0; } Modified: openbios-devel/fs/grubfs/defs.h =================================================================== --- openbios-devel/fs/grubfs/defs.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/defs.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution(a)CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ Modified: openbios-devel/fs/grubfs/dir.h =================================================================== --- openbios-devel/fs/grubfs/dir.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/dir.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,26 +1,26 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution(a)CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ Modified: openbios-devel/fs/grubfs/disk_inode_ffs.h =================================================================== --- openbios-devel/fs/grubfs/disk_inode_ffs.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/disk_inode_ffs.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution(a)CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ Modified: openbios-devel/fs/grubfs/filesys.h =================================================================== --- openbios-devel/fs/grubfs/filesys.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/filesys.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,4 +1,4 @@ -/* GRUB compatibility header +/* GRUB compatibility header * * taken from filo and grub. */ @@ -76,21 +76,21 @@ /* assume 8 bits per byte. */ unsigned int i = 1 << (sizeof(word)*8 - 1); unsigned int pow = sizeof(word) * 8 - 1; - + if (! word) { /* invalid parameter */ return -1; } for(; i > word; i >>= 1, pow--) ; - - return pow; + + return pow; } #define ffz(n) log2(~(n)) #endif -static inline int +static inline int substring (const char *s1, const char *s2) { while (*s1 == *s2) @@ -115,7 +115,7 @@ #define MAXINT 0x7fffffff /* This is only used by fsys_* to determine if it's hard disk. If it is, - * they try to guess filesystem type by partition type. I guess it is + * they try to guess filesystem type by partition type. I guess it is * not necessory, so hardcoded to 0 (first floppy) --ts1 */ #define current_drive 0 #define current_slice 0 Modified: openbios-devel/fs/grubfs/fs.h =================================================================== --- openbios-devel/fs/grubfs/fs.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/fs.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution(a)CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -75,7 +75,7 @@ /* * Addresses stored in inodes are capable of addressing fragments - * of `blocks'. File system blocks of at most size MAXBSIZE can + * of `blocks'. File system blocks of at most size MAXBSIZE can * be optionally broken into 2, 4, or 8 pieces, each of which is * addressible; these pieces may be DEV_BSIZE, or some multiple of * a DEV_BSIZE unit. @@ -113,7 +113,7 @@ /* * The path name on which the file system is mounted is maintained - * in fs_fsmnt. MAXMNTLEN defines the amount of space allocated in + * in fs_fsmnt. MAXMNTLEN defines the amount of space allocated in * the super block for this name. * The limit on the amount of summary information per file system * is defined by MAXCSBUFS. It is currently parameterized for a Modified: openbios-devel/fs/grubfs/fsys_affs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_affs.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/fsys_affs.c 2008-12-11 20:30:53 UTC (rev 284) @@ -92,7 +92,7 @@ #define ST_FILE -3 #define ST_ROOT 1 -#define ST_USERDIR 2 +#define ST_USERDIR 2 struct BootBlock{ int id; @@ -465,7 +465,7 @@ static unsigned int getHashKey(char *name,unsigned int tablesize, unsigned char flags) { unsigned int length; - + length=0; while (name[length] != 0) length++; @@ -667,7 +667,7 @@ if (print_possibilities>0) print_possibilities = -print_possibilities; #endif - } + } else { errnum = ERR_BAD_FILETYPE; @@ -689,7 +689,7 @@ while (*current && !isspace(*current)) *fname++ = *current++; *fname = 0; - + errnum = findBlock(filename, &buffer2); if (errnum) return 0; Modified: openbios-devel/fs/grubfs/fsys_ext2fs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_ext2fs.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/fsys_ext2fs.c 2008-12-11 20:30:53 UTC (rev 284) @@ -285,7 +285,7 @@ printf(" flags=%d\n", __le32_to_cpu(i->i_flags)); } -void +void dump_inode_data(unsigned char *inode, int len) { static char hexdigit[] = "0123456789abcdef"; @@ -333,8 +333,8 @@ ext2_rdfsb (int fsblock, char * buffer) { #ifdef E2DEBUG - printf ("ext2_rdfsb: fsblock %d, devblock %d, size %d\n", fsblock, - fsblock * (EXT2_BLOCK_SIZE (SUPERBLOCK) / DEV_BSIZE), + printf ("ext2_rdfsb: fsblock %d, devblock %d, size %d\n", fsblock, + fsblock * (EXT2_BLOCK_SIZE (SUPERBLOCK) / DEV_BSIZE), EXT2_BLOCK_SIZE (SUPERBLOCK)); #endif /* E2DEBUG */ return devread (fsblock * (EXT2_BLOCK_SIZE (SUPERBLOCK) / DEV_BSIZE), 0, @@ -574,14 +574,14 @@ #ifdef E2DEBUG dump_group_desc(GROUP_DESC); -#endif /* E2DEBUG */ +#endif /* E2DEBUG */ gdp = GROUP_DESC; ino_blk = __le32_to_cpu(gdp[desc].bg_inode_table) + (((current_ino - 1) % __le32_to_cpu(SUPERBLOCK->s_inodes_per_group)) >> log2 (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode))); #ifdef E2DEBUG - printf ("ext2fs_dir: itab_blk=%d, i_in_grp=%d, log2=%d\n", + printf ("ext2fs_dir: itab_blk=%d, i_in_grp=%d, log2=%d\n", __le32_to_cpu(gdp[desc].bg_inode_table), ((current_ino - 1) % __le32_to_cpu(SUPERBLOCK->s_inodes_per_group)), log2 (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode))); Modified: openbios-devel/fs/grubfs/fsys_fat.c =================================================================== --- openbios-devel/fs/grubfs/fsys_fat.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/fsys_fat.c 2008-12-11 20:30:53 UTC (rev 284) @@ -23,7 +23,7 @@ #include "filesys.h" #include "fat.h" -struct fat_superblock +struct fat_superblock { int fat_offset; int fat_length; @@ -31,7 +31,7 @@ int root_offset; int root_max; int data_offset; - + int num_sectors; int num_clust; int clust_eof_marker; @@ -39,7 +39,7 @@ int sectsize_bits; int clustsize_bits; int root_cluster; - + int cached_fat; int file_cluster; int current_cluster_num; @@ -59,13 +59,13 @@ { struct fat_bpb bpb; __u32 magic, first_fat; - + /* Check partition type for harddisk */ if (((current_drive & 0x80) || (current_slice != 0)) && ! IS_PC_SLICE_TYPE_FAT (current_slice) && (! IS_PC_SLICE_TYPE_BSD_WITH_FS (current_slice, FS_MSDOS))) return 0; - + /* Read bpb */ if (! devread (0, 0, sizeof (bpb), (char *) &bpb)) return 0; @@ -74,40 +74,40 @@ zero division. */ if (bpb.sects_per_clust == 0) return 0; - + FAT_SUPER->sectsize_bits = log2 (bpb.bytes_per_sect); FAT_SUPER->clustsize_bits = FAT_SUPER->sectsize_bits + log2 (bpb.sects_per_clust); - + /* Fill in info about super block */ - FAT_SUPER->num_sectors = bpb.short_sectors + FAT_SUPER->num_sectors = bpb.short_sectors ? bpb.short_sectors : bpb.long_sectors; - + /* FAT offset and length */ FAT_SUPER->fat_offset = bpb.reserved_sects; - FAT_SUPER->fat_length = + FAT_SUPER->fat_length = bpb.fat_length ? bpb.fat_length : bpb.fat32_length; - + /* Rootdir offset and length for FAT12/16 */ - FAT_SUPER->root_offset = + FAT_SUPER->root_offset = FAT_SUPER->fat_offset + bpb.num_fats * FAT_SUPER->fat_length; FAT_SUPER->root_max = FAT_DIRENTRY_LENGTH * bpb.dir_entries; - + /* Data offset and number of clusters */ - FAT_SUPER->data_offset = + FAT_SUPER->data_offset = FAT_SUPER->root_offset + ((FAT_SUPER->root_max - 1) >> FAT_SUPER->sectsize_bits) + 1; - FAT_SUPER->num_clust = - 2 + ((FAT_SUPER->num_sectors - FAT_SUPER->data_offset) + FAT_SUPER->num_clust = + 2 + ((FAT_SUPER->num_sectors - FAT_SUPER->data_offset) / bpb.sects_per_clust); FAT_SUPER->sects_per_clust = bpb.sects_per_clust; - + if (!bpb.fat_length) { /* This is a FAT32 */ if (bpb.dir_entries) return 0; - + if (bpb.flags & 0x0080) { /* FAT mirroring is disabled, get active FAT */ @@ -116,34 +116,34 @@ return 0; FAT_SUPER->fat_offset += active_fat * FAT_SUPER->fat_length; } - + FAT_SUPER->fat_size = 8; FAT_SUPER->root_cluster = bpb.root_cluster; /* Yes the following is correct. FAT32 should be called FAT28 :) */ FAT_SUPER->clust_eof_marker = 0xffffff8; - } - else + } + else { if (!FAT_SUPER->root_max) return 0; - + FAT_SUPER->root_cluster = -1; - if (FAT_SUPER->num_clust > FAT_MAX_12BIT_CLUST) + if (FAT_SUPER->num_clust > FAT_MAX_12BIT_CLUST) { FAT_SUPER->fat_size = 4; FAT_SUPER->clust_eof_marker = 0xfff8; - } + } else { FAT_SUPER->fat_size = 3; FAT_SUPER->clust_eof_marker = 0xff8; } } - - + + /* Now do some sanity checks */ - + if (bpb.bytes_per_sect != (1 << FAT_SUPER->sectsize_bits) || bpb.bytes_per_sect != SECTOR_SIZE || bpb.sects_per_clust != (1 << (FAT_SUPER->clustsize_bits @@ -152,7 +152,7 @@ || (FAT_SUPER->fat_size * FAT_SUPER->num_clust / (2 * SECTOR_SIZE) > FAT_SUPER->fat_length)) return 0; - + /* kbs: Media check on first FAT entry [ported from PUPA] */ if (!devread(FAT_SUPER->fat_offset, 0, @@ -189,7 +189,7 @@ int offset; int ret = 0; int size; - + if (FAT_SUPER->file_cluster < 0) { /* root directory for fat16 */ @@ -201,7 +201,7 @@ filepos += size; return size; } - + logical_clust = filepos >> FAT_SUPER->clustsize_bits; offset = (filepos & ((1 << FAT_SUPER->clustsize_bits) - 1)); if (logical_clust < FAT_SUPER->current_cluster_num) @@ -209,19 +209,19 @@ FAT_SUPER->current_cluster_num = 0; FAT_SUPER->current_cluster = FAT_SUPER->file_cluster; } - + while (len > 0) { int sector; while (logical_clust > FAT_SUPER->current_cluster_num) { /* calculate next cluster */ - int fat_entry = + int fat_entry = FAT_SUPER->current_cluster * FAT_SUPER->fat_size; int next_cluster; int cached_pos = (fat_entry - FAT_SUPER->cached_fat); - - if (cached_pos < 0 || + + if (cached_pos < 0 || (cached_pos + FAT_SUPER->fat_size) > 2*FAT_CACHE_SIZE) { FAT_SUPER->cached_fat = (fat_entry & ~(2*SECTOR_SIZE - 1)); @@ -240,7 +240,7 @@ } else if (FAT_SUPER->fat_size == 4) next_cluster &= 0xFFFF; - + if (next_cluster >= FAT_SUPER->clust_eof_marker) return ret; if (next_cluster < 2 || next_cluster >= FAT_SUPER->num_clust) @@ -248,24 +248,24 @@ errnum = ERR_FSYS_CORRUPT; return 0; } - + FAT_SUPER->current_cluster = next_cluster; FAT_SUPER->current_cluster_num++; } - + sector = FAT_SUPER->data_offset + ((FAT_SUPER->current_cluster - 2) << (FAT_SUPER->clustsize_bits - FAT_SUPER->sectsize_bits)); size = (1 << FAT_SUPER->clustsize_bits) - offset; if (size > len) size = len; - + disk_read_func = disk_read_hook; - + devread(sector, offset, size, buf); - + disk_read_func = NULL; - + len -= size; buf += size; ret += size; @@ -285,25 +285,25 @@ #ifndef STAGE1_5 int do_possibilities = 0; #endif - + /* XXX I18N: - * the positions 2,4,6 etc are high bytes of a 16 bit unicode char + * the positions 2,4,6 etc are high bytes of a 16 bit unicode char */ - static unsigned char longdir_pos[] = + static unsigned char longdir_pos[] = { 1, 3, 5, 7, 9, 14, 16, 18, 20, 22, 24, 28, 30 }; int slot = -2; int alias_checksum = -1; - + FAT_SUPER->file_cluster = FAT_SUPER->root_cluster; filepos = 0; FAT_SUPER->current_cluster_num = MAXINT; - + /* main loop to find desired directory entry */ loop: - + /* if we have a real file (and we're not just printing possibilities), then this is where we want to exit */ - + if (!*dirname || isspace (*dirname)) { if (attrib & FAT_ATTRIB_DIR) @@ -311,15 +311,15 @@ errnum = ERR_BAD_FILETYPE; return 0; } - + return 1; } - + /* continue with the file/directory name interpretation */ - + while (*dirname == '/') dirname++; - + if (!(attrib & FAT_ATTRIB_DIR)) { errnum = ERR_BAD_FILETYPE; @@ -327,16 +327,16 @@ } /* Directories don't have a file size */ filemax = MAXINT; - + for (rest = dirname; (ch = *rest) && !isspace (ch) && ch != '/'; rest++); - + *rest = 0; - + # ifndef STAGE1_5 if (print_possibilities && ch != '/') do_possibilities = 1; # endif - + while (1) { if (fat_read (dir_buf, FAT_DIRENTRY_LENGTH) != FAT_DIRENTRY_LENGTH @@ -353,14 +353,14 @@ return 1; } # endif /* STAGE1_5 */ - + errnum = ERR_FILE_NOT_FOUND; *rest = ch; } - + return 0; } - + if (FAT_DIRENTRY_ATTRIB (dir_buf) == FAT_ATTRIB_LONGNAME) { /* This is a long filename. The filename is build from back @@ -377,72 +377,72 @@ */ int i, offset; unsigned char id = FAT_LONGDIR_ID(dir_buf); - - if ((id & 0x40)) + + if ((id & 0x40)) { id &= 0x3f; slot = id; filename[slot * 13] = 0; alias_checksum = FAT_LONGDIR_ALIASCHECKSUM(dir_buf); - } - + } + if (id != slot || slot == 0 || alias_checksum != FAT_LONGDIR_ALIASCHECKSUM(dir_buf)) { alias_checksum = -1; continue; } - + slot--; offset = slot * 13; - + for (i=0; i < 13; i++) filename[offset+i] = dir_buf[longdir_pos[i]]; continue; } - + if (!FAT_DIRENTRY_VALID (dir_buf)) continue; - + if (alias_checksum != -1 && slot == 0) { int i; unsigned char sum; - + slot = -2; for (sum = 0, i = 0; i< 11; i++) sum = ((sum >> 1) | (sum << 7)) + dir_buf[i]; - + if (sum == alias_checksum) { # ifndef STAGE1_5 if (do_possibilities) goto print_filename; # endif /* STAGE1_5 */ - + if (substring (dirname, filename) == 0) break; } } - + /* XXX convert to 8.3 filename format here */ { int i, j, c; - + for (i = 0; i < 8 && (c = filename[i] = tolower (dir_buf[i])) && !isspace (c); i++); - + filename[i++] = '.'; - + for (j = 0; j < 3 && (c = filename[i + j] = tolower (dir_buf[8 + j])) && !isspace (c); j++); - + if (j == 0) i--; - + filename[i + j] = 0; } - + # ifndef STAGE1_5 if (do_possibilities) { @@ -456,19 +456,19 @@ continue; } # endif /* STAGE1_5 */ - + if (substring (dirname, filename) == 0) break; } - + *(dirname = rest) = ch; - + attrib = FAT_DIRENTRY_ATTRIB (dir_buf); filemax = FAT_DIRENTRY_FILELENGTH (dir_buf); filepos = 0; FAT_SUPER->file_cluster = FAT_DIRENTRY_FIRST_CLUSTER (dir_buf); FAT_SUPER->current_cluster_num = MAXINT; - + /* go back to main loop at top of function */ goto loop; } Modified: openbios-devel/fs/grubfs/fsys_ffs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_ffs.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/fsys_ffs.c 2008-12-11 20:30:53 UTC (rev 284) @@ -91,7 +91,7 @@ mapblock = -1; mapblock_offset = -1; - + return retval; } @@ -99,10 +99,10 @@ block_map (int file_block) { int bnum, offset, bsize; - + if (file_block < NDADDR) return (INODE->i_db[file_block]); - + /* If the blockmap loaded does not include FILE_BLOCK, load a new blockmap. */ if ((bnum = fsbtodb (SUPERBLOCK, INODE->i_ib[0])) != mapblock @@ -112,7 +112,7 @@ { offset = ((file_block - NDADDR) % NINDIR (SUPERBLOCK)); bsize = MAPBUF_LEN; - + if (offset + MAPBUF_LEN > SUPERBLOCK->fs_bsize) offset = (SUPERBLOCK->fs_bsize - MAPBUF_LEN) / sizeof (int); } @@ -121,7 +121,7 @@ bsize = SUPERBLOCK->fs_bsize; offset = 0; } - + if (! devread (bnum, offset * sizeof (int), bsize, (char *) MAPBUF)) { mapblock = -1; @@ -130,12 +130,12 @@ errnum = ERR_FSYS_CORRUPT; return -1; } - + mapblock = bnum; mapblock_bsize = bsize; mapblock_offset = offset; } - + return (((int *) MAPBUF)[((file_block - NDADDR) % NINDIR (SUPERBLOCK)) - mapblock_offset]); } @@ -145,7 +145,7 @@ ffs_read (char *buf, int len) { int logno, off, size, map, ret = 0; - + while (len && !errnum) { off = blkoff (SUPERBLOCK, filepos); @@ -296,7 +296,7 @@ familiar with BSD should check for this. */ if (needed_sectors > 14) return 0; - + *start_sector = 1; #if 1 /* FIXME: Disable the embedding in FFS until someone checks if Modified: openbios-devel/fs/grubfs/fsys_iso9660.c =================================================================== --- openbios-devel/fs/grubfs/fsys_iso9660.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/fsys_iso9660.c 2008-12-11 20:30:53 UTC (rev 284) @@ -82,7 +82,7 @@ */ for (sector = 16 ; sector < 32 ; sector++) { - if (!iso9660_devread(sector, 0, sizeof(*PRIMDESC), (char *)PRIMDESC)) + if (!iso9660_devread(sector, 0, sizeof(*PRIMDESC), (char *)PRIMDESC)) break; /* check ISO_VD_PRIMARY and ISO_STANDARD_ID */ if (CHECK4(&PRIMDESC->type, ISO_VD_PRIMARY, 'C', 'D', '0') Modified: openbios-devel/fs/grubfs/fsys_jfs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_jfs.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/fsys_jfs.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,5 +1,5 @@ /* fsys_jfs.c - an implementation for the IBM JFS file system */ -/* +/* * GRUB -- GRand Unified Bootloader * Copyright (C) 2001,2002 Free Software Foundation, Inc. * @@ -240,7 +240,7 @@ offset = offsetXAD (xad); xadlen = lengthXAD (xad); if (isinxt (filepos >> jfs.l2bsize, offset, xadlen)) { - endofcur = (offset + xadlen) << jfs.l2bsize; + endofcur = (offset + xadlen) << jfs.l2bsize; toread = (endofcur >= endpos) ? len : (endofcur - filepos); @@ -262,7 +262,7 @@ } continue; } - endofprev = offset + xadlen; + endofprev = offset + xadlen; xad = next_extent (); } while (len > 0 && xad); Modified: openbios-devel/fs/grubfs/fsys_minix.c =================================================================== --- openbios-devel/fs/grubfs/fsys_minix.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/fsys_minix.c 2008-12-11 20:30:53 UTC (rev 284) @@ -20,7 +20,7 @@ /* Restrictions: This is MINIX V1 only (yet) Disk creation is like: - mkfs.minix -c DEVICE + mkfs.minix -c DEVICE */ #ifdef FSYS_MINIX @@ -75,7 +75,7 @@ #define MINIX_V1 0x0001 /* original minix fs */ #define MINIX_V2 0x0002 /* minix V2 fs */ -/* originally this is : +/* originally this is : #define INODE_VERSION(inode) inode->i_sb->u.minix_sb.s_version here we have */ #define INODE_VERSION(inode) (SUPERBLOCK->s_version) @@ -164,15 +164,15 @@ && ! IS_PC_SLICE_TYPE_MINIX (current_slice) && ! IS_PC_SLICE_TYPE_BSD_WITH_FS (current_slice, FS_OTHER)) return 0; /* The partition is not of MINIX type */ - + if (part_length < (SBLOCK + (sizeof (struct minix_super_block) / DEV_BSIZE))) return 0; /* The partition is too short */ - + if (!devread (SBLOCK, 0, sizeof (struct minix_super_block), (char *) SUPERBLOCK)) return 0; /* Cannot read superblock */ - + switch (SUPERBLOCK->s_magic) { case MINIX_SUPER_MAGIC: @@ -210,7 +210,7 @@ if (logical_block < 512) { i = INODE->i_zone[7]; - + if (!i || ((mapblock1 != 1) && !minix_rdfsb (i, DATABLOCK1))) { @@ -311,7 +311,7 @@ char * rest; char ch; - int off; /* offset within block of directory + int off; /* offset within block of directory entry */ int loc; /* location within a directory */ int blk; /* which data blk within dir entry */ @@ -326,7 +326,7 @@ #ifdef DEBUG_MINIX printf ("\n"); -#endif +#endif while (1) { @@ -345,7 +345,7 @@ raw_inode = INODE + ((current_ino - 1) % MINIX_INODES_PER_BLOCK); /* copy inode to fixed location */ - memmove ((void *) INODE, (void *) raw_inode, + memmove ((void *) INODE, (void *) raw_inode, sizeof (struct minix_inode)); /* If we've got a symbolic link, then chase it. */ @@ -430,7 +430,7 @@ while (*dirname == '/') dirname++; - /* if this isn't a directory of sufficient size to hold our file, + /* if this isn't a directory of sufficient size to hold our file, abort */ if (!(INODE->i_size) || !S_ISDIR (INODE->i_mode)) { Modified: openbios-devel/fs/grubfs/fsys_ntfs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_ntfs.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/fsys_ntfs.c 2008-12-11 20:30:53 UTC (rev 284) @@ -431,7 +431,7 @@ { #ifdef DEBUG_NTFS printf("searching attribute %x <%s>\n", type, name); -#endif +#endif mftr->attr_type = type; mftr->attr_name = name; @@ -907,7 +907,7 @@ ret += len0; } #else - errnum = FSYS_CORRUPT; + errnum = FSYS_CORRUPT; #endif /*NO_NTFS_DECOMPRESSION*/ #endif /*STAGE1_5*/ return ret; Modified: openbios-devel/fs/grubfs/fsys_reiserfs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_reiserfs.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/fsys_reiserfs.c 2008-12-11 20:30:53 UTC (rev 284) @@ -96,9 +96,9 @@ /* this header block gets written whenever a transaction is considered fully flushed, and is more recent than the last fully flushed - transaction. + transaction. fully flushed means all the log blocks and all the real blocks are - on disk, and this transaction does not need to be replayed. + on disk, and this transaction does not need to be replayed. */ struct reiserfs_journal_header { /* id of last fully flushed transaction */ @@ -110,7 +110,7 @@ }; /* magic string to find desc blocks in the journal */ -#define JOURNAL_DESC_MAGIC "ReIsErLB" +#define JOURNAL_DESC_MAGIC "ReIsErLB" /* @@ -127,7 +127,7 @@ * hashing the name and using few bits (23 or more) of the resulting * hash, and generation number that allows distinguishing names with * hash collisions. If number of collisions overflows generation - * number, we return EEXIST. High order bit is 0 always + * number, we return EEXIST. High order bit is 0 always */ __u32 k_offset; __u32 k_uniqueness; @@ -144,7 +144,7 @@ * hashing the name and using few bits (23 or more) of the resulting * hash, and generation number that allows distinguishing names with * hash collisions. If number of collisions overflows generation - * number, we return EEXIST. High order bit is 0 always + * number, we return EEXIST. High order bit is 0 always */ __u64 k_offset:60; __u64 k_type: 4; @@ -171,7 +171,7 @@ /* Header of a disk block. More precisely, header of a formatted leaf or internal node, and not the header of an unformatted node. */ struct block_head -{ +{ __u16 blk_level; /* Level of a block in the tree. */ __u16 blk_nr_item; /* Number of keys/items in a block. */ __u16 blk_free_space; /* Block free space in bytes. */ @@ -184,7 +184,7 @@ struct item_head { struct key ih_key; /* Everything in the tree is found by searching for it based on its key.*/ - + union { __u16 ih_free_space; /* The free space in the last unformatted node of an indirect item if this @@ -197,8 +197,8 @@ u; __u16 ih_item_len; /* total size of the item body */ __u16 ih_item_location; /* an offset to the item body within the block */ - __u16 ih_version; /* ITEM_VERSION_1 for all old items, - ITEM_VERSION_2 for new ones. + __u16 ih_version; /* ITEM_VERSION_1 for all old items, + ITEM_VERSION_2 for new ones. Highest bit is set by fsck temporary, cleaned after all done */ }; @@ -268,7 +268,7 @@ #define V2_TYPE_STAT_DATA 0 #define V2_TYPE_INDIRECT 1 #define V2_TYPE_DIRECT 2 -#define V2_TYPE_DIRENTRY 3 +#define V2_TYPE_DIRENTRY 3 #define REISERFS_ROOT_OBJECTID 2 #define REISERFS_ROOT_PARENT_OBJECTID 1 @@ -327,7 +327,7 @@ __u16 cached_slots; /* The number of valid transactions in journal */ __u16 journal_transactions; - + unsigned int blocks[MAX_HEIGHT]; unsigned int next_key_nr[MAX_HEIGHT]; }; @@ -348,13 +348,13 @@ */ #define INFO \ ((struct fsys_reiser_info *) ((char *) FSYS_BUF + FSYSREISER_CACHE_SIZE)) -/* +/* * The journal cache. For each transaction it contains the number of - * blocks followed by the real block numbers of this transaction. + * blocks followed by the real block numbers of this transaction. * * If the block numbers of some transaction won't fit in this space, * this list is stopped with a 0xffffffff marker and the remaining - * uncommitted transactions aren't cached. + * uncommitted transactions aren't cached. */ #define JOURNAL_START ((__u32 *) (INFO + 1)) #define JOURNAL_END ((__u32 *) (FSYS_BUF + FSYS_BUFLEN)) @@ -365,16 +365,16 @@ return (word & -word) == word; } -static int -journal_read (int block, int len, char *buffer) +static int +journal_read (int block, int len, char *buffer) { - return devread ((INFO->journal_block + block) << INFO->blocksize_shift, + return devread ((INFO->journal_block + block) << INFO->blocksize_shift, 0, len, buffer); } /* Read a block from ReiserFS file system, taking the journal into * account. If the block nr is in the journal, the block from the - * journal taken. + * journal taken. */ static int block_read (int blockNr, int start, int len, char *buffer) @@ -384,7 +384,7 @@ int journal_mask = INFO->journal_block_count - 1; int translatedNr = blockNr; __u32 *journal_table = JOURNAL_START; - while (transactions-- > 0) + while (transactions-- > 0) { int i = 0; int j_len; @@ -416,11 +416,11 @@ while (i < j_len && i < JOURNAL_TRANS_HALF) if (desc.j_realblock[i++] == blockNr) goto found; - + if (j_len >= JOURNAL_TRANS_HALF) { int commit_block = (desc_block + 1 + j_len) & journal_mask; - if (! journal_read (commit_block, + if (! journal_read (commit_block, sizeof (commit), (char *) &commit)) return 0; while (i < j_len) @@ -429,11 +429,11 @@ } } goto not_found; - + found: translatedNr = INFO->journal_block + ((desc_block + i) & journal_mask); #ifdef REISERDEBUG - printf ("block_read: block %d is mapped to journal block %d.\n", + printf ("block_read: block %d is mapped to journal block %d.\n", blockNr, translatedNr - INFO->journal_block); #endif /* We must continue the search, as this block may be overwritten @@ -450,8 +450,8 @@ * we can still read the rest from the disk on demand. * * The first number of valid transactions and the descriptor block of the - * first valid transaction are held in INFO. The transactions are all - * adjacent, but we must take care of the journal wrap around. + * first valid transaction are held in INFO. The transactions are all + * adjacent, but we must take care of the journal wrap around. */ static int journal_init (void) @@ -474,11 +474,11 @@ next_trans_id = header.j_last_flush_trans_id + 1; #ifdef REISERDEBUG - printf ("journal_init: last flushed %d\n", + printf ("journal_init: last flushed %d\n", header.j_last_flush_trans_id); #endif - while (1) + while (1) { journal_read (desc_block, sizeof (desc), (char *) &desc); if (substring (JOURNAL_DESC_MAGIC, desc.j_magic) > 0 @@ -486,16 +486,16 @@ || desc.j_mount_id != header.j_mount_id) /* no more valid transactions */ break; - + commit_block = (desc_block + desc.j_len + 1) & (block_count - 1); journal_read (commit_block, sizeof (commit), (char *) &commit); if (desc.j_trans_id != commit.j_trans_id || desc.j_len != commit.j_len) /* no more valid transactions */ break; - + #ifdef REISERDEBUG - printf ("Found valid transaction %d/%d at %d.\n", + printf ("Found valid transaction %d/%d at %d.\n", desc.j_trans_id, desc.j_mount_id, desc_block); #endif @@ -521,7 +521,7 @@ { *journal_table++ = desc.j_realblock[i]; #ifdef REISERDEBUG - printf ("block %d is in journal %d.\n", + printf ("block %d is in journal %d.\n", desc.j_realblock[i], desc_block); #endif } @@ -529,8 +529,8 @@ { *journal_table++ = commit.j_realblock[i-JOURNAL_TRANS_HALF]; #ifdef REISERDEBUG - printf ("block %d is in journal %d.\n", - commit.j_realblock[i-JOURNAL_TRANS_HALF], + printf ("block %d is in journal %d.\n", + commit.j_realblock[i-JOURNAL_TRANS_HALF], desc_block); #endif } @@ -539,7 +539,7 @@ desc_block = (commit_block + 1) & (block_count - 1); } #ifdef REISERDEBUG - printf ("Transaction %d/%d at %d isn't valid.\n", + printf ("Transaction %d/%d at %d isn't valid.\n", desc.j_trans_id, desc.j_mount_id, desc_block); #endif @@ -556,7 +556,7 @@ int superblock = REISERFS_DISK_OFFSET_IN_BYTES >> SECTOR_BITS; if (part_length < superblock + (sizeof (super) >> SECTOR_BITS) - || ! devread (superblock, 0, sizeof (struct reiserfs_super_block), + || ! devread (superblock, 0, sizeof (struct reiserfs_super_block), (char *) &super) || (substring (REISER2FS_SUPER_MAGIC_STRING, super.s_magic) > 0 && substring (REISERFS_SUPER_MAGIC_STRING, super.s_magic) > 0) @@ -567,7 +567,7 @@ /* Try old super block position */ superblock = REISERFS_OLD_DISK_OFFSET_IN_BYTES >> SECTOR_BITS; if (part_length < superblock + (sizeof (super) >> SECTOR_BITS) - || ! devread (superblock, 0, sizeof (struct reiserfs_super_block), + || ! devread (superblock, 0, sizeof (struct reiserfs_super_block), (char *) &super)) return 0; @@ -575,10 +575,10 @@ && substring (REISERFS_SUPER_MAGIC_STRING, super.s_magic) > 0) { /* pre journaling super block ? */ - if (substring (REISERFS_SUPER_MAGIC_STRING, + if (substring (REISERFS_SUPER_MAGIC_STRING, (char*) ((char *) &super + 20)) > 0) return 0; - + super.s_blocksize = REISERFS_OLD_BLOCKSIZE; super.s_journal_block = 0; super.s_version = 0; @@ -588,16 +588,16 @@ /* check the version number. */ if (super.s_version > REISERFS_MAX_SUPPORTED_VERSION) return 0; - + INFO->version = super.s_version; INFO->blocksize = super.s_blocksize; INFO->fullblocksize_shift = log2 (super.s_blocksize); INFO->blocksize_shift = INFO->fullblocksize_shift - SECTOR_BITS; - INFO->cached_slots = + INFO->cached_slots = (FSYSREISER_CACHE_SIZE >> INFO->fullblocksize_shift) - 1; #ifdef REISERDEBUG - printf ("reiserfs_mount: version=%d, blocksize=%d\n", + printf ("reiserfs_mount: version=%d, blocksize=%d\n", INFO->version, INFO->blocksize); #endif /* REISERDEBUG */ @@ -610,7 +610,7 @@ return 0; /* Initialize journal code. If something fails we end with zero - * journal_transactions, so we don't access the journal at all. + * journal_transactions, so we don't access the journal at all. */ INFO->journal_transactions = 0; if (super.s_journal_block != 0 && super.s_journal_dev == 0) @@ -621,17 +621,17 @@ journal_init (); /* Read in super block again, maybe it is in the journal */ - block_read (superblock >> INFO->blocksize_shift, + block_read (superblock >> INFO->blocksize_shift, 0, sizeof (struct reiserfs_super_block), (char *) &super); } if (! block_read (super.s_root_block, 0, INFO->blocksize, (char*) ROOT)) return 0; - + INFO->tree_depth = BLOCKHEAD (ROOT)->blk_level; - + #ifdef REISERDEBUG - printf ("root read_in: block=%d, depth=%d\n", + printf ("root read_in: block=%d, depth=%d\n", super.s_root_block, INFO->tree_depth); #endif /* REISERDEBUG */ @@ -639,7 +639,7 @@ return 0; if (INFO->tree_depth == DISK_LEAF_NODE_LEVEL) { - /* There is only one node in the whole filesystem, + /* There is only one node in the whole filesystem, * which is simultanously leaf and root */ memcpy (LEAF, ROOT, INFO->blocksize); } @@ -654,7 +654,7 @@ * My tree node cache is organized as following * 0 ROOT node * 1 LEAF node (if the ROOT is also a LEAF it is copied here - * 2-n other nodes on current path from bottom to top. + * 2-n other nodes on current path from bottom to top. * if there is not enough space in the cache, the top most are * omitted. * @@ -664,7 +664,7 @@ * next_key() gets the next key in tree order. * * This means, that I can only sequential reads of files are - * efficient, but this really doesn't hurt for grub. + * efficient, but this really doesn't hurt for grub. */ /* Read in the node at the current path and depth into the node cache. @@ -678,7 +678,7 @@ if (depth < num_cached) { /* This is the cached part of the path. Check if same block is - * needed. + * needed. */ if (blockNr == INFO->blocks[depth]) return cache; @@ -704,7 +704,7 @@ } /* Get the next key, i.e. the key following the last retrieved key in - * tree order. INFO->current_ih and + * tree order. INFO->current_ih and * INFO->current_info are adapted accordingly. */ static int next_key (void) @@ -712,21 +712,21 @@ int depth; struct item_head *ih = INFO->current_ih + 1; char *cache; - + #ifdef REISERDEBUG - printf ("next_key:\n old ih: key %d:%d:%d:%d version:%d\n", - INFO->current_ih->ih_key.k_dir_id, - INFO->current_ih->ih_key.k_objectid, + printf ("next_key:\n old ih: key %d:%d:%d:%d version:%d\n", + INFO->current_ih->ih_key.k_dir_id, + INFO->current_ih->ih_key.k_objectid, INFO->current_ih->ih_key.u.v1.k_offset, INFO->current_ih->ih_key.u.v1.k_uniqueness, INFO->current_ih->ih_version); #endif /* REISERDEBUG */ - + if (ih == &ITEMHEAD[BLOCKHEAD (LEAF)->blk_nr_item]) { depth = DISK_LEAF_NODE_LEVEL; - /* The last item, was the last in the leaf node. - * Read in the next block + /* The last item, was the last in the leaf node. + * Read in the next block */ do { @@ -743,18 +743,18 @@ #endif /* REISERDEBUG */ } while (INFO->next_key_nr[depth] == 0); - + if (depth == INFO->tree_depth) cache = ROOT; else if (depth <= INFO->cached_slots) cache = CACHE (depth); - else + else { cache = read_tree_node (INFO->blocks[depth], depth); if (! cache) return 0; } - + do { int nr_item = BLOCKHEAD (cache)->blk_nr_item; @@ -771,16 +771,16 @@ return 0; } while (depth > DISK_LEAF_NODE_LEVEL); - + ih = ITEMHEAD; } found: INFO->current_ih = ih; INFO->current_item = &LEAF[ih->ih_item_location]; #ifdef REISERDEBUG - printf (" new ih: key %d:%d:%d:%d version:%d\n", - INFO->current_ih->ih_key.k_dir_id, - INFO->current_ih->ih_key.k_objectid, + printf (" new ih: key %d:%d:%d:%d version:%d\n", + INFO->current_ih->ih_key.k_dir_id, + INFO->current_ih->ih_key.k_objectid, INFO->current_ih->ih_key.u.v1.k_offset, INFO->current_ih->ih_key.u.v1.k_uniqueness, INFO->current_ih->ih_version); @@ -788,18 +788,18 @@ return 1; } -/* preconditions: reiserfs_mount already executed, therefore +/* preconditions: reiserfs_mount already executed, therefore * INFO block is valid - * returns: 0 if error (errnum is set), + * returns: 0 if error (errnum is set), * nonzero iff we were able to find the key successfully. - * postconditions: on a nonzero return, the current_ih and + * postconditions: on a nonzero return, the current_ih and * current_item fields describe the key that equals the * searched key. INFO->next_key contains the next key after * the searched key. * side effects: messes around with the cache. */ static int -search_stat (__u32 dir_id, __u32 objectid) +search_stat (__u32 dir_id, __u32 objectid) { char *cache; int depth; @@ -809,21 +809,21 @@ #ifdef REISERDEBUG printf ("search_stat:\n key %d:%d:0:0\n", dir_id, objectid); #endif /* REISERDEBUG */ - + depth = INFO->tree_depth; cache = ROOT; - + while (depth > DISK_LEAF_NODE_LEVEL) { struct key *key; nr_item = BLOCKHEAD (cache)->blk_nr_item; - + key = KEY (cache); - - for (i = 0; i < nr_item; i++) + + for (i = 0; i < nr_item; i++) { if (key->k_dir_id > dir_id - || (key->k_dir_id == dir_id + || (key->k_dir_id == dir_id && (key->k_objectid > objectid || (key->k_objectid == objectid && (key->u.v1.k_offset @@ -831,7 +831,7 @@ break; key++; } - + #ifdef REISERDEBUG printf (" depth=%d, i=%d/%d\n", depth, i, nr_item); #endif /* REISERDEBUG */ @@ -840,13 +840,13 @@ if (! cache) return 0; } - + /* cache == LEAF */ nr_item = BLOCKHEAD (LEAF)->blk_nr_item; ih = ITEMHEAD; - for (i = 0; i < nr_item; i++) + for (i = 0; i < nr_item; i++) { - if (ih->ih_key.k_dir_id == dir_id + if (ih->ih_key.k_dir_id == dir_id && ih->ih_key.k_objectid == objectid && ih->ih_key.u.v1.k_offset == 0 && ih->ih_key.u.v1.k_uniqueness == 0) @@ -871,32 +871,32 @@ unsigned int offset; unsigned int to_read; char *prev_buf = buf; - + #ifdef REISERDEBUG printf ("reiserfs_read: filepos=%d len=%d, offset=%x:%x\n", filepos, len, (__u64) IH_KEY_OFFSET (INFO->current_ih) - 1); #endif /* REISERDEBUG */ - + if (INFO->current_ih->ih_key.k_objectid != INFO->fileinfo.k_objectid || IH_KEY_OFFSET (INFO->current_ih) > filepos + 1) { search_stat (INFO->fileinfo.k_dir_id, INFO->fileinfo.k_objectid); goto get_next_key; } - + while (! errnum) { if (INFO->current_ih->ih_key.k_objectid != INFO->fileinfo.k_objectid) break; - + offset = filepos - IH_KEY_OFFSET (INFO->current_ih) + 1; blocksize = INFO->current_ih->ih_item_len; - + #ifdef REISERDEBUG printf (" loop: filepos=%d len=%d, offset=%d blocksize=%d\n", filepos, len, offset, blocksize); #endif /* REISERDEBUG */ - + if (IH_KEY_ISTYPE(INFO->current_ih, TYPE_DIRECT) && offset < blocksize) { @@ -907,14 +907,14 @@ to_read = blocksize - offset; if (to_read > len) to_read = len; - + if (disk_read_hook != NULL) { disk_read_func = disk_read_hook; - + block_read (INFO->blocks[DISK_LEAF_NODE_LEVEL], (INFO->current_item - LEAF + offset), to_read, buf); - + disk_read_func = NULL; } else @@ -928,25 +928,25 @@ printf ("indirect_read: offset=%d, blocksize=%d\n", offset, blocksize); #endif /* REISERDEBUG */ - + while (offset < blocksize) { __u32 blocknr = ((__u32 *) INFO->current_item) [offset >> INFO->fullblocksize_shift]; int blk_offset = offset & (INFO->blocksize-1); - + to_read = INFO->blocksize - blk_offset; if (to_read > len) to_read = len; - + disk_read_func = disk_read_hook; - + /* Journal is only for meta data. Data blocks can be read * directly without using block_read */ devread (blocknr << INFO->blocksize_shift, blk_offset, to_read, buf); - + disk_read_func = NULL; update_buf_len: len -= to_read; @@ -965,11 +965,11 @@ } -/* preconditions: reiserfs_mount already executed, therefore +/* preconditions: reiserfs_mount already executed, therefore * INFO block is valid * returns: 0 if error, nonzero iff we were able to find the file successfully * postconditions: on a nonzero return, INFO->fileinfo contains the info - * of the file we were trying to look up, filepos is 0 and filemax is + * of the file we were trying to look up, filepos is 0 and filemax is * the size of the file. */ int @@ -987,23 +987,23 @@ dir_id = REISERFS_ROOT_PARENT_OBJECTID; objectid = REISERFS_ROOT_OBJECTID; - + while (1) { #ifdef REISERDEBUG printf ("dirname=%s\n", dirname); #endif /* REISERDEBUG */ - + /* Search for the stat info first. */ if (! search_stat (dir_id, objectid)) return 0; - + #ifdef REISERDEBUG - printf ("sd_mode=%x sd_size=%d\n", + printf ("sd_mode=%x sd_size=%d\n", ((struct stat_data *) INFO->current_item)->sd_mode, ((struct stat_data *) INFO->current_item)->sd_size); #endif /* REISERDEBUG */ - + mode = ((struct stat_data *) INFO->current_item)->sd_mode; /* If we've got a symbolic link, then chase it. */ @@ -1029,7 +1029,7 @@ errnum = ERR_FILELENGTH; return 0; } - + /* Copy the remaining name to the end of the symlink data. Note that DIRNAME and LINKBUF may overlap! */ grub_memmove (linkbuf + filemax, dirname, len+1); @@ -1069,7 +1069,7 @@ /* if we have a real file (and we're not just printing possibilities), then this is where we want to exit */ - + if (! *dirname || isspace (*dirname)) { if (! S_ISREG (mode)) @@ -1077,22 +1077,22 @@ errnum = ERR_BAD_FILETYPE; return 0; } - + filepos = 0; filemax = ((struct stat_data *) INFO->current_item)->sd_size; - - /* If this is a new stat data and size is > 4GB set filemax to + + /* If this is a new stat data and size is > 4GB set filemax to * maximum */ if (INFO->current_ih->ih_version == ITEM_VERSION_2 && ((struct stat_data *) INFO->current_item)->sd_size_hi > 0) filemax = 0xffffffff; - + INFO->fileinfo.k_dir_id = dir_id; INFO->fileinfo.k_objectid = objectid; return next_key (); } - + /* continue with the file/directory name interpretation */ while (*dirname == '/') dirname++; @@ -1103,31 +1103,31 @@ } for (rest = dirname; (ch = *rest) && ! isspace (ch) && ch != '/'; rest++); *rest = 0; - + # ifndef STAGE1_5 if (print_possibilities && ch != '/') do_possibilities = 1; # endif /* ! STAGE1_5 */ - + while (1) { char *name_end; int num_entries; - + if (! next_key ()) return 0; #ifdef REISERDEBUG - printf ("ih: key %d:%d:%d:%d version:%d\n", - INFO->current_ih->ih_key.k_dir_id, - INFO->current_ih->ih_key.k_objectid, + printf ("ih: key %d:%d:%d:%d version:%d\n", + INFO->current_ih->ih_key.k_dir_id, + INFO->current_ih->ih_key.k_objectid, INFO->current_ih->ih_key.u.v1.k_offset, INFO->current_ih->ih_key.u.v1.k_uniqueness, INFO->current_ih->ih_version); #endif /* REISERDEBUG */ - + if (INFO->current_ih->ih_key.k_objectid != objectid) break; - + name_end = INFO->current_item + INFO->current_ih->ih_item_len; de_head = (struct reiserfs_de_head *) INFO->current_item; num_entries = INFO->current_ih->u.ih_entry_count; @@ -1142,7 +1142,7 @@ * terminated. We write a temporary 0 behind it. * NOTE: that this may overwrite the first block in * the tree cache. That doesn't hurt as long as we - * don't call next_key () in between. + * don't call next_key () in between. */ *name_end = 0; cmp = substring (dirname, filename); @@ -1171,18 +1171,18 @@ num_entries--; } } - + # ifndef STAGE1_5 if (print_possibilities < 0) return 1; # endif /* ! STAGE1_5 */ - + errnum = ERR_FILE_NOT_FOUND; *rest = ch; return 0; - + found: - + *rest = ch; dirname = rest; @@ -1198,22 +1198,22 @@ { struct reiserfs_super_block super; int num_sectors; - - if (! devread (REISERFS_DISK_OFFSET_IN_BYTES >> SECTOR_BITS, 0, + + if (! devread (REISERFS_DISK_OFFSET_IN_BYTES >> SECTOR_BITS, 0, sizeof (struct reiserfs_super_block), (char *) &super)) return 0; - + *start_sector = 1; /* reserve first sector for stage1 */ if ((substring (REISERFS_SUPER_MAGIC_STRING, super.s_magic) <= 0 || substring (REISER2FS_SUPER_MAGIC_STRING, super.s_magic) <= 0) && (/* check that this is not a super block copy inside * the journal log */ - super.s_journal_block * super.s_blocksize + super.s_journal_block * super.s_blocksize > REISERFS_DISK_OFFSET_IN_BYTES)) num_sectors = (REISERFS_DISK_OFFSET_IN_BYTES >> SECTOR_BITS) - 1; else num_sectors = (REISERFS_OLD_DISK_OFFSET_IN_BYTES >> SECTOR_BITS) - 1; - + return (needed_sectors <= num_sectors); } #endif /* FSYS_REISERFS */ Modified: openbios-devel/fs/grubfs/fsys_vstafs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_vstafs.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/fsys_vstafs.c 2008-12-11 20:30:53 UTC (rev 284) @@ -41,21 +41,21 @@ */ static int f_sector; -int +int vstafs_mount (void) { int retval = 1; - + if( (((current_drive & 0x80) || (current_slice != 0)) && current_slice != PC_SLICE_TYPE_VSTAFS) || ! devread (0, 0, BLOCK_SIZE, (char *) FSYS_BUF) || FIRST_SECTOR->fs_magic != 0xDEADFACE) retval = 0; - + return retval; } -static void +static void get_file_info (int sector) { devread (sector, 0, BLOCK_SIZE, (char *) FILE_INFO); @@ -76,13 +76,13 @@ errnum = ERR_FILE_NOT_FOUND; return NULL; } - + a1 = FILE_INFO->blocks; curr_ext = 0; devread (a1[curr_ext].a_start, 0, 512, (char *) DIRECTORY_BUF); current_direntry = 11; current_blockpos = 0; - + return &DIRECTORY_BUF[10]; } @@ -97,7 +97,7 @@ current_blockpos = 0; curr_ext++; } - + if (curr_ext < FILE_INFO->extents) { devread (a1[curr_ext].a_start + current_blockpos, 0, @@ -109,17 +109,17 @@ return NULL; } } - + return &DIRECTORY_BUF[current_direntry++]; } -int +int vstafs_dir (char *dirname) { char *fn, ch; struct dir_entry *d; /* int l, i, s; */ - + /* * Read in the entries of the current directory. */ @@ -130,7 +130,7 @@ { return 0; } - + /* * Find the file in the path */ @@ -138,19 +138,19 @@ fn = dirname; while ((ch = *fn) && ch != '/' && ! isspace (ch)) fn++; *fn = 0; - + do { if (d->name[0] == 0 || d->name[0] & 0x80) continue; - + #ifndef STAGE1_5 if (print_possibilities && ch != '/' && (! *dirname || strcmp (dirname, d->name) <= 0)) { if (print_possibilities > 0) print_possibilities = -print_possibilities; - + printf (" %s", d->name); } #endif @@ -158,12 +158,12 @@ { f_sector = d->start; get_file_info (f_sector); - filemax = FILE_INFO->len; + filemax = FILE_INFO->len; break; } } while ((d =vstafs_nextdir ())); - + *(dirname = fn) = ch; if (! d) { @@ -174,17 +174,17 @@ #endif return 1; } - + errnum = ERR_FILE_NOT_FOUND; return 0; } } while (*dirname && ! isspace (ch)); - + return 1; } -int +int vstafs_read (char *addr, int len) { struct alloc *a2; @@ -193,11 +193,11 @@ char extent; int ext_size; char *curr_pos; - + get_file_info (f_sector); size = FILE_INFO->len-VSTAFS_START_DATA; a2 = FILE_INFO->blocks; - + if (filepos > 0) { if (filepos < a2[0].a_len * 512 - VSTAFS_START_DATA) @@ -226,11 +226,11 @@ extent = 0; curr_len = a2[0].a_len * 512 - offset; } - + curr_pos = addr; if (curr_len > len) curr_len = len; - + for (curr_ext2=extent; curr_ext2 < FILE_INFO->extents; curr_len = a2[curr_ext].a_len * 512, curr_pos += curr_len, curr_ext2++) @@ -242,11 +242,11 @@ ret += size; curr_len += size; } - + devread (a2[curr_ext2].a_start,offset, curr_len, curr_pos); offset = 0; } - + return ret; } Modified: openbios-devel/fs/grubfs/fsys_xfs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_xfs.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/fsys_xfs.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,5 +1,5 @@ /* fsys_xfs.c - an implementation for the SGI XFS file system */ -/* +/* * GRUB -- GRand Unified Bootloader * Copyright (C) 2001,2002 Free Software Foundation, Inc. * @@ -107,7 +107,7 @@ return x; #else return __be16_to_cpu(x); -#endif +#endif } static inline __uint32_t @@ -142,7 +142,7 @@ static xfs_fsblock_t xt_start (xfs_bmbt_rec_32_t *r) { - return (((xfs_fsblock_t)(le32 (r->l1) & mask32lo(9))) << 43) | + return (((xfs_fsblock_t)(le32 (r->l1) & mask32lo(9))) << 43) | (((xfs_fsblock_t)le32 (r->l2)) << 11) | (((xfs_fsblock_t)le32 (r->l3)) >> 21); } @@ -369,7 +369,7 @@ ++name; ++namelen; sfe = (xfs_dir2_sf_entry_t *) - (inode->di_u.di_c + (inode->di_u.di_c + sizeof(xfs_dir2_sf_hdr_t) - xfs.i8param); break; @@ -466,7 +466,7 @@ if (!devread (0, 0, sizeof(super), (char *)&super) || (le32(super.sb_magicnum) != XFS_SB_MAGIC) - || ((le16(super.sb_versionnum) + || ((le16(super.sb_versionnum) & XFS_SB_VERSION_NUMBITS) != XFS_SB_VERSION_4) ) { return 0; } @@ -513,7 +513,7 @@ offset = xad->offset; xadlen = xad->len; if (isinxt (filepos >> xfs.blklog, offset, xadlen)) { - endofcur = (offset + xadlen) << xfs.blklog; + endofcur = (offset + xadlen) << xfs.blklog; toread = (endofcur >= endpos) ? len : (endofcur - filepos); @@ -535,7 +535,7 @@ } continue; } - endofprev = offset + xadlen; + endofprev = offset + xadlen; } return filepos - startpos; Modified: openbios-devel/fs/grubfs/glue.h =================================================================== --- openbios-devel/fs/grubfs/glue.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/glue.h 2008-12-11 20:30:53 UTC (rev 284) @@ -23,7 +23,7 @@ extern int using_devsize; /* - * some of the filesystem drivers don't correctly provide their + * some of the filesystem drivers don't correctly provide their * prototypes. we fix this here so we can leave them untouched. */ Modified: openbios-devel/fs/grubfs/grubfs_fs.c =================================================================== --- openbios-devel/fs/grubfs/grubfs_fs.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/grubfs_fs.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * <grubfs_fs.c> - * + * * grub vfs - * + * * Copyright (C) 2004 Stefan Reinauer * Copyright (C) 2004 Samuel Rydh * * inspired by HFS code from Samuel Rydh - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #include "openbios/config.h" @@ -34,7 +34,7 @@ /* we fake this for now, assuming that the filesystem is not corrupt */ unsigned long part_length=(unsigned long)-1; -/* these are not even used by us, instead +/* these are not even used by us, instead * the grub fs drivers want them: */ int fsmax; @@ -163,7 +163,7 @@ filepos=file->pos; filemax=file->len; - + ret=curfs->fsys->read_func(buf, count); file->pos=filepos; @@ -174,7 +174,7 @@ get_path( file_desc_t *fd, char *retbuf, int len ) { const char *path=((grubfile_t *)fd)->path; - + if(strlen(path) > len) return NULL; @@ -208,7 +208,7 @@ ret->len=filemax; ret->path=strdup(path); ret->fs=fs; - + return (file_desc_t *)ret; } @@ -217,7 +217,7 @@ { free( fs->fs_data ); fs->fs_data = NULL; - + /* callers responsibility to call free(fs) */ } @@ -226,7 +226,7 @@ { grubfs_t *gfs = (grubfs_t*)fs->fs_data; return gfs->fsys->name; -} +} static const fs_ops_t grubfs_ops = { .close_fs = close_fs, @@ -285,7 +285,7 @@ #ifdef CONFIG_DEBUG_FS //printk("devread s=%x buf=%x, fd=%x\n",sector, buf, curfs->dev_fd); #endif - + if( !curfs ) { #ifdef CONFIG_DEBUG_FS printk("devread: fsys == NULL!\n"); @@ -309,4 +309,4 @@ len = filemax - filepos; errnum = 0; return curfs->fsys->read_func( buf, len ); -} +} Modified: openbios-devel/fs/grubfs/jfs.h =================================================================== --- openbios-devel/fs/grubfs/jfs.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/jfs.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,22 +1,22 @@ /* jfs.h - an extractions from linux/include/linux/jfs/jfs* into one file */ -/* +/* * GRUB -- GRand Unified Bootloader * Copyright (C) 2000 International Business Machines Corp. * Copyright (C) 2001 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See * the GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * MA 02110-1301, USA. */ @@ -177,7 +177,7 @@ s64 s_size; /* 8: aggregate size in hardware/LVM blocks; * VFS: number of blocks */ - s32 s_bsize; /* 4: aggregate block size in bytes; + s32 s_bsize; /* 4: aggregate block size in bytes; * VFS: fragment size */ s16 s_l2bsize; /* 2: log2 of s_bsize */ @@ -191,7 +191,7 @@ u32 s_flag; /* 4: aggregate attributes: * see jfs_filsys.h */ - u32 s_state; /* 4: mount/unmount/recovery state: + u32 s_state; /* 4: mount/unmount/recovery state: * see jfs_filsys.h */ s32 s_compress; /* 4: > 0 if data compression */ @@ -212,11 +212,11 @@ struct timestruc_t s_time; /* 8: time last updated */ s32 s_fsckloglen; /* 4: Number of filesystem blocks reserved for - * the fsck service log. + * the fsck service log. * N.B. These blocks are divided among the * versions kept. This is not a per * version size. - * N.B. These blocks are included in the + * N.B. These blocks are included in the * length field of s_fsckpxd. */ s8 s_fscklog; /* 1: which fsck service log is most recent @@ -224,7 +224,7 @@ * 1 => the first one * 2 => the 2nd one */ - char s_fpack[11]; /* 11: file system volume name + char s_fpack[11]; /* 11: file system volume name * N.B. This must be 11 bytes to * conform with the OS/2 BootSector * requirements @@ -237,7 +237,7 @@ /* - 128 byte boundary - */ /* - * DFS VFS support (preliminary) + * DFS VFS support (preliminary) */ char s_attach; /* 1: VFS: flag: set when aggregate is attached */ @@ -246,22 +246,22 @@ u64 totalUsable; /* 8: VFS: total of 1K blocks which are * available to "normal" (non-root) users. */ - u64 minFree; /* 8: VFS: # of 1K blocks held in reserve for + u64 minFree; /* 8: VFS: # of 1K blocks held in reserve for * exclusive use of root. This value can be 0, - * and if it is then totalUsable will be equal + * and if it is then totalUsable will be equal * to # of blocks in aggregate. I believe this * means that minFree + totalUsable = # blocks. - * In that case, we don't need to store both + * In that case, we don't need to store both * totalUsable and minFree since we can compute - * one from the other. I would guess minFree - * would be the one we should store, and - * totalUsable would be the one we should + * one from the other. I would guess minFree + * would be the one we should store, and + * totalUsable would be the one we should * compute. (Just a guess...) */ - u64 realFree; /* 8: VFS: # of free 1K blocks can be used by + u64 realFree; /* 8: VFS: # of free 1K blocks can be used by * "normal" users. It may be this is something - * we should compute when asked for instead of + * we should compute when asked for instead of * storing in the superblock. I don't know how * often this information is needed. */ @@ -318,7 +318,7 @@ /* * dir_table used for directory traversal during readdir -*/ +*/ /* * Maximum entry in inline directory table @@ -562,8 +562,8 @@ /* * inode allocation map: - * - * inode allocation map consists of + * + * inode allocation map consists of * . the inode map control page and * . inode allocation group pages (per 4096 inodes) * which are addressed by standard JFS xtree. Modified: openbios-devel/fs/grubfs/ufs_fs.h =================================================================== --- openbios-devel/fs/grubfs/ufs_fs.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/ufs_fs.h 2008-12-11 20:30:53 UTC (rev 284) @@ -55,7 +55,7 @@ * the ``cgbase(fs, cg)'' macro. * * Depending on the architecture and the media, the superblock may - * reside in any one of four places. For tiny media where every block + * reside in any one of four places. For tiny media where every block * counts, it is placed at the very front of the partition. Historically, * UFS1 placed it 8K from the front to leave room for the disk label and * a small bootstrap. For UFS2 it got moved to 64K from the front to leave @@ -338,7 +338,7 @@ int32_t fs_save_cgsize; /* save real cg size to use fs_bsize */ int32_t fs_sparecon32[26]; /* reserved for future constants */ int32_t fs_flags; /* see FS_ flags below */ - int32_t fs_contigsumsize; /* size of cluster summary array */ + int32_t fs_contigsumsize; /* size of cluster summary array */ int32_t fs_maxsymlinklen; /* max length of an internal symlink */ int32_t fs_old_inodefmt; /* format of on-disk inodes */ uint64_t fs_maxfilesize; /* maximum representable file size */ Modified: openbios-devel/fs/grubfs/xfs.h =================================================================== --- openbios-devel/fs/grubfs/xfs.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/grubfs/xfs.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,35 +1,35 @@ /* xfs.h - an extraction from xfsprogs-1.3.5/include/xfs* into one file */ -/* +/* * GRUB -- GRand Unified Bootloader * Copyright (C) 2000 Silicon Graphics, Inc. All Rights Reserved. * Copyright (C) 2001 Free Software Foundation, Inc. - * + * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as * published by the Free Software Foundation. - * + * * This program is distributed in the hope that it would be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * + * * Further, this software is distributed without any warranty that it is * free of the rightful claim of any third person regarding infringement * or the like. Any license provided herein, whether implied or * otherwise, applies only to this software file. Patent licenses, if * any, provided herein do not apply to combinations of this program with * other software, or any other product whatsoever. - * + * * You should have received a copy of the GNU General Public License along - * with this program; if not, write the Free Software Foundation, Inc., + * with this program; if not, write the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * + * * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * - * For further information regarding this notice, see: - * + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ */ @@ -132,7 +132,7 @@ __uint8_t sb_shared_vn; /* shared version number */ xfs_extlen_t sb_inoalignmt; /* inode chunk alignment, fsblocks */ __uint32_t sb_unit; /* stripe or raid unit */ - __uint32_t sb_width; /* stripe or raid width */ + __uint32_t sb_width; /* stripe or raid width */ __uint8_t sb_dirblklog; /* log2 of dir block size (fsbs) */ __uint8_t sb_dummy[7]; /* padding */ } xfs_sb_t; Modified: openbios-devel/fs/hfs/block.c =================================================================== --- openbios-devel/fs/hfs/block.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfs/block.c 2008-12-11 20:30:53 UTC (rev 284) @@ -37,7 +37,7 @@ { bcache *cache; int i; - + ASSERT(vol->cache == 0); cache = ALLOC(bcache, 1); Modified: openbios-devel/fs/hfs/hfs.c =================================================================== --- openbios-devel/fs/hfs/hfs.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfs/hfs.c 2008-12-11 20:30:53 UTC (rev 284) @@ -69,7 +69,7 @@ { hfsvol *vol, *check; int mode = HFS_MODE_RDONLY; - + /* see if the volume is already mounted */ for (check = hfs_mounts; check; check = check->next) { Modified: openbios-devel/fs/hfs/hfs_fs.c =================================================================== --- openbios-devel/fs/hfs/hfs_fs.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfs/hfs_fs.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2001/05/06 22:47:23 samuel> * Time-stamp: <2004/01/12 10:24:35 samuel> - * + * * <hfs_fs.c> - * + * * HFS world interface - * + * * Copyright (C) 2001-2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #include "openbios/config.h" @@ -39,7 +39,7 @@ hfsdirent ent; hfsdir *dir; int ret=1; - + if( !(dir=hfs_opendir(vol, path)) ) return 1; @@ -76,24 +76,24 @@ while( status && !hfs_readdir(dir, &ent) ) { ulong type, creator; - + *p = 0; topdir = 0; - + strncat( buf, ent.name, sizeof(buf) ); if( (status=_search(vol, buf, sname, ret_fd)) != 2 ) continue; topdir = 1; - + /* name search? */ if( sname ) { status = strcasecmp( ent.name, sname ); continue; } - + type = *(ulong*)ent.u.file.type; creator = *(ulong*)ent.u.file.creator; - + /* look for Mac OS ROM, System and Finder in the same directory */ if( type == MAC_OS_ROM_TYPE && creator == MAC_OS_ROM_CREATOR ) { if( strcasecmp(ent.name, MAC_OS_ROM_NAME) ) @@ -113,11 +113,11 @@ } static file_desc_t * -_do_search( fs_ops_t *fs, const char *sname ) +_do_search( fs_ops_t *fs, const char *sname ) { hfsvol *vol = hfs_getvol( NULL ); file_desc_t *ret_fd = NULL; - + (void)_search( vol, ":", sname, &ret_fd ); return ret_fd; } @@ -183,7 +183,7 @@ hfsdirent ent; int start, ns; ulong id; - + hfs_fstat( file, &ent ); start = sizeof(buf) - strlen(ent.name) - 1; if( start <= 0 ) @@ -202,7 +202,7 @@ } if( strlen(buf + start) >= len ) return NULL; - + strcpy( retbuf, buf+start ); return retbuf; } @@ -220,7 +220,7 @@ hfsvol *vol = (hfsvol*)fs->fs_data; const char *s; char buf[256]; - + if( !strncmp(path, "\\\\", 2) ) { hfsvolent ent; @@ -231,7 +231,7 @@ } else { hfs_chdir( vol, ":" ); } - + for( path-- ;; ) { int n; @@ -241,7 +241,7 @@ n = MIN( sizeof(buf)-1, (path-s) ); if( !n ) continue; - + strncpy( buf, s, n ); buf[n] = 0; if( hfs_chdir(vol, buf) ) @@ -254,16 +254,16 @@ file_desc_t *ret = NULL; hfsdirent ent; hfsdir *dir; - + s++; id = oldid; hfs_dirinfo( vol, &id, buf ); hfs_setcwd( vol, id ); - + if( !(dir=hfs_opendir(vol, buf)) ) return NULL; hfs_setcwd( vol, oldid ); - + while( !hfs_readdir(dir, &ent) ) { if( ent.flags & HFS_ISDIR ) continue; @@ -289,10 +289,10 @@ } static char * -get_fstype( fs_ops_t *fs ) +get_fstype( fs_ops_t *fs ) { return ("HFS"); -} +} static const fs_ops_t hfs_ops = { .close_fs = close_fs, @@ -319,6 +319,6 @@ *fs = hfs_ops; fs->fs_data = vol; - + return 0; } Modified: openbios-devel/fs/hfs_mdb.h =================================================================== --- openbios-devel/fs/hfs_mdb.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfs_mdb.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,15 +1,15 @@ -/* +/* * Creation Date: <2000/09/03 23:04:27 samuel> * Time-stamp: <2000/09/04 01:23:55 samuel> - * + * * <hfs_mdb.h> - * + * * HFS Master Directory Block (MDB) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #ifndef _H_HFS_MDB @@ -22,7 +22,7 @@ #define hfs_get_ushort(addr) (*((unsigned short*)(addr))) #define hfs_get_uint(addr) (*((unsigned int*)(addr))) -/* +/* * The HFS Master Directory Block (MDB). * * Also known as the Volume Information Block (VIB), this structure is @@ -64,8 +64,8 @@ hfs_uint_t drDirCnt; /* number of directories in the fs */ hfs_char_t drFndrInfo[32]; /* data used by the Finder */ hfs_ushort_t drEmbedSigWord; /* embedded volume signature */ - hfs_uint_t drEmbedExtent; /* starting block number (xdrStABN) - and number of allocation blocks + hfs_uint_t drEmbedExtent; /* starting block number (xdrStABN) + and number of allocation blocks (xdrNumABlks) occupied by embedded volume */ hfs_uint_t drXTFlSize; /* bytes in the extents B-tree */ Modified: openbios-devel/fs/hfsplus/blockiter.c =================================================================== --- openbios-devel/fs/hfsplus/blockiter.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfsplus/blockiter.c 2008-12-11 20:30:53 UTC (rev 284) @@ -5,7 +5,7 @@ * * Copyright (C) 2000 Klaus Halfmann <khalfmann(a)libra.de> * Original work by 1996-1998 Robert Leslie <rob(a)mars.org> - * other work 2000 from Brad Boyer (flar(a)pants.nu) + * other work 2000 from Brad Boyer (flar(a)pants.nu) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -35,8 +35,8 @@ #include "hfstime.h" /* Initialize iterator for a given fork */ -void -blockiter_init(blockiter* b, volume* vol, hfsp_fork_raw* f, +void +blockiter_init(blockiter* b, volume* vol, hfsp_fork_raw* f, UInt8 forktype, UInt32 fileId) { b->vol = vol; @@ -52,7 +52,7 @@ } /* get next extent record when needed */ -static int +static int blockiter_next_extent(blockiter *b) { btree* extents_tree = volume_get_extents_tree(b->vol); @@ -64,7 +64,7 @@ err = record_next_extent(&b->er); // Hope there is no need to check this ... // if (b->er.key.start_block != b->curr_block) - // HFSP_ERROR(ENOENT, + // HFSP_ERROR(ENOENT, // "Extents record inconistent"); } else @@ -78,10 +78,10 @@ } /* find next block of the fork iterating over */ -int +int blockiter_next(blockiter *b) { - b->curr_block ++; + b->curr_block ++; b->block ++; if (b->curr_block >= b->max_block) return -1; // end of Blocks, but no error @@ -104,7 +104,7 @@ } /* skip the indicated number of blocks */ -int +int blockiter_skip(blockiter *b, UInt32 skip) { while (skip > 0) @@ -118,7 +118,7 @@ } else skip -= diff; - b->curr_block += diff; + b->curr_block += diff; b->block += diff; if (b->curr_block >= b->max_block) return -1; // end of Blocks, but no error Modified: openbios-devel/fs/hfsplus/btree.c =================================================================== --- openbios-devel/fs/hfsplus/btree.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfsplus/btree.c 2008-12-11 20:30:53 UTC (rev 284) @@ -8,7 +8,7 @@ * * Copyright (C) 2000 Klaus Halfmann <khalfmann(a)libra.de> * Original 1996-1998 Robert Leslie <rob(a)mars.org> - * Additional work by Brad Boyer (flar(a)pants.nu) + * Additional work by Brad Boyer (flar(a)pants.nu) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -47,7 +47,7 @@ node->num_rec = bswabU16_inc(p); node->reserved = bswabU16_inc(p); return p; -} +} /* read a btree header from the given buffer and swap the bytes. * @@ -81,15 +81,15 @@ * Should be the average number of keys per node but these vary. */ #define DEPTH_FACTOR 1000 -/* Cache size is height of tree + this value +/* Cache size is height of tree + this value * Really big numbers wont help in case of ls -R */ -#define EXTRA_CACHESIZE 3 +#define EXTRA_CACHESIZE 3 /* Not in use by now ... */ #define CACHE_DIRTY 0x0001 -/* Intialize cache with default cache Size, +/* Intialize cache with default cache Size, * must call node_cache_close to deallocate memory */ static int node_cache_init(node_cache* cache, btree* tree, int size) { @@ -129,7 +129,7 @@ free(cache->entries); } -/* Load the cach node indentified by index with +/* Load the cach node indentified by index with * the node identified by node_index */ static node_buf* node_cache_load_buf @@ -138,7 +138,7 @@ node_buf *result = node_buf_get(cache ,index); UInt32 blkpernode = bt->blkpernode; UInt32 block = node_index * blkpernode; - void* p = volume_readfromfork(bt->vol, result->node, bt->fork, + void* p = volume_readfromfork(bt->vol, result->node, bt->fork, block, blkpernode, HFSP_EXTENT_DATA, bt->cnid); node_entry *e = &cache->entries[index]; @@ -210,9 +210,9 @@ /** intialize the btree with the first entry in the fork */ static int btree_init(btree* bt, volume* vol, hfsp_fork_raw* fork) -{ +{ void *p; - char buf[vol->blksize]; + char buf[vol->blksize]; UInt16 node_size; btree_node_desc node; @@ -236,7 +236,7 @@ node_cache_init(&bt->cache, bt, bt->head.depth + EXTRA_CACHESIZE); - // Allocate buffer + // Allocate buffer // bt->buf = malloc(node_size); // if (!bt->buf) // return ENOMEM; @@ -249,10 +249,10 @@ { bt->cache.entries = NULL; } - + /** Intialize catalog btree */ int btree_init_cat(btree* bt, volume* vol, hfsp_fork_raw* fork) -{ +{ int result = btree_init(bt,vol,fork); // super (...) bt->cnid = HFSP_CAT_CNID; bt->kcomp = record_key_compare; @@ -262,7 +262,7 @@ /** Intialize catalog btree */ int btree_init_extent(btree* bt, volume* vol, hfsp_fork_raw* fork) -{ +{ int result = btree_init(bt,vol,fork); // super (...) bt->cnid = HFSP_EXT_CNID; bt->kcomp = record_extent_key_compare; @@ -280,16 +280,16 @@ /* returns pointer to key given by index in current node. * * Assumes that current node is not NODE_HEAD ... - */ + */ void* btree_key_by_index(btree* bt, node_buf* buf, UInt16 index) { - UInt16 node_size = bt->head.node_size; + UInt16 node_size = bt->head.node_size; // The offsets are found at the end of the node ... UInt16 off_pos = node_size - (index +1) * sizeof(btree_record_offset); // position of offset at end of node - btree_record_offset* offset = + btree_record_offset* offset = (btree_record_offset*) (buf->node + off_pos); - + // now we have the offset and can read the key ... #ifdef CONFIG_LITTLE_ENDIAN return buf->node + bswap_16(*offset); @@ -297,8 +297,8 @@ return buf->node + *offset; #endif } - + #ifdef DEBUG /* print btree header node information */ @@ -338,7 +338,7 @@ /* Dump all the node information to stdout */ void btree_print(btree* bt) -{ +{ btree_node_desc* node; btree_printhead(&bt->head); @@ -350,7 +350,7 @@ printf("num_rec : %#X\n", node->num_rec); printf("reserved : %#X\n", node->reserved); printf("height : %#X\n", node->height); switch(node->kind) - { + { case HFSP_NODE_NDX : printf("HFSP_NODE_NDX\n"); break; @@ -365,8 +365,8 @@ break; default: printf("*** Unknown Node type ***\n"); - } -} + } +} #endif Modified: openbios-devel/fs/hfsplus/hfsp_fs.c =================================================================== --- openbios-devel/fs/hfsplus/hfsp_fs.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfsplus/hfsp_fs.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2001/05/05 23:33:49 samuel> * Time-stamp: <2004/01/12 10:25:39 samuel> - * + * * <hfsp_fs.c> - * + * * HFS+ file system interface (and ROM lookup support) - * + * * Copyright (C) 2001, 2002, 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #include "openbios/config.h" @@ -95,13 +95,13 @@ return search_files( &r, recursive, proc, match_data, pt ); } -static int +static int match_file( record *r, record *parent, const void *match_data, hfsp_file_t *pt ) { const char *p = (const char*)match_data; char name[256]; int ret=1; - + if( r->record.type != HFSP_FILE ) return 1; @@ -119,7 +119,7 @@ FInfo *fi = &file->user_info; int ret = 1; char buf[256]; - + if( r->record.type == HFSP_FILE && fi->fdCreator == MAC_OS_ROM_CREATOR && fi->fdType == MAC_OS_ROM_TYPE ) { ret = search_files( par, 0, match_file, "System", NULL ) || search_files( par, 0, match_file, "Finder", NULL ); @@ -193,7 +193,7 @@ } static file_desc_t * -_create_fops( hfsp_file_t *t ) +_create_fops( hfsp_file_t *t ) { hfsp_file_t *r = malloc( sizeof(hfsp_file_t) ); @@ -208,7 +208,7 @@ hfsp_file_t t; volume *vol = (volume*)fs->fs_data; record r; - + /* Leading \\ means system folder. The finder info block has * the following meaning. * @@ -341,7 +341,7 @@ } size = (count-act_count > max)? max : count-act_count; memcpy( (char *)buf + act_count, &buf2[add], size ); - + curpos += blksize; act_count += size; @@ -360,10 +360,10 @@ } static char * -get_fstype( fs_ops_t *fs ) +get_fstype( fs_ops_t *fs ) { return ("HFS+"); -} +} static const fs_ops_t fs_ops = { @@ -377,7 +377,7 @@ .close = file_close, .read = file_read, .lseek = file_lseek, - + .get_fstype = get_fstype }; @@ -392,6 +392,6 @@ } *fs = fs_ops; fs->fs_data = vol; - + return 0; } Modified: openbios-devel/fs/hfsplus/include/apple.h =================================================================== --- openbios-devel/fs/hfsplus/include/apple.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfsplus/include/apple.h 2008-12-11 20:30:53 UTC (rev 284) @@ -3,10 +3,10 @@ * * This file contains defintions that are special for Apple. * The names match the defintions found in Apple Header files. - * + * * Copyright (C) 2000 Klaus Halfmann <khalfmann(a)libra.de> * Original code 1996-1998 by Robert Leslie <rob(a)mars.rog> - * other work 2000 from Brad Boyer (flar(a)pants.nu) + * other work 2000 from Brad Boyer (flar(a)pants.nu) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,15 +36,15 @@ typedef unsigned long OSType; typedef unsigned long long UInt64; -/* A point, normally used by Quickdraw, - * but found in Finderinformation, too +/* A point, normally used by Quickdraw, + * but found in Finderinformation, too */ typedef struct { SInt16 v; /* vertical coordinate */ SInt16 h; /* horizontal coordinate */ } Point; -/* A rectancle, normally used by Quickdraw, +/* A rectancle, normally used by Quickdraw, * but found in Finderinformation, too. */ typedef struct { @@ -54,8 +54,8 @@ SInt16 right; /* right edge */ } Rect; -/* Information about the location and size of a folder - * used by the Finder. +/* Information about the location and size of a folder + * used by the Finder. */ typedef struct { Rect frRect; /* folder's rectangle */ Modified: openbios-devel/fs/hfsplus/include/blockiter.h =================================================================== --- openbios-devel/fs/hfsplus/include/blockiter.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfsplus/include/blockiter.h 2008-12-11 20:30:53 UTC (rev 284) @@ -2,10 +2,10 @@ * libhfs - library for reading and writing Macintosh HFS volumes * * The iterator shown here iterates over the blocks of a fork. - * + * * Copyright (C) 2000 Klaus Halfmann <khalfmann(a)libra.de> * Original work by 1996-1998 Robert Leslie <rob(a)mars.org> - * other work 2000 from Brad Boyer (flar(a)pants.nu) + * other work 2000 from Brad Boyer (flar(a)pants.nu) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ */ /* Structure of the blockiterator */ -typedef struct +typedef struct { volume* vol; // volume we iterate over UInt32 curr_block; // current, absolute block @@ -38,11 +38,11 @@ UInt8 forktype; // type of fork we iterate over UInt8 in_extent; // boolean 0 - in file extent // 1 - in extents file - extent_record er; // record to iterate in extents file. + extent_record er; // record to iterate in extents file. } blockiter; /* Initialize iterator for a given fork */ -extern void blockiter_init(blockiter* b, volume* vol, hfsp_fork_raw* f, +extern void blockiter_init(blockiter* b, volume* vol, hfsp_fork_raw* f, UInt8 forktype, UInt32 fileId); /* find next block of the fork iterating over */ Modified: openbios-devel/fs/hfsplus/include/btree.h =================================================================== --- openbios-devel/fs/hfsplus/include/btree.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfsplus/include/btree.h 2008-12-11 20:30:53 UTC (rev 284) @@ -6,7 +6,7 @@ * * Copyright (C) 2000 Klaus Halfmann <khalfmann(a)libra.de> * Original 1996-1998 Robert Leslie <rob(a)mars.org> - * Additional work by Brad Boyer (flar(a)pants.nu) + * Additional work by Brad Boyer (flar(a)pants.nu) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: openbios-devel/fs/hfsplus/include/hfs.h =================================================================== --- openbios-devel/fs/hfsplus/include/hfs.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfsplus/include/hfs.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,11 +1,11 @@ /* * libhfsp - library for reading and writing Macintosh HFS+ volumes - * + * * This file includes definitions for access to old HFS structures. * * Copyright (C) 2000 Klaus Halfmann <khalfmann(a)libra.de> * Original code 1996-1998 by Robert Leslie <rob(a)mars.rog> - * other work 2000 from Brad Boyer (flar(a)pants.nu) + * other work 2000 from Brad Boyer (flar(a)pants.nu) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ */ -#define HFS_BLOCKSZ 512 +#define HFS_BLOCKSZ 512 /* A sector for Apple is always 512 bytes */ #define HFS_BLOCKSZ_BITS 9 /* 1<<9 == 512 */ #define HFS_VOLHEAD_SIG 0x4244 /* 'BD' */ Modified: openbios-devel/fs/hfsplus/include/hfsp.h =================================================================== --- openbios-devel/fs/hfsplus/include/hfsp.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfsplus/include/hfsp.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,6 +1,6 @@ /* * libhfsp - library for reading and writing Macintosh HFS+ volumes - * + * * This file includes definitions for the structures found on * HFS+ Volumes. The structures are further wrapped by struct * found in libhfsp.h. fucntions on those enhanced structures @@ -8,7 +8,7 @@ * * Copyright (C) 2000 Klaus Halfmann <khalfmann(a)libra.de> * Original code 1996-1998 by Robert Leslie <rob(a)mars.rog> - * other work 2000 from Brad Boyer (flar(a)pants.nu) + * other work 2000 from Brad Boyer (flar(a)pants.nu) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -68,29 +68,29 @@ */ typedef struct hfsp_vh { UInt16 signature; // must be HFSPLUS_VOLHEAD_SIG 'H+' - UInt16 version; // currently 4, ignored + UInt16 version; // currently 4, ignored UInt32 attributes; // See bit constants below UInt32 last_mount_vers; // Use a registered creator code here (what do we use ?) // Mac OS uses '8.10' well UInt32 reserved; - + UInt32 create_date; // local time ! UInt32 modify_date; // GMT (?) UInt32 backup_date; // GMT (?) UInt32 checked_date; // GMT (?) fsck ? - + UInt32 file_count; // not including special files but including DATA and RSRC forks UInt32 folder_count; // excluding the root folder - + UInt32 blocksize; // must be multiple of HFSPLUS_SECTOR_SIZE, // should be a multiple of 4k for harddisk UInt32 total_blocks; UInt32 free_blocks; // The total number of unused allocation blocks on the disk. - + UInt32 next_alloc; // hint wher to search for next allocation blocks UInt32 rsrc_clump_sz; @@ -104,7 +104,7 @@ UInt64 encodings_bmp; // for every encoding used on the disk a bit is set // ignored but eventually must be cared for - Char finder_info[32]; + Char finder_info[32]; hfsp_fork_raw alloc_file; // stores bitmap of use/free blocks hfsp_fork_raw ext_file; @@ -162,7 +162,7 @@ UInt16 depth; // equal to height of btree_node_desc UInt32 root; - // root node of the hierarchy + // root node of the hierarchy UInt32 leaf_count; UInt32 leaf_head; UInt32 leaf_tail; @@ -179,9 +179,9 @@ // always 0 for HFS+ UInt8 reserved2; UInt32 attributes; - // see below + // see below UInt32 reserved3[16]; -} btree_head; +} btree_head; /* BTree attributes */ #define HFSPLUS_BAD_CLOSE 0x01 @@ -192,7 +192,7 @@ #define HFSPLUS_TREE_VAR_NDXKEY_SIZE 0x04 // use variable length index nodes, always set for catalog btree, // always cleared for extents btree. - + #define HFSPLUS_TREE_UNUSED 0xFFFFFFF8 /* Some special File ID numbers */ @@ -226,7 +226,7 @@ UInt8 fork_type; /* Seee below */ UInt8 filler; UInt32 file_id; - UInt32 start_block; + UInt32 start_block; } hfsp_extent_key; #define HFSP_EXTENT_DATA 0x00 @@ -238,10 +238,10 @@ #define HFSP_FOLDER 0x0001 // entry fo a Folder #define HFSP_FILE 0x0002 // entry for a File -#define HFSP_FOLDER_THREAD 0x0003 +#define HFSP_FOLDER_THREAD 0x0003 // Like '.' in unix, identifies the folder by its id, only -#define HFSP_FILE_THREAD 0x0004 - // Im unsure if this is used by HFS+, too +#define HFSP_FILE_THREAD 0x0004 + // Im unsure if this is used by HFS+, too /* HFS+ folder data (part of an hfsp_cat_entry) */ typedef struct { Modified: openbios-devel/fs/hfsplus/include/hfstime.h =================================================================== --- openbios-devel/fs/hfsplus/include/hfstime.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfsplus/include/hfstime.h 2008-12-11 20:30:53 UTC (rev 284) @@ -5,7 +5,7 @@ * other work 2000 from Brad Boyer (flar(a)pants.nu) * * The HFS+ dates are stored as UInt32 containing the number of seconds since - * midnight, January 1, 1904, GMT. This is slightly different from HFS, + * midnight, January 1, 1904, GMT. This is slightly different from HFS, * where the value represents local time. A notable exception is the * creationdate !. Linux uses times in GMT starting at January 1, 1970 * @@ -25,7 +25,7 @@ * * $Id: hfstime.h,v 1.2 2000/10/19 13:33:38 hasi Exp $ */ - + /* The number of seconds between 1.1.1904 and 1.1.1970 */ #define HFSPTIMEDIFF 2082844800U Modified: openbios-devel/fs/hfsplus/include/libhfsp.h =================================================================== --- openbios-devel/fs/hfsplus/include/libhfsp.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfsplus/include/libhfsp.h 2008-12-11 20:30:53 UTC (rev 284) @@ -28,7 +28,7 @@ # include "hfsp.h" /* Last error is eventually found here */ -extern const char *hfsp_error; +extern const char *hfsp_error; # define HFSP_ERROR(code, str) \ do { hfsp_error = (str), errno = (code); goto fail; } while (0) @@ -66,7 +66,7 @@ /* Signatures registered with Apple to identify this driver */ /* Identifies the userland implementation */ -# define HPLS_SIGNATURE 0x482B4C58 // 'H+LX' +# define HPLS_SIGNATURE 0x482B4C58 // 'H+LX' /* Identifies the kernel module by Brad Boyer (flar(a)pants.nu) */ # define HPLS_SIGRES1 0x482B4C78 // 'H+Lx' /* not jet in use ... */ @@ -81,7 +81,7 @@ /* Othe Signatures may follow for informational purpos */ - + /* prototype for key comparing functions. */ typedef int (*hfsp_key_compare) (void* key1, void* key2); @@ -92,13 +92,13 @@ /* Structures for a node cache. The cache is an array * with linear search. (So making it to big may make - * things slower). It is searched in a round robin + * things slower). It is searched in a round robin * fashion. */ -typedef struct +typedef struct { - UInt32 priority; + UInt32 priority; // as lower this number as higher the priority. // decremetned on any sucessfull usage // incremented else, intial value height*DEPTHFACTOR @@ -116,29 +116,29 @@ // contents of node in original byte order } node_buf; -typedef struct +typedef struct { int size; // number of nodes in the cache int currindex; // round robin index int nodebufsize; // size of complete node_buf, including node - node_entry *entries; + node_entry *entries; char *buffers; // actually *node_buf } node_cache; -typedef struct -{ +typedef struct +{ struct volume* vol; /* pointer to volume this tree is part of */ hfsp_fork_raw* fork; /* pointer to fork this tree is part of */ UInt32 cnid; /* (pseudo) file id for the fork */ - hfsp_key_compare kcomp; + hfsp_key_compare kcomp; /* function used for key compare in _this_ btree */ hfsp_key_read kread; /* fucntion used to read a key int _this_ btree */ btree_head head; - + UInt16 blkpernode; /* Number of volume blocks per node (usually 1-4) */ - node_cache cache; + node_cache cache; /* Warning all functions of btrees and records may modify the following values ! */ // UInt16 node_index; /* index of node in fork */ @@ -158,22 +158,22 @@ UInt16 blksize_bits; /* blocksize of device = 1 << blksize_bits */ UInt16 filler; UInt32 blksize; /* always 1 << blksize_bits */ - UInt32 startblock; - /* Offset from physical to logical blocks, - eventually intodruced by HFS wrapper */ + UInt32 startblock; + /* Offset from physical to logical blocks, + eventually intodruced by HFS wrapper */ UInt32 maxblocks; /* maximum number of blocks in device */ // UInt32 currblock; /* value of current block, to cache blocks */ hfsp_vh vol; /* raw volume data */ // void* blockbuf; /* (single) buffer for fetching one block */ /* Buffer has double size of blksize to allow cross block reading */ - + btree* extents; /* is NULL by default and intialized when needed */ btree catalog; /* This is always neeeded */ -} volume; +} volume; /* Functions on volumes are defined in volume.h */ -typedef struct { // may not be used as found here +typedef struct { // may not be used as found here btree* tree; // tree where this record is contained in. UInt16 node_index; /* index of record in btree */ UInt16 keyind; /* index of current key in btree */ @@ -181,7 +181,7 @@ UInt32 child; /* child node belonging to this key */ } index_record; -typedef struct { +typedef struct { btree* tree; // tree where this record is contained in. UInt16 node_index; /* index of record in btree */ UInt16 keyind; /* index of current key in btree */ Modified: openbios-devel/fs/hfsplus/include/record.h =================================================================== --- openbios-devel/fs/hfsplus/include/record.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfsplus/include/record.h 2008-12-11 20:30:53 UTC (rev 284) @@ -6,7 +6,7 @@ * * Copyright (C) 2000 Klaus Halfmann <khalfmann(a)libra.de> * Original 1996-1998 Robert Leslie <rob(a)mars.org> - * Additional work by Brad Boyer (flar(a)pants.nu) + * Additional work by Brad Boyer (flar(a)pants.nu) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -51,7 +51,7 @@ extern int record_init_parent(record* r, record* parent); /* intialize the record by searching for the given string in the given folder. - * + * * parent and r may be the same. */ extern int record_init_string_parent(record* r, record* parent, char* key); @@ -65,9 +65,9 @@ */ extern int record_next(record* r); -/* intialize the extent_record to the extent identified by +/* intialize the extent_record to the extent identified by * a given file */ -extern int record_init_file(extent_record* r, btree* tree, +extern int record_init_file(extent_record* r, btree* tree, UInt8 forktype, UInt32 fileId, UInt32 blockindex); /* move foreward to next entent record. */ Modified: openbios-devel/fs/hfsplus/include/unicode.h =================================================================== --- openbios-devel/fs/hfsplus/include/unicode.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfsplus/include/unicode.h 2008-12-11 20:30:53 UTC (rev 284) @@ -24,5 +24,5 @@ /* similar to strcmp for unicode, pascal strings */ -SInt32 fast_unicode_compare (const hfsp_unistr255 *ustr1, +SInt32 fast_unicode_compare (const hfsp_unistr255 *ustr1, const hfsp_unistr255 *ustr2); Modified: openbios-devel/fs/hfsplus/include/volume.h =================================================================== --- openbios-devel/fs/hfsplus/include/volume.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfsplus/include/volume.h 2008-12-11 20:30:53 UTC (rev 284) @@ -34,8 +34,8 @@ * * returns given pointer or NULL on failure. */ -extern void* volume_readfromfork(volume* vol, void* buf, - hfsp_fork_raw* f, UInt32 block, +extern void* volume_readfromfork(volume* vol, void* buf, + hfsp_fork_raw* f, UInt32 block, UInt32 count, UInt8 forktype, UInt32 fileId); /* Fill a given buffer with the given block in volume. @@ -57,7 +57,7 @@ /* Read a raw hfsp_extent_rec from memory. */ extern void* volume_readextent(void *p, hfsp_extent_rec er); -/* Read fork information from raw memory */ +/* Read fork information from raw memory */ extern void* volume_readfork(void *p, hfsp_fork_raw* f); /* internal function used to create the extents btree, @@ -70,8 +70,8 @@ volume_create_extents_tree(vol); return vol->extents; } - + #ifdef DEBUG /* Print raw fork information to stdout */ void volume_print_fork(hfsp_fork_raw* f); Modified: openbios-devel/fs/hfsplus/libhfsp.c =================================================================== --- openbios-devel/fs/hfsplus/libhfsp.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfsplus/libhfsp.c 2008-12-11 20:30:53 UTC (rev 284) @@ -25,4 +25,4 @@ #include "openbios/config.h" #include "libhfsp.h" -const char *hfsp_error = "no error"; /* static error string */ +const char *hfsp_error = "no error"; /* static error string */ Modified: openbios-devel/fs/hfsplus/record.c =================================================================== --- openbios-devel/fs/hfsplus/record.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfsplus/record.c 2008-12-11 20:30:53 UTC (rev 284) @@ -6,7 +6,7 @@ * * Copyright (C) 2000 Klaus Halfmann <khalfmann(a)libra.de> * Original 1996-1998 Robert Leslie <rob(a)mars.org> - * Additional work by Brad Boyer (flar(a)pants.nu) + * Additional work by Brad Boyer (flar(a)pants.nu) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -52,7 +52,7 @@ /* check if keylenght was correct */ if (key_length != ((char*) p) - ((char*) check)) HFSP_ERROR(EINVAL, "Invalid key length in record_readkey"); - return p; + return p; fail: return NULL; } @@ -70,7 +70,7 @@ HFSP_ERROR(-1, "Invalid key length in record_extent_readkey"); key->file_id = bswabU32_inc(p); key->start_block = bswabU32_inc(p); - return p; + return p; fail: return NULL; } @@ -282,7 +282,7 @@ hfsp_cat_key* key2 = (hfsp_cat_key*) k2; int diff = key2->parent_cnid - key1->parent_cnid; if (!diff) // same parent - diff = fast_unicode_compare(&key1->name, &key2->name); + diff = fast_unicode_compare(&key1->name, &key2->name); return diff; } @@ -333,7 +333,7 @@ start = mid + 1; else if (comp < 0) end = mid; - else + else break; } if (!p) // Empty tree, fascinating ... @@ -349,7 +349,7 @@ if (!p) HFSP_ERROR(-1, "record_find_node: unexpected error"); } - + index = bswabU32_inc(p); node = btree_node_by_index(tree, index); } @@ -359,7 +359,7 @@ } /* search for the given key in the btree. - * + * * returns pointer to memory just after key or NULL * In any case *keyind recives the index where the * key was found (or could be inserted.) @@ -392,7 +392,7 @@ start = mid + 1; else if (comp < 0) end = mid; - else + else break; } if (!p) // Empty tree, fascinating ... @@ -408,7 +408,7 @@ } /* intialize the record by searching for the given key in the btree. - * + * * r is umodified on error. */ static int @@ -417,7 +417,7 @@ int keyind; UInt16 node_index; void *p = record_find_key(tree, key, &keyind, &node_index); - + if (p) { r -> tree = tree; @@ -438,14 +438,14 @@ * * forktype: either HFSP_EXTEND_DATA or HFSP_EXTEND_RSRC */ -int record_init_file(extent_record* r, btree* tree, +int record_init_file(extent_record* r, btree* tree, UInt8 forktype, UInt32 fileId, UInt32 blockindex) { int keyind; UInt16 node_index; hfsp_extent_key key = { 10, forktype, 0, fileId, blockindex }; void *p = record_find_key(tree, &key, &keyind, &node_index); - + if (p) { r -> tree = tree; @@ -466,7 +466,7 @@ int record_init_cnid(record* r, btree* tree, UInt32 cnid) { hfsp_cat_key thread_key; // the thread is the first record - + thread_key.key_length = 6; // null name (like '.' in unix ) thread_key.parent_cnid = cnid; thread_key.name.strlen = 0; @@ -486,7 +486,7 @@ *r = *parent; // The folder thread is in fact the first entry, like '.' return 0; } - HFSP_ERROR(EINVAL, + HFSP_ERROR(EINVAL, "record_init_parent: parent is neither folder nor folder thread."); fail: @@ -513,9 +513,9 @@ } return buf; } -/* move record foreward to next entry. +/* move record foreward to next entry. * - * In case of an error the value of *r is undefined ! + * In case of an error the value of *r is undefined ! */ int record_next(record* r) { @@ -523,10 +523,10 @@ UInt16 index = r->keyind +1; UInt32 parent; node_buf* buf = prepare_next(tree, r->node_index, &index); - + if (!buf) return ENOENT; // No (more) such file or directory - + parent = r->key.parent_cnid; if (record_init(r, tree, buf, index)) @@ -539,9 +539,9 @@ return 0; } -/* move record foreward to next extent record. +/* move record foreward to next extent record. * - * In case of an error the value of *r is undefined ! + * In case of an error the value of *r is undefined ! */ int record_next_extent(extent_record* r) { @@ -553,7 +553,7 @@ if (!buf) return ENOENT; // No (more) such file or directory - + file_id = r->key.file_id; fork_type = r->key.fork_type; @@ -569,13 +569,13 @@ } /* intialize the record by searching for the given string in the given folder. - * + * * parent and r may be the same. */ int record_init_string_parent(record* r, record* parent, char* name) { hfsp_cat_key key; - + if (parent->record.type == HFSP_FOLDER) key.parent_cnid = parent->record.u.folder.id; else if(parent->record.type == HFSP_FOLDER_THREAD) @@ -632,8 +632,8 @@ /* print the key of a record */ static void record_print_key(hfsp_cat_key* key) { - char buf[255]; // mh this _might_ overflow - unicode_uni2asc(buf, &key->name, 255); + char buf[255]; // mh this _might_ overflow + unicode_uni2asc(buf, &key->name, 255); printf("parent cnid : %ld\n", key->parent_cnid); printf("name : %s\n", buf); } @@ -687,7 +687,7 @@ printf( "fdLocation :\t"); record_print_Point(&finfo->fdLocation); printf("\nfdFldr :\t%d\n", finfo->fdFldr); } - + /* print extended File info */ static void record_print_FXInfo(FXInfo* xinfo) { @@ -695,7 +695,7 @@ // xinfo -> fdUnused; printf( "fdComment :\t%d\n", xinfo->fdComment); printf( "fdPutAway :\t%ld\n", xinfo->fdPutAway); -} +} /* print folder entry */ @@ -719,8 +719,8 @@ /* print info for a file or folder thread */ static void record_print_thread(hfsp_cat_thread* entry) { - char buf[255]; // mh this _might_ overflow - unicode_uni2asc(buf, &entry->nodeName, 255); + char buf[255]; // mh this _might_ overflow + unicode_uni2asc(buf, &entry->nodeName, 255); printf("parent cnid :\t%ld\n", entry->parentID); printf("name :\t%s\n" , buf); } Modified: openbios-devel/fs/hfsplus/unicode.c =================================================================== --- openbios-devel/fs/hfsplus/unicode.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfsplus/unicode.c 2008-12-11 20:30:53 UTC (rev 284) @@ -18,7 +18,7 @@ asc2uni( unsigned char *ustr, const char *astr, int maxlen ) { int len; - + if( maxlen <= 0 ) return 0; @@ -35,10 +35,10 @@ uni2asc( char *astr, const unsigned char *ustr, int ustrlen, int maxlen ) { int len; - + if( maxlen <= 0 ) return 0; - + for( len=0; ustrlen-- > 0 && len < maxlen-1 ; ustr += 2 ) { /* might be unrepresentable (or too complicated for us) */ if( ustr[0] || !ustr[1] ) @@ -70,7 +70,7 @@ static const UInt16 gLowerCaseTable[]; -SInt32 fast_unicode_compare ( const hfsp_unistr255 *ustr1, +SInt32 fast_unicode_compare ( const hfsp_unistr255 *ustr1, const hfsp_unistr255 *ustr2) { register UInt16 c1,c2; Modified: openbios-devel/fs/hfsplus/volume.c =================================================================== --- openbios-devel/fs/hfsplus/volume.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/hfsplus/volume.c 2008-12-11 20:30:53 UTC (rev 284) @@ -5,7 +5,7 @@ * * Copyright (C) 2000 Klaus Halfmann <khalfmann(a)libra.de> * Original work by 1996-1998 Robert Leslie <rob(a)mars.org> - * other work 2000 from Brad Boyer (flar(a)pants.nu) + * other work 2000 from Brad Boyer (flar(a)pants.nu) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,15 +36,15 @@ /* Fill a given buffer with the given block in volume. */ -int +int volume_readinbuf(volume * vol,void* buf, long block) { UInt16 blksize_bits; ASSERT( block < vol->maxblocks); - - blksize_bits = vol->blksize_bits; + + blksize_bits = vol->blksize_bits; block += vol->startblock; - if( os_seek(vol->os_fd, block, blksize_bits) == block) + if( os_seek(vol->os_fd, block, blksize_bits) == block) if( 1 == os_read(vol->os_fd, buf, 1, blksize_bits)) return 0; return -1; @@ -54,9 +54,9 @@ * * returns given pinter or NULL on failure. */ -void* -volume_readfromfork(volume* vol, void* buf, - hfsp_fork_raw* f, UInt32 block, +void* +volume_readfromfork(volume* vol, void* buf, + hfsp_fork_raw* f, UInt32 block, UInt32 count, UInt8 forktype, UInt32 fileId) { blockiter iter; @@ -71,7 +71,7 @@ if( volume_readinbuf(vol, cbuf, blockiter_curr(&iter))) return NULL; cbuf += vol->blksize; - if( count > 0 && blockiter_next(&iter)) + if( count > 0 && blockiter_next(&iter)) return NULL; } return buf; @@ -79,7 +79,7 @@ /* Read a raw hfsp_extent_rec from memory. - * + * * return pointer right after the structure. */ void* @@ -97,10 +97,10 @@ } /* Read a raw hfsp_fork from memory. - * + * * return pointer right after the structure. */ -void* +void* volume_readfork(void *p, hfsp_fork_raw* f) { f->total_size = bswabU64_inc(p); @@ -111,18 +111,18 @@ } /* Read the volume from the given buffer and swap the bytes. - * - * ToDo: add more consitency checks. + * + * ToDo: add more consitency checks. */ static int volume_readbuf(hfsp_vh* vh, char * p) { - if( (vh->signature = bswabU16_inc(p)) != HFSP_VOLHEAD_SIG) + if( (vh->signature = bswabU16_inc(p)) != HFSP_VOLHEAD_SIG) HFSP_ERROR(-1, "This is not a HFS+ volume"); vh->version = bswabU16_inc(p); - vh->attributes = bswabU32_inc(p); - vh->last_mount_vers = bswabU32_inc(p); + vh->attributes = bswabU32_inc(p); + vh->last_mount_vers = bswabU32_inc(p); vh->reserved = bswabU32_inc(p); vh->create_date = bswabU32_inc(p); vh->modify_date = bswabU32_inc(p); @@ -139,7 +139,7 @@ vh->next_cnid = bswabU32_inc(p); vh->write_count = bswabU32_inc(p); vh->encodings_bmp = bswabU64_inc(p); - memcpy(vh->finder_info, p, 32); + memcpy(vh->finder_info, p, 32); p += 32; // So finderinfo must be swapped later, *** p = volume_readfork(p, &vh->alloc_file ); p = volume_readfork(p, &vh->ext_file ); @@ -150,9 +150,9 @@ fail: return -1; } - + /* Read the volume from the given block */ -static int +static int volume_read(volume * vol, hfsp_vh* vh, UInt32 block) { char buf[vol->blksize]; @@ -163,7 +163,7 @@ } /* Find out wether the volume is wrapped and unwrap it eventually */ -static int +static int volume_read_wrapper(volume * vol, hfsp_vh* vh) { UInt16 signature; @@ -179,19 +179,19 @@ UInt32 sect_per_block; /* how may block build an hfs sector */ UInt16 drAlBlSt; /* first allocation block in volume */ UInt16 embeds, embedl; /* Start/lenght of embedded area in blocks */ - + p += 0x12; /* skip unneded HFS vol fields */ drAlBlkSiz = bswabU32_inc(p); /* offset 0x14 */ p += 0x4; /* skip unneded HFS vol fields */ drAlBlSt = bswabU16_inc(p); /* offset 0x1C */ - + p += 0x5E; /* skip unneded HFS vol fields */ signature = bswabU16_inc(p); /* offset 0x7C, drEmbedSigWord */ if( signature != HFSP_VOLHEAD_SIG) HFSP_ERROR(-1, "This looks like a normal HFS volume"); embeds = bswabU16_inc(p); embedl = bswabU16_inc(p); - sect_per_block = (drAlBlkSiz / HFSP_BLOCKSZ); + sect_per_block = (drAlBlkSiz / HFSP_BLOCKSZ); // end is absolute (not relative to HFS+ start) vol->maxblocks = embedl * sect_per_block; vol->startblock = drAlBlSt + embeds * sect_per_block; @@ -207,7 +207,7 @@ return -1; } - + /* Open the device, read and verify the volume header (and its backup) */ int @@ -223,12 +223,12 @@ vol->maxblocks = 3; /* this should be enough until we find the volume descriptor */ vol->extents = NULL; /* Thanks to Jeremias Sauceda */ - + btree_reset(&vol->catalog); vol->os_fd = os_fd; - // vol->maxblocks = os_seek(vol->os_fd, -1, HFSP_BLOCKSZ_BITS); - // This wont work for /dev/... but we do not really need it + // vol->maxblocks = os_seek(vol->os_fd, -1, HFSP_BLOCKSZ_BITS); + // This wont work for /dev/... but we do not really need it if( volume_read_wrapper(vol, &vol->vol)) return -1; @@ -249,17 +249,17 @@ shift++; } /* shift = 3 */ } - vol -> blksize_bits += shift; + vol -> blksize_bits += shift; vol -> blksize = 1 << vol->blksize_bits; vol -> startblock >>= shift; vol -> maxblocks = vol->vol.total_blocks; /* cant calculate via shift ? */ - + if( btree_init_cat(&vol->catalog, vol, &vol->vol.cat_file)) return -1; - + return 0; } - + /* Write back all data eventually cached and close the device */ int volume_close(volume* vol) @@ -274,7 +274,7 @@ /* internal fucntion used to create the extents btree, is called by inline function when needed */ -void +void volume_create_extents_tree(volume* vol) { btree* result = (btree*) ALLOC(btree*, sizeof(btree)); @@ -285,5 +285,5 @@ return; } fail: - vol->extents = NULL; + vol->extents = NULL; } Modified: openbios-devel/fs/ioglue.c =================================================================== --- openbios-devel/fs/ioglue.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/fs/ioglue.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2001/05/06 22:27:09 samuel> * Time-stamp: <2003/12/12 02:24:56 samuel> - * + * * <fs.c> - * + * * I/O API used by the filesystem code - * + * * Copyright (C) 2001, 2002, 2003 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #include "openbios/config.h" Modified: openbios-devel/include/a.out.h =================================================================== --- openbios-devel/include/a.out.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/a.out.h 2008-12-11 20:30:53 UTC (rev 284) @@ -63,7 +63,7 @@ #define NMAGIC 0410 /* Code indicating demand-paged executable. */ #define ZMAGIC 0413 -/* This indicates a demand-paged executable with the header in the text. +/* This indicates a demand-paged executable with the header in the text. The first page is unmapped to help trap NULL pointer references */ #define QMAGIC 0314 Modified: openbios-devel/include/amd64/io.h =================================================================== --- openbios-devel/include/amd64/io.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/amd64/io.h 2008-12-11 20:30:53 UTC (rev 284) @@ -7,9 +7,9 @@ #define virt_to_phys(virt) ((unsigned long) (virt) + virt_offset) #define __SLOW_DOWN_IO "outb %%al,$0x80;" -static inline void slow_down_io(void) +static inline void slow_down_io(void) { - __asm__ __volatile__( + __asm__ __volatile__( __SLOW_DOWN_IO #ifdef REALLY_SLOW_IO __SLOW_DOWN_IO __SLOW_DOWN_IO __SLOW_DOWN_IO Modified: openbios-devel/include/elf_boot.h =================================================================== --- openbios-devel/include/elf_boot.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/elf_boot.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,5 +1,5 @@ -#ifndef ELF_BOOT_H -#define ELF_BOOT_H +#ifndef ELF_BOOT_H +#define ELF_BOOT_H /* This defines the structure of a table of parameters useful for ELF @@ -34,7 +34,7 @@ Elf_Half b_records; } Elf_Bhdr; -/* +/* * ELF Notes. */ Modified: openbios-devel/include/ia64/io.h =================================================================== --- openbios-devel/include/ia64/io.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/ia64/io.h 2008-12-11 20:30:53 UTC (rev 284) @@ -7,9 +7,9 @@ #define virt_to_phys(virt) ((unsigned long) (virt) + virt_offset) #define __SLOW_DOWN_IO "outb %%al,$0x80;" -static inline void slow_down_io(void) +static inline void slow_down_io(void) { - __asm__ __volatile__( + __asm__ __volatile__( __SLOW_DOWN_IO #ifdef REALLY_SLOW_IO __SLOW_DOWN_IO __SLOW_DOWN_IO __SLOW_DOWN_IO @@ -46,7 +46,7 @@ BUILDIO(b,b,char) BUILDIO(w,w,short) BUILDIO(l,,int) -#else +#else extern u8 inb( u32 reg ); extern u16 inw( u32 reg ); extern u32 inl( u32 reg ); Modified: openbios-devel/include/libc/diskio.h =================================================================== --- openbios-devel/include/libc/diskio.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/libc/diskio.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/12/20 00:57:01 samuel> * Time-stamp: <2004/01/07 19:32:29 samuel> - * + * * <diskio.h> - * - * - * + * + * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #ifndef _H_DISKIO Modified: openbios-devel/include/libc/stdlib.h =================================================================== --- openbios-devel/include/libc/stdlib.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/libc/stdlib.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,16 +1,16 @@ -/* +/* * Creation Date: <2003/12/19 18:52:20 samuel> * Time-stamp: <2003/12/19 18:52:21 samuel> - * + * * <stdlib.h> - * - * + * + * * Copyright (C) 2003 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #ifndef _H_STDLIB Modified: openbios-devel/include/libc/string.h =================================================================== --- openbios-devel/include/libc/string.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/libc/string.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2002/10/12 20:41:57 samuel> * Time-stamp: <2003/10/25 12:51:22 samuel> - * + * * <string.h> - * + * * string library functions - * + * * Copyright (C) 2002, 2003 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #ifndef _H_STRING Modified: openbios-devel/include/libc/vsprintf.h =================================================================== --- openbios-devel/include/libc/vsprintf.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/libc/vsprintf.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/12/20 01:51:22 samuel> * Time-stamp: <2004/01/07 19:02:17 samuel> - * + * * <vsprintf.h> - * - * - * + * + * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #ifndef _H_VSPRINTF Modified: openbios-devel/include/mconfig.h =================================================================== --- openbios-devel/include/mconfig.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/mconfig.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,4 +1,4 @@ -/* +/* * We got rid of configure for now, and I hope it stays like this. * This file may have to be changed/reworked completely * Modified: openbios-devel/include/ofmem.h =================================================================== --- openbios-devel/include/ofmem.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/ofmem.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <1999/11/16 00:47:06 samuel> * Time-stamp: <2003/10/18 13:28:14 samuel> - * + * * <ofmem.h> - * - * - * + * + * + * * Copyright (C) 1999, 2002 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #ifndef _H_OFMEM Modified: openbios-devel/include/openbios/bindings.h =================================================================== --- openbios-devel/include/openbios/bindings.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/openbios/bindings.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/12/19 23:09:56 samuel> * Time-stamp: <2004/01/07 19:36:42 samuel> - * + * * <bindings.h> - * + * * Forth bindings - * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #ifndef _H_BINDINGS Modified: openbios-devel/include/openbios/config.h =================================================================== --- openbios-devel/include/openbios/config.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/openbios/config.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/12/20 00:07:16 samuel> * Time-stamp: <2004/01/19 17:40:26 stepan> - * + * * <config.h> - * - * - * + * + * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #ifndef _H_CONFIG Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/openbios/drivers.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,8 +1,8 @@ /* * OpenBIOS driver prototypes - * + * * (C) 2004 Stefan Reinauer <stepan(a)openbios.org> - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 Modified: openbios-devel/include/openbios/elfload.h =================================================================== --- openbios-devel/include/openbios/elfload.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/openbios/elfload.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2001/05/05 16:44:17 samuel> * Time-stamp: <2003/10/22 23:18:42 samuel> - * + * * <elfload.h> - * + * * Elf loader - * + * * Copyright (C) 2001, 2003 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #ifndef _H_ELFLOAD Modified: openbios-devel/include/openbios/fs.h =================================================================== --- openbios-devel/include/openbios/fs.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/openbios/fs.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2001/05/06 17:12:45 samuel> * Time-stamp: <2003/10/22 11:43:45 samuel> - * + * * <fs_loader.h> - * + * * Generic file system access - * + * * Copyright (C) 2001, 2002, 2003 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #ifndef _H_FS Modified: openbios-devel/include/openbios/kernel.h =================================================================== --- openbios-devel/include/openbios/kernel.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/openbios/kernel.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,18 +1,18 @@ -/* +/* * Creation Date: <2003/12/19 00:20:11 samuel> * Time-stamp: <2004/01/07 19:19:14 samuel> - * + * * <kernel.h> - * - * - * + * + * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) * Stefan Reinauer (stepan(a)openbios.org) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #ifndef _H_KERNEL Modified: openbios-devel/include/openbios/nvram.h =================================================================== --- openbios-devel/include/openbios/nvram.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/openbios/nvram.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/12/20 01:04:25 samuel> * Time-stamp: <2004/01/07 19:59:11 samuel> - * + * * <nvram.h> - * + * * arch NVRAM interface - * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #ifndef _H_NVRAM Modified: openbios-devel/include/openbios/of.h =================================================================== --- openbios-devel/include/openbios/of.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/openbios/of.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2004/01/07 19:19:18 samuel> * Time-stamp: <2004/01/07 19:19:48 samuel> - * + * * <of.h> - * + * * OpenFirmware related defines - * + * * Copyright (C) 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #ifndef _H_OF Modified: openbios-devel/include/ppc/asmdefs.h =================================================================== --- openbios-devel/include/ppc/asmdefs.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/ppc/asmdefs.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,18 +1,18 @@ -/* -*- asm -*- +/* -*- asm -*- * * Creation Date: <2001/02/03 19:38:07 samuel> * Time-stamp: <2003/07/08 18:55:50 samuel> - * + * * <asmdefs.h> - * + * * Common assembly definitions - * + * * Copyright (C) 2001, 2002, 2003 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #ifndef _H_ASMDEFS @@ -82,7 +82,7 @@ /* an underscore is needed on Darwin */ #define GLOBL( name ) .globl _##name ; name: ; _##name #define EXTERN( name ) _##name -#endif +#endif #define BIT(n) (1<<(31-(n))) Modified: openbios-devel/include/ppc/processor.h =================================================================== --- openbios-devel/include/ppc/processor.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/ppc/processor.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,16 +1,16 @@ -/* +/* * Creation Date: <2000/10/29 01:43:29 samuel> * Time-stamp: <2003/07/27 22:37:49 samuel> - * + * * <processor.h> - * + * * Extract from <asm/processor.h> - * - * + * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #ifndef _H_PROCESSOR @@ -144,7 +144,7 @@ #define S_PTELO 982 /* 7445/7455 */ #define S_L3PM 983 /* L3 Private Memory Address Control Register */ #define S_L3ITCR0 984 /* ??? */ -#define S_L3OHCR 1000 /* ??? */ +#define S_L3OHCR 1000 /* ??? */ #define S_L3ITCR1 1001 /* ??? */ #define S_L3ITCR2 1002 /* ??? */ #define S_L3ITCR3 1003 /* ??? */ Modified: openbios-devel/include/sys_info.h =================================================================== --- openbios-devel/include/sys_info.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/sys_info.h 2008-12-11 20:30:53 UTC (rev 284) @@ -29,6 +29,6 @@ /* Our name and version. I want to see single instance of these in the image */ extern const char *program_name, *program_version; -#define LOADER_NOT_SUPPORT 0xbadf11e +#define LOADER_NOT_SUPPORT 0xbadf11e #endif /* SYS_INFO_H */ Modified: openbios-devel/include/unix/plugin_pci.h =================================================================== --- openbios-devel/include/unix/plugin_pci.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/unix/plugin_pci.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,5 +1,5 @@ /* tag: openbios pci plugin headers - * + * * Copyright (C) 2003 Stefan Reinauer * * See the file "COPYING" for further information about Modified: openbios-devel/include/unix/plugins.h =================================================================== --- openbios-devel/include/unix/plugins.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/unix/plugins.h 2008-12-11 20:30:53 UTC (rev 284) @@ -21,7 +21,7 @@ #define PLUGIN_LICENSE(license) const char *plugin_license=license; #define PLUGIN_DESCRIPTION(desc) const char *plugin_description=desc; -int register_iorange(const char *name, io_ops_t *ops, +int register_iorange(const char *name, io_ops_t *ops, unsigned int rstart, unsigned int rend); io_ops_t *find_iorange(u32 reg); Modified: openbios-devel/include/x86/io.h =================================================================== --- openbios-devel/include/x86/io.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/include/x86/io.h 2008-12-11 20:30:53 UTC (rev 284) @@ -7,9 +7,9 @@ #define virt_to_phys(virt) ((unsigned long) (virt) + virt_offset) #define __SLOW_DOWN_IO "outb %%al,$0x80;" -static inline void slow_down_io(void) +static inline void slow_down_io(void) { - __asm__ __volatile__( + __asm__ __volatile__( __SLOW_DOWN_IO #ifdef REALLY_SLOW_IO __SLOW_DOWN_IO __SLOW_DOWN_IO __SLOW_DOWN_IO Modified: openbios-devel/kernel/bootstrap.c =================================================================== --- openbios-devel/kernel/bootstrap.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/kernel/bootstrap.c 2008-12-11 20:30:53 UTC (rev 284) @@ -104,20 +104,20 @@ ucell *reloc_table; int pos, bit; int l=(length+(sizeof(cell)-1))/sizeof(ucell), i; - + /* prepare relocation table */ relocation_length=(length+BITS-1)/BITS; reloc_table = malloc(relocation_length*sizeof(cell)); memset(reloc_table,0,relocation_length*sizeof(cell)); - + for (i=0; i<l; i++) { - + pos=i/BITS; bit=i&~(-BITS); - + if(d1[i]==d2[i]) { reloc_table[pos] &= target_ucell(~((ucell)1UL<<bit)); - + // This check might bring false positives in data. //if(d1[i] >= pointer2cell(dict_one) && // d1[i] <= pointer2cell(dict_one+length)) @@ -148,7 +148,7 @@ /* * get memory for dictionary */ - + write_len = sizeof(dictionary_header_t)+dicthead+relocation_length*sizeof(cell); write_data = malloc(write_len); if(!write_data) { @@ -157,11 +157,11 @@ exit(1); } memset(write_data, 0, write_len); - + /* - * prepare dictionary header + * prepare dictionary header */ - + header = (dictionary_header_t *)write_data; *header = (dictionary_header_t){ .signature = DICTID, @@ -185,15 +185,15 @@ /* * prepare dictionary data */ - + walk_data=write_data+sizeof(dictionary_header_t); memcpy (walk_data, dict, dicthead); - + /* - * prepare relocation data. + * prepare relocation data. * relocation_address is zero when writing a dictionary core. */ - + if (relocation_address) { #ifdef CONFIG_DEBUG_DICTIONARY printk("writing %d reloc cells \n",relocation_length); @@ -207,9 +207,9 @@ } else { header->relocation=0; } - + /* - * Calculate Checksum + * Calculate Checksum */ walk_data=write_data; @@ -218,11 +218,11 @@ walk_data+=sizeof(u32); } checksum=(u32)-checksum; - + header->checksum=target_long(checksum); - + dump_header(header); - + f = fopen(filename, "w"); if (!f) { printk("panic: can't write to dictionary '%s'.\n", filename); @@ -329,7 +329,7 @@ /* * parse_word is a small helper that skips whitespaces before a word. - * it's behaviour is similar to the forth version parse-word. + * it's behaviour is similar to the forth version parse-word. */ static void parse_word(FILE * f, char *line) @@ -381,7 +381,7 @@ printk("WARNING: tried to create unnamed word.\n"); return; } - + writestring(word); /* get us at least 1 byte for flags */ writebyte(0); @@ -479,8 +479,8 @@ exit(1); } - /* FIXME: We should read this file at - * once. No need to get it char by char + /* FIXME: We should read this file at + * once. No need to get it char by char */ while (!feof(f)) { @@ -655,7 +655,7 @@ else num = strtoul(tib, &test, read_ucell(base)); - + if (*test != 0) { /* what is it?? */ printk("%s is not defined.\n\n", tib); @@ -692,10 +692,10 @@ /* we need a temporary place for latest outside the dictionary */ latest = &lfa; - + /* starting a new dictionary: clear dicthead */ dicthead = 0; - + #ifdef CONFIG_DEBUG_DICTIONARY printk("building dictionary, %d primitives.\nbuilt words:", sizeof(wordnames) / sizeof(void *)); @@ -721,7 +721,7 @@ *latest = target_ucell(pointer2cell(latest)-2*sizeof(cell)); base=buildvariable("base", 10); - + buildconstant("/c", sizeof(u8)); buildconstant("/w", sizeof(u16)); buildconstant("/l", sizeof(u32)); @@ -759,12 +759,12 @@ int get_inputbyte( void ) { int tmp; - + if( cursrc < 1 ) { runforth = 0; return 0; } - + tmp = getc( srcfiles[cursrc-1] ); if (tmp != EOF) return tmp; @@ -810,14 +810,14 @@ exit(1); } -/* +/* * allocate memory and prepare engine for memory management. */ static void init_memory(void) { memset(memory, 0, MEMORY_SIZE); - + /* we push start and end of memory to the stack * so that it can be used by the forth word QUIT * to initialize the memory allocator. @@ -865,7 +865,7 @@ { FILE *file = fopen_include(name); int size; - + if( !file ) { printk("\npanic: Can't open '%s'\n", name ); exit(1); @@ -873,7 +873,7 @@ fseek( file, 0, SEEK_END ); size = ftell( file ); fseek( file, 0, SEEK_SET ); - + printk("\nEncoding %s [%d bytes]\n", name, size ); fread( dict + dicthead, size, 1, file ); PUSH( pointer2cell(dict + dicthead) ); @@ -912,7 +912,7 @@ static void new_dictionary(const char *source) { build_dictionary(); - + interpret_source((char *)source); printk("interpretion finished. %d errors occured.\n", @@ -1035,10 +1035,10 @@ /* - * Get all required resources + * Get all required resources */ - - + + ressources = malloc(MEMORY_SIZE + (2 * DICTIONARY_SIZE) + TRAMPOLINE_SIZE); if (!ressources) { printk("panic: not enough memory on host system.\n"); @@ -1048,13 +1048,13 @@ #ifdef NATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH base_address=(unsigned long)ressources; #endif - + memory = (ucell *)ressources; - + bootstrapdict[0] = ressources + MEMORY_SIZE; bootstrapdict[1] = ressources + MEMORY_SIZE + DICTIONARY_SIZE; trampoline = (ucell *)(ressources + MEMORY_SIZE + DICTIONARY_SIZE + DICTIONARY_SIZE); - + #ifdef CONFIG_DEBUG_INTERPRETER printf("memory: %p\n",memory); printf("dict1: %p\n",bootstrapdict[0]); @@ -1064,9 +1064,9 @@ DICTIONARY_SIZE) + TRAMPOLINE_SIZE, TRAMPOLINE_SIZE); #endif - + init_trampoline(); - + if (!segfault) { if (verbose) printk("Installing SIGSEGV handler..."); @@ -1079,11 +1079,11 @@ if (verbose) printk("done.\n"); } - + /* * Now do the real work */ - + for (cnt=0; cnt<2; cnt++) { printk("Compiling dictionary %d/%d\n", cnt+1, 2); dict=bootstrapdict[cnt]; @@ -1095,7 +1095,7 @@ run_dictionary(basedict); } - if(errors) + if(errors) break; } @@ -1108,7 +1108,7 @@ relocation_table( bootstrapdict[0], bootstrapdict[1], dicthead); write_dictionary( dictname ? dictname : "bootstrap.dict"); } - + free(ressources); return 0; } Modified: openbios-devel/kernel/cross.h =================================================================== --- openbios-devel/kernel/cross.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/kernel/cross.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,5 +1,5 @@ /* memory access abstraction layer for forth kernel - * + * * Copyright (C) 2005 Stefan Reinauer * * See the file "COPYING" for further information about @@ -9,7 +9,7 @@ #ifndef __CROSS_H #define __CROSS_H 1 -/* The forthstrap compiler has to abstract the underlying dictionary +/* The forthstrap compiler has to abstract the underlying dictionary * type: big/little endian, 32/64bit. All other binaries shall use * unchanged memory access for performance. */ Modified: openbios-devel/kernel/dict.c =================================================================== --- openbios-devel/kernel/dict.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/kernel/dict.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,6 +1,6 @@ /* * tag: dict management - * + * * Copyright (C) 2003-2005 Stefan Reinauer, Patrick Mauritz * * See the file "COPYING" for further information about @@ -39,7 +39,7 @@ /* lfa2cfa * converts a link field address to a code field address. - * in this forth implementation this is just a fixed offset + * in this forth implementation this is just a fixed offset */ static xt_t lfa2cfa(ucell ilfa) @@ -151,16 +151,16 @@ len -= sizeof(dictionary_header_t); dicthead = target_long(header->length); - + memcpy(dict, data, dicthead); reloc_table=(ucell *)(data+dicthead); #ifdef CONFIG_DEBUG_DICTIONARY - printk("\nmoving dictionary (%x bytes) to %x\n", + printk("\nmoving dictionary (%x bytes) to %x\n", (ucell)dicthead, (ucell)dict); printk("\ndynamic relocation..."); #endif - + for (walk = (ucell *) dict; walk < (ucell *) (dict + dicthead); walk++) { int pos, bit, l; Modified: openbios-devel/kernel/forth.c =================================================================== --- openbios-devel/kernel/forth.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/kernel/forth.c 2008-12-11 20:30:53 UTC (rev 284) @@ -778,7 +778,7 @@ /* - * unaligned-l! ( quad addr -- ) + * unaligned-l! ( quad addr -- ) */ static void unalignedlongwrite(void) Modified: openbios-devel/kernel/include/dict.h =================================================================== --- openbios-devel/kernel/include/dict.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/kernel/include/dict.h 2008-12-11 20:30:53 UTC (rev 284) @@ -37,7 +37,7 @@ ucell lfa2nfa(ucell ilfa); ucell load_dictionary(const char *data, ucell len); void dump_header(dictionary_header_t *header); - + /* program counter */ extern ucell PC; Modified: openbios-devel/kernel/internal.c =================================================================== --- openbios-devel/kernel/internal.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/kernel/internal.c 2008-12-11 20:30:53 UTC (rev 284) @@ -20,7 +20,7 @@ #ifdef FCOMPILER extern ucell *trampoline; #else -/* instead of pointing to an explicit 0 variable we +/* instead of pointing to an explicit 0 variable we * point behind the pointer. */ static ucell t[] = { DOCOL, 0, (ucell)(t+3), 0 }; @@ -98,7 +98,7 @@ * handle exceptions by returning immediately since the throw * is supposed to abort the execution of this C-code too. */ - + if( rstackcnt != tmp ) printk("EXCEPTION DETECTED!\n"); #endif @@ -157,7 +157,7 @@ } /* - * call ( ... function-ptr -- ??? ) + * call ( ... function-ptr -- ??? ) */ static void call(void) { @@ -172,7 +172,7 @@ #endif } -/* +/* * sys-debug ( errno -- ) */ Modified: openbios-devel/kernel/primitives.c =================================================================== --- openbios-devel/kernel/primitives.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/kernel/primitives.c 2008-12-11 20:30:53 UTC (rev 284) @@ -18,8 +18,8 @@ #include "cross.h" -/* - * Code Field Address (CFA) definitions (DOCOL and the like) +/* + * Code Field Address (CFA) definitions (DOCOL and the like) */ #include "internal.c" @@ -31,12 +31,12 @@ #include "forth.c" /* words[] is a function array of all native code functions in used by - * the dictionary, i.e. CFAs and primitives. - * Any change here needs a matching change in the primitive word's + * the dictionary, i.e. CFAs and primitives. + * Any change here needs a matching change in the primitive word's * name list that is kept for bootstrapping in arch/unix/unix.c * - * NOTE: THIS LIST SHALL NOT CHANGE (EXCEPT MANDATORY ADDITIONS AT - * THE END). ANY OTHER CHANGE WILL BREAK COMPATIBILITY TO OLDER + * NOTE: THIS LIST SHALL NOT CHANGE (EXCEPT MANDATORY ADDITIONS AT + * THE END). ANY OTHER CHANGE WILL BREAK COMPATIBILITY TO OLDER * BINARY DICTIONARIES. */ void * const words[] = { Modified: openbios-devel/libc/diskio.c =================================================================== --- openbios-devel/libc/diskio.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/libc/diskio.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/12/07 19:36:00 samuel> * Time-stamp: <2004/01/07 19:28:43 samuel> - * + * * <diskio.c> - * + * * I/O wrappers - * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -61,10 +61,10 @@ break; if(fd==MAX_FD) return -1; - + fdp = malloc( sizeof(*fdp) ); - /* Better clear the fd, as it - * contains valuable information + /* Better clear the fd, as it + * contains valuable information */ memset(fdp, 0, sizeof(*fdp)); fdp->ih = ih; @@ -82,15 +82,15 @@ int fd; ihandle_t ih = open_dev( spec ); priv_fd_t *fdp; - + if( !ih ) return -1; - + if( (fd=open_ih(ih)) == -1 ) { close_dev( ih ); return -1; } - + fdp = file_descriptors[fd]; fdp->do_close = 1; @@ -102,10 +102,10 @@ { priv_fd_t *fdp = file_descriptors[fd]; int ret; - + if( lookup_xt(fdp->ih, "reopen", &fdp->reopen_xt) ) return -1; - + push_str( filename ); call_package( fdp->reopen_xt, fdp->ih ); ret = (POP() == (ucell)-1)? 0 : -1; @@ -117,7 +117,7 @@ reopen_nwrom( int fd ) { priv_fd_t *fdp = file_descriptors[fd]; - + if( lookup_xt(fdp->ih, "open-nwrom", &fdp->open_nwrom_xt) ) return -1; call_package( fdp->open_nwrom_xt, fdp->ih ); @@ -166,12 +166,12 @@ { priv_fd_t *fdp = file_descriptors[fd]; ucell ret; - + PUSH( (ucell)buf ); PUSH( cnt ); call_package( fdp->read_xt, fdp->ih ); ret = POP(); - + if( !ret && cnt ) ret = -1; return ret; @@ -188,11 +188,11 @@ } llong -tell( int fd ) +tell( int fd ) { priv_fd_t *fdp = file_descriptors[fd]; llong offs; - + if( lookup_xt(fdp->ih, "tell", &fdp->tell_xt) ) return -1; call_package( fdp->tell_xt, fdp->ih ); Modified: openbios-devel/libc/extra.c =================================================================== --- openbios-devel/libc/extra.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/libc/extra.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/10/18 13:52:32 samuel> * Time-stamp: <2003/10/18 13:54:24 samuel> - * + * * <extra.c> - * + * * Libc extras - * + * * Copyright (C) 2003 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" Modified: openbios-devel/libc/misc.c =================================================================== --- openbios-devel/libc/misc.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/libc/misc.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2002/10/19 21:05:07 samuel> * Time-stamp: <2002/10/22 22:29:18 samuel> - * + * * <misc.c> - * + * * Miscellaneous - * + * * Copyright (C) 2002, 2003 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #include "openbios/config.h" Modified: openbios-devel/libc/vsprintf.c =================================================================== --- openbios-devel/libc/vsprintf.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/libc/vsprintf.c 2008-12-11 20:30:53 UTC (rev 284) @@ -216,7 +216,7 @@ /* get the precision */ precision = -1; if (*fmt == '.') { - ++fmt; + ++fmt; if (isdigit(*fmt)) precision = skip_atoi(&fmt); else if (*fmt == '*') { Modified: openbios-devel/modules/bindings.c =================================================================== --- openbios-devel/modules/bindings.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/modules/bindings.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/11/24 12:30:18 samuel> * Time-stamp: <2004/01/07 19:37:38 samuel> - * + * * <bindings.c> - * + * * Forth bindings - * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -297,10 +297,10 @@ get_property( phandle_t ph, const char *name, int *retlen ) { int len; - + if( retlen ) *retlen = -1; - + push_str( name ); PUSH_ph( ph ); fword("get-package-property"); @@ -316,7 +316,7 @@ get_int_property( phandle_t ph, const char *name, int *retlen ) { cell *p; - + if( !(p=(cell *)get_property(ph, name, retlen)) ) return 0; return __becell_to_cpu(*p); @@ -378,7 +378,7 @@ { if( !last ) return dt_iter_begin(); - + PUSH_ph( last ); fword("iterate-tree"); return POP_ph(); @@ -389,7 +389,7 @@ { if( !last ) last = dt_iter_begin(); - + /* root node is never matched but we don't care about that */ while( (last=dt_iterate(last)) ) { char *s = get_property( last, "device_type", NULL ); @@ -437,11 +437,11 @@ { xt_t xt=0; int i; - + /* nodes might be matched multiple times */ if( find_package_method(methods[0].name, get_cur_dev()) ) return; - + if( size ) { PUSH( size ); fword("is-ibuf"); @@ -477,7 +477,7 @@ { phandle_t save_ph = get_cur_dev(); int i; - + for( i=0; i<npaths; i++ ) { const char *name = paths[i]; @@ -512,7 +512,7 @@ const method_t *methods, int nmet ) { phandle_t save_ph = get_cur_dev(); - + /* create node */ push_str( name ); fword("create-node"); Modified: openbios-devel/modules/client.c =================================================================== --- openbios-devel/modules/client.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/modules/client.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,24 +1,24 @@ -/* +/* * Creation Date: <2003/11/25 14:29:08 samuel> * Time-stamp: <2004/03/27 01:13:53 samuel> - * + * * <client.c> - * + * * OpenFirmware client interface - * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" #include "openbios/bindings.h" #include "openbios/of.h" -/* OF client interface. r3 points to the argument array. On return, +/* OF client interface. r3 points to the argument array. On return, * r3 should contain 0==true or -1==false. r4-r12,cr0,cr1 may * be modified freely. * @@ -39,7 +39,7 @@ handle_calls( prom_args_t *pb ) { int i, dstacksave = dstackcnt; - + /* printk("%s ([%d] -- [%d])\n", pb->service, pb->nargs, pb->nret ); */ for( i=pb->nargs-1; i>=0; i-- ) @@ -59,11 +59,11 @@ #if 0 /* useful for debug but not necessarily an error */ if( i != pb->nret || dstacksave != dstacksave ) { - printk("%s '%s': possible argument error (%d--%d) got %d\n", + printk("%s '%s': possible argument error (%d--%d) got %d\n", pb->service, (char*)pb->args[0], pb->nargs-2, pb->nret, i ); } #endif - + dstackcnt = dstacksave; return 0; } @@ -81,12 +81,12 @@ for( i=0; i<pb->nargs; i++ ) printk("%lx ", pb->args[i] ); printk("\n"); -#endif +#endif /* call-method exceptions are special */ if( !strcmp("call-method", pb->service) || !strcmp("interpret", pb->service) ) return handle_calls( pb ); - + dstacksave = dstackcnt; for( i=0; i<pb->nargs; i++ ) PUSH( pb->args[i] ); @@ -104,9 +104,9 @@ for( i=0; i<pb->nret && dstackcnt > dstacksave ; i++ ) pb->args[pb->nargs + i] = POP(); - + if( i != pb->nret || dstackcnt != dstacksave ) { - printk("service %s: argument count error (%d %d)\n", + printk("service %s: argument count error (%d %d)\n", pb->service, i, dstackcnt - dstacksave ); dstackcnt = dstacksave; } Modified: openbios-devel/modules/cmdline.c =================================================================== --- openbios-devel/modules/cmdline.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/modules/cmdline.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/12/28 14:16:31 samuel> * Time-stamp: <2004/01/07 10:37:40 samuel> - * + * * <cmdline.c> - * + * * OpenFirmwware User Interface - * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -113,7 +113,7 @@ { char *p = ci->history; int len; - + while( n-- && p ) if( (p=strchr(p,'\n')) ) p++; @@ -133,7 +133,7 @@ history_remove( cmdline_info_t *ci, int line ) { char *s, *p = history_get( ci, line ); - + if( !p || !(s=strchr(p, '\n')) ) return 1; s++; @@ -145,13 +145,13 @@ add_to_history( cmdline_info_t *ci, char *str ) { int n, len; - + if( !ci->history ) return 0; len = strlen(str); if( !len ) return 0; - + /* make room for line in history */ for( ;; ) { char *p; @@ -159,7 +159,7 @@ if( n + len + 1 <= ci->hsize ) break; - + if( !(p=strrchr(ci->history,'\n')) ) return 0; *p = 0; @@ -182,7 +182,7 @@ buf = ci->buf; selfword("prepare"); - + emit('\n'); #ifdef NOLEAVE for (;;) @@ -191,13 +191,13 @@ #endif { int drop = 0; - + if( prompt ) { fword("print-prompt"); buf[0] = 0; cur_added = prompt = histind = pos = n = 0; } - + switch( (ch=key()) ) { case 27: switch( key() ) { @@ -312,7 +312,7 @@ fword("print-prompt"); move_cursor( pos-emit_str(buf) ); break; - + //case 66: /* down */ // drop = 1; case 14: /* ^n */ @@ -327,7 +327,7 @@ history_remove( ci, 0 ); } break; - + //case 65: /* up */ // drop = 1; case 16: /* ^p */ @@ -344,7 +344,7 @@ } if( (uint)ch < 32 ) drop = 1; - + if( !drop && n < ci->ncol ) { memmove( &buf[pos+1], &buf[pos], n+1-pos ); n++; Modified: openbios-devel/modules/console.c =================================================================== --- openbios-devel/modules/console.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/modules/console.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,15 +1,15 @@ -/* +/* * <console.c> - * + * * Simple text console - * + * * Copyright (C) 2002, 2003 Samuel Rydh (samuel(a)ibrium.se) * Copyright (C) 2005 Stefan Reinauer <stepan(a)openbios.org> - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #include "openbios/config.h" @@ -57,10 +57,10 @@ int x, y, xx, rskip, m; int invert = (h==cons.x && v==cons.y && cons.cursor_on); int ch = get_conschar( h, v ); - + while( h >= cons.w || v >= cons.h ) return; - + h *= FONT_WIDTH; v *= FONT_ADJ_HEIGHT; @@ -106,36 +106,36 @@ static void refresh( void ) { - int i; + int i; for( i=0; i<cons.h; i++ ) draw_line(i); } #endif static int -console_init( void ) +console_init( void ) { if( video_get_res(&cons.physw,&cons.physh) < 0 ) return -1; set_color( 0, 0 ); - + cons.w = cons.physw/FONT_WIDTH; cons.h = cons.physh/FONT_ADJ_HEIGHT; cons.buf = malloc( cons.w * cons.h ); - cons.inited = 1; + cons.inited = 1; cons.x = cons.y = 0; cons.vc_state = ESnormal; return 0; } void -console_close( void ) +console_close( void ) { if( !cons.inited ) - return; + return; free( cons.buf ); - cons.inited = 0; + cons.inited = 0; } static void Modified: openbios-devel/modules/deblocker.c =================================================================== --- openbios-devel/modules/deblocker.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/modules/deblocker.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/12/03 21:20:58 samuel> * Time-stamp: <2004/01/07 19:34:50 samuel> - * + * * <deblocker.c> - * + * * deblocker implementation - * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -81,7 +81,7 @@ RET(-1); di->mark_hi = pos_hi; di->mark_lo = pos_lo; - + /* 0,1 == success, -1 == error */ PUSH(0); } @@ -130,7 +130,7 @@ w[1].len = w[1].nblks * di->blksize; data += w[1].len; len -= w[1].len; - + w[2].blk_buf = di->buf; w[2].data = data; w[2].len = len; @@ -147,7 +147,7 @@ ducell mark = ((ducell)di->mark_hi << BITS) | di->mark_lo; /* printk("read: %x %x\n", (int)dest, len ); */ - + if( !xt ) return -1; @@ -162,7 +162,7 @@ DO_IO( di->read_xt, w[i].blk_buf, blk, w[i].nblks ); memcpy( w[i].blk_buf + w[i].offs, w[i].data, w[i].len ); } - + n = DO_IO( xt, w[i].blk_buf, blk, w[i].nblks ); if( n < 0 ) { if( !retlen ) @@ -208,7 +208,7 @@ { "open", deblk_open }, { "close", deblk_close }, { "read", deblk_read }, - { "write", deblk_write }, + { "write", deblk_write }, { "seek", deblk_seek }, { "tell", deblk_tell }, }; Modified: openbios-devel/modules/disk-label.c =================================================================== --- openbios-devel/modules/disk-label.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/modules/disk-label.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/12/03 22:10:45 samuel> * Time-stamp: <2004/01/07 19:17:45 samuel> - * + * * <disk-label.c> - * + * * Partition support - * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -21,7 +21,7 @@ typedef struct { int fd; - + ucell offs_hi, offs_lo; ucell size_hi, size_lo; int type; /* partition type or -1 */ @@ -85,7 +85,7 @@ PUSH( (ucell)block0 ); selfword("find-part-handler"); ph = POP_ph(); - + /* open partition package */ if( ph ) { xt_t xt; @@ -113,7 +113,7 @@ goto out; } success = 1; - + out: if( parstr ) free( parstr ); Modified: openbios-devel/modules/elfload.c =================================================================== --- openbios-devel/modules/elfload.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/modules/elfload.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,4 +1,4 @@ -/* Mac-on-Linux ELF loader +/* Mac-on-Linux ELF loader Copyright (C) 2001-2003 Samuel Rydh @@ -11,7 +11,7 @@ Copyright (C) 1999 Marius Vollmer portions based on quik - + Copyright (C) 1996 Paul Mackerras. Because this program is derived from the corresponding file in the @@ -44,12 +44,12 @@ find_elf( int fd ) { int size, offs; - + seek_io( fd, -1 ); size = tell( fd ); if( size > 0x10000 ) size = 0x10000; - + for( offs=0; offs < size; offs+= BS ) if( is_elf(fd, offs) ) return offs; @@ -82,18 +82,18 @@ { int size; Elf_phdr *ph; - + if( !is_elf(fd, offs) ) { printk("Not an ELF image\n"); return NULL; } - + seek_io( fd, offs ); if( read_io(fd, e, sizeof(*e)) != sizeof(*e) ) { printk("\nCan't read ELF image header\n"); return NULL; } - + #if DEBUG printk("ELF header:\n"); printk(" e.e_type = %d\n", (int)e->e_type); Modified: openbios-devel/modules/filesystems.c =================================================================== --- openbios-devel/modules/filesystems.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/modules/filesystems.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,18 +1,18 @@ -/* +/* * Creation Date: <2003/12/08 19:19:29 samuel> * Time-stamp: <2004/01/07 19:22:40 samuel> - * + * * <filesystems.c> - * + * * generic filesystem support node - * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) * Copyright (C) 2004 Stefan Reinauer - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -47,9 +47,9 @@ if( !err ) { err=fs_hfsp_open(fd, fs); if( err ) err = fs_hfs_open(fd, fs); - if( err ) err = fs_grubfs_open(fd, fs); + if( err ) err = fs_grubfs_open(fd, fs); } - + fs->fd = fd; if( err ) { @@ -76,7 +76,7 @@ { fs_ops_t *fs = do_open( my_parent() ); char *name; - + if( !fs ) RET( 0 ); @@ -90,7 +90,7 @@ /* printk("PATH: %s\n", fs->get_path(mi->file, mi->pathbuf, PATHBUF_SIZE) ); */ } mi->fs = fs; - + if( name ) free( name ); @@ -110,7 +110,7 @@ /* ( file-str len -- success? ) */ static void -files_reopen( files_info_t *mi ) +files_reopen( files_info_t *mi ) { file_desc_t *file = NULL; char *name = pop_fstr_copy(); @@ -145,14 +145,14 @@ if( !mi->volname ) mi->volname = malloc( VOLNAME_SIZE ); - + ret = mi->fs->vol_name( mi->fs, mi->volname, VOLNAME_SIZE ); PUSH( (ucell)ret ); } /* ( -- success? ) */ static void -files_open_nwrom( files_info_t *mi ) +files_open_nwrom( files_info_t *mi ) { file_desc_t *file = fs_search_rom( mi->fs ); do_reopen( mi, file ); @@ -180,7 +180,7 @@ int len = POP(); char *buf = (char*)POP(); int ret; - + if( mi->file ) { ret = mi->fs->read( mi->file, buf, len ); mi->filepos += ret; @@ -204,7 +204,7 @@ { llong pos = DPOP(); cell ret; - + if( mi->file ) { int offs = (int)pos; int whence = SEEK_SET; @@ -266,17 +266,17 @@ { "open", files_open }, { "close", files_close }, { "read", files_read }, - { "write", files_write }, + { "write", files_write }, { "seek", files_seek }, { "tell", files_tell }, - + /* special */ { "reopen", files_reopen }, { "open-nwrom", files_open_nwrom }, { "get-path", files_get_path }, { "get-fstype", files_get_fstype }, { "volume-name", files_volume_name }, - + { NULL, files_initializer }, }; Modified: openbios-devel/modules/init.c =================================================================== --- openbios-devel/modules/init.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/modules/init.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/12/23 00:28:05 samuel> * Time-stamp: <2003/12/28 19:43:41 samuel> - * + * * <init.c> - * + * * Module intialization - * + * * Copyright (C) 2003 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -26,7 +26,7 @@ #endif #ifdef CONFIG_DEBLOCKER deblocker_init(); -#endif +#endif #ifdef CONFIG_DISK_LABEL disklabel_init(); #endif Modified: openbios-devel/modules/ipchecksum.c =================================================================== --- openbios-devel/modules/ipchecksum.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/modules/ipchecksum.c 2008-12-11 20:30:53 UTC (rev 284) @@ -41,7 +41,7 @@ sum = ~sum & 0xFFFF; new = ~new & 0xFFFF; if (offset & 1) { - /* byte swap the sum if it came from an odd offset + /* byte swap the sum if it came from an odd offset * since the computation is endian independant this * works. */ Modified: openbios-devel/modules/linuxbios.c =================================================================== --- openbios-devel/modules/linuxbios.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/modules/linuxbios.c 2008-12-11 20:30:53 UTC (rev 284) @@ -11,7 +11,7 @@ #ifdef CONFIG_DEBUG_BOOT #define debug printk #else -#define debug(x...) +#define debug(x...) #endif #define for_each_lbrec(head, rec) \ @@ -19,7 +19,7 @@ (((char *)rec) < (((char *)head) + sizeof(*head) + head->table_bytes)) && \ (rec->size >= 1) && \ ((((char *)rec) + rec->size) <= (((char *)head) + sizeof(*head) + head->table_bytes)); \ - rec = (struct lb_record *)(((char *)rec) + rec->size)) + rec = (struct lb_record *)(((char *)rec) + rec->size)) static void convert_memmap(struct lb_memory *lbmem, struct sys_info *info) { @@ -67,7 +67,7 @@ count = 0; end = ((char *)start) + length; for(rec = start; ((void *)rec < end) && - ((signed long)rec->size <= (end - (void *)rec)); + ((signed long)rec->size <= (end - (void *)rec)); rec = (void *)(((char *)rec) + rec->size)) { count++; } @@ -80,7 +80,7 @@ /* For now be stupid.... */ for(ptr = start; (void *)ptr < end; ptr += 16) { struct lb_header *head = (struct lb_header *)ptr; - if ( (head->signature[0] != 'L') || + if ( (head->signature[0] != 'L') || (head->signature[1] != 'B') || (head->signature[2] != 'I') || (head->signature[3] != 'O')) { @@ -89,7 +89,7 @@ if (head->header_bytes != sizeof(*head)) continue; debug("Found canidate at: %p\n", head); - if (ipchksum((uint16_t *)head, sizeof(*head)) != 0) + if (ipchksum((uint16_t *)head, sizeof(*head)) != 0) continue; debug("header checksum o.k.\n"); if (ipchksum((uint16_t *)(ptr + sizeof(*head)), head->table_bytes) != Modified: openbios-devel/modules/linuxbios.h =================================================================== --- openbios-devel/modules/linuxbios.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/modules/linuxbios.h 2008-12-11 20:30:53 UTC (rev 284) @@ -6,7 +6,7 @@ * is expected to be information that cannot be discovered by * other means, such as quering the hardware directly. * - * All of the information should be Position Independent Data. + * All of the information should be Position Independent Data. * That is it should be safe to relocated any of the information * without it's meaning/correctnes changing. For table that * can reasonably be used on multiple architectures the data @@ -62,7 +62,7 @@ #define LB_MEM_RAM 1 /* Memory anyone can use */ #define LB_MEM_RESERVED 2 /* Don't use this memory region */ #define LB_MEM_TABLE 16 /* Ram configuration tables are kept in */ - + }; struct lb_memory { @@ -128,7 +128,7 @@ uint32_t config; /* e=enumeration, h=hex, r=reserved */ uint32_t config_id; /* a number linking to an enumeration record */ #define CMOS_MAX_NAME_LENGTH 32 - uint8_t name[CMOS_MAX_NAME_LENGTH]; /* name of entry in ascii, + uint8_t name[CMOS_MAX_NAME_LENGTH]; /* name of entry in ascii, variable length int aligned */ }; @@ -144,7 +144,7 @@ uint32_t config_id; /* a number identifying the config id */ uint32_t value; /* the value associated with the text */ #define CMOS_MAX_TEXT_LENGTH 32 - uint8_t text[CMOS_MAX_TEXT_LENGTH]; /* enum description in ascii, + uint8_t text[CMOS_MAX_TEXT_LENGTH]; /* enum description in ascii, variable length int aligned */ }; Modified: openbios-devel/modules/mac-parts.c =================================================================== --- openbios-devel/modules/mac-parts.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/modules/mac-parts.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/12/04 17:07:05 samuel> * Time-stamp: <2004/01/07 19:36:09 samuel> - * + * * <mac-parts.c> - * + * * macintosh partition support - * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -89,7 +89,7 @@ if( par.pmSig != 0x504d /* 'PM' */ || !par.pmPartBlkCnt ) RET(0); - + di->offs = (llong)par.pmPyPartStart * bs; di->size = (llong)par.pmPartBlkCnt * bs; Modified: openbios-devel/modules/mac-parts.h =================================================================== --- openbios-devel/modules/mac-parts.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/modules/mac-parts.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <1999/07/06 15:45:12 samuel> * Time-stamp: <2002/10/20 16:31:48 samuel> - * + * * <partition_table.h> - * + * * Headers describing the partition table - * + * * Copyright (C) 1999, 2002 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #ifndef _H_PARTITION_TABLE @@ -51,7 +51,7 @@ ulong pmPartBlkCnt; /* #blocks in partition */ char pmPartName[32]; /* partition name */ char pmPartType[32]; /* partition type */ - + /* these fields may or may not be used */ ulong pmLgDataStart; ulong pmDataCnt; Modified: openbios-devel/modules/modules.h =================================================================== --- openbios-devel/modules/modules.h 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/modules/modules.h 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/12/23 00:32:12 samuel> * Time-stamp: <2003/12/28 14:47:02 samuel> - * + * * <modules.h> - * + * * Module initialization - * + * * Copyright (C) 2003 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #ifndef _H_MODULES Modified: openbios-devel/modules/nvram.c =================================================================== --- openbios-devel/modules/nvram.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/modules/nvram.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2003/12/01 00:26:13 samuel> * Time-stamp: <2004/01/07 19:59:53 samuel> - * + * * <nvram.c> - * + * * medium-level NVRAM handling - * + * * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -65,7 +65,7 @@ val = (val - 256 + 1) & 0xff; } return val; -} +} static inline int nvpart_size( nvpart_t *p ) @@ -114,11 +114,11 @@ { nvpart_t *p = NULL; int fs; - + while( next_nvpart(&p) > 0 ) { if( p->signature != NV_SIG_FREE ) continue; - + fs = nvpart_size( p ); if( fs < size ) size = fs; @@ -151,7 +151,7 @@ { nvpart_t *p = NULL; char buf[13]; - + while( next_nvpart(&p) > 0 ) { memcpy( buf, p->name, sizeof(p->name) ); buf[12] = 0; @@ -174,11 +174,11 @@ nvconf_init( void ) { int once=0; - + /* initialize nvram structure completely */ nvram.config = NULL; nvram.config_size = 0; - + nvram.size = arch_nvram_size(); nvram.data = malloc( nvram.size ); arch_nvram_get( nvram.data ); @@ -197,7 +197,7 @@ if( p->signature == NV_SIG_SYSTEM ) { nvram.config = p; nvram.config_size = nvpart_size(p) - 0x10; - + if( !once++ ) { PUSH( (ucell)p->data ); PUSH( nvram.config_size ); @@ -300,6 +300,6 @@ nvram_init( char *path ) { nvconf_init(); - + REGISTER_NAMED_NODE( nvram, path ); } Modified: openbios-devel/modules/pc-parts.c =================================================================== --- openbios-devel/modules/pc-parts.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/modules/pc-parts.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,15 +1,15 @@ -/* +/* * pc partition support - * + * * Copyright (C) 2004 Stefan Reinauer * - * This code is based (and copied in many places) from + * This code is based (and copied in many places) from * mac partition support by Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -83,12 +83,12 @@ printk("pc partition magic not found.\n"); RET(0); } - + /* get partition data */ p = (struct pc_partition *) (buf + 0x1be); bs=512; - + if (parnum < 4) { /* primary partition */ p += parnum; @@ -101,27 +101,27 @@ /* printk("Primary partition at sector %x\n", __le32_to_cpu(*((u32 *)p->start_sect))); */ - + RET( -1 ); } else { /* Extended partition */ int i, cur_part; unsigned long ext_start, cur_table; - + /* Search for the extended partition * which contains logical partitions */ for (i = 0; i < 4; i++) { if (is_pc_extended_part(p[i].type)) break; } - + if (i >= 4) { printk("Extended partition not found\n"); RET( 0 ); } - + printk("Extended partition at %d\n", i+1); - + /* Visit each logical partition labels */ ext_start = __le32_to_cpu(*((u32 *)p[i].start_sect)); cur_table = ext_start; @@ -129,7 +129,7 @@ for (;;) { /* printk("cur_part=%d at %x\n", cur_part, cur_table); */ - + SEEK( cur_table*bs ); if( READ(buf, sizeof(512)) != sizeof(512) ) RET( 0 ); @@ -138,7 +138,7 @@ printk("Extended partition has no magic\n"); break; } - + p = (struct pc_partition *) (buf + 0x1be); /* First entry is the logical partition */ if (cur_part == parnum) { @@ -151,7 +151,7 @@ di->size = (llong)__le32_to_cpu(*((u32 *)p->nr_sects)) * bs; RET ( -1 ); } - + /* Second entry is link to next partition */ if (!is_pc_extended_part(p[1].type)) { printk("no link\n"); @@ -172,7 +172,7 @@ pcparts_probe( pcparts_info_t *dummy ) { unsigned char *buf = (unsigned char *)POP(); - + RET ( has_pc_part_magic(buf) ); } Modified: openbios-devel/modules/sun-parts.c =================================================================== --- openbios-devel/modules/sun-parts.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/modules/sun-parts.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,15 +1,15 @@ -/* +/* * Sun (Sparc32/64) partition support - * + * * Copyright (C) 2004 Stefan Reinauer * - * This code is based (and copied in many places) from + * This code is based (and copied in many places) from * mac partition support by Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #include "openbios/config.h" @@ -106,7 +106,7 @@ parnum = str[0] - 'a'; else parnum = atol(str); - + free( str ); } @@ -156,7 +156,7 @@ sunparts_probe( __attribute__((unused))sunparts_info_t *dummy ) { unsigned char *buf = (unsigned char *)POP(); - + RET ( has_sun_part_magic(buf) ); } Modified: openbios-devel/modules/video.c =================================================================== --- openbios-devel/modules/video.c 2008-12-11 17:10:03 UTC (rev 283) +++ openbios-devel/modules/video.c 2008-12-11 20:30:53 UTC (rev 284) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2002/10/23 20:26:40 samuel> * Time-stamp: <2004/01/07 19:39:15 samuel> - * + * * <video.c> - * + * * Mac-on-Linux display node - * + * * Copyright (C) 2002, 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation - * + * */ #include "openbios/config.h" @@ -57,7 +57,7 @@ return; *(!i ? &width : &height) = atol(buf); } - + if( (s=width * height * 3) > 0x20000 ) return; @@ -69,9 +69,9 @@ dx = (video.fb.w - width)/2; dy = (video.fb.h - height)/3; - + pp = (char*)video.fb.mphys + dy * video.fb.rb + dx * (video.fb.depth >= 24 ? 4 : 2); - + for( y=0 ; y<height; y++, pp += video.fb.rb ) { if( video.fb.depth >= 24 ) { ulong *d = (ulong*)pp; @@ -109,7 +109,7 @@ return 0; } -void +void draw_pixel( int x, int y, int colind ) { char *p = (char*)video.fb.mphys + video.fb.rb * y; @@ -221,7 +221,7 @@ int w, h; (void) video_get_res( &w, &h ); PUSH( w ); - PUSH( h ); + PUSH( h ); } /* ( table start count -- ) (?) */ @@ -263,7 +263,7 @@ int y = POP(); int x = POP(); int color_ind = POP(); - + fill_rect( color_ind, x, y, w, h ); } @@ -328,12 +328,12 @@ for( i=0; i<256; i++ ) set_color( i, i * 0x010101 ); - + set_color( 254, 0xffffcc ); fill_rect( 254, 0, 0, video.fb.w, video.fb.h ); refresh_palette(); startup_splash(); - REGISTER_NODE( video ); + REGISTER_NODE( video ); }

1 0

r283 - openbios-devel/arch/sparc64
by svn＠openbios.org 11 Dec '08

11 Dec '08

Author: blueswirl Date: 2008-12-11 18:10:03 +0100 (Thu, 11 Dec 2008) New Revision: 283 Modified: openbios-devel/arch/sparc64/openbios.c Log: Fix fake CPU ID value (Igor Kovalenko) Small correction: cpuid property of qemu cpu should be "0" for the linux kernel to boot on qemu. This is because kernel is reading cpu registers to find out current smp processor ID and it happens to find out "0" cpuid because corresponding register is zeroed by qemu. Currently kernel fails since there is no "0" cpu node in tree. Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-12-05 18:32:39 UTC (rev 282) +++ openbios-devel/arch/sparc64/openbios.c 2008-12-11 17:10:03 UTC (rev 283) @@ -424,7 +424,7 @@ push_str("sparc-version"); fword("property"); - PUSH(1); + PUSH(0); fword("encode-int"); push_str("cpuid"); fword("property");

1 0