OpenBIOS December 2012

openbios@openbios.org

8 participants
33 discussions

[PATCH] Fix HFS+ wrapper recognition issue
by Programmingkid 07 Dec '12

07 Dec '12

This patch fixes a problem with recognizing wrapped HFS+ volumes. This patch will eliminate the problem of seeing the file Where_have_all_my_files_gone? when listing the contents of a volume. signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: trunk/openbios-devel/fs/hfsplus/hfsp_volume.c =================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_volume.c (revision 1075) +++ trunk/openbios-devel/fs/hfsplus/hfsp_volume.c (working copy) @@ -305,13 +305,14 @@ { UInt16 *vol; int ret = 0; + #define wrapper_offset 0x3e vol = (UInt16 *)malloc(2 * 1 << HFSP_BLOCKSZ_BITS); os_seek_offset( fd, 2 * (1 << HFSP_BLOCKSZ_BITS) + offset ); os_read(fd, vol, 2, HFSP_BLOCKSZ_BITS); if (__be16_to_cpu(vol[0]) == HFS_VOLHEAD_SIG && - __be16_to_cpu(vol[0x7c]) == HFSP_VOLHEAD_SIG) { + __be16_to_cpu(vol[wrapper_offset]) == HFSP_VOLHEAD_SIG) { ret = -1; } else if (__be16_to_cpu(vol[0]) == HFSP_VOLHEAD_SIG) { ret = -1;

1 0

[commit] r1077 - in trunk/openbios-devel/forth: bootstrap device
by repository service 07 Dec '12

07 Dec '12

Author: mcayland Date: Fri Dec 7 15:28:07 2012 New Revision: 1077 URL: http://tracker.coreboot.org/trac/openbios/changeset/1077 Log: Redefine "to" word in device.fs to allow the current package to be set like a standard value. BootX appears to be able to want to change the current package phandle by executing Forth statements in the form "<value> to active-package". This won't work correctly in OpenBIOS, since changing packages requires calling the active-package! word to perform additional housekeeping such as changing wordlists. The proposed solution here is to redefine "to" at the end of device.fs so that if package support is included, we perform an additional check on the destination xt to see if it matches that of active-package. If it does, then we manually invoke the active-package! word to select the new package. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs trunk/openbios-devel/forth/device/device.fs Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs ============================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs Fri Dec 7 15:18:41 2012 (r1076) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs Fri Dec 7 15:28:07 2012 (r1077) @@ -1052,17 +1052,21 @@ 3 /n* + ! then ; - -: to - ['] ' execute + +: (to-xt) ( xt -- ) dup @ instance-cfa? state @ if swap ['] (lit) , , if ['] (ito) else ['] (to) then , else if (ito) else /n + ! then then - ; immediate +; +: to + ['] ' execute + (to-xt) + ; immediate + : is ( xt "wordname<>" -- ) parse-word $find if (to) Modified: trunk/openbios-devel/forth/device/device.fs ============================================================================== --- trunk/openbios-devel/forth/device/device.fs Fri Dec 7 15:18:41 2012 (r1076) +++ trunk/openbios-devel/forth/device/device.fs Fri Dec 7 15:28:07 2012 (r1077) @@ -189,3 +189,14 @@ free-mem then ; + +\ Redefine to word so that statements of the form "0 to active-package" +\ are supported for bootloaders that require it +: to + ['] ' execute + dup ['] active-package = if + drop active-package! + else + (to-xt) + then +; immediate

1 0

[commit] r1076 - trunk/openbios-devel/packages
by repository service 07 Dec '12

07 Dec '12

Author: mcayland Date: Fri Dec 7 15:18:41 2012 New Revision: 1076 URL: http://tracker.coreboot.org/trac/openbios/changeset/1076 Log: Rework mac-parts.c to use CHRP-compliant partition search, followed by Apple OF partition search. The confusion from the previous refactoring of mac-parts.c came from the fact that it must support searching for a boot partition using the algorithm specified in the OF CHRP bindings supplement, as well as Apple's brute-force partition-type search. This patch corrects mac-parts.c so that it will first attempt to find a CHRP boot partition, and if it does not exist or fails to boot, fall back to the first partition that would be considered valid by Apple's OF if one exists. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/packages/mac-parts.c Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Fri Nov 30 00:02:25 2012 (r1075) +++ trunk/openbios-devel/packages/mac-parts.c Fri Dec 7 15:18:41 2012 (r1076) @@ -51,10 +51,11 @@ char *str = my_args_copy(); char *argstr = strdup(""); char *parstr = strdup(""); - int bs, parnum=-1; + int bs, parnum=-1, apple_parnum=-1; + int parlist[2], parlist_size = 0; desc_map_t dmap; part_entry_t par; - int ret = 0; + int ret = 0, i = 0, j = 0; int want_bootcode = 0; phandle_t ph; ducell offs = 0, size = -1; @@ -161,101 +162,135 @@ DPRINTF("mac-parts: counted %d partitions\n", __be32_to_cpu(par.pmMapBlkCnt)); /* No partition was explicitly requested so let's find a suitable partition... */ - for (parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) { - SEEK( bs * parnum ); + for (i = 1; i <= __be32_to_cpu(par.pmMapBlkCnt); i++) { + SEEK( bs * i ); READ( &par, sizeof(par) ); - if( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || + if ( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || !__be32_to_cpu(par.pmPartBlkCnt) ) - break; + continue; - DPRINTF("found partition type: %s with status %x\n", par.pmPartType, __be32_to_cpu(par.pmPartStatus)); + DPRINTF("found partition %d type: %s with status %x\n", i, par.pmPartType, __be32_to_cpu(par.pmPartStatus)); /* If we have a valid, allocated and readable partition... */ if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { - offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; - size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; - /* If the filename was set to %BOOT, we actually want the bootcode */ - if (want_bootcode && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid)) { - offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; - size = (long long)__be32_to_cpu(par.pmBootSize); - - goto found; - } else { - /* Otherwise we were passed a filename and path. So let's - choose the first partition with a valid filesystem */ - DPUSH( offs ); - PUSH_ih( my_parent() ); - parword("find-filesystem"); + /* Unfortunately Apple's OF implementation doesn't follow the OF PowerPC CHRP bindings + * and instead will brute-force boot the first valid partition it finds with a + * type of either "Apple_Boot", "Apple_HFS" or "DOS_FAT_". Here we store the id + * of the first partition that matches these criteria to use as a fallback later + * if required. */ - ph = POP_ph(); - if (ph) - goto found; + if (apple_parnum == -1 && + (strcmp(par.pmPartType, "Apple_Boot") == 0 || + strcmp(par.pmPartType, "Apple_HFS") == 0 || + strcmp(par.pmPartType, "DOS_FAT_") == 0)) { + apple_parnum = i; + + DPRINTF("Located Apple OF fallback partition %d\n", apple_parnum); + } + + /* If the partition is also bootable and the pmProcessor field matches "PowerPC" (insensitive + * match), then according to the CHRP bindings this is our chosen partition */ + for (j = 0; j < strlen(par.pmProcessor); j++) { + par.pmProcessor[j] = tolower(par.pmProcessor[j]); + } + + if ((__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid) && + strcmp(par.pmProcessor, "powerpc") == 0) { + parnum = i; + + DPRINTF("Located CHRP-compliant boot partition %d\n", parnum); } } } + + /* If we found a valid CHRP partition, add it to the list */ + if (parnum > 0) { + parlist[parlist_size++] = parnum; + } + /* If we found an Apple OF fallback partition, add it to the list */ + if (apple_parnum > 0 && apple_parnum != parnum) { + parlist[parlist_size++] = apple_parnum; + } + } else { /* Another partition was explicitly requested */ - SEEK( bs * parnum ); - READ( &par, sizeof(par) ); - - if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { - - offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; - size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; - } - } - - /* If we couldn't find a partition, exit */ - if (size == -1) { - DPRINTF("Unable to automatically find partition!\n"); - goto out; + parlist[parlist_size++] = parnum; + + DPRINTF("Partition %d explicitly requested\n", parnum); } -found: - - ret = -1; - di->blocksize = (unsigned int)bs; - - di->offs_hi = offs >> BITS; - di->offs_lo = offs & (ucell) -1; + /* Attempt to use our CHRP partition, optionally followed by our Apple OF fallback partition */ + for (j = 0; j < parlist_size; j++) { + + /* Make sure our partition is valid */ + parnum = parlist[j]; + + DPRINTF("Selected partition %d to boot\n", parnum); + + SEEK( bs * parnum ); + READ( &par, sizeof(par) ); - di->size_hi = size >> BITS; - di->size_lo = size & (ucell) -1; - - /* We have a valid partition - so probe for a filesystem at the current offset */ - DPRINTF("mac-parts: about to probe for fs\n"); - DPUSH( offs ); - PUSH_ih( my_parent() ); - parword("find-filesystem"); - DPRINTF("mac-parts: done fs probe\n"); - - ph = POP_ph(); - if( ph ) { - DPRINTF("mac-parts: filesystem found with ph " FMT_ucellx " and args %s\n", ph, argstr); - di->filesystem_ph = ph; - - /* If the filename was %BOOT then it's not a real filename, so clear argstr before - attempting interpose */ - if (want_bootcode) - argstr = strdup(""); - - /* If we have been asked to open a particular file, interpose the filesystem package with - the passed filename as an argument */ - if (strlen(argstr)) { - push_str( argstr ); - PUSH_ph( ph ); - fword("interpose"); - } - } else { - DPRINTF("mac-parts: no filesystem found; bypassing misc-files interpose\n"); + if(! ((__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable)) ) { + DPRINTF("Partition %d is not valid, allocated and readable\n", parnum); + goto out; + } + + ret = -1; + + offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; + size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; + + if (want_bootcode) { + offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; + size = (long long)__be32_to_cpu(par.pmBootSize); + } + + di->blocksize = (unsigned int)bs; + + di->offs_hi = offs >> BITS; + di->offs_lo = offs & (ucell) -1; + + di->size_hi = size >> BITS; + di->size_lo = size & (ucell) -1; + + /* We have a valid partition - so probe for a filesystem at the current offset */ + DPRINTF("mac-parts: about to probe for fs\n"); + DPUSH( offs ); + PUSH_ih( my_parent() ); + parword("find-filesystem"); + DPRINTF("mac-parts: done fs probe\n"); + + ph = POP_ph(); + if( ph ) { + DPRINTF("mac-parts: filesystem found on partition %d with ph " FMT_ucellx " and args %s\n", parnum, ph, argstr); + di->filesystem_ph = ph; + + /* If the filename was %BOOT then it's not a real filename, so clear argstr before + attempting interpose */ + if (want_bootcode) { + argstr = strdup(""); + } + + /* If we have been asked to open a particular file, interpose the filesystem package with + the passed filename as an argument */ + if (strlen(argstr)) { + push_str( argstr ); + PUSH_ph( ph ); + fword("interpose"); + } + + goto out; + } else { + DPRINTF("mac-parts: no filesystem found on partition %d; bypassing misc-files interpose\n", parnum); + } } - + free( str ); out:

1 0

[PATCH] Rework mac-parts.c to use CHRP-compliant partition search, followed by Apple OF partition search.
by Mark Cave-Ayland 07 Dec '12

07 Dec '12

The confusion from the previous refactoring of mac-parts.c came from the fact that it must support searching for a boot partition using the algorithm specified in the OF CHRP bindings supplement, as well as Apple's brute-force partition-type search. This patch corrects mac-parts.c so that it will first attempt to find a CHRP boot partition, and if it does not exist or fails to boot, fall back to the first partition that would be considered valid by Apple's OF. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/packages/mac-parts.c | 191 +++++++++++++++++++++-------------- 1 file changed, 113 insertions(+), 78 deletions(-) diff --git a/openbios-devel/packages/mac-parts.c b/openbios-devel/packages/mac-parts.c index a286870..9501bfd 100644 --- a/openbios-devel/packages/mac-parts.c +++ b/openbios-devel/packages/mac-parts.c @@ -51,10 +51,11 @@ macparts_open( macparts_info_t *di ) char *str = my_args_copy(); char *argstr = strdup(""); char *parstr = strdup(""); - int bs, parnum=-1; + int bs, parnum=-1, apple_parnum=-1; + int parlist[2], parlist_size = 0; desc_map_t dmap; part_entry_t par; - int ret = 0; + int ret = 0, i = 0, j = 0; int want_bootcode = 0; phandle_t ph; ducell offs = 0, size = -1; @@ -161,101 +162,135 @@ macparts_open( macparts_info_t *di ) DPRINTF("mac-parts: counted %d partitions\n", __be32_to_cpu(par.pmMapBlkCnt)); /* No partition was explicitly requested so let's find a suitable partition... */ - for (parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) { - SEEK( bs * parnum ); + for (i = 1; i <= __be32_to_cpu(par.pmMapBlkCnt); i++) { + SEEK( bs * i ); READ( &par, sizeof(par) ); - if( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || + if ( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || !__be32_to_cpu(par.pmPartBlkCnt) ) - break; + continue; - DPRINTF("found partition type: %s with status %x\n", par.pmPartType, __be32_to_cpu(par.pmPartStatus)); + DPRINTF("found partition %d type: %s with status %x\n", i, par.pmPartType, __be32_to_cpu(par.pmPartStatus)); /* If we have a valid, allocated and readable partition... */ if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { - offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; - size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; - - /* If the filename was set to %BOOT, we actually want the bootcode */ - if (want_bootcode && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid)) { - offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; - size = (long long)__be32_to_cpu(par.pmBootSize); - - goto found; - } else { - /* Otherwise we were passed a filename and path. So let's - choose the first partition with a valid filesystem */ - DPUSH( offs ); - PUSH_ih( my_parent() ); - parword("find-filesystem"); + + /* Unfortunately Apple's OF implementation doesn't follow the OF PowerPC CHRP bindings + * and instead will brute-force boot the first valid partition it finds with a + * type of either "Apple_Boot", "Apple_HFS" or "DOS_FAT_". Here we store the id + * of the first partition that matches these criteria to use as a fallback later + * if required. */ - ph = POP_ph(); - if (ph) - goto found; + if (apple_parnum == -1 && + (strcmp(par.pmPartType, "Apple_Boot") == 0 || + strcmp(par.pmPartType, "Apple_HFS") == 0 || + strcmp(par.pmPartType, "DOS_FAT_") == 0)) { + apple_parnum = i; + + DPRINTF("Located Apple OF fallback partition %d\n", apple_parnum); + } + + /* If the partition is also bootable and the pmProcessor field matches "PowerPC" (insensitive + * match), then according to the CHRP bindings this is our chosen partition */ + for (j = 0; j < strlen(par.pmProcessor); j++) { + par.pmProcessor[j] = tolower(par.pmProcessor[j]); + } + + if ((__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid) && + strcmp(par.pmProcessor, "powerpc") == 0) { + parnum = i; + + DPRINTF("Located CHRP-compliant boot partition %d\n", parnum); } } } + + /* If we found a valid CHRP partition, add it to the list */ + if (parnum > 0) { + parlist[parlist_size++] = parnum; + } + /* If we found an Apple OF fallback partition, add it to the list */ + if (apple_parnum > 0 && apple_parnum != parnum) { + parlist[parlist_size++] = apple_parnum; + } + } else { /* Another partition was explicitly requested */ - SEEK( bs * parnum ); - READ( &par, sizeof(par) ); - - if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { - - offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; - size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; - } + parlist[parlist_size++] = parnum; + + DPRINTF("Partition %d explicitly requested\n", parnum); } - /* If we couldn't find a partition, exit */ - if (size == -1) { - DPRINTF("Unable to automatically find partition!\n"); + /* Attempt to use our CHRP partition, optionally followed by our Apple OF fallback partition */ + for (j = 0; j < parlist_size; j++) { + + /* Make sure our partition is valid */ + parnum = parlist[j]; + + DPRINTF("Selected partition %d to boot\n", parnum); + + SEEK( bs * parnum ); + READ( &par, sizeof(par) ); + + if(! ((__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable)) ) { + DPRINTF("Partition %d is not valid, allocated and readable\n", parnum); goto out; + } + + ret = -1; + + offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; + size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; + + if (want_bootcode) { + offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; + size = (long long)__be32_to_cpu(par.pmBootSize); + } + + di->blocksize = (unsigned int)bs; + + di->offs_hi = offs >> BITS; + di->offs_lo = offs & (ucell) -1; + + di->size_hi = size >> BITS; + di->size_lo = size & (ucell) -1; + + /* We have a valid partition - so probe for a filesystem at the current offset */ + DPRINTF("mac-parts: about to probe for fs\n"); + DPUSH( offs ); + PUSH_ih( my_parent() ); + parword("find-filesystem"); + DPRINTF("mac-parts: done fs probe\n"); + + ph = POP_ph(); + if( ph ) { + DPRINTF("mac-parts: filesystem found on partition %d with ph " FMT_ucellx " and args %s\n", parnum, ph, argstr); + di->filesystem_ph = ph; + + /* If the filename was %BOOT then it's not a real filename, so clear argstr before + attempting interpose */ + if (want_bootcode) { + argstr = strdup(""); + } + + /* If we have been asked to open a particular file, interpose the filesystem package with + the passed filename as an argument */ + if (strlen(argstr)) { + push_str( argstr ); + PUSH_ph( ph ); + fword("interpose"); + } + + goto out; + } else { + DPRINTF("mac-parts: no filesystem found on partition %d; bypassing misc-files interpose\n", parnum); + } } - -found: - - ret = -1; - di->blocksize = (unsigned int)bs; - - di->offs_hi = offs >> BITS; - di->offs_lo = offs & (ucell) -1; - - di->size_hi = size >> BITS; - di->size_lo = size & (ucell) -1; - - /* We have a valid partition - so probe for a filesystem at the current offset */ - DPRINTF("mac-parts: about to probe for fs\n"); - DPUSH( offs ); - PUSH_ih( my_parent() ); - parword("find-filesystem"); - DPRINTF("mac-parts: done fs probe\n"); - - ph = POP_ph(); - if( ph ) { - DPRINTF("mac-parts: filesystem found with ph " FMT_ucellx " and args %s\n", ph, argstr); - di->filesystem_ph = ph; - - /* If the filename was %BOOT then it's not a real filename, so clear argstr before - attempting interpose */ - if (want_bootcode) - argstr = strdup(""); - - /* If we have been asked to open a particular file, interpose the filesystem package with - the passed filename as an argument */ - if (strlen(argstr)) { - push_str( argstr ); - PUSH_ph( ph ); - fword("interpose"); - } - } else { - DPRINTF("mac-parts: no filesystem found; bypassing misc-files interpose\n"); - } - + free( str ); out: -- 1.7.10.4

2 2

testing Mac OS X boot on latest trunk (revision 1075)
by Amadeusz Sławiński 06 Dec '12

06 Dec '12

Current trunk (1075) lists some files and doesn't boot at all Welcome to OpenBIOS v1.0 built on Nov 30 2012 19:55 Trying hd:,\\:tbxi... Trying hd:,\ppc\bootinfo.txt... No valid state has been set by load or init-program 0 > boot cd:,\\:tbxi >> Not a bootable ELF image No valid state has been set by load or init-program ok 0 > dir cd:9,\ 73728 2002-07-18 08:21:48 Desktop DB 0 2002-07-18 08:21:49 Desktop DF 0 2002-07-18 08:21:49 Finder 0 2002-07-18 08:21:49 OSXBoot! 0 2002-07-18 08:21:50 System 1778 2002-07-18 08:21:49 Where_have_all_my_files_gone? ok 0 > boot cd:9,\\:tbxi No valid state has been set by load or init-program ok 0 > After testing with this patch: http://lists.openbios.org/pipermail/openbios/2011-August/006618.html I have better results Welcome to OpenBIOS v1.0 built on Nov 30 2012 20:00 Trying hd:,\\:tbxi... Trying hd:,\ppc\bootinfo.txt... No valid state has been set by load or init-program 0 > boot cd:,\\:tbxi >> Not a bootable ELF image No valid state has been set by load or init-program ok 0 > dir cd:9,\ 82 2002-07-24 17:47:43 ._Welcome to Mac OS X 6148 2002-07-31 23:59:42 .DS_Store 0 2002-07-31 23:59:37 .Trashes\ 0 2002-07-29 03:06:27 .vol\ 0 2002-07-30 10:00:25 Applications\ 0 2002-07-31 23:43:08 bin\ 5120 2002-07-31 23:59:40 Desktop DB 25410 2002-07-31 23:59:40 Desktop DF 0 2002-07-15 06:20:41 dev\ 11 2002-07-31 23:57:11 etc 0 2002-07-30 10:14:44 Library\ 11 2002-07-31 23:57:11 mach 3678188 2002-07-28 20:19:43 mach_kernel 0 2002-07-30 10:57:00 private\ 0 2002-07-31 23:41:16 sbin\ 0 2002-07-30 10:57:38 System\ 11 2002-07-31 23:58:55 tmp 0 2002-07-30 10:03:14 usr\ 11 2002-07-31 23:58:58 var 0 2002-07-29 03:06:27 Volumes\ 0 2002-07-30 11:07:00 Welcome to Mac OS X\ 0 2002-07-19 08:21:48 HFS+ Private Data\ ok 0 > boot cd:9,\\:tbxi call-method slw_update_keymap: exception -21 Here is also a listing of partitions on mine boot disk, # mac-fdisk /home/amade/emu/Mac\ OS\ 10.2\ $Disc\ 1$.img /home/amade/emu/Mac OS 10.2 (Disc 1).img Command (? for help): p /home/amade/emu/Mac OS 10.2 (Disc 1).img # type name length base ( size ) system /home/amade/emu/Mac OS 10.2 (Disc 1).img1 Apple_partition_map Apple 63 @ 1 ( 31.5k) Partition map /home/amade/emu/Mac OS 10.2 (Disc 1).img2 Apple_Driver43 Macintosh 56 @ 64 ( 28.0k) Driver 4.3 /home/amade/emu/Mac OS 10.2 (Disc 1).img3 Apple_Driver43_CD Macintosh 140 @ 120 ( 70.0k) Unknown /home/amade/emu/Mac OS 10.2 (Disc 1).img4 Apple_Void 0 @ 0 ( 0.0k) Unknown /home/amade/emu/Mac OS 10.2 (Disc 1).img5 Apple_Driver_ATAPI Macintosh 56 @ 260 ( 28.0k) Unknown /home/amade/emu/Mac OS 10.2 (Disc 1).img6 Apple_Driver_ATAPI Macintosh 140 @ 316 ( 70.0k) Unknown /home/amade/emu/Mac OS 10.2 (Disc 1).img7 Apple_Patches Patch Partition 512 @ 456 (256.0k) Unknown /home/amade/emu/Mac OS 10.2 (Disc 1).img8 Apple_Void 0 @ 0 ( 0.0k) Unknown /home/amade/emu/Mac OS 10.2 (Disc 1).img9 Apple_HFS Mac_OS_X 1278432 @ 968 (624.2M) HFS /home/amade/emu/Mac OS 10.2 (Disc 1).img10 Apple_Free 45656 @ 1279400 ( 22.3M) Free space Block size=2048, Number of Blocks=331264 DeviceType=0x1, DeviceId=0x1 Drivers- 1: @ 16 for 5, type=0x1 2: @ 30 for 25, type=0xffff 3: @ 65 for 5, type=0x701 4: @ 79 for 31, type=0xf8ff Command (? for help): Two similar (to me) things which probably still need fixing in filesystem handling are 1. "boot cd:,\\:tbxi" should do some kind of search through partitions 2. later in boot process it goes through partitions 0,1,2 seemingly from comments on GSOC patches expecting some of them to be ignored (http://asmblr.net/scrot/2012-11-30-211915_1366x768_scrot.png) screenshot is from bios with gsoc patches Also I wonder if "Still waiting for root device" problem which I have with gsoc patches, isn't caused by not going properly through partitions or even expecting them to be numbered differently (but those are just speculations) Amadeusz

4 15

[PATCH] Adds get-key-map to keyboard node
by Programmingkid 05 Dec '12

05 Dec '12

This patch adds the get-key-map word to the keyboard node. This patch is an improvement on the last get-key-map patch. It adds a keyboard node to /aliases and fixes a bug with the getKeyMap() function. If you wish to test out this patch, the program below will show you what key you pushed. The output will display hex values and text. The hex values in the middle tells you which key is being pushed. : myword { ; keyboardDevice } " keyboard" open-dev -> keyboardDevice begin " get-key-map" keyboardDevice $call-method 32 dump 10000 ms \ update speed again ; signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- drivers/adb_kbd.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 82 insertions(+), 4 deletions(-) diff --git a/drivers/adb_kbd.c b/drivers/adb_kbd.c index e38798a..e799704 100644 --- a/drivers/adb_kbd.c +++ b/drivers/adb_kbd.c @@ -42,11 +42,13 @@ keyboard_close(int *idx) } static void keyboard_read(void); +void getKeyMap(void); NODE_METHODS( keyboard ) = { - { "open", keyboard_open }, - { "close", keyboard_close }, - { "read", keyboard_read }, + { "open", keyboard_open }, + { "close", keyboard_close }, + { "read", keyboard_read }, + { "get-key-map", getKeyMap }, }; /* VT100 escape sequences */ @@ -545,7 +547,8 @@ void *adb_kbd_new (char *path, void *private) set_property(ph, "reg", (char *)&props, sizeof(props)); aliases = find_dev("/aliases"); - set_property(aliases, "adb-keyboard", buf, strlen(buf) + 1); + set_property(aliases, "adb-keyboard", buf, strlen(buf) + 1); + set_property(aliases, "keyboard", buf, strlen(buf) + 1); return kbd; } @@ -566,3 +569,78 @@ static void keyboard_read(void) } PUSH(i); } + + +// Returns the base to the exponent power +static int pow(int base, int exponent) +{ + int index, answer; + answer = base; + for(index = 1; index < exponent; index++) + { + answer = answer * base; + } + return answer; +} + +// The implementation of the get-key-map word. +// Returns an array of 32 bytes. Certain bits +// are used to determine which keys are being +// held down. + +void getKeyMap(void) +{ + int keyPushed, *keyMapArray, offset; + const int sizeOfArray = 8; + const int modifierKeyIndex = 7; + const int commandKeyValue = pow(2,28); + const int shiftKeyValue = pow(2,30); + const int theAKeyValue = pow(2,27); + + keyMapArray = (int *) malloc(sizeOfArray); + if(!keyMapArray) // if failed to allocate memory + { + printk("Failed to allocate memory for keyMapArray!\n"); + PUSH(0); + return; + } + + // Set all the elements to zero + int index; + for(index = 0; index < sizeOfArray; index++) + { + keyMapArray[index] = 0; + } + + feval("key?"); + if(POP() != -1) // if no key was pushed + { + PUSH((int)keyMapArray); // returns the address of keyMapArray + return; + } + + feval("key"); + keyPushed = POP(); + + if(keyPushed > 0 && keyPushed < 27) // control key combination + { + offset = 1; + keyMapArray[modifierKeyIndex] = commandKeyValue; + } + + else if(keyPushed > 64 && keyPushed < 91) // shift key combination + { + offset = 65; + keyMapArray[modifierKeyIndex] = shiftKeyValue; + } + + else // just a letter is being held down + { + offset = 97; + } + + // Determines the value and location of a bit in the array. + *keyMapArray = theAKeyValue >> (keyPushed - offset); + + PUSH((int) keyMapArray); +} \ No newline at end of file -- 1.7.5.4

