OpenBIOS October 2012

openbios@openbios.org

6 participants
18 discussions

[PATCH] Adds the get-time word to the dictionary. Used to obtain the date and time.
by Programmingkid 08 Oct '12

08 Oct '12

Signed-of-by: John Arbuckle <programmingkidx(a)gmail.com> --- forth/system/main.fs | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/forth/system/main.fs b/forth/system/main.fs index 122ab1f..09c08d3 100644 --- a/forth/system/main.fs +++ b/forth/system/main.fs @@ -58,3 +58,10 @@ variable DIAG-list outer-interpreter ; + + +\ Returns the time ( -- second minute hour day month year ) +: get-time ( -- ) + s" rtc" s" get-time" execute-device-method + 0= ABORT" Sorry but the rtc node was not found" +; \ No newline at end of file -- 1.7.5.4

1 0

Issue with server
by Programmingkid 08 Oct '12

08 Oct '12

On the page http://www.openfirmware.info/OpenBIOS, the link "most current snapshot" does not work. This is the error message that is displayed: Trac detected an internal error: SubversionException: ("Can't open file '/srv/svn/repositories/openbios/db/revs/0/695': Too many open files", 24)

2 1

Re: [OpenBIOS] [PATCH] Adds the get-time word to the dictionary. It returns the current time and date on the stack.
by Programmingkid 07 Oct '12

07 Oct '12

On Oct 4, 2012, at 3:30 PM, openbios-request(a)openbios.org wrote: > > Message: 4 > Date: Mon, 24 Sep 2012 23:40:27 +0100 > From: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org> > Subject: Re: [OpenBIOS] [PATCH] Adds the get-time word to the > dictionary. It returns the current time and date on the stack. > Message-ID: <5060E15B.3020103(a)ilande.co.uk> > Content-Type: text/plain; charset=ISO-8859-1; format=flowed > > On 23/09/12 22:57, Programmingkid wrote: > >> Made a few changes to the patch. Thank you Tarl for your suggestions. >> >> Signed-Off-By: John Arbuckle<programmingkidx(a)gmail.com> >> >> --- >> forth/system/main.fs | 22 ++++++++++++++++++++++ >> 1 files changed, 22 insertions(+), 0 deletions(-) >> >> diff --git a/forth/system/main.fs b/forth/system/main.fs >> index 122ab1f..16d4829 100644 >> --- a/forth/system/main.fs >> +++ b/forth/system/main.fs >> @@ -58,3 +58,25 @@ variable DIAG-list >> >> outer-interpreter >> ; >> + >> +\ Returns the time ( -- second minute hour day month year ) >> +: get-time >> + " rtc" open-dev ( device ) >> + dup ( device device ) >> + >> + 0= if \ if the real-time clock isn't available >> + drop ( ) >> + true ( flag ) >> + cr >> + abort" Sorry but get-time isn't available for your system. " >> + then >> + >> + " get-time" ( device addr len ) >> + rot ( addr len device ) >> + dup ( addr len device device ) >> +>r ( addr len device ) ( R: device ) >> + $call-method ( addr len device -- second minute hour day month year ) ( R: device ) >> + r> ( device ) ( R: ) >> + close-dev ( device -- ) >> +; >> + > > While I'm not objecting to this patch in principle, I find it quite > unusual that Apple would place a word with the same arguments in the > global namespace. In particular, I see references like this which > suggest it is not required: > http://hints.macworld.com/article.php?story=20060814075952448. > > Can you give some more context as to why the get-time word in the rtc > node cannot be used? I was trying out some source code I found in the book "Mac OS X Internals" on page 320. When I typed get-time, the word was not found in the dictionary. So I thought I could make a contribution by adding this word to the dictionary. A little later I found out the word was a part of the rtc node. I figure adding this word to the dictionary might help the next person who might be reading this book and trying out some of the source code in it.

2 1

[PATCH 1/3] Fix bug related to opening backup volumes in libhfsp's volume_open().
by Mark Cave-Ayland 07 Oct '12

07 Oct '12

