OpenBIOS February 2009

openbios@openbios.org

15 participants
46 discussions

Re: [OpenBIOS] [coreboot] OpenBIOS SVN r416 breaks coreboot-v3
by Mark Cave-Ayland 14 Feb '09

14 Feb '09

Blue Swirl wrote: > How about this patch instead? Unfortunately no - qemu trunk still panics with "qemu: hardware error: register_ioport_write: invalid opaque". Some extra debugging shows that the IO address causing the problem in qemu is still 0x510 :( ATB, Mark. -- Mark Cave-Ayland Sirius Corporation - The Open Source Experts http://www.siriusit.co.uk T: +44 870 608 0063

1 0

r451 - openbios-devel/arch/sparc32
by svn＠openbios.org 12 Feb '09

12 Feb '09

Author: blueswirl Date: 2009-02-12 20:39:47 +0100 (Thu, 12 Feb 2009) New Revision: 451 Modified: openbios-devel/arch/sparc32/ldscript openbios-devel/arch/sparc32/openbios.c Log: Increase Forth memory for FCode tables Modified: openbios-devel/arch/sparc32/ldscript =================================================================== --- openbios-devel/arch/sparc32/ldscript 2009-02-08 15:45:15 UTC (rev 450) +++ openbios-devel/arch/sparc32/ldscript 2009-02-12 19:39:47 UTC (rev 451) @@ -12,7 +12,8 @@ /* 16KB stack */ STACK_SIZE = 16384; -VMEM_SIZE = (256 + 256 + 16) * 1024; +/* 256k general alloc + 256k Forth dictionary + 128k Forth memory */ +VMEM_SIZE = (256 + 256 + 128) * 1024; IOMEM_SIZE = 256 * 1024 + 768 * 1024; SECTIONS Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2009-02-08 15:45:15 UTC (rev 450) +++ openbios-devel/arch/sparc32/openbios.c 2009-02-12 19:39:47 UTC (rev 451) @@ -20,7 +20,7 @@ #include "boot.h" #include "video_subr.h" -#define MEMORY_SIZE (16*1024) /* 16K ram for hosted system */ +#define MEMORY_SIZE (128*1024) /* 16K ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ static ucell *memory;

1 0

Re: [OpenBIOS] [coreboot] OpenBIOS SVN r416 breaks coreboot-v3
by Mark Cave-Ayland 12 Feb '09

12 Feb '09

Blue Swirl wrote: > Would this patch fix the problem? Yes. Applying this patch to OpenBIOS trunk allows QEMU SVN to run a coreboot-v3/openbios SVN payload correctly without a panic. Many thanks, Mark. -- Mark Cave-Ayland Sirius Corporation - The Open Source Experts http://www.siriusit.co.uk T: +44 870 608 0063

2 4

How does one use the partition access functions
by lsorense＠csclub.uwaterloo.ca 09 Feb '09

09 Feb '09

I see there are functions for accessing partition info in modules/mac-parts.[ch] among others. I do not see any of the code using any of these functions however. I am trying to fix booting on powermac's under qemu so that it actually looks at each partition entry and determines if it is flagged as bootable, and if so looks at the load size and load address specified there and boots that. The idea is to replace the broken quik boot code, with something that actually does what the boot loader says to do, not what the openbios assumes it wants to do. Does anyone have any hint as to how to actually use these nice partition access functions so I can look at each partition table entry until I find the bootable one (if any)? -- Len Sorensen

3 6

r450 - openbios-devel/fs/grubfs
by svn＠openbios.org 08 Feb '09

08 Feb '09

Author: blueswirl Date: 2009-02-08 16:45:15 +0100 (Sun, 08 Feb 2009) New Revision: 450 Modified: openbios-devel/fs/grubfs/fsys_iso9660.c openbios-devel/fs/grubfs/iso9660.h Log: Fix endianess bug in Rock Ridge extensions Modified: openbios-devel/fs/grubfs/fsys_iso9660.c =================================================================== --- openbios-devel/fs/grubfs/fsys_iso9660.c 2009-02-08 12:22:04 UTC (rev 449) +++ openbios-devel/fs/grubfs/fsys_iso9660.c 2009-02-08 15:45:15 UTC (rev 450) @@ -192,16 +192,16 @@ rr_ptr.rr->signature >> 8); #endif } - else if (rr_ptr.rr->signature == RRMAGIC('R', 'R') + else if (CHECK2(&rr_ptr.rr->signature, 'R', 'R') && rr_ptr.rr->len >= 5) rr_flag &= rr_ptr.rr->u.rr.flags.ENDIAN; - else if (rr_ptr.rr->signature == RRMAGIC('N', 'M')) + else if (CHECK2(&rr_ptr.rr->signature, 'N', 'M')) { name = (char *)rr_ptr.rr->u.nm.name; name_len = rr_ptr.rr->len - 5; rr_flag &= ~RR_FLAG_NM; } - else if (rr_ptr.rr->signature == RRMAGIC('P', 'X') + else if (CHECK2(&rr_ptr.rr->signature, 'P', 'X') && rr_ptr.rr->len >= 36) { file_type = ((rr_ptr.rr->u.px.mode.ENDIAN & POSIX_S_IFMT) @@ -212,7 +212,7 @@ ? ISO_DIRECTORY : ISO_OTHER)); rr_flag &= ~RR_FLAG_PX; } - else if (rr_ptr.rr->signature == RRMAGIC('C', 'E') + else if (CHECK2(&rr_ptr.rr->signature, 'C', 'E') && rr_ptr.rr->len >= 28) ce_ptr = rr_ptr.rr; if (!rr_flag) Modified: openbios-devel/fs/grubfs/iso9660.h =================================================================== --- openbios-devel/fs/grubfs/iso9660.h 2009-02-08 12:22:04 UTC (rev 449) +++ openbios-devel/fs/grubfs/iso9660.h 2009-02-08 15:45:15 UTC (rev 450) @@ -157,10 +157,9 @@ int i; } RR_ptr_t; -#define RRMAGIC(c1, c2) ((c1)|(c2) << 8) - -#define CHECK2(ptr, c1, c2) \ - (*(ptr) == (c1) && *(ptr + 1) == (c2)) +#define CHECK2(ptr, c1, c2) \ + (*(unsigned char *)(ptr) == (c1) && \ + *((unsigned char *)(ptr) + 1) == (c2)) #define CHECK4(ptr, c1, c2, c3, c4) \ (*(unsigned char *)(ptr) == (c1) && \ *((unsigned char *)(ptr) + 1) == (c2) && \

