OpenBIOS December 2008

openbios@openbios.org

8 participants
78 discussions

[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