The existing code in hfsp_volume.c tries to locate the alternate volume header at the block vol->maxblocks - 2. Currently for unwrapped HFS+ volumes, vol->maxblocks is never set from the main volume header once it is located and so it tries to find the backup volume at the (dummy) block 3 which inevitably fails. On a secondary note until towards the end of the function, volume_open() assumes the block size is 512 bytes. Therefore once we determine the size of the volume from the main volume header in blocks, we need to convert it from the block size indicated in the volume header to a fixed 512 byte block size in order for the alternate volume header to be located correctly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/fs/hfsplus/hfsp_volume.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/openbios-devel/fs/hfsplus/hfsp_volume.c b/openbios-devel/fs/hfsplus/hfsp_volume.c index 802d700..e6d9d60 100644 --- a/openbios-devel/fs/hfsplus/hfsp_volume.c +++ b/openbios-devel/fs/hfsplus/hfsp_volume.c @@ -171,7 +171,9 @@ volume_read_wrapper(volume * vol, hfsp_vh* vh) UInt16 signature; char buf[vol->blksize]; char *p = buf; - + int ret; + UInt64 vol_size; + if( volume_readinbuf(vol, buf, 2) ) // Wrapper or volume header starts here return -1; @@ -202,7 +204,14 @@ volume_read_wrapper(volume * vol, hfsp_vh* vh) } else if( signature == HFSP_VOLHEAD_SIG) { /* Native HFS+ volume */ p = buf; // Restore to begin of block - return volume_readbuf(vh, p); + ret = volume_readbuf(vh, p); + if( !ret ) { + /* When reading the initial partition we must use 512 byte blocks */ + vol_size = vh->blocksize * vh->total_blocks; + vol->maxblocks = vol_size / HFSP_BLOCKSZ; + } + + return ret; } else HFSP_ERROR(-1, "Neither Wrapper nor native HFS+ volume header found"); fail: -- 1.7.10.4

3 8

[commit] r1066 - trunk/openbios-devel/fs/hfsplus
by repository service 07 Oct '12

07 Oct '12

Author: mcayland Date: Sun Oct 7 17:26:53 2012 New Revision: 1066 URL: http://tracker.coreboot.org/trac/openbios/changeset/1066 Log: Add initial implementation of "dir" word for HFS+ filesystems. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Oct 7 17:26:49 2012 (r1065) +++ trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Oct 7 17:26:53 2012 (r1066) @@ -437,14 +437,147 @@ PUSH(pointer2cell(volname)); } +static const int days_month[12] = + { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; +static const int days_month_leap[12] = + { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; + +static inline int is_leap(int year) +{ + return ((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0); +} + +static void +print_date(uint32_t sec) +{ + unsigned int second, minute, hour, month, day, year; + int current; + const int *days; + + second = sec % 60; + sec /= 60; + + minute = sec % 60; + sec /= 60; + + hour = sec % 24; + sec /= 24; + + year = sec * 100 / 36525; + sec -= year * 36525 / 100; + year += 1904; + + days = is_leap(year) ? days_month_leap : days_month; + + current = 0; + month = 0; + while (month < 12) { + if (sec <= current + days[month]) { + break; + } + current += days[month]; + month++; + } + month++; + + day = sec - current + 1; + + forth_printf("%d-%02d-%02d %02d:%02d:%02d ", + year, month, day, hour, minute, second); +} + /* static method, ( pathstr len ihandle -- ) */ static void hfsp_files_dir( hfsp_info_t *dummy ) { - forth_printf("dir method not implemented for HFS+ filesystem\n"); - POP(); - POP(); - POP(); + ihandle_t ih = POP_ih(); + char *path = pop_fstr_copy(); + int fd, found; + volume *vol; + record rec, r, folrec; + char name[256], *curfol, *tmppath; + + fd = open_ih(ih); + if ( fd == -1 ) { + free( path ); + RET( 0 ); + } + + vol = malloc( sizeof(volume) ); + if (volume_open(vol, fd)) { + free( path ); + close_io( fd ); + RET( 0 ); + } + + /* First move to the specified folder */ + tmppath = strdup(path); + record_init_root( &rec, &vol->catalog ); + record_init_parent( &r, &rec ); + + /* Remove initial \ or / */ + curfol = strsep(&tmppath, "\\//"); + curfol = strsep(&tmppath, "\\//"); + forth_printf("\n"); + + while (curfol && strlen(curfol)) { + found = 0; + do { + if (r.record.type == HFSP_FOLDER) { + unicode_uni2asc(name, &r.key.name, sizeof(name)); + + if (!strcmp(name, curfol)) { + folrec = r; + found = -1; + } + } + } while ( !record_next(&r) ); + + if (!found) { + forth_printf("Unable to locate path %s on filesystem\n", path); + goto done; + } else { + record_init_parent( &r, &folrec ); + } + + curfol = strsep(&tmppath, "\\//"); + } + + /* Output the directory contents */ + found = 0; + do { + unicode_uni2asc(name, &r.key.name, sizeof(name)); + + if (r.record.type == HFSP_FILE) { + /* Grab the file entry */ + hfsp_cat_file *file = &r.record.u.file; + forth_printf("% 10" PRId64 " ", file->data_fork.total_size); + print_date(file->create_date); + forth_printf(" %s\n", name); + found = -1; + } + + if (r.record.type == HFSP_FOLDER) { + /* Grab the directory entry */ + hfsp_cat_folder *folder = &r.record.u.folder; + forth_printf(" 0 "); + print_date(folder->create_date); + forth_printf(" %s\\\n", name); + found = -1; + } + + } while ( !record_next(&r) ); + + if (!found) { + forth_printf(" (Empty folder)\n"); + } + +done: + volume_close(vol); + free(vol); + free(path); + if (tmppath) + free(tmppath); } /* static method, ( pos.d ih -- flag? ) */

1 0