1 0

Re: [OpenBIOS] [Qemu-devel] [PATCH, RFC] Mac99 (CHRP?) support
by Aurelien Jarno 08 Feb '09

08 Feb '09

On Sat, Feb 07, 2009 at 11:05:52PM +0200, Blue Swirl wrote: > On 2/7/09, Blue Swirl <blauwirbel(a)gmail.com> wrote: > > On 2/7/09, Aurelien Jarno <aurelien(a)aurel32.net> wrote: > > > On Sat, Feb 07, 2009 at 01:38:58PM +0200, Blue Swirl wrote: > > > > Hi, > > > > > > Hi! > > > > > > > This set of patches adds basic support for Mac99 Qemu machine, > > > > > > > > > As you ask the question in the subject, this machine is a NewWorld > > > machine, and not a CHRP one. I think we don't really want to provide a > > > CHRP emulated machine, so the best is probably to rename ppc_chrp.c into > > > ppc_newworld.c. > > > > > > True. I think RS6000 series were closest to CHRP, not iMac. > > > > The rename does not affect OHW status, so it could be done immediately. > > > > > > > > provided by ppc_chrp.c. I've used the device tree of iMac DV ('99) as > > > > reference: > > > > http://penguinppc.org/historical/dev-trees-html/imac-dv-99.html > > > > > > > > The patches changes the machine to use OpenBIOS instead of OHW and > > > > otherwise breaks OHW assumptions. On OpenBIOS side there are still > > > > some missing bits. > > > > > > > > Comments welcome. > > > > > > > > > Great work. > > > > > > I gave a quick look at the patches, they looks fine. However I still > > > experience some problem with the PowerMac IDE emulation, especially with > > > recent kernels, so until it is fixed (Laurent is working on that) I > > > think we should keep the CMD646 as a default. > > > > > > OK¸ I'll change that part and send new patches. > > This new set of patches perform the rename (to be replaced with SVN > operation). CMD646 is used instead of pmac ide. > > Debian 4.0 R6 cd image boots, installer starts but keyboard does not > work (probably because OpenBIOS doesn't advertise OpenPic). That may be the problem. Alternatively, note that NewWorld machine are not suppose to support ADB bus, so maybe the kernel is disabling that part. We should switch the keyboard and the mouse to USB as on real machines. We already have the code on the QEMU side, so it should be easy. On the OpenBIOS side the code to support an USB keyboard is probably more complicated. > The 6th patch is not wanted, it just switches CMD646 back to pmac, but > it's there if someone wants to play. > > Should these be committed or do we want to wait for more OpenBIOS > updates? At least the OpenBIOS patch, patch #0 and patch #5 are > harmless. For QEMU, I think there is no problem with that. For OpenBIOS, I think as long as the patches don't break the OldWorld platform, they can be applied. -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien(a)aurel32.net http://www.aurel32.net

2 1

r449 - in openbios-devel: arch/ppc/qemu drivers
by svn＠openbios.org 08 Feb '09

08 Feb '09

Author: blueswirl Date: 2009-02-08 13:22:04 +0100 (Sun, 08 Feb 2009) New Revision: 449 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/ldscript openbios-devel/drivers/macio.c openbios-devel/drivers/macio.h openbios-devel/drivers/pci.c openbios-devel/drivers/pci_database.c openbios-devel/drivers/pci_database.h Log: Add basic Mac99 machine support Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2009-02-05 21:37:26 UTC (rev 448) +++ openbios-devel/arch/ppc/qemu/init.c 2009-02-08 12:22:04 UTC (rev 449) @@ -462,12 +462,12 @@ /* model */ - push_str("PowerMac1,1"); + push_str("PowerMac2,1"); fword("model"); /* compatible */ - push_str("PowerMac1,1"); + push_str("PowerMac2,1"); fword("encode-string"); push_str("MacRISC"); fword("encode-string"); Modified: openbios-devel/arch/ppc/qemu/ldscript =================================================================== --- openbios-devel/arch/ppc/qemu/ldscript 2009-02-05 21:37:26 UTC (rev 448) +++ openbios-devel/arch/ppc/qemu/ldscript 2009-02-08 12:22:04 UTC (rev 449) @@ -7,7 +7,7 @@ /* As NVRAM is at 0xfff04000, the .text needs to be after that */ -TEXT_ADDR = 0xfff06000; +TEXT_ADDR = 0xfff08000; /* Hard reset vector address */ Modified: openbios-devel/drivers/macio.c =================================================================== --- openbios-devel/drivers/macio.c 2009-02-05 21:37:26 UTC (rev 448) +++ openbios-devel/drivers/macio.c 2009-02-08 12:22:04 UTC (rev 449) @@ -19,15 +19,26 @@ #include "cuda.h" #include "escc.h" -#define IO_NVRAM_SIZE 0x00020000 -#define IO_NVRAM_OFFSET 0x00060000 +#define OW_IO_NVRAM_SIZE 0x00020000 +#define OW_IO_NVRAM_OFFSET 0x00060000 +#define OW_IO_NVRAM_SHIFT 4 +#define NW_IO_NVRAM_SIZE 0x00004000 +#define NW_IO_NVRAM_OFFSET 0xfff04000 +#define NW_IO_NVRAM_SHIFT 1 + +#define IO_OPENPIC_SIZE 0x00040000 +#define IO_OPENPIC_OFFSET 0x00040000 + static char *nvram; int arch_nvram_size( void ) { - return IO_NVRAM_SIZE>>4; + if (is_oldworld()) + return OW_IO_NVRAM_SIZE >> OW_IO_NVRAM_SHIFT; + else + return NW_IO_NVRAM_SIZE >> NW_IO_NVRAM_SHIFT; } void macio_nvram_init(const char *path, uint32_t addr) @@ -36,14 +47,28 @@ phandle_t dnode; int props[2]; char buf[64]; + unsigned long nvram_size, nvram_offset; - nvram = (char*)addr + IO_NVRAM_OFFSET; + if (is_oldworld()) { + nvram_offset = OW_IO_NVRAM_OFFSET; + nvram_size = OW_IO_NVRAM_SIZE; + } else { + nvram_offset = NW_IO_NVRAM_OFFSET; + nvram_size = NW_IO_NVRAM_SIZE; + push_str("/"); + fword("find-device"); + fword("new-device"); + push_str("nvram"); + fword("device-name"); + fword("finish-device"); + } + nvram = (char*)addr + 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); + props[0] = __cpu_to_be32(nvram_offset); + props[1] = __cpu_to_be32(nvram_size); set_property(dnode, "reg", (char *)&props, sizeof(props)); set_property(dnode, "device_type", "nvram", 6); @@ -81,8 +106,15 @@ arch_nvram_put( char *buf ) { int i; + unsigned int it_shift; + + if (is_oldworld()) + it_shift = OW_IO_NVRAM_SHIFT; + else + it_shift = NW_IO_NVRAM_SHIFT; + for (i=0; i< arch_nvram_size() ; i++) - nvram[i<<4]=buf[i]; + nvram[i << it_shift] = buf[i]; #ifdef DUMP_NVRAM printk("new nvram:\n"); dump_nvram(); @@ -93,8 +125,15 @@ arch_nvram_get( char *buf ) { int i; + unsigned int it_shift; + + if (is_oldworld()) + it_shift = OW_IO_NVRAM_SHIFT; + else + it_shift = NW_IO_NVRAM_SHIFT; + for (i=0; i< arch_nvram_size(); i++) - buf[i]=nvram[i<<4]; + buf[i] = nvram[i << it_shift]; #ifdef DUMP_NVRAM printk("current nvram:\n"); @@ -102,8 +141,36 @@ #endif } +static void +openpic_init(const char *path, uint32_t addr) +{ + phandle_t dnode; + int props[2]; + char buf[128]; + + push_str(path); + fword("find-device"); + fword("new-device"); + push_str("interrupt-controller"); + fword("device-name"); + fword("finish-device"); + + snprintf(buf, sizeof(buf), "%s/interrupt-controller", path); + dnode = find_dev(buf); + set_property(dnode, "device_type", "open-pic", 9); + set_property(dnode, "compatible", "chrp,open-pic", 14); + set_property(dnode, "built-in", "", 0); + props[0] = __cpu_to_be32(IO_OPENPIC_OFFSET); + props[1] = __cpu_to_be32(IO_OPENPIC_SIZE); + set_property(dnode, "reg", (char *)&props, sizeof(props)); + set_int_property(dnode, "#interrupt-cells", 2); + set_int_property(dnode, "#address-cells", 0); + set_property(dnode, "interrupt-controller", "", 0); + set_int_property(dnode, "clock-frequency", 4166666); +} + void -ob_macio_init(const char *path, uint32_t addr) +ob_macio_heathrow_init(const char *path, uint32_t addr) { phandle_t aliases; @@ -115,3 +182,19 @@ escc_init(path, addr); macio_ide_init(path, addr, 1); } + +void +ob_macio_keylargo_init(const char *path, uint32_t addr) +{ + phandle_t aliases; + + aliases = find_dev("/aliases"); + set_property(aliases, "mac-io", path, strlen(path) + 1); + + cuda_init(path, addr); + /* The NewWorld NVRAM is not located in the MacIO device */ + macio_nvram_init("", 0); + escc_init(path, addr); + macio_ide_init(path, addr, 3); + openpic_init(path, addr); +} Modified: openbios-devel/drivers/macio.h =================================================================== --- openbios-devel/drivers/macio.h 2009-02-05 21:37:26 UTC (rev 448) +++ openbios-devel/drivers/macio.h 2009-02-08 12:22:04 UTC (rev 449) @@ -1,4 +1,5 @@ extern phandle_t pic_handle; -void ob_macio_init(const char *path, uint32_t addr); +void ob_macio_heathrow_init(const char *path, uint32_t addr); +void ob_macio_keylargo_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-02-05 21:37:26 UTC (rev 448) +++ openbios-devel/drivers/pci.c 2009-02-08 12:22:04 UTC (rev 449) @@ -419,16 +419,26 @@ set_property(dev, "ranges", (char *)props, ncells * sizeof(cell)); } -int macio_config_cb (const pci_config_t *config) +int macio_heathrow_config_cb (const pci_config_t *config) { pci_set_ranges(config); #ifdef CONFIG_DRIVER_MACIO - ob_macio_init(config->path, config->assigned[0] & ~0x0000000F); + ob_macio_heathrow_init(config->path, config->assigned[0] & ~0x0000000F); #endif return 0; } +int macio_keylargo_config_cb (const pci_config_t *config) +{ + pci_set_ranges(config); + +#ifdef CONFIG_DRIVER_MACIO + ob_macio_keylargo_init(config->path, config->assigned[0] & ~0x0000000F); +#endif + return 0; +} + int vga_config_cb (const pci_config_t *config) { if (config->assigned[0] != 0x00000000) Modified: openbios-devel/drivers/pci_database.c =================================================================== --- openbios-devel/drivers/pci_database.c 2009-02-05 21:37:26 UTC (rev 448) +++ openbios-devel/drivers/pci_database.c 2009-02-08 12:22:04 UTC (rev 449) @@ -289,7 +289,7 @@ PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_PCI, NULL, "pci", "AAPL,UniNorth", "uni-north\0", 3, 2, 1, - NULL, NULL + host_config_cb, NULL, }, { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_I_PCI, NULL, @@ -1071,21 +1071,21 @@ PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_343S1201, "mac-io", "mac-io", "AAPL,343S1201", "heathrow\0", 1, 1, 1, - &macio_config_cb, NULL, + &macio_heathrow_config_cb, NULL, }, /* Paddington Mac I/O */ { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_343S1211, "mac-io", "mac-io", "AAPL,343S1211", "paddington\0heathrow\0", 1, 1, 1, - &macio_config_cb, NULL, + &macio_heathrow_config_cb, NULL, }, /* KeyLargo Mac I/O */ { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_KEYL, "mac-io", "mac-io", "AAPL,Keylargo", "Keylargo\0", 1, 1, 2, - &macio_config_cb, NULL, + &macio_keylargo_config_cb, NULL, }, { 0xFFFF, 0xFFFF, Modified: openbios-devel/drivers/pci_database.h =================================================================== --- openbios-devel/drivers/pci_database.h 2009-02-05 21:37:26 UTC (rev 448) +++ openbios-devel/drivers/pci_database.h 2009-02-08 12:22:04 UTC (rev 449) @@ -27,7 +27,8 @@ 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 macio_heathrow_config_cb(const pci_config_t *config); +extern int macio_keylargo_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);

1 0

Fixing QUIK boot loader support
by lsorense＠csclub.uwaterloo.ca 08 Feb '09

08 Feb '09

After trying to fix a problem with the quik boot loader (as in you can't actually compile it with a current e2fslib without it breaking), I kept having odd problems. My tests were done using qemu (from git) and hence using openbios-ppc (which is way better than openhackware ever was). I managed to compile with an old library version just to verify that things still worked that way, and they did. Howver as soon as I changed anything about how QUIK structured its data, then it no longer booted. In fact it didn't even appear to try to start the boot loader. Seemed odd, and even though I don't considere myself that experienced at dealing with assembly, I was pretty sure what I was doing was right. But it never worked. So after about 3 days of trying different things and many many reboots of qemu, I finally thought I would look at what openbios uses to determine if the bootloader should be started. Much to my surprise I found a copy of a data structure from quik's source code plastered in openbios, and not only that openbios had various #define values copied from quik as well and was using those to determine where in the first stage boot loader to check for the string "QUIK" to decide if this was in fact the quik boot loader it had located. Gah! Well clearly as soon as I change quik, and move things around, this match no longer happens, and openbios ignores the perfectly valid bootable partition. Wouldn't it make a lot more sense to simply try booting any partition marked bootable? Isn't that what a real oldworld powermac would have done? So my first "quick fix" was to change the structure and constants to match my modified quik boot laoder, and hey what do you know, now it boots and it works with new e2fslib versions and it even supports using more than 11MB of ram for the kernel+initrd combination (I increased it to 64MB from 16MB mapped, except for the ppc 601 which is different and which I have no idea how to test). So a better fix would be to scan for the string QUIK anywhere in the 1KB first stage bootloader area, rather than looking at a specific location. The best fix would of course be to simply boot the partition if it is flagged as bootable and hence support any boot loader that could be there not just QUIK 2.x. Not sure if or how this might conflict with the yaboot support. Any suggistions and/or preferences for how this gets done? I will be fixing it one way or another because the current method simply doesn't work since the current version of quik no longer works if you recompile it on a modern powerpc linux system, and I have fixed that (I just have to figure out where the maintainer is to see how to go about doing a new release, assuming he still cares). -- Len Sorensen

1 0

Re: [OpenBIOS] [Qemu-devel] [PATCH, RFC] Mac99 (CHRP?) support
by Aurelien Jarno 07 Feb '09

07 Feb '09

On Sat, Feb 07, 2009 at 01:38:58PM +0200, Blue Swirl wrote: > Hi, Hi! > This set of patches adds basic support for Mac99 Qemu machine, As you ask the question in the subject, this machine is a NewWorld machine, and not a CHRP one. I think we don't really want to provide a CHRP emulated machine, so the best is probably to rename ppc_chrp.c into ppc_newworld.c. > provided by ppc_chrp.c. I've used the device tree of iMac DV ('99) as > reference: > http://penguinppc.org/historical/dev-trees-html/imac-dv-99.html > > The patches changes the machine to use OpenBIOS instead of OHW and > otherwise breaks OHW assumptions. On OpenBIOS side there are still > some missing bits. > > Comments welcome. Great work. I gave a quick look at the patches, they looks fine. However I still experience some problem with the PowerMac IDE emulation, especially with recent kernels, so until it is fixed (Laurent is working on that) I think we should keep the CMD646 as a default. -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien(a)aurel32.net http://www.aurel32.net

2 1

Re: [OpenBIOS] r448 - openbios-devel/modules
by hy 06 Feb '09

06 Feb '09

Dear laurent: Hi, my name is HY Chen, lived in Taiwan and my job is BIOS programmer. Nice to meet you. Regards, hy.hy.chen(a)msa.hinet.net ----- Original Message ----- From: <svn(a)openbios.org> To: <openbios(a)lists.openbios.org> Sent: Friday, February 06, 2009 5:37 AM Subject: [OpenBIOS] r448 - openbios-devel/modules > Author: laurent > Date: 2009-02-05 22:37:26 +0100 (Thu, 05 Feb 2009) > New Revision: 448 > > Modified: > openbios-devel/modules/disk-label.c > Log: > Set disk-label information when no partition map is used > > Modified: openbios-devel/modules/disk-label.c > =================================================================== > --- openbios-devel/modules/disk-label.c 2009-02-05 21:33:23 UTC (rev 447) > +++ openbios-devel/modules/disk-label.c 2009-02-05 21:37:26 UTC (rev 448) > @@ -52,6 +52,7 @@ > char block0[512]; > phandle_t ph; > int fd, success=0; > + xt_t xt; > > parstr = my_args_copy(); > /* printk("dlabel-open '%s'\n", parstr ); */ > @@ -81,11 +82,23 @@ > > /* try to see if there is a filesystem without partition */ > > - if (atol(parstr) == 0 || atol(parstr) == 1) { > + if (atol(parstr) == 1) { > PUSH_ih( my_self() ); > selfword("find-filesystem"); > ph = POP_ph(); > if( ph ) { > + di->offs_hi = 0; > + di->offs_lo = 0; > + di->size_hi = -1; > + di->size_lo = -1; > + di->part_ih = 0; > + di->type = -1; > + di->block_size = 512; > + xt = find_parent_method("block-size"); > + if (xt) { > + call_parent(xt); > + di->block_size = POP(); > + } > push_str( filename ); > PUSH_ph( ph ); > fword("interpose"); > @@ -104,7 +117,6 @@ > > /* open partition package */ > if( ph ) { > - xt_t xt; > if( !(di->part_ih=open_package(parstr, ph)) ) > goto out; > if( !(xt=find_ih_method("get-info", di->part_ih)) ) > > > -- > OpenBIOS http://openbios.org/ > Mailinglist: http://lists.openbios.org/mailman/listinfo > Free your System - May the Forth be with you

1 0