OpenBIOS November 2009

openbios@openbios.org

15 participants
81 discussions

Re: [OpenBIOS] PPC cross-compiler defaults to 'powerpc-linux-gnu-'prefix
by Laurent Vivier 26 Nov '09

26 Nov '09

>Hi all, > >While setting up a PPC cross-compiler environment for OpenBIOS, I >noticed that the default cross-compiler prefix is set to >'powerpc-linux-gnu-' as opposed to 'powerpc-elf-'. > >Is there any particular reason that we need the linux platform version, >instead of the elf version which is used by SPARC? The reason I ask is >that the Linux platform version is much much harder to compile as you >need an extra set of glibc headers and have to bootstrap the gcc build >by hand in order to produce the working final compiler. The only reason is because I use "powerpc-linux-gnu-gcc", but I agree it is much harder to produce. But I produce my cross-compile environment from debian packages, which seems simpler. Do you know if there is a "powerpc-elf-gdb" ? >On my tests here everything seems to work fine with just the >'powerpc-elf-' prefix as far as I can tell. If you provide a patch, I agree to apply it. Regards, Laurent -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

5 9

[RFC][PATCH] Select cross-compiler target during configure phase
by Laurent Vivier 26 Nov '09

26 Nov '09

This patch selects cross-compiler prefix from predefined list (*-linux-gnu-, *-elf-, *-eabi-) by testing which one is present on the system when the script switch-arch is run. -- --------------------- laurent(a)vivier.eu ---------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

3 2

r635 - in trunk/openbios-devel: forth/debugging modules
by svn＠openbios.org 26 Nov '09

26 Nov '09