2 10

Re: [OpenBIOS] Patch for auto partition selection
by Programmingkid 04 Dec '12

04 Dec '12

On Dec 4, 2012, at 1:48 PM, Blue Swirl wrote: > On Tue, Dec 4, 2012 at 1:25 AM, Programmingkid > <programmingkidx(a)gmail.com> wrote: >> >> On Dec 3, 2012, at 3:13 PM, Mark Cave-Ayland wrote: >> >> On 30/11/12 20:14, Programmingkid wrote: >> >> What do you mean when you say something is whitespace damaged? >> >> >> It's a general term for formatting changes that don't affect the patch, e.g. >> >> for (i = 0; i <= 10; i++) { >> >> to >> >> for (i = 0; i <= 10; i++) >> { > > Please take a look at this example for non-wanted style changes. Don't > just ignore what others are telling you. > >> >> It means that the patch includes non-functional changes which is generally >> frowned upon. >> >> What section do I not need? Could you give me the first and last line of >> this section? I need the actual text since the line number will probably not >> help if our files are different. >> >> >> See below. >> >> - } else { >> >> - /* Another partition was explicitly requested */ >> >> + } >> >> + >> >> + // if no partition and no file was selected - example: "dir cd:,\" >> >> + else if (parnum == -1) >> >> + { >> >> + // search for the first partition of type Apple_HFS or Apple_HFSX >> >> + for(parnum = 1; parnum<= __be32_to_cpu(par.pmMapBlkCnt); parnum++) >> >> + { >> >> + SEEK( bs * parnum ); >> >> + READ(&par, sizeof(par) ); >> >> + DPRINTF("found partition type: %s with status %x\n", >> par.pmPartType, __be32_to_cpu(par.pmPartStatus)); >> >> + if(strcmp(par.pmPartType, "Apple_HFS") == 0 || >> strcmp(par.pmPartType, "Apple_HFSX") == 0) >> >> + { >> >> + offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; >> >> + size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; >> >> + goto found; >> >> + break; >> >> + } >> >> + } >> >> + } >> >> + >> >> + // Another partition was explicitly requested >> >> + else >> >> + { >> >> + >> >> >> ATB, >> >> Mark. >> >> >> >> Ok this patch removes the unneeded code and remotes the whitespace damage. >> >> signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> >> >> Index: trunk/openbios-devel/packages/mac-parts.c >> =================================================================== >> --- trunk/openbios-devel/packages/mac-parts.c (revision 1075) >> +++ trunk/openbios-devel/packages/mac-parts.c (working copy) >> @@ -164,16 +164,12 @@ >> for (parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) { >> SEEK( bs * parnum ); >> READ( &par, sizeof(par) ); >> - if( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || >> - !__be32_to_cpu(par.pmPartBlkCnt) ) >> - break; >> - >> + >> DPRINTF("found partition type: %s with status %x\n", par.pmPartType, >> __be32_to_cpu(par.pmPartStatus)); >> >> >> >> - /* If we have a valid, allocated and readable partition... */ >> - if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && >> - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && >> - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { >> + // If an Apple_HFS or Apple_HFSX partition was found >> + if(strcmp(par.pmPartType, "Apple_HFS") == 0 || strcmp(par.pmPartType, >> "Apple_HFSX") == 0) >> + { > > Here's one case where you have changed the brace style. > >> offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; >> size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; >> >> >> >> @@ -181,9 +177,11 @@ >> if (want_bootcode && (__be32_to_cpu(par.pmPartStatus) & >> kPartitionAUXIsBootValid)) { >> offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; >> size = (long long)__be32_to_cpu(par.pmBootSize); >> - >> goto found; >> - } else { >> + } >> + >> + else >> + { > > Another, don't change '} else {'. > >> /* Otherwise we were passed a filename and path. So let's >> choose the first partition with a valid filesystem */ >> DPUSH( offs ); >> @@ -196,9 +194,11 @@ >> } >> } >> } >> - >> - } else { >> - /* Another partition was explicitly requested */ >> + } >> + >> + // Another partition was explicitly requested > > And here you changed the comment style to C99. Don't do that. > >> + else >> + { > > Another unwanted change. > > Please take a more care to follow the style, consistency is important > in software projects. Ignoring review comments will lead to ignored > patches. > >> SEEK( bs * parnum ); >> READ( &par, sizeof(par) ); >> Here is an updated patch with the above issues fixed. Signed-off-by : John Arbuckle <programmingkidx(a)gmail.com> Index: trunk/openbios-devel/packages/mac-parts.c =================================================================== --- trunk/openbios-devel/packages/mac-parts.c (revision 1075) +++ trunk/openbios-devel/packages/mac-parts.c (working copy) @@ -164,16 +164,10 @@ for (parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) { SEEK( bs * parnum ); READ( &par, sizeof(par) ); - if( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || - !__be32_to_cpu(par.pmPartBlkCnt) ) - break; - DPRINTF("found partition type: %s with status %x\n", par.pmPartType, __be32_to_cpu(par.pmPartStatus)); - /* If we have a valid, allocated and readable partition... */ - if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { + /* If an Apple_HFS or Apple_HFSX partition was found */ + if(strcmp(par.pmPartType, "Apple_HFS") == 0 || strcmp(par.pmPartType, "Apple_HFSX") == 0) { offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; @@ -196,9 +190,7 @@ } } } - - } else { - /* Another partition was explicitly requested */ + } else { /* Another partition was explicitly requested */ SEEK( bs * parnum ); READ( &par, sizeof(par) );

2 1

Re: [OpenBIOS] [PATCH] PPC: Rework assignment of keyboard devalias.
by Mark Cave-Ayland 04 Dec '12

04 Dec '12

On 04/12/12 18:22, Blue Swirl wrote: >> The committed version was actually much smaller than this, as the string >> munging was required due to a separate bug for unit address during path >> resolution. >> >> I'd be quite keen to do the keyboard alias assignment as a separate pass, as >> I've used QEMU with multiple keyboards attached in some circumstances to >> work around driver issues. While the current algorithm is to pick the first >> keyboard device found, I'd like to think this could be controlled by >> parameters passed into QEMU/NVRAM someday. > > Something like -prom-env 'keyboard=/pci/isa/pckdb' or -prom-env > '/aliases/keyboard=/pci/isa/pckdb' should be easy to handle in > OpenBIOS. Yeah something like that to specify an override would be good. It's not on my immediate TODO list at the moment, although I'd be tempted to unify the current algorithm (which I committed to PPC only) across all architectures so that when the time comes, such a change becomes trivial. ATB, Mark.

1 0

Re: [OpenBIOS] Patch for auto partition selection
by Programmingkid 04 Dec '12

04 Dec '12

On Dec 3, 2012, at 3:13 PM, Mark Cave-Ayland wrote: > On 30/11/12 20:14, Programmingkid wrote: > >> What do you mean when you say something is whitespace damaged? > > It's a general term for formatting changes that don't affect the patch, e.g. > > for (i = 0; i <= 10; i++) { > > to > > for (i = 0; i <= 10; i++) > { > > It means that the patch includes non-functional changes which is generally frowned upon. > >> What section do I not need? Could you give me the first and last line of this section? I need the actual text since the line number will probably not help if our files are different. > > See below. > >>>> - } else { >>>> - /* Another partition was explicitly requested */ >>>> + } >>>> + >>>> + // if no partition and no file was selected - example: "dir cd:,\" >>>> + else if (parnum == -1) >>>> + { >>>> + // search for the first partition of type Apple_HFS or Apple_HFSX >>>> + for(parnum = 1; parnum<= __be32_to_cpu(par.pmMapBlkCnt); parnum++) >>>> + { >>>> + SEEK( bs * parnum ); >>>> + READ(&par, sizeof(par) ); >>>> + DPRINTF("found partition type: %s with status %x\n", par.pmPartType, __be32_to_cpu(par.pmPartStatus)); >>>> + if(strcmp(par.pmPartType, "Apple_HFS") == 0 || strcmp(par.pmPartType, "Apple_HFSX") == 0) >>>> + { >>>> + offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; >>>> + size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; >>>> + goto found; >>>> + break; >>>> + } >>>> + } >>>> + } >>>> + >>>> + // Another partition was explicitly requested >>>> + else >>>> + { >>>> + > > ATB, > > Mark. Ok this patch removes the unneeded code and remotes the whitespace damage. signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: trunk/openbios-devel/packages/mac-parts.c =================================================================== --- trunk/openbios-devel/packages/mac-parts.c (revision 1075) +++ trunk/openbios-devel/packages/mac-parts.c (working copy) @@ -164,16 +164,12 @@ for (parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) { SEEK( bs * parnum ); READ( &par, sizeof(par) ); - if( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || - !__be32_to_cpu(par.pmPartBlkCnt) ) - break; - + DPRINTF("found partition type: %s with status %x\n", par.pmPartType, __be32_to_cpu(par.pmPartStatus)); - /* If we have a valid, allocated and readable partition... */ - if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { + // If an Apple_HFS or Apple_HFSX partition was found + if(strcmp(par.pmPartType, "Apple_HFS") == 0 || strcmp(par.pmPartType, "Apple_HFSX") == 0) + { offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; @@ -181,9 +177,11 @@ if (want_bootcode && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid)) { offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; size = (long long)__be32_to_cpu(par.pmBootSize); - goto found; - } else { + } + + else + { /* Otherwise we were passed a filename and path. So let's choose the first partition with a valid filesystem */ DPUSH( offs ); @@ -196,9 +194,11 @@ } } } - - } else { - /* Another partition was explicitly requested */ + } + + // Another partition was explicitly requested + else + { SEEK( bs * parnum ); READ( &par, sizeof(par) );

2 1

Re: [OpenBIOS] [PATCH] PPC: Rework assignment of keyboard devalias.
by Mark Cave-Ayland 04 Dec '12

04 Dec '12

On 01/12/12 14:35, Blue Swirl wrote: > On Mon, Nov 26, 2012 at 12:13 AM, Mark Cave-Ayland > <mark.cave-ayland(a)ilande.co.uk> wrote: >> Rather than simply copy the value of input-device, we scan the device >> tree for an entry with a device_type of keyboard and use that. This >> ensures that the keyboard alias always points to a physical keyboard >> device. > > Maybe I'm missing something, but other keyboard drivers (escc.c and > pc_kbd.c) just add the keyboard alias themselves, this should be > slightly faster because the scan is avoided. It's also only two lines > of code. The committed version was actually much smaller than this, as the string munging was required due to a separate bug for unit address during path resolution. I'd be quite keen to do the keyboard alias assignment as a separate pass, as I've used QEMU with multiple keyboards attached in some circumstances to work around driver issues. While the current algorithm is to pick the first keyboard device found, I'd like to think this could be controlled by parameters passed into QEMU/NVRAM someday. ATB, Mark.

2 1