[commit] r1065 - trunk/openbios-devel/fs/hfsplus
by repository service 07 Oct '12

07 Oct '12

Author: mcayland Date: Sun Oct 7 17:26:49 2012 New Revision: 1065 URL: http://tracker.coreboot.org/trac/openbios/changeset/1065 Log: Fix HFS+ display for non-ASCII characters. Replace any non-ASCII characters with a ? to prevent display errors when converting from Unicode filenames. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/fs/hfsplus/hfsp_unicode.c Modified: trunk/openbios-devel/fs/hfsplus/hfsp_unicode.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_unicode.c Sun Oct 7 17:26:46 2012 (r1064) +++ trunk/openbios-devel/fs/hfsplus/hfsp_unicode.c Sun Oct 7 17:26:49 2012 (r1065) @@ -43,7 +43,10 @@ /* might be unrepresentable (or too complicated for us) */ if( ustr[0] || !ustr[1] ) continue; - *astr++ = ustr[1]; + if( ustr[1] < 0x20 || ustr[1] >= 0x7f ) + *astr++ = '?'; + else + *astr++ = ustr[1]; len++; } *astr = 0;

1 0

[commit] r1064 - trunk/openbios-devel/fs/hfsplus
by repository service 07 Oct '12

07 Oct '12

Author: mcayland Date: Sun Oct 7 17:26:46 2012 New Revision: 1064 URL: http://tracker.coreboot.org/trac/openbios/changeset/1064 Log: Fix bug related to opening backup volumes in libhfsp's volume_open(). The existing code in hfsp_volume.c tries to locate the alternate volume header at the block vol->maxblocks - 2. Currently for unwrapped HFS+ volumes, vol->maxblocks is never set from the main volume header once it is located and so it tries to find the backup volume at the (dummy) block 3 which inevitably fails. On a secondary note until towards the end of the function, volume_open() assumes the block size is 512 bytes. Therefore once we determine the size of the volume from the main volume header in blocks, we need to convert it from the block size indicated in the volume header to a fixed 512 byte block size in order for the alternate volume header to be located correctly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/fs/hfsplus/hfsp_volume.c Modified: trunk/openbios-devel/fs/hfsplus/hfsp_volume.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_volume.c Tue Aug 21 00:29:42 2012 (r1063) +++ trunk/openbios-devel/fs/hfsplus/hfsp_volume.c Sun Oct 7 17:26:46 2012 (r1064) @@ -171,7 +171,9 @@ UInt16 signature; char buf[vol->blksize]; char *p = buf; - + int ret; + UInt64 vol_size; + if( volume_readinbuf(vol, buf, 2) ) // Wrapper or volume header starts here return -1; @@ -202,7 +204,14 @@ } else if( signature == HFSP_VOLHEAD_SIG) { /* Native HFS+ volume */ p = buf; // Restore to begin of block - return volume_readbuf(vh, p); + ret = volume_readbuf(vh, p); + if( !ret ) { + /* When reading the initial partition we must use 512 byte blocks */ + vol_size = vh->blocksize * vh->total_blocks; + vol->maxblocks = vol_size / HFSP_BLOCKSZ; + } + + return ret; } else HFSP_ERROR(-1, "Neither Wrapper nor native HFS+ volume header found"); fail:

1 0

Re: [OpenBIOS] [PATCH] Adds the get-time word to the dictionary. Used to obtain the current time.
by Programmingkid 06 Oct '12

06 Oct '12

On Oct 4, 2012, at 3:30 PM, openbios-request(a)openbios.org wrote: > Message: 5 > Date: Tue, 25 Sep 2012 16:03:20 +0200 > From: Segher Boessenkool <segher(a)kernel.crashing.org> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org> > Subject: Re: [OpenBIOS] [PATCH] Adds the get-time word to the > dictionary. Used to obtain the current time. > Message-ID: <21F2BBE0-1211-44F5-8C20-8148431F682A(a)kernel.crashing.org> > Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed > >> : get-time >> " rtc" open-dev ( ihandle ) >> ?dup 0= if >> cr abort" Sorry but no rtc node is present on this system" >> then ( ihandle ) >>> r " get-time" r@ $call-method ( <returned args - 6 of em? >> Yikes > ) >> r> close-dev ( <returned args> ) >> ; > > : get-time > s" rtc" s" get-time" execute-device-method > 0= ABORT" Sorry but no rtc node is present on this system" ; > > (note that ABORT" takes a flag as input), but better is > > : get-time > s" rtc" s" get-time" execute-device-method > 0= IF fake-some-sort-of-plausible-time-1970-or-so THEN ; > > which is pretty much what Apple's OF does. execute-device-method > is not the same thing as open-dev followed by $call-method: it > does not call "open" in the instance for the device itself (you > only need that for devices that can have multiple clients at the > same time and need to keep state for each client; or when instead > you need to prevent concurrent access from multiple clients, by > having the second open fail). > > > Segher I honestly see no reason to replace open-dev with execute-device-method. My original patch is just fine.

2 1