Author: laurent Date: 2009-11-26 02:47:36 +0100 (Thu, 26 Nov 2009) New Revision: 635 Modified: trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/modules/filesystems.c Log: dir command cleanup Modified: trunk/openbios-devel/forth/debugging/client.fs =================================================================== --- trunk/openbios-devel/forth/debugging/client.fs 2009-11-23 21:43:09 UTC (rev 634) +++ trunk/openbios-devel/forth/debugging/client.fs 2009-11-26 01:47:36 UTC (rev 635) @@ -308,20 +308,18 @@ ; : dir ( "{paths}<cr>" -- ) - linefeed parse 2dup + linefeed parse open-dev dup 0= if - 3drop + drop exit then - dup >r - dup ihandle>phandle " dir" rot find-method ( xt 0|1 ) + dup + " dir" rot ['] $call-method catch if - swap call-package - else 3drop cr ." Cannot find dir for this package" then - r> close-dev + close-dev ; : go ( -- ) Modified: trunk/openbios-devel/modules/filesystems.c =================================================================== --- trunk/openbios-devel/modules/filesystems.c 2009-11-23 21:43:09 UTC (rev 634) +++ trunk/openbios-devel/modules/filesystems.c 2009-11-26 01:47:36 UTC (rev 635) @@ -297,16 +297,8 @@ static void files_dir( files_info_t *mi ) { - fs_ops_t *fs = do_open( my_parent() ); - char *path = pop_fstr_copy(); - - if (!path) - return; - - if (fs->dir) - fs->dir(mi->file); - - free(path); + if (mi->fs->dir) + mi->fs->dir(mi->file); } static void

1 0

PATCH: Rework CIF interface to handle parameters in reverse order
by Mark Cave-Ayland 25 Nov '09

25 Nov '09

Hi all, This patch is an attempt at reworking the CIF so that it can be called correctly from both Fcode (Forth) and C. Currently the C arguments are pushed into the stack in reverse order, rather than forward order which is required by Forth words calling the CIF. In order to fix this, we correct the order in which C arguments are placed on the Forth stack by pushing the parameters in forward order. However, this has the side effect of reversing the order in which the parameters to the CIF Forth words are expected and so these must also be altered to take this into account. This patch works as expected from Forth Fcode, but I would like to put it out for testing before I commit to the repository. Blue Swirl/Laurent - please can you test on your setups again? Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

3 5

r634 - trunk/openbios-devel/modules
by svn＠openbios.org 23 Nov '09

23 Nov '09

Author: laurent Date: 2009-11-23 22:43:09 +0100 (Mon, 23 Nov 2009) New Revision: 634 Modified: trunk/openbios-devel/modules/cmdline.c Log: Correct command line history management when we move forward (ctrl-n or arrow down). Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/modules/cmdline.c =================================================================== --- trunk/openbios-devel/modules/cmdline.c 2009-11-22 10:21:43 UTC (rev 633) +++ trunk/openbios-devel/modules/cmdline.c 2009-11-23 21:43:09 UTC (rev 634) @@ -357,7 +357,7 @@ go_down: if( !histind ) break; - history_get( ci, --histind ); + history_get( ci, --histind - 1); clearline( pos, n ); emit_str( buf ); pos = n = strlen( buf );

1 0

Re: [OpenBIOS] r624 - trunk/openbios-devel/forth/system
by Laurent Vivier 23 Nov '09

23 Nov '09

Le vendredi 20 novembre 2009 à 20:09 +0100, svn(a)openbios.org a écrit : > Author: stepan > Date: 2009-11-20 20:09:04 +0100 (Fri, 20 Nov 2009) > New Revision: 624 > > Modified: > trunk/openbios-devel/forth/system/ciface.fs > Log: > In the IEEE 1275-1994 specification the parameters for Client Interface calls > are not in forth stack order but in reversed (heh!) order. Our implementation > confused this. > > This might / will need some more work, but get this in so more people can test > easily. This breaks PPC boot. All my ISO disk images (Fedora 10, 11, debian 5.0.0, 4.0r6, openSUSE 11.1, openbsd 4.6, freebsd 7.2 ...) hang. They are yaboot based. My etch HD disk image hangs with this message (it is quik based): call-method AG�@: exception 5401f50 Regards, Laurent -- --------------------- laurent(a)vivier.eu ---------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

6 19

r633 - trunk/openbios-devel/fs/hfs
by svn＠openbios.org 22 Nov '09

22 Nov '09

Author: laurent Date: 2009-11-22 11:21:43 +0100 (Sun, 22 Nov 2009) New Revision: 633 Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c Log: Implements dir method for HFS filesystem. 0 > dir cd:\ 393216 2009-02-15 17:11:17 .disk\ 131072 2009-02-15 17:10:53 css\ 984 2009-02-07 19:35:37 dedication.txt 65536 2009-02-15 17:11:18 dists\ 1966080 2009-02-15 17:11:18 doc\ 65536 2009-02-15 17:10:54 etc\ 458752 2009-02-15 17:11:18 install\ 45447 2009-02-15 17:11:17 md5sum.txt 917504 2009-02-15 17:10:53 pics\ 65536 2009-02-15 17:11:18 pool\ 131072 2009-02-15 17:11:18 ppc\ 8921 2009-02-15 17:11:17 README.html 119979 2009-02-14 20:52:19 README.mirrors.html 60194 2009-02-14 20:52:19 README.mirrors.txt 379 2009-02-15 17:10:54 README.source 5468 2009-02-15 17:11:17 README.txt Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c =================================================================== --- trunk/openbios-devel/fs/hfs/hfs_fs.c 2009-11-22 10:07:23 UTC (rev 632) +++ trunk/openbios-devel/fs/hfs/hfs_fs.c 2009-11-22 10:21:43 UTC (rev 633) @@ -16,6 +16,7 @@ #include "openbios/config.h" #include "openbios/fs.h" +#include "libc/vsprintf.h" #include "libhfs.h" #define MAC_OS_ROM_CREATOR 0x63687270 /* 'chrp' */ @@ -27,6 +28,13 @@ #define SYSTEM_TYPE 0x7A737973 /* 'zsys' */ #define SYSTEM_CREATOR 0x4D414353 /* 'MACS' */ +typedef struct { + enum { FILE, DIR } type; + union { + hfsdir *dir; + hfsfile *file; + }; +} hfscommon; /************************************************************************/ @@ -142,15 +150,22 @@ static void file_close( file_desc_t *fd ) { - hfsfile *file = (hfsfile*)fd; - hfs_close( file ); + hfscommon *common = (hfscommon*)fd; + if (common->type == FILE) + hfs_close( common->file ); + else if (common->type == DIR) + hfs_closedir( common->dir ); + free(common); } static int file_lseek( file_desc_t *fd, off_t offs, int whence ) { - hfsfile *file = (hfsfile*)fd; + hfscommon *common = (hfscommon*)fd; + if (common->type != FILE) + return -1; + switch( whence ) { case SEEK_CUR: whence = HFS_SEEK_CUR; @@ -164,27 +179,32 @@ break; } - return hfs_seek( file, offs, whence ); + return hfs_seek( common->file, offs, whence ); } static int file_read( file_desc_t *fd, void *buf, size_t count ) { - hfsfile *file = (hfsfile*)fd; - return hfs_read( file, buf, count ); + hfscommon *common = (hfscommon*)fd; + if (common->type != FILE) + return -1; + return hfs_read( common->file, buf, count ); } static char * get_path( file_desc_t *fd, char *retbuf, int len ) { char buf[256], buf2[256]; + hfscommon *common = (hfscommon*)fd; hfsvol *vol = hfs_getvol( NULL ); - hfsfile *file = (hfsfile*)fd; hfsdirent ent; int start, ns; ulong id; - hfs_fstat( file, &ent ); + if (common->type != FILE) + return NULL; + + hfs_fstat( common->file, &ent ); start = sizeof(buf) - strlen(ent.name) - 1; if( start <= 0 ) return NULL; @@ -215,28 +235,51 @@ static file_desc_t * -open_path( fs_ops_t *fs, const char *path ) +open_path( fs_ops_t *fs, const char *fullpath ) { hfsvol *vol = (hfsvol*)fs->fs_data; const char *s; char buf[256]; + hfscommon *common; + char *path = strdup(fullpath); if( !strncmp(path, "\\\\", 2) ) { hfsvolent ent; /* \\ is an alias for the (blessed) system folder */ - if( hfs_vstat(vol, &ent) < 0 || hfs_setcwd(vol, ent.blessed) ) + if( hfs_vstat(vol, &ent) < 0 || hfs_setcwd(vol, ent.blessed) ) { + free(path); return NULL; + } path += 2; } else { hfs_chdir( vol, ":" ); } + common = malloc(sizeof(*common)); + if (!common) { + free(path); + return NULL; + } + + if (strcmp(path, "\\") == 0) { + /* root directory is in fact ":" */ + common->dir = hfs_opendir(vol, ":"); + common->type = DIR; + free(path); + return (file_desc_t*)common; + } + + if (path[strlen(path) - 1] == '\\') { + path[strlen(path) - 1] = 0; + } + for( path-- ;; ) { int n; s = ++path; - if( !(path=strchr(s, '\\')) ) + path = strchr(s, '\\'); + if( !path || !path[1]) break; n = MIN( sizeof(buf)-1, (path-s) ); if( !n ) @@ -244,8 +287,11 @@ strncpy( buf, s, n ); buf[n] = 0; - if( hfs_chdir(vol, buf) ) + if( hfs_chdir(vol, buf) ) { + free(common); + free(path); return NULL; + } } /* support the ':filetype' syntax */ @@ -260,23 +306,43 @@ hfs_dirinfo( vol, &id, buf ); hfs_setcwd( vol, id ); - if( !(dir=hfs_opendir(vol, buf)) ) + if( !(dir=hfs_opendir(vol, buf)) ) { + free(common); + free(path); return NULL; + } hfs_setcwd( vol, oldid ); while( !hfs_readdir(dir, &ent) ) { if( ent.flags & HFS_ISDIR ) continue; if( !strncmp(s, ent.u.file.type, 4) ) { - ret = (file_desc_t*)hfs_open( vol, ent.name ); + common->type = FILE; + common->file = hfs_open( vol, ent.name ); + ret = (file_desc_t*)common; break; } } hfs_closedir( dir ); + free(path); return ret; } - return (file_desc_t*)hfs_open( vol, s ); + common->dir = hfs_opendir(vol, s); + if (!common->dir) { + common->file = hfs_open( vol, s ); + if (common->file == NULL) { + free(common); + free(path); + return NULL; + } + common->type = FILE; + free(path); + return (file_desc_t*)common; + } + common->type = DIR; + free(path); + return (file_desc_t*)common; } static void @@ -288,6 +354,75 @@ /* callers responsibility to call free(fs) */ } +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(time_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 += 1970; + + 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 void +dir_fs( file_desc_t *fd ) +{ + hfscommon *common = (hfscommon*)fd; + hfsdirent ent; + + if (common->type != DIR) + return; + + forth_printf("\n"); + while( !hfs_readdir(common->dir, &ent) ) { + forth_printf("% 10d ", ent.u.file.dsize); + print_date(ent.mddate); + if( ent.flags & HFS_ISDIR ) + forth_printf("%s\\\n", ent.name); + else + forth_printf("%s\n", ent.name); + } +} + static const char * get_fstype( fs_ops_t *fs ) { @@ -295,6 +430,7 @@ } static const fs_ops_t hfs_ops = { + .dir = dir_fs, .close_fs = close_fs, .open_path = open_path, .search_rom = search_rom,

1 0

r632 - trunk/openbios-devel/fs/ext2
by svn＠openbios.org 22 Nov '09

22 Nov '09

Author: laurent Date: 2009-11-22 11:07:23 +0100 (Sun, 22 Nov 2009) New Revision: 632 Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c Log: Implements dir method for ext2 filesystem. 0 > dir hd:3,\ 4096 2009-08-05 22:20:53 .\ 4096 2009-08-05 22:20:53 ..\ 16384 2009-02-20 10:56:01 lost+found\ 4096 2009-02-20 10:56:59 boot\ 4096 2009-11-10 21:44:03 etc\ 4096 2009-02-20 10:57:14 media\ 11 2009-02-20 10:57:14 cdrom 4096 2007-03-07 23:22:28 selinux\ 4096 2009-02-20 11:12:18 var\ 4096 2009-02-20 11:12:19 usr\ 4096 2008-05-21 08:44:38 sys\ 12288 2009-08-05 22:30:50 lib\ 4096 2009-08-05 22:31:05 sbin\ 4096 2009-02-20 13:00:26 bin\ 40960 2009-02-20 14:32:18 dev\ 4096 2009-02-20 14:30:57 home\ 4096 2006-10-28 13:49:35 mnt\ 4096 2006-10-28 13:49:35 proc\ 4096 2009-05-18 12:40:32 root\ 4096 2009-11-10 21:44:15 tmp\ 4096 2009-02-20 12:30:21 lib64\ 4096 2009-02-20 11:12:17 srv\ 4096 2009-02-20 11:12:18 opt\ 4096 2009-02-20 11:12:18 initrd\ 5349268 2009-02-20 11:51:46 initrd.img-2.6.18-6-powerpc 4405754 2008-12-13 09:58:03 vmlinux-2.6.18-6-powerpc Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_fs.c 2009-11-22 10:03:00 UTC (rev 631) +++ trunk/openbios-devel/fs/ext2/ext2_fs.c 2009-11-22 10:07:23 UTC (rev 632) @@ -9,7 +9,16 @@ #include "libext2.h" #include "ext2_utils.h" #include "openbios/fs.h" +#include "libc/vsprintf.h" +typedef struct { + enum { FILE, DIR } type; + union { + ext2_FILE *file; + ext2_DIR *dir; + }; +} ext2_COMMON; + static void umount( fs_ops_t *fs ) { @@ -18,49 +27,146 @@ ext2_umount( volume ); } +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(time_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 += 1970; + + 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 void +dir_fs ( file_desc_t *fd) +{ + ext2_COMMON *common = (ext2_COMMON *)fd; + struct ext2_dir_entry_2 *entry; + struct ext2_inode inode; + + if (common->type != DIR) + return; + + forth_printf("\n"); + while ( (entry = ext2_readdir(common->dir)) ) { + ext2_get_inode(common->dir->volume, entry->inode, &inode); + forth_printf("% 10d ", inode.i_size); + print_date(inode.i_mtime); + if (S_ISDIR(inode.i_mode)) + forth_printf("%s\\\n", entry->name); + else + forth_printf("%s\n", entry->name); + } +} + static file_desc_t * open_path( fs_ops_t *fs, const char *path ) { ext2_VOLUME *volume = (ext2_VOLUME *)fs->fs_data; - ext2_FILE *file; + ext2_COMMON *common; - file = ext2_open(volume, path); + common = (ext2_COMMON*)malloc(sizeof(*common)); + if (common == NULL) + return NULL; - return (file_desc_t *)file; + common->dir = ext2_opendir(volume, path); + if (common->dir == NULL) { + common->file = ext2_open(volume, path); + if (common->file == NULL) { + free(common); + return NULL; + } + common->type = FILE; + return (file_desc_t *)common; + } + common->type = DIR; + return (file_desc_t *)common; } static char * get_path( file_desc_t *fd, char *buf, int size ) { - ext2_FILE *file = (ext2_FILE *)fd; + ext2_COMMON *common =(ext2_COMMON *)fd; - strncpy(buf, file->path, size); + if (common->type != FILE) + return NULL; + strncpy(buf, common->file->path, size); + return buf; } static int file_lseek( file_desc_t *fd, off_t offs, int whence ) { - ext2_FILE *file = (ext2_FILE *)fd; + ext2_COMMON *common =(ext2_COMMON *)fd; - return ext2_lseek(file, offs, whence); + if (common->type != FILE) + return -1; + + return ext2_lseek(common->file, offs, whence); } static void file_close( file_desc_t *fd ) { - ext2_FILE *file = (ext2_FILE *)fd; + ext2_COMMON *common =(ext2_COMMON *)fd; - ext2_close(file); + if (common->type == FILE) + ext2_close(common->file); + else if (common->type == DIR) + ext2_closedir(common->dir); + free(common); } static int file_read( file_desc_t *fd, void *buf, size_t count ) { - ext2_FILE *file = (ext2_FILE *)fd; + ext2_COMMON *common =(ext2_COMMON *)fd; - return ext2_read(file, buf, count); + if (common->type != FILE) + return -1; + + return ext2_read(common->file, buf, count); } static const char * @@ -70,6 +176,7 @@ } static const fs_ops_t ext2_ops = { + .dir = dir_fs, .close_fs = umount, .open_path = open_path,

1 0

r631 - trunk/openbios-devel/fs/iso9660
by svn＠openbios.org 22 Nov '09

22 Nov '09

Author: laurent Date: 2009-11-22 11:03:00 +0100 (Sun, 22 Nov 2009) New Revision: 631 Modified: trunk/openbios-devel/fs/iso9660/iso9660_fs.c Log: Implements dir method for ISO9660 filesystem. 0 > dir cd:\ 2048 2007-02-01 13:50:07 .\ 2048 2007-02-01 13:50:07 ..\ 2048 2007-02-01 13:54:13 ppc\ ok 0 > dir cd:\ppc 2048 2007-02-01 13:54:13 .\ 2048 2007-02-01 13:50:07 ..\ 190 2007-02-01 13:54:13 bootinfo.txt 2048 2007-02-01 13:51:11 chrp\ Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/fs/iso9660/iso9660_fs.c =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_fs.c 2009-11-22 09:58:01 UTC (rev 630) +++ trunk/openbios-devel/fs/iso9660/iso9660_fs.c 2009-11-22 10:03:00 UTC (rev 631) @@ -6,7 +6,16 @@ #include "libiso9660.h" #include "openbios/fs.h" +#include "libc/vsprintf.h" +typedef struct { + enum { FILE, DIR } type; + union { + iso9660_FILE *file; + iso9660_DIR * dir; + }; +} iso9660_COMMON; + static void umount( fs_ops_t *fs ) { @@ -15,49 +24,102 @@ iso9660_umount( volume ); } +static void +dir_fs ( file_desc_t *fd ) +{ + iso9660_COMMON *common = (iso9660_COMMON *)fd; + struct iso_directory_record *idr; + char name_buf[256]; + + if (common->type != DIR) + return; + + forth_printf("\n"); + while ( (idr = iso9660_readdir(common->dir)) ) { + + forth_printf("% 10d ", isonum_733(idr->size)); + forth_printf("%d-%02d-%02d %02d:%02d:%02d ", + idr->date[0] + 1900, /* year */ + idr->date[1], /* month */ + idr->date[2], /* day */ + idr->date[3], idr->date[4], idr->date[5]); + iso9660_name(common->dir->volume, idr, name_buf); + if (idr->flags[0] & 2) + forth_printf("%s\\\n", name_buf); + else + forth_printf("%s\n", name_buf); + } +} + static file_desc_t * open_path( fs_ops_t *fs, const char *path ) { iso9660_VOLUME *volume = (iso9660_VOLUME *)fs->fs_data; - iso9660_FILE *file; + iso9660_COMMON *common; - file = iso9660_open(volume, path); + common = (iso9660_COMMON *)malloc(sizeof(*common)); + if (common == NULL) + return NULL; - return (file_desc_t *)file; + common->dir = iso9660_opendir(volume, path); + if (common->dir == NULL) { + common->file = iso9660_open(volume, path); + if (common->file == NULL) { + free(common); + return NULL; + } + common->type = FILE; + return (file_desc_t *)common; + } + common->type = DIR; + return (file_desc_t *)common; } static char * get_path( file_desc_t *fd, char *buf, int size ) { - iso9660_FILE *file = (iso9660_FILE*)fd; + iso9660_COMMON *common = (iso9660_COMMON *)fd; - strncpy(buf, file->path, size); + if (common->type != FILE) + return NULL; + strncpy(buf, common->file->path, size); + return buf; } static int file_lseek( file_desc_t *fd, off_t offs, int whence ) { - iso9660_FILE *file = (iso9660_FILE*)fd; + iso9660_COMMON *common = (iso9660_COMMON *)fd; - return iso9660_lseek(file, offs, whence); + if (common->type != FILE) + return -1; + + return iso9660_lseek(common->file, offs, whence); } static void file_close( file_desc_t *fd ) { - iso9660_FILE *file = (iso9660_FILE*)fd; + iso9660_COMMON *common = (iso9660_COMMON *)fd; - iso9660_close(file); + if (common->type == FILE) + iso9660_close(common->file); + else if (common->type == DIR) + iso9660_closedir(common->dir); + free(common); } static int file_read( file_desc_t *fd, void *buf, size_t count ) { - iso9660_FILE *file = (iso9660_FILE*)fd; + iso9660_COMMON *common = (iso9660_COMMON *)fd; - return iso9660_read(file, buf, count); + if (common->type != FILE) + return -1; + + return iso9660_read(common->file, buf, count); } static char * @@ -77,6 +139,7 @@ } static const fs_ops_t iso9660_ops = { + .dir = dir_fs, .close_fs = umount, .open_path = open_path,

1 0

r630 - in trunk/openbios-devel: forth/debugging include/openbios modules
by svn＠openbios.org 22 Nov '09

22 Nov '09

Author: laurent Date: 2009-11-22 10:58:01 +0100 (Sun, 22 Nov 2009) New Revision: 630 Modified: trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/include/openbios/fs.h trunk/openbios-devel/modules/filesystems.c Log: Implement command "dir <path>". This is the generic command, it needs support from the filesystem packages. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/forth/debugging/client.fs =================================================================== --- trunk/openbios-devel/forth/debugging/client.fs 2009-11-22 09:53:54 UTC (rev 629) +++ trunk/openbios-devel/forth/debugging/client.fs 2009-11-22 09:58:01 UTC (rev 630) @@ -307,6 +307,23 @@ init-program ; +: dir ( "{paths}<cr>" -- ) + linefeed parse 2dup + open-dev dup 0= if + 3drop + exit + then + dup >r + dup ihandle>phandle " dir" rot find-method ( xt 0|1 ) + if + swap call-package + else + 3drop + cr ." Cannot find dir for this package" + then + r> close-dev +; + : go ( -- ) state-valid @ not if exit then elf file-type @ = if Modified: trunk/openbios-devel/include/openbios/fs.h =================================================================== --- trunk/openbios-devel/include/openbios/fs.h 2009-11-22 09:53:54 UTC (rev 629) +++ trunk/openbios-devel/include/openbios/fs.h 2009-11-22 09:58:01 UTC (rev 630) @@ -42,6 +42,7 @@ int (*read)( file_desc_t *file, void *buf, size_t count ); int (*lseek)( file_desc_t *file, off_t offset, int whence ); char *(*get_path)( file_desc_t *file, char *buf, int len ); + void (*dir)( file_desc_t *file ); const char *(*get_fstype)( fs_ops_t *fs ); }; Modified: trunk/openbios-devel/modules/filesystems.c =================================================================== --- trunk/openbios-devel/modules/filesystems.c 2009-11-22 09:53:54 UTC (rev 629) +++ trunk/openbios-devel/modules/filesystems.c 2009-11-22 09:58:01 UTC (rev 630) @@ -295,6 +295,21 @@ } static void +files_dir( files_info_t *mi ) +{ + fs_ops_t *fs = do_open( my_parent() ); + char *path = pop_fstr_copy(); + + if (!path) + return; + + if (fs->dir) + fs->dir(mi->file); + + free(path); +} + +static void files_initializer( files_info_t *dummy ) { fword("register-fs-package"); @@ -309,6 +324,7 @@ { "seek", files_seek }, { "tell", files_tell }, { "load", files_load }, + { "dir", files_dir }, { "block-size", files_block_size }, /* special */

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →