OpenBIOS November 2009

openbios@openbios.org

15 participants
81 discussions

r629 - in trunk/openbios-devel/arch: ppc sparc32 sparc64 unix
by svn＠openbios.org 22 Nov '09

22 Nov '09

Author: laurent Date: 2009-11-22 10:53:54 +0100 (Sun, 22 Nov 2009) New Revision: 629 Modified: trunk/openbios-devel/arch/ppc/build.xml trunk/openbios-devel/arch/sparc32/build.xml trunk/openbios-devel/arch/sparc64/build.xml trunk/openbios-devel/arch/unix/build.xml Log: Change link edition order to move libc after libfs, allowing libfs to use functions from libc. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/arch/ppc/build.xml =================================================================== --- trunk/openbios-devel/arch/ppc/build.xml 2009-11-22 09:50:54 UTC (rev 628) +++ trunk/openbios-devel/arch/ppc/build.xml 2009-11-22 09:53:54 UTC (rev 629) @@ -155,8 +155,8 @@ <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> <external-object source="libdrivers.a"/> + <external-object source="libfs.a"/> <external-object source="liblibc.a"/> - <external-object source="libfs.a"/> </executable> <executable name="openbios-pearpc.elf" target="target" condition="PEARPC"> @@ -170,8 +170,8 @@ <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> <external-object source="libdrivers.a"/> + <external-object source="libfs.a"/> <external-object source="liblibc.a"/> - <external-object source="libfs.a"/> </executable> <executable name="openbios-qemu.elf" target="target" condition="QEMU"> @@ -185,8 +185,8 @@ <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> <external-object source="libdrivers.a"/> + <external-object source="libfs.a"/> <external-object source="liblibc.a"/> - <external-object source="libfs.a"/> <external-object source="libgcc.a"/> </executable> @@ -200,8 +200,8 @@ <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> <external-object source="libdrivers.a"/> + <external-object source="libfs.a"/> <external-object source="liblibc.a"/> - <external-object source="libfs.a"/> </executable> </build> Modified: trunk/openbios-devel/arch/sparc32/build.xml =================================================================== --- trunk/openbios-devel/arch/sparc32/build.xml 2009-11-22 09:50:54 UTC (rev 628) +++ trunk/openbios-devel/arch/sparc32/build.xml 2009-11-22 09:53:54 UTC (rev 629) @@ -34,8 +34,8 @@ <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> <external-object source="libdrivers.a"/> + <external-object source="libfs.a"/> <external-object source="liblibc.a"/> - <external-object source="libfs.a"/> <external-object source="libgcc.a"/> </executable> @@ -68,8 +68,8 @@ <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> <external-object source="libdrivers.a"/> + <external-object source="libfs.a"/> <external-object source="liblibc.a"/> - <external-object source="libfs.a"/> <external-object source="libgcc.a"/> </executable> Modified: trunk/openbios-devel/arch/sparc64/build.xml =================================================================== --- trunk/openbios-devel/arch/sparc64/build.xml 2009-11-22 09:50:54 UTC (rev 628) +++ trunk/openbios-devel/arch/sparc64/build.xml 2009-11-22 09:53:54 UTC (rev 629) @@ -35,8 +35,8 @@ <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> <external-object source="libdrivers.a"/> + <external-object source="libfs.a"/> <external-object source="liblibc.a"/> - <external-object source="libfs.a"/> <external-object source="libgcc.a"/> </executable> @@ -70,8 +70,8 @@ <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> <external-object source="libdrivers.a"/> + <external-object source="libfs.a"/> <external-object source="liblibc.a"/> - <external-object source="libfs.a"/> <external-object source="libgcc.a"/> </executable> Modified: trunk/openbios-devel/arch/unix/build.xml =================================================================== --- trunk/openbios-devel/arch/unix/build.xml 2009-11-22 09:50:54 UTC (rev 628) +++ trunk/openbios-devel/arch/unix/build.xml 2009-11-22 09:53:54 UTC (rev 629) @@ -15,8 +15,8 @@ <external-object source="libbootstrap.a"/> <external-object source="libmodules.a"/> <external-object source="libdrivers.a"/> + <external-object source="libfs.a"/> <external-object source="liblibc.a"/> - <external-object source="libfs.a"/> </executable> </build>

1 0

r628 - in trunk/openbios-devel: include/libc libc
by svn＠openbios.org 22 Nov '09

22 Nov '09

Author: laurent Date: 2009-11-22 10:50:54 +0100 (Sun, 22 Nov 2009) New Revision: 628 Modified: trunk/openbios-devel/include/libc/vsprintf.h trunk/openbios-devel/libc/extra.c Log: Add a function forth_printf() which prints to openbios stdout. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/include/libc/vsprintf.h =================================================================== --- trunk/openbios-devel/include/libc/vsprintf.h 2009-11-22 09:47:08 UTC (rev 627) +++ trunk/openbios-devel/include/libc/vsprintf.h 2009-11-22 09:50:54 UTC (rev 628) @@ -25,4 +25,6 @@ extern int vsnprintf(char *buf, size_t size, const char *fmt, va_list args); extern int snprintf(char * buf, size_t size, const char *fmt, ...); +extern int forth_printf( const char *fmt, ... ); + #endif /* _H_VSPRINTF */ Modified: trunk/openbios-devel/libc/extra.c =================================================================== --- trunk/openbios-devel/libc/extra.c 2009-11-22 09:47:08 UTC (rev 627) +++ trunk/openbios-devel/libc/extra.c 2009-11-22 09:50:54 UTC (rev 628) @@ -16,6 +16,8 @@ #include "openbios/config.h" #include "libc/string.h" +#include "libc/vsprintf.h" +#include "openbios/bindings.h" /* strncpy without 0-pad */ char * @@ -24,3 +26,24 @@ int len = MIN( n, strlen(src)+1 ); return memcpy( dest, src, len ); } + +/* printf */ + +int forth_printf( const char *fmt, ... ) +{ + char buf[512]; + va_list args; + int i; + + va_start(args, fmt); + i = vsnprintf(buf, sizeof(buf), fmt, args); + va_end(args); + + PUSH((ucell)buf); + PUSH(i); + fword("type"); + + return i; +} + +

1 0

r627 - in trunk/openbios-devel: config/examples config/scripts fs fs/ext2 include/openbios modules
by svn＠openbios.org 22 Nov '09

22 Nov '09

Author: laurent Date: 2009-11-22 10:47:08 +0100 (Sun, 22 Nov 2009) New Revision: 627 Added: trunk/openbios-devel/fs/ext2/ trunk/openbios-devel/fs/ext2/build.xml trunk/openbios-devel/fs/ext2/ext2.h trunk/openbios-devel/fs/ext2/ext2_close.c trunk/openbios-devel/fs/ext2/ext2_closedir.c trunk/openbios-devel/fs/ext2/ext2_fs.c trunk/openbios-devel/fs/ext2/ext2_fs.h trunk/openbios-devel/fs/ext2/ext2_lseek.c trunk/openbios-devel/fs/ext2/ext2_mount.c trunk/openbios-devel/fs/ext2/ext2_open.c trunk/openbios-devel/fs/ext2/ext2_opendir.c trunk/openbios-devel/fs/ext2/ext2_read.c trunk/openbios-devel/fs/ext2/ext2_readdir.c trunk/openbios-devel/fs/ext2/ext2_utils.c trunk/openbios-devel/fs/ext2/ext2_utils.h trunk/openbios-devel/fs/ext2/libext2.h Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml trunk/openbios-devel/config/examples/ppc_config.xml trunk/openbios-devel/config/scripts/switch-arch trunk/openbios-devel/fs/build.xml trunk/openbios-devel/include/openbios/fs.h trunk/openbios-devel/modules/filesystems.c Log: Add cleaner ext2 filesystem implementation Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-11-22 09:26:50 UTC (rev 626) +++ trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-11-22 09:47:08 UTC (rev 627) @@ -51,8 +51,9 @@ <option name="CONFIG_HFS" type="boolean" value="true"/> <option name="CONFIG_HFSP" type="boolean" value="true"/> <option name="CONFIG_ISO9660" type="boolean" value="true"/> + <option name="CONFIG_EXT2" type="boolean" value="true"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="false"/> <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> <option name="CONFIG_FSYS_JFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/examples/ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml 2009-11-22 09:26:50 UTC (rev 626) +++ trunk/openbios-devel/config/examples/ppc_config.xml 2009-11-22 09:47:08 UTC (rev 627) @@ -52,8 +52,9 @@ <option name="CONFIG_HFS" type="boolean" value="true"/> <option name="CONFIG_HFSP" type="boolean" value="true"/> <option name="CONFIG_ISO9660" type="boolean" value="true"/> + <option name="CONFIG_EXT2" type="boolean" value="true"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> - <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="false"/> <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> <option name="CONFIG_FSYS_JFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/scripts/switch-arch =================================================================== --- trunk/openbios-devel/config/scripts/switch-arch 2009-11-22 09:26:50 UTC (rev 626) +++ trunk/openbios-devel/config/scripts/switch-arch 2009-11-22 09:47:08 UTC (rev 627) @@ -167,6 +167,7 @@ mkdir -p $OBJDIR/target/fs/hfs mkdir -p $OBJDIR/target/fs/hfsplus mkdir -p $OBJDIR/target/fs/iso9660 + mkdir -p $OBJDIR/target/fs/ext2 mkdir -p $OBJDIR/target/drivers mkdir -p $OBJDIR/target/libc mkdir -p $OBJDIR/host/include Modified: trunk/openbios-devel/fs/build.xml =================================================================== --- trunk/openbios-devel/fs/build.xml 2009-11-22 09:26:50 UTC (rev 626) +++ trunk/openbios-devel/fs/build.xml 2009-11-22 09:47:08 UTC (rev 627) @@ -9,5 +9,6 @@ <include href="hfs/build.xml"/> <include href="hfsplus/build.xml"/> <include href="iso9660/build.xml"/> + <include href="ext2/build.xml"/> </build> Added: trunk/openbios-devel/fs/ext2/build.xml =================================================================== --- trunk/openbios-devel/fs/ext2/build.xml (rev 0) +++ trunk/openbios-devel/fs/ext2/build.xml 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,14 @@ +<build> + <library name="fs" type="static" target="target"> + <object source="ext2_close.c" condition="EXT2"/> + <object source="ext2_closedir.c" condition="EXT2"/> + <object source="ext2_fs.c" condition="EXT2"/> + <object source="ext2_lseek.c" condition="EXT2"/> + <object source="ext2_mount.c" condition="EXT2"/> + <object source="ext2_open.c" condition="EXT2"/> + <object source="ext2_opendir.c" condition="EXT2"/> + <object source="ext2_read.c" condition="EXT2"/> + <object source="ext2_readdir.c" condition="EXT2"/> + <object source="ext2_utils.c" condition="EXT2"/> + </library> +</build> Added: trunk/openbios-devel/fs/ext2/ext2.h =================================================================== --- trunk/openbios-devel/fs/ext2/ext2.h (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2.h 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,33 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#ifndef __EXT2_H__ +#define __EXT2_H__ + +#include "ext2_fs.h" + +typedef struct ext2_VOLUME { + int fd; + struct ext2_super_block *super; + unsigned int current; + char *buffer; +} ext2_VOLUME; + +typedef struct ext2_DIR { + ext2_VOLUME *volume; + struct ext2_inode *inode; + off_t index; +} ext2_DIR; + +typedef struct ext2_FILE { + ext2_VOLUME *volume; + struct ext2_inode *inode; + off_t offset; + char *path; +} ext2_FILE; +#endif /* __LIBEXT2_H__ */ Added: trunk/openbios-devel/fs/ext2/ext2_close.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_close.c (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_close.c 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,18 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libext2.h" + +void ext2_close(ext2_FILE *file) +{ + if (file == NULL) + return; + free(file->inode); + free(file->path); + free(file); +} Added: trunk/openbios-devel/fs/ext2/ext2_closedir.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_closedir.c (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_closedir.c 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,18 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libext2.h" +#include "ext2.h" + +void ext2_closedir(ext2_DIR *dir) +{ + if (dir == NULL) + return; + free(dir->inode); + free(dir); +} Added: trunk/openbios-devel/fs/ext2/ext2_fs.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_fs.c (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_fs.c 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,96 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libext2.h" +#include "ext2_utils.h" +#include "openbios/fs.h" + +static void +umount( fs_ops_t *fs ) +{ + ext2_VOLUME *volume = (ext2_VOLUME *)fs->fs_data; + + ext2_umount( volume ); +} + +static file_desc_t * +open_path( fs_ops_t *fs, const char *path ) +{ + ext2_VOLUME *volume = (ext2_VOLUME *)fs->fs_data; + ext2_FILE *file; + + file = ext2_open(volume, path); + + return (file_desc_t *)file; +} + +static char * +get_path( file_desc_t *fd, char *buf, int size ) +{ + ext2_FILE *file = (ext2_FILE *)fd; + + strncpy(buf, file->path, size); + + return buf; +} + +static int +file_lseek( file_desc_t *fd, off_t offs, int whence ) +{ + ext2_FILE *file = (ext2_FILE *)fd; + + return ext2_lseek(file, offs, whence); +} + +static void +file_close( file_desc_t *fd ) +{ + ext2_FILE *file = (ext2_FILE *)fd; + + ext2_close(file); +} + +static int +file_read( file_desc_t *fd, void *buf, size_t count ) +{ + ext2_FILE *file = (ext2_FILE *)fd; + + return ext2_read(file, buf, count); +} + +static const char * +get_fstype( fs_ops_t *fs) +{ + return "EXT2"; +} + +static const fs_ops_t ext2_ops = { + .close_fs = umount, + + .open_path = open_path, + .get_path = get_path, + .close = file_close, + .read = file_read, + .lseek = file_lseek, + + .get_fstype = get_fstype, +}; + +int fs_ext2_open(int fd, fs_ops_t *fs) +{ + ext2_VOLUME *volume; + + volume = ext2_mount(fd); + if (volume == NULL) + return -1; + + *fs = ext2_ops; + fs->fs_data = volume; + + return 0; +} Added: trunk/openbios-devel/fs/ext2/ext2_fs.h =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_fs.h (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_fs.h 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,534 @@ +/* + * This file has been copied from + * linux/include/linux/ext2_fs.h + * + * Copyright (C) 1992, 1993, 1994, 1995 + * Remy Card (card(a)masi.ibp.fr) + * Laboratoire MASI - Institut Blaise Pascal + * Universite Pierre et Marie Curie (Paris VI) + * + * from + * + * linux/include/linux/minix_fs.h + * + * Copyright (C) 1991, 1992 Linus Torvalds + */ + +#ifndef _EXT2_FS_H +#define _EXT2_FS_H + +/* from /usr/include/linux/magic.h */ + +#define EXT2_SUPER_MAGIC 0xEF53 + +/* + * The second extended filesystem constants/structures + */ + +/* + * Define EXT2FS_DEBUG to produce debug messages + */ +#undef EXT2FS_DEBUG + +/* + * Define EXT2_RESERVATION to reserve data blocks for expanding files + */ +#define EXT2_DEFAULT_RESERVE_BLOCKS 8 +/*max window size: 1024(direct blocks) + 3([t,d]indirect blocks) */ +#define EXT2_MAX_RESERVE_BLOCKS 1027 +#define EXT2_RESERVE_WINDOW_NOT_ALLOCATED 0 +/* + * The second extended file system version + */ +#define EXT2FS_DATE "95/08/09" +#define EXT2FS_VERSION "0.5b" + +/* + * Debug code + */ +#ifdef EXT2FS_DEBUG +# define ext2_debug(f, a...) { \ + printk ("EXT2-fs DEBUG (%s, %d): %s:", \ + __FILE__, __LINE__, __FUNCTION__); \ + printk (f, ## a); \ + } +#else +# define ext2_debug(f, a...) /**/ +#endif + +/* + * Special inode numbers + */ +#define EXT2_BAD_INO 1 /* Bad blocks inode */ +#define EXT2_ROOT_INO 2 /* Root inode */ +#define EXT2_BOOT_LOADER_INO 5 /* Boot loader inode */ +#define EXT2_UNDEL_DIR_INO 6 /* Undelete directory inode */ + +/* First non-reserved inode for old ext2 filesystems */ +#define EXT2_GOOD_OLD_FIRST_INO 11 + +/* Assume that user mode programs are passing in an ext2fs superblock, not + * a kernel struct super_block. This will allow us to call the feature-test + * macros from user land. */ +#define EXT2_SB(sb) (sb) + +/* + * Maximal count of links to a file + */ +#define EXT2_LINK_MAX 32000 + +/* + * Macro-instructions used to manage several block sizes + */ +#define EXT2_MIN_BLOCK_SIZE 1024 +#define EXT2_MAX_BLOCK_SIZE 4096 +#define EXT2_MIN_BLOCK_LOG_SIZE 10 +# define EXT2_BLOCK_SIZE(s) (EXT2_MIN_BLOCK_SIZE << (s)->s_log_block_size) +#define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (uint32_t)) +# define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10) +#define EXT2_INODE_SIZE(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \ + EXT2_GOOD_OLD_INODE_SIZE : \ + (s)->s_inode_size) +#define EXT2_FIRST_INO(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \ + EXT2_GOOD_OLD_FIRST_INO : \ + (s)->s_first_ino) + +/* + * Macro-instructions used to manage fragments + */ +#define EXT2_MIN_FRAG_SIZE 1024 +#define EXT2_MAX_FRAG_SIZE 4096 +#define EXT2_MIN_FRAG_LOG_SIZE 10 +# define EXT2_FRAG_SIZE(s) (EXT2_MIN_FRAG_SIZE << (s)->s_log_frag_size) +# define EXT2_FRAGS_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / EXT2_FRAG_SIZE(s)) + +/* + * Structure of a blocks group descriptor + */ +struct ext2_group_desc +{ + uint32_t bg_block_bitmap; /* Blocks bitmap block */ + uint32_t bg_inode_bitmap; /* Inodes bitmap block */ + uint32_t bg_inode_table; /* Inodes table block */ + uint16_t bg_free_blocks_count; /* Free blocks count */ + uint16_t bg_free_inodes_count; /* Free inodes count */ + uint16_t bg_used_dirs_count; /* Directories count */ + uint16_t bg_pad; + uint32_t bg_reserved[3]; +}; + +/* + * Macro-instructions used to manage group descriptors + */ +# define EXT2_BLOCKS_PER_GROUP(s) ((s)->s_blocks_per_group) +# define EXT2_DESC_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (struct ext2_group_desc)) +# define EXT2_INODES_PER_GROUP(s) ((s)->s_inodes_per_group) + +/* + * Constants relative to the data blocks + */ +#define EXT2_NDIR_BLOCKS 12 +#define EXT2_IND_BLOCK EXT2_NDIR_BLOCKS +#define EXT2_DIND_BLOCK (EXT2_IND_BLOCK + 1) +#define EXT2_TIND_BLOCK (EXT2_DIND_BLOCK + 1) +#define EXT2_N_BLOCKS (EXT2_TIND_BLOCK + 1) + +/* + * Inode flags (GETFLAGS/SETFLAGS) + */ +#define EXT2_SECRM_FL FS_SECRM_FL /* Secure deletion */ +#define EXT2_UNRM_FL FS_UNRM_FL /* Undelete */ +#define EXT2_COMPR_FL FS_COMPR_FL /* Compress file */ +#define EXT2_SYNC_FL FS_SYNC_FL /* Synchronous updates */ +#define EXT2_IMMUTABLE_FL FS_IMMUTABLE_FL /* Immutable file */ +#define EXT2_APPEND_FL FS_APPEND_FL /* writes to file may only append */ +#define EXT2_NODUMP_FL FS_NODUMP_FL /* do not dump file */ +#define EXT2_NOATIME_FL FS_NOATIME_FL /* do not update atime */ +/* Reserved for compression usage... */ +#define EXT2_DIRTY_FL FS_DIRTY_FL +#define EXT2_COMPRBLK_FL FS_COMPRBLK_FL /* One or more compressed clusters */ +#define EXT2_NOCOMP_FL FS_NOCOMP_FL /* Don't compress */ +#define EXT2_ECOMPR_FL FS_ECOMPR_FL /* Compression error */ +/* End compression flags --- maybe not all used */ +#define EXT2_BTREE_FL FS_BTREE_FL /* btree format dir */ +#define EXT2_INDEX_FL FS_INDEX_FL /* hash-indexed directory */ +#define EXT2_IMAGIC_FL FS_IMAGIC_FL /* AFS directory */ +#define EXT2_JOURNAL_DATA_FL FS_JOURNAL_DATA_FL /* Reserved for ext3 */ +#define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */ +#define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */ +#define EXT2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/ +#define EXT2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */ + +#define EXT2_FL_USER_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */ +#define EXT2_FL_USER_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */ + +/* + * ioctl commands + */ +#define EXT2_IOC_GETFLAGS FS_IOC_GETFLAGS +#define EXT2_IOC_SETFLAGS FS_IOC_SETFLAGS +#define EXT2_IOC_GETVERSION FS_IOC_GETVERSION +#define EXT2_IOC_SETVERSION FS_IOC_SETVERSION +#define EXT2_IOC_GETRSVSZ _IOR('f', 5, long) +#define EXT2_IOC_SETRSVSZ _IOW('f', 6, long) + +/* + * ioctl commands in 32 bit emulation + */ +#define EXT2_IOC32_GETFLAGS FS_IOC32_GETFLAGS +#define EXT2_IOC32_SETFLAGS FS_IOC32_SETFLAGS +#define EXT2_IOC32_GETVERSION FS_IOC32_GETVERSION +#define EXT2_IOC32_SETVERSION FS_IOC32_SETVERSION + +/* + * Structure of an inode on the disk + */ +struct ext2_inode { + uint16_t i_mode; /* File mode */ + uint16_t i_uid; /* Low 16 bits of Owner Uid */ + uint32_t i_size; /* Size in bytes */ + uint32_t i_atime; /* Access time */ + uint32_t i_ctime; /* Creation time */ + uint32_t i_mtime; /* Modification time */ + uint32_t i_dtime; /* Deletion Time */ + uint16_t i_gid; /* Low 16 bits of Group Id */ + uint16_t i_links_count; /* Links count */ + uint32_t i_blocks; /* Blocks count */ + uint32_t i_flags; /* File flags */ + union { + struct { + uint32_t l_i_reserved1; + } linux1; + struct { + uint32_t h_i_translator; + } hurd1; + struct { + uint32_t m_i_reserved1; + } masix1; + } osd1; /* OS dependent 1 */ + uint32_t i_block[EXT2_N_BLOCKS];/* Pointers to blocks */ + uint32_t i_generation; /* File version (for NFS) */ + uint32_t i_file_acl; /* File ACL */ + uint32_t i_dir_acl; /* Directory ACL */ + uint32_t i_faddr; /* Fragment address */ + union { + struct { + uint8_t l_i_frag; /* Fragment number */ + uint8_t l_i_fsize; /* Fragment size */ + uint16_t i_pad1; + uint16_t l_i_uid_high; /* these 2 fields */ + uint16_t l_i_gid_high; /* were reserved2[0] */ + uint32_t l_i_reserved2; + } linux2; + struct { + uint8_t h_i_frag; /* Fragment number */ + uint8_t h_i_fsize; /* Fragment size */ + uint16_t h_i_mode_high; + uint16_t h_i_uid_high; + uint16_t h_i_gid_high; + uint32_t h_i_author; + } hurd2; + struct { + uint8_t m_i_frag; /* Fragment number */ + uint8_t m_i_fsize; /* Fragment size */ + uint16_t m_pad1; + uint32_t m_i_reserved2[2]; + } masix2; + } osd2; /* OS dependent 2 */ +}; + +#define i_size_high i_dir_acl + +#if defined(__KERNEL__) || defined(__linux__) +#define i_reserved1 osd1.linux1.l_i_reserved1 +#define i_frag osd2.linux2.l_i_frag +#define i_fsize osd2.linux2.l_i_fsize +#define i_uid_low i_uid +#define i_gid_low i_gid +#define i_uid_high osd2.linux2.l_i_uid_high +#define i_gid_high osd2.linux2.l_i_gid_high +#define i_reserved2 osd2.linux2.l_i_reserved2 +#endif + +#ifdef __hurd__ +#define i_translator osd1.hurd1.h_i_translator +#define i_frag osd2.hurd2.h_i_frag; +#define i_fsize osd2.hurd2.h_i_fsize; +#define i_uid_high osd2.hurd2.h_i_uid_high +#define i_gid_high osd2.hurd2.h_i_gid_high +#define i_author osd2.hurd2.h_i_author +#endif + +#ifdef __masix__ +#define i_reserved1 osd1.masix1.m_i_reserved1 +#define i_frag osd2.masix2.m_i_frag +#define i_fsize osd2.masix2.m_i_fsize +#define i_reserved2 osd2.masix2.m_i_reserved2 +#endif + +/* + * File system states + */ +#define EXT2_VALID_FS 0x0001 /* Unmounted cleanly */ +#define EXT2_ERROR_FS 0x0002 /* Errors detected */ + +/* + * Mount flags + */ +#define EXT2_MOUNT_CHECK 0x000001 /* Do mount-time checks */ +#define EXT2_MOUNT_OLDALLOC 0x000002 /* Don't use the new Orlov allocator */ +#define EXT2_MOUNT_GRPID 0x000004 /* Create files with directory's group */ +#define EXT2_MOUNT_DEBUG 0x000008 /* Some debugging messages */ +#define EXT2_MOUNT_ERRORS_CONT 0x000010 /* Continue on errors */ +#define EXT2_MOUNT_ERRORS_RO 0x000020 /* Remount fs ro on errors */ +#define EXT2_MOUNT_ERRORS_PANIC 0x000040 /* Panic on errors */ +#define EXT2_MOUNT_MINIX_DF 0x000080 /* Mimics the Minix statfs */ +#define EXT2_MOUNT_NOBH 0x000100 /* No buffer_heads */ +#define EXT2_MOUNT_NO_UID32 0x000200 /* Disable 32-bit UIDs */ +#define EXT2_MOUNT_XATTR_USER 0x004000 /* Extended user attributes */ +#define EXT2_MOUNT_POSIX_ACL 0x008000 /* POSIX Access Control Lists */ +#define EXT2_MOUNT_XIP 0x010000 /* Execute in place */ +#define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */ +#define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */ +#define EXT2_MOUNT_RESERVATION 0x080000 /* Preallocation */ + + +#define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt +#define set_opt(o, opt) o |= EXT2_MOUNT_##opt +#define test_opt(sb, opt) (EXT2_SB(sb)->s_mount_opt & \ + EXT2_MOUNT_##opt) +/* + * Maximal mount counts between two filesystem checks + */ +#define EXT2_DFL_MAX_MNT_COUNT 20 /* Allow 20 mounts */ +#define EXT2_DFL_CHECKINTERVAL 0 /* Don't use interval check */ + +/* + * Behaviour when detecting errors + */ +#define EXT2_ERRORS_CONTINUE 1 /* Continue execution */ +#define EXT2_ERRORS_RO 2 /* Remount fs read-only */ +#define EXT2_ERRORS_PANIC 3 /* Panic */ +#define EXT2_ERRORS_DEFAULT EXT2_ERRORS_CONTINUE + +/* + * Structure of the super block + */ +struct ext2_super_block { + uint32_t s_inodes_count; /* Inodes count */ + uint32_t s_blocks_count; /* Blocks count */ + uint32_t s_r_blocks_count; /* Reserved blocks count */ + uint32_t s_free_blocks_count; /* Free blocks count */ + uint32_t s_free_inodes_count; /* Free inodes count */ + uint32_t s_first_data_block; /* First Data Block */ + uint32_t s_log_block_size; /* Block size */ + uint32_t s_log_frag_size; /* Fragment size */ + uint32_t s_blocks_per_group; /* # Blocks per group */ + uint32_t s_frags_per_group; /* # Fragments per group */ + uint32_t s_inodes_per_group; /* # Inodes per group */ + uint32_t s_mtime; /* Mount time */ + uint32_t s_wtime; /* Write time */ + uint16_t s_mnt_count; /* Mount count */ + uint16_t s_max_mnt_count; /* Maximal mount count */ + uint16_t s_magic; /* Magic signature */ + uint16_t s_state; /* File system state */ + uint16_t s_errors; /* Behaviour when detecting errors */ + uint16_t s_minor_rev_level; /* minor revision level */ + uint32_t s_lastcheck; /* time of last check */ + uint32_t s_checkinterval; /* max. time between checks */ + uint32_t s_creator_os; /* OS */ + uint32_t s_rev_level; /* Revision level */ + uint16_t s_def_resuid; /* Default uid for reserved blocks */ + uint16_t s_def_resgid; /* Default gid for reserved blocks */ + /* + * These fields are for EXT2_DYNAMIC_REV superblocks only. + * + * Note: the difference between the compatible feature set and + * the incompatible feature set is that if there is a bit set + * in the incompatible feature set that the kernel doesn't + * know about, it should refuse to mount the filesystem. + * + * e2fsck's requirements are more strict; if it doesn't know + * about a feature in either the compatible or incompatible + * feature set, it must abort and not try to meddle with + * things it doesn't understand... + */ + uint32_t s_first_ino; /* First non-reserved inode */ + uint16_t s_inode_size; /* size of inode structure */ + uint16_t s_block_group_nr; /* block group # of this superblock */ + uint32_t s_feature_compat; /* compatible feature set */ + uint32_t s_feature_incompat; /* incompatible feature set */ + uint32_t s_feature_ro_compat; /* readonly-compatible feature set */ + uint8_t s_uuid[16]; /* 128-bit uuid for volume */ + char s_volume_name[16]; /* volume name */ + char s_last_mounted[64]; /* directory where last mounted */ + uint32_t s_algorithm_usage_bitmap; /* For compression */ + /* + * Performance hints. Directory preallocation should only + * happen if the EXT2_COMPAT_PREALLOC flag is on. + */ + uint8_t s_prealloc_blocks; /* Nr of blocks to try to preallocate*/ + uint8_t s_prealloc_dir_blocks; /* Nr to preallocate for dirs */ + uint16_t s_padding1; + /* + * Journaling support valid if EXT3_FEATURE_COMPAT_HAS_JOURNAL set. + */ + uint8_t s_journal_uuid[16]; /* uuid of journal superblock */ + uint32_t s_journal_inum; /* inode number of journal file */ + uint32_t s_journal_dev; /* device number of journal file */ + uint32_t s_last_orphan; /* start of list of inodes to delete */ + uint32_t s_hash_seed[4]; /* HTREE hash seed */ + uint8_t s_def_hash_version; /* Default hash version to use */ + uint8_t s_reserved_char_pad; + uint16_t s_reserved_word_pad; + uint32_t s_default_mount_opts; + uint32_t s_first_meta_bg; /* First metablock block group */ + uint32_t s_reserved[190]; /* Padding to the end of the block */ +}; + +/* + * Codes for operating systems + */ +#define EXT2_OS_LINUX 0 +#define EXT2_OS_HURD 1 +#define EXT2_OS_MASIX 2 +#define EXT2_OS_FREEBSD 3 +#define EXT2_OS_LITES 4 + +/* + * Revision levels + */ +#define EXT2_GOOD_OLD_REV 0 /* The good old (original) format */ +#define EXT2_DYNAMIC_REV 1 /* V2 format w/ dynamic inode sizes */ + +#define EXT2_CURRENT_REV EXT2_GOOD_OLD_REV +#define EXT2_MAX_SUPP_REV EXT2_DYNAMIC_REV + +#define EXT2_GOOD_OLD_INODE_SIZE 128 + +/* + * Feature set definitions + */ + +#define EXT2_HAS_COMPAT_FEATURE(sb,mask) \ + ( EXT2_SB(sb)->s_es->s_feature_compat & cpu_to_le32(mask) ) +#define EXT2_HAS_RO_COMPAT_FEATURE(sb,mask) \ + ( EXT2_SB(sb)->s_es->s_feature_ro_compat & cpu_to_le32(mask) ) +#define EXT2_HAS_INCOMPAT_FEATURE(sb,mask) \ + ( EXT2_SB(sb)->s_es->s_feature_incompat & cpu_to_le32(mask) ) +#define EXT2_SET_COMPAT_FEATURE(sb,mask) \ + EXT2_SB(sb)->s_es->s_feature_compat |= cpu_to_le32(mask) +#define EXT2_SET_RO_COMPAT_FEATURE(sb,mask) \ + EXT2_SB(sb)->s_es->s_feature_ro_compat |= cpu_to_le32(mask) +#define EXT2_SET_INCOMPAT_FEATURE(sb,mask) \ + EXT2_SB(sb)->s_es->s_feature_incompat |= cpu_to_le32(mask) +#define EXT2_CLEAR_COMPAT_FEATURE(sb,mask) \ + EXT2_SB(sb)->s_es->s_feature_compat &= ~cpu_to_le32(mask) +#define EXT2_CLEAR_RO_COMPAT_FEATURE(sb,mask) \ + EXT2_SB(sb)->s_es->s_feature_ro_compat &= ~cpu_to_le32(mask) +#define EXT2_CLEAR_INCOMPAT_FEATURE(sb,mask) \ + EXT2_SB(sb)->s_es->s_feature_incompat &= ~cpu_to_le32(mask) + +#define EXT2_FEATURE_COMPAT_DIR_PREALLOC 0x0001 +#define EXT2_FEATURE_COMPAT_IMAGIC_INODES 0x0002 +#define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004 +#define EXT2_FEATURE_COMPAT_EXT_ATTR 0x0008 +#define EXT2_FEATURE_COMPAT_RESIZE_INO 0x0010 +#define EXT2_FEATURE_COMPAT_DIR_INDEX 0x0020 +#define EXT2_FEATURE_COMPAT_ANY 0xffffffff + +#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001 +#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 +#define EXT2_FEATURE_RO_COMPAT_BTREE_DIR 0x0004 +#define EXT2_FEATURE_RO_COMPAT_ANY 0xffffffff + +#define EXT2_FEATURE_INCOMPAT_COMPRESSION 0x0001 +#define EXT2_FEATURE_INCOMPAT_FILETYPE 0x0002 +#define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004 +#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008 +#define EXT2_FEATURE_INCOMPAT_META_BG 0x0010 +#define EXT2_FEATURE_INCOMPAT_ANY 0xffffffff + +#define EXT2_FEATURE_COMPAT_SUPP EXT2_FEATURE_COMPAT_EXT_ATTR +#define EXT2_FEATURE_INCOMPAT_SUPP (EXT2_FEATURE_INCOMPAT_FILETYPE| \ + EXT2_FEATURE_INCOMPAT_META_BG) +#define EXT2_FEATURE_RO_COMPAT_SUPP (EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \ + EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \ + EXT2_FEATURE_RO_COMPAT_BTREE_DIR) +#define EXT2_FEATURE_RO_COMPAT_UNSUPPORTED ~EXT2_FEATURE_RO_COMPAT_SUPP +#define EXT2_FEATURE_INCOMPAT_UNSUPPORTED ~EXT2_FEATURE_INCOMPAT_SUPP + +/* + * Default values for user and/or group using reserved blocks + */ +#define EXT2_DEF_RESUID 0 +#define EXT2_DEF_RESGID 0 + +/* + * Default mount options + */ +#define EXT2_DEFM_DEBUG 0x0001 +#define EXT2_DEFM_BSDGROUPS 0x0002 +#define EXT2_DEFM_XATTR_USER 0x0004 +#define EXT2_DEFM_ACL 0x0008 +#define EXT2_DEFM_UID16 0x0010 + /* Not used by ext2, but reserved for use by ext3 */ +#define EXT3_DEFM_JMODE 0x0060 +#define EXT3_DEFM_JMODE_DATA 0x0020 +#define EXT3_DEFM_JMODE_ORDERED 0x0040 +#define EXT3_DEFM_JMODE_WBACK 0x0060 + +/* + * Structure of a directory entry + */ +#define EXT2_NAME_LEN 255 + +struct ext2_dir_entry { + uint32_t inode; /* Inode number */ + uint16_t rec_len; /* Directory entry length */ + uint16_t name_len; /* Name length */ + char name[EXT2_NAME_LEN]; /* File name */ +}; + +/* + * The new version of the directory entry. Since EXT2 structures are + * stored in intel byte order, and the name_len field could never be + * bigger than 255 chars, it's safe to reclaim the extra byte for the + * file_type field. + */ +struct ext2_dir_entry_2 { + uint32_t inode; /* Inode number */ + uint16_t rec_len; /* Directory entry length */ + uint8_t name_len; /* Name length */ + uint8_t file_type; + char name[EXT2_NAME_LEN]; /* File name */ +}; + +/* + * Ext2 directory file types. Only the low 3 bits are used. The + * other bits are reserved for now. + */ +enum { + EXT2_FT_UNKNOWN, + EXT2_FT_REG_FILE, + EXT2_FT_DIR, + EXT2_FT_CHRDEV, + EXT2_FT_BLKDEV, + EXT2_FT_FIFO, + EXT2_FT_SOCK, + EXT2_FT_SYMLINK, + EXT2_FT_MAX +}; + +/* + * EXT2_DIR_PAD defines the directory entries boundaries + * + * NOTE: It must be a multiple of 4 + */ +#define EXT2_DIR_PAD 4 +#define EXT2_DIR_ROUND (EXT2_DIR_PAD - 1) +#define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \ + ~EXT2_DIR_ROUND) +#define EXT2_MAX_REC_LEN ((1<<16)-1) + +#endif /* _EXT2_FS_H */ Added: trunk/openbios-devel/fs/ext2/ext2_lseek.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_lseek.c (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_lseek.c 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,38 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libext2.h" +#include "ext2.h" + +int ext2_lseek(ext2_FILE *file, long offset, int whence) +{ + long new_offset; + + switch(whence) + { + case SEEK_SET: + new_offset = offset; + break; + case SEEK_CUR: + new_offset = file->offset + offset; + break; + case SEEK_END: + new_offset = file->inode->i_size + offset; + break; + default: + return -1; + } + + if ( (new_offset < 0) || + (new_offset > file->inode->i_size) ) + return -1; + + file->offset = new_offset; + + return new_offset; +} Added: trunk/openbios-devel/fs/ext2/ext2_mount.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_mount.c (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_mount.c 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,62 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libext2.h" +#include "ext2.h" +#include "ext2_utils.h" + +#define SB_OFFSET (2) + +ext2_VOLUME* ext2_mount(int fd) +{ + ext2_VOLUME *volume; + struct ext2_super_block *super; + char *buffer; + + super = (struct ext2_super_block*)malloc(sizeof(struct ext2_super_block)); + if (super == NULL) + return NULL; + + ext2_get_super(fd, super); + if (super->s_magic != EXT2_SUPER_MAGIC) { + free(super); + return NULL; + } + + buffer = (char*)malloc(EXT2_BLOCK_SIZE(super)); + if (buffer == NULL) { + free(super); + return NULL; + } + + volume = (ext2_VOLUME*)malloc(sizeof(ext2_VOLUME)); + if (volume == NULL) { + free(super); + free(buffer); + return NULL; + } + + volume->buffer = buffer; + volume->fd = fd; + volume->super = super; + + volume->current = -1; + ext2_read_block(volume, 0); + + return volume; +} + +int ext2_umount(ext2_VOLUME* volume) +{ + if (volume == NULL) + return -1; + free(volume->super); + free(volume->buffer); + free(volume); + return 0; +} Added: trunk/openbios-devel/fs/ext2/ext2_open.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_open.c (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_open.c 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,65 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libext2.h" +#include "ext2.h" +#include "ext2_utils.h" + +ext2_FILE* ext2_open(ext2_VOLUME *volume, const char* pathname) +{ + ext2_FILE *file; + struct ext2_inode *inode; + int ino; + int ret; + + ino = ext2_seek_name(volume, pathname); + if (ino == 0) + return NULL; + + inode = (struct ext2_inode*)malloc(sizeof(struct ext2_inode)); + if (inode == NULL) + return NULL; + + ret = ext2_get_inode(volume, ino, inode); + if (ret == -1) { + free(inode); + return NULL; + } + if (S_ISLNK(inode->i_mode)) { + static char buffer[1024]; + int i, last = 0; + strcpy(buffer, pathname); + for (i = 0; buffer[i]; i++) + if (buffer[i] == '\\') + last = i; + buffer[last] = '\\'; + strcpy(buffer + last + 1, (char*)inode->i_block); + ino = ext2_seek_name((ext2_VOLUME*)volume, buffer); + if (ino == 0) { + free(inode); + return NULL; + } + ret = ext2_get_inode((ext2_VOLUME*)volume, ino, inode); + if (ret == -1) { + free(inode); + return NULL; + } + } + + file = (ext2_FILE*)malloc(sizeof(ext2_FILE)); + if (file == NULL) { + free(inode); + return NULL; + } + file->volume = volume; + file->inode = inode; + file->offset = 0; + file->path = strdup(pathname); + + return file; +} Added: trunk/openbios-devel/fs/ext2/ext2_opendir.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_opendir.c (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_opendir.c 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,49 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libext2.h" +#include "ext2.h" +#include "ext2_utils.h" + +ext2_DIR* ext2_opendir(ext2_VOLUME *volume, const char *name) +{ + ext2_DIR* dir; + int ino; + struct ext2_inode *inode; + int ret; + + ino = ext2_seek_name(volume, name); + if (ino == 0) + return NULL; + + inode = (struct ext2_inode*)malloc(sizeof(struct ext2_inode)); + if (inode == NULL) + return NULL; + + ret = ext2_get_inode(volume, ino, inode); + if (ret == -1) { + free(inode); + return NULL; + } + + if (!S_ISDIR(inode->i_mode)) { + free(inode); + return NULL; + } + + dir = (ext2_DIR*)malloc(sizeof(ext2_DIR)); + if (dir == NULL) { + free(inode); + return NULL; + } + dir->volume = (ext2_VOLUME*)volume; + dir->inode = inode; + dir->index = 0; + + return dir; +} Added: trunk/openbios-devel/fs/ext2/ext2_read.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_read.c (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_read.c 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,23 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libext2.h" +#include "ext2.h" +#include "ext2_utils.h" + +size_t ext2_read(ext2_FILE *file, void *buf, size_t count) +{ + int ret; + + ret = ext2_read_data(file->volume, file->inode, file->offset, + buf, count); + if (ret == -1) + return -1; + file->offset += ret; + return ret; +} Added: trunk/openbios-devel/fs/ext2/ext2_readdir.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_readdir.c (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_readdir.c 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,25 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libext2.h" +#include "ext2_utils.h" + +static struct ext2_dir_entry_2 entry; + +struct ext2_dir_entry_2 *ext2_readdir(ext2_DIR *dir) +{ + int ret; + + ret = ext2_dir_entry(dir->volume, dir->inode, dir->index, &entry); + if (ret == -1) + return NULL; + dir->index = ret; + + entry.name[entry.name_len] = 0; + return &entry; +} Added: trunk/openbios-devel/fs/ext2/ext2_utils.c =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_utils.c (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_utils.c 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,315 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libext2.h" +#include "ext2_utils.h" +#include "openbios/bindings.h" +#include "libc/diskio.h" +#include "libc/byteorder.h" + +void ext2_get_super(int fd, struct ext2_super_block *super) +{ + seek_io(fd, 2 * 512); + read_io(fd, super, sizeof (*super)); + + super->s_inodes_count = __le32_to_cpu(super->s_inodes_count); + super->s_blocks_count = __le32_to_cpu(super->s_blocks_count); + super->s_r_blocks_count = __le32_to_cpu(super->s_r_blocks_count); + super->s_free_blocks_count = __le32_to_cpu(super->s_free_blocks_count); + super->s_free_inodes_count = __le32_to_cpu(super->s_free_inodes_count); + super->s_first_data_block = __le32_to_cpu(super->s_first_data_block); + super->s_log_block_size = __le32_to_cpu(super->s_log_block_size); + super->s_log_frag_size = __le32_to_cpu(super->s_log_frag_size); + super->s_blocks_per_group = __le32_to_cpu(super->s_blocks_per_group); + super->s_frags_per_group = __le32_to_cpu(super->s_frags_per_group); + super->s_inodes_per_group = __le32_to_cpu(super->s_inodes_per_group); + super->s_mtime = __le32_to_cpu(super->s_mtime); + super->s_wtime = __le32_to_cpu(super->s_wtime); + super->s_mnt_count = __le16_to_cpu(super->s_mnt_count); + super->s_max_mnt_count = __le16_to_cpu(super->s_max_mnt_count); + super->s_magic = __le16_to_cpu(super->s_magic); + super->s_state = __le16_to_cpu(super->s_state); + super->s_errors = __le16_to_cpu(super->s_errors); + super->s_minor_rev_level = __le16_to_cpu(super->s_minor_rev_level); + super->s_lastcheck = __le32_to_cpu(super->s_lastcheck); + super->s_checkinterval = __le32_to_cpu(super->s_checkinterval); + super->s_creator_os = __le32_to_cpu(super->s_creator_os); + super->s_rev_level = __le32_to_cpu(super->s_rev_level); + super->s_def_resuid = __le16_to_cpu(super->s_def_resuid); + super->s_def_resgid = __le16_to_cpu(super->s_def_resgid); + super->s_first_ino = __le32_to_cpu(super->s_first_ino); + super->s_inode_size = __le16_to_cpu(super->s_inode_size); + super->s_block_group_nr = __le16_to_cpu(super->s_block_group_nr); + super->s_feature_compat = __le32_to_cpu(super->s_feature_compat); + super->s_feature_incompat = __le32_to_cpu(super->s_feature_incompat); + super->s_feature_ro_compat = __le32_to_cpu(super->s_feature_ro_compat); + super->s_algorithm_usage_bitmap = + __le32_to_cpu(super->s_algorithm_usage_bitmap); + super->s_journal_inum = __le32_to_cpu(super->s_journal_inum); + super->s_journal_dev = __le32_to_cpu(super->s_journal_dev); + super->s_last_orphan = __le32_to_cpu(super->s_last_orphan); + super->s_hash_seed[0] = __le32_to_cpu(super->s_hash_seed[0]); + super->s_hash_seed[1] = __le32_to_cpu(super->s_hash_seed[1]); + super->s_hash_seed[2] = __le32_to_cpu(super->s_hash_seed[2]); + super->s_hash_seed[3] = __le32_to_cpu(super->s_hash_seed[3]); + super->s_default_mount_opts = + __le32_to_cpu(super->s_default_mount_opts); + super->s_first_meta_bg = __le32_to_cpu(super->s_first_meta_bg); +} + +void ext2_read_block(ext2_VOLUME* volume, unsigned int fsblock) +{ + llong offset; + + if (fsblock == volume->current) + return; + + volume->current = fsblock; + offset = fsblock * EXT2_BLOCK_SIZE(volume->super); + + seek_io(volume->fd, offset); + read_io(volume->fd, volume->buffer, EXT2_BLOCK_SIZE(volume->super)); +} + +void ext2_get_group_desc(ext2_VOLUME* volume, + int group_id, struct ext2_group_desc *gdp) +{ + unsigned int block, offset; + struct ext2_group_desc *le_gdp; + + block = 1 + volume->super->s_first_data_block; + block += group_id / EXT2_DESC_PER_BLOCK(volume->super); + ext2_read_block(volume, block); + + offset = group_id % EXT2_DESC_PER_BLOCK(volume->super); + offset *= sizeof(*gdp); + + le_gdp = (struct ext2_group_desc *)(volume->buffer + offset); + + gdp->bg_block_bitmap = __le32_to_cpu(le_gdp->bg_block_bitmap); + gdp->bg_inode_bitmap = __le32_to_cpu(le_gdp->bg_inode_bitmap); + gdp->bg_inode_table = __le32_to_cpu(le_gdp->bg_inode_table); + gdp->bg_free_blocks_count = __le16_to_cpu(le_gdp->bg_free_blocks_count); + gdp->bg_free_inodes_count = __le16_to_cpu(le_gdp->bg_free_inodes_count); + gdp->bg_used_dirs_count = __le16_to_cpu(le_gdp->bg_used_dirs_count); +} + +int ext2_get_inode(ext2_VOLUME* volume, + unsigned int ino, struct ext2_inode *inode) +{ + struct ext2_group_desc desc; + unsigned int block; + unsigned int group_id; + unsigned int offset; + struct ext2_inode *le_inode; + int i; + + ino--; + + group_id = ino / EXT2_INODES_PER_GROUP(volume->super); + ext2_get_group_desc(volume, group_id, &desc); + + ino %= EXT2_INODES_PER_GROUP(volume->super); + + block = desc.bg_inode_table; + block += ino / (EXT2_BLOCK_SIZE(volume->super) / + EXT2_INODE_SIZE(volume->super)); + ext2_read_block(volume, block); + + offset = ino % (EXT2_BLOCK_SIZE(volume->super) / + EXT2_INODE_SIZE(volume->super)); + offset *= EXT2_INODE_SIZE(volume->super); + + le_inode = (struct ext2_inode *)(volume->buffer + offset); + + inode->i_mode = __le16_to_cpu(le_inode->i_mode); + inode->i_uid = __le16_to_cpu(le_inode->i_uid); + inode->i_size = __le32_to_cpu(le_inode->i_size); + inode->i_atime = __le32_to_cpu(le_inode->i_atime); + inode->i_ctime = __le32_to_cpu(le_inode->i_ctime); + inode->i_mtime = __le32_to_cpu(le_inode->i_mtime); + inode->i_dtime = __le32_to_cpu(le_inode->i_dtime); + inode->i_gid = __le16_to_cpu(le_inode->i_gid); + inode->i_links_count = __le16_to_cpu(le_inode->i_links_count); + inode->i_blocks = __le32_to_cpu(le_inode->i_blocks); + inode->i_flags = __le32_to_cpu(le_inode->i_flags); + if (S_ISLNK(inode->i_mode)) { + memcpy(inode->i_block, le_inode->i_block, EXT2_N_BLOCKS * 4); + } else { + for (i = 0; i < EXT2_N_BLOCKS; i++) + inode->i_block[i] = __le32_to_cpu(le_inode->i_block[i]); + } + inode->i_generation = __le32_to_cpu(le_inode->i_generation); + inode->i_file_acl = __le32_to_cpu(le_inode->i_file_acl); + inode->i_dir_acl = __le32_to_cpu(le_inode->i_dir_acl); + inode->i_faddr = __le32_to_cpu(le_inode->i_faddr); + inode->osd2.linux2.l_i_frag = le_inode->osd2.linux2.l_i_frag; + inode->osd2.linux2.l_i_fsize = le_inode->osd2.linux2.l_i_fsize; + inode->osd2.linux2.l_i_uid_high = + __le16_to_cpu(le_inode->osd2.linux2.l_i_uid_high); + inode->osd2.linux2.l_i_gid_high = + __le16_to_cpu(le_inode->osd2.linux2.l_i_gid_high); + return 0; +} + +unsigned int ext2_get_block_addr(ext2_VOLUME* volume, struct ext2_inode *inode, + unsigned int logical) +{ + unsigned int physical; + unsigned int addr_per_block; + + /* direct */ + + if (logical < EXT2_NDIR_BLOCKS) { + physical = inode->i_block[logical]; + return physical; + } + + /* indirect */ + + logical -= EXT2_NDIR_BLOCKS; + + addr_per_block = EXT2_ADDR_PER_BLOCK (volume->super); + if (logical < addr_per_block) { + ext2_read_block(volume, inode->i_block[EXT2_IND_BLOCK]); + physical = __le32_to_cpu(((unsigned int *)volume->buffer)[logical]); + return physical; + } + + /* double indirect */ + + logical -= addr_per_block; + + if (logical < addr_per_block * addr_per_block) { + ext2_read_block(volume, inode->i_block[EXT2_DIND_BLOCK]); + physical = __le32_to_cpu(((unsigned int *)volume->buffer) + [logical / addr_per_block]); + ext2_read_block(volume, physical); + physical = __le32_to_cpu(((unsigned int *)volume->buffer) + [logical % addr_per_block]); + return physical; + } + + /* triple indirect */ + + logical -= addr_per_block * addr_per_block; + ext2_read_block(volume, inode->i_block[EXT2_DIND_BLOCK]); + physical = __le32_to_cpu(((unsigned int *)volume->buffer) + [logical / (addr_per_block * addr_per_block)]); + ext2_read_block(volume, physical); + logical = logical % (addr_per_block * addr_per_block); + physical = __le32_to_cpu(((unsigned int *)volume->buffer)[logical / addr_per_block]); + ext2_read_block(volume, physical); + physical = __le32_to_cpu(((unsigned int *)volume->buffer)[logical % addr_per_block]); + return physical; +} + +int ext2_read_data(ext2_VOLUME* volume, struct ext2_inode *inode, + off_t offset, char *buffer, size_t length) +{ + unsigned int logical, physical; + int blocksize = EXT2_BLOCK_SIZE(volume->super); + int shift; + size_t read; + + if (offset >= inode->i_size) + return -1; + + if (offset + length >= inode->i_size) + length = inode->i_size - offset; + + read = 0; + logical = offset / blocksize; + shift = offset % blocksize; + + if (shift) { + physical = ext2_get_block_addr(volume, inode, logical); + ext2_read_block(volume, physical); + + if (length < blocksize - shift) { + memcpy(buffer, volume->buffer + shift, length); + return length; + } + read += blocksize - shift; + memcpy(buffer, volume->buffer + shift, read); + + buffer += read; + length -= read; + logical++; + } + + while (length) { + physical = ext2_get_block_addr(volume, inode, logical); + ext2_read_block(volume, physical); + + if (length < blocksize) { + memcpy(buffer, volume->buffer, length); + read += length; + return read; + } + memcpy(buffer, volume->buffer, blocksize); + + buffer += blocksize; + length -= blocksize; + read += blocksize; + logical++; + } + + return read; +} + +off_t ext2_dir_entry(ext2_VOLUME *volume, struct ext2_inode *inode, + off_t index, struct ext2_dir_entry_2 *entry) +{ + int ret; + + ret = ext2_read_data(volume, inode, index, + (char*)entry, sizeof(*entry)); + if (ret == -1) + return -1; + + entry->inode = __le32_to_cpu(entry->inode); + entry->rec_len = __le16_to_cpu(entry->rec_len); + return index + entry->rec_len; +} + +unsigned int ext2_seek_name(ext2_VOLUME *volume, const char *name) +{ + struct ext2_inode inode; + int ret; + unsigned int ino; + off_t index; + struct ext2_dir_entry_2 entry; + + ino = EXT2_ROOT_INO; + while(1) { + while (*name == '\\') + name++; + if (!*name) + break; + ret = ext2_get_inode(volume, ino, &inode); + if (ret == -1) + return 0; + index = 0; + while (1) { + index = ext2_dir_entry(volume, &inode, index, &entry); + if (index == -1) + return 0; + ret = strncmp(name, entry.name, entry.name_len); + if (ret == 0 && + (name[entry.name_len] == 0 || + name[entry.name_len] == '\\')) { + ino = entry.inode; + break; + } + } + name += entry.name_len; + } + + return ino; +} Added: trunk/openbios-devel/fs/ext2/ext2_utils.h =================================================================== --- trunk/openbios-devel/fs/ext2/ext2_utils.h (rev 0) +++ trunk/openbios-devel/fs/ext2/ext2_utils.h 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,53 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#ifndef __EXT2_UTILS_H__ +#define __EXT2_UTILS_H__ + +#include "ext2_fs.h" +#include "ext2.h" + +/* from linux/stat.h */ + +#define S_IFMT 00170000 +#define S_IFSOCK 0140000 +#define S_IFLNK 0120000 +#define S_IFREG 0100000 +#define S_IFBLK 0060000 +#define S_IFDIR 0040000 +#define S_IFCHR 0020000 +#define S_IFIFO 0010000 +#define S_ISUID 0004000 +#define S_ISGID 0002000 +#define S_ISVTX 0001000 + +#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) +#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) +#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) +#define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR) +#define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK) +#define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO) +#define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK) + +/* utilities */ + +extern void ext2_get_super(int fd, struct ext2_super_block *super); +extern void ext2_read_block(ext2_VOLUME* volume, unsigned int fsblock); +extern void ext2_get_group_desc(ext2_VOLUME* volume, + int group_id, struct ext2_group_desc *gdp); +extern int ext2_get_inode(ext2_VOLUME* volume, + unsigned int ino, struct ext2_inode *inode); +extern unsigned int ext2_get_block_addr(ext2_VOLUME* volume, + struct ext2_inode *inode, + unsigned int logical); +extern int ext2_read_data(ext2_VOLUME* volume, struct ext2_inode *inode, + off_t offset, char *buffer, size_t length); +extern off_t ext2_dir_entry(ext2_VOLUME *volume, struct ext2_inode *inode, + off_t offset, struct ext2_dir_entry_2 *entry); +extern unsigned int ext2_seek_name(ext2_VOLUME *volume, const char *name); +#endif /* __EXT2_UTILS_H__ */ Added: trunk/openbios-devel/fs/ext2/libext2.h =================================================================== --- trunk/openbios-devel/fs/ext2/libext2.h (rev 0) +++ trunk/openbios-devel/fs/ext2/libext2.h 2009-11-22 09:47:08 UTC (rev 627) @@ -0,0 +1,25 @@ +/* + * + * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#ifndef __LIBEXT2_H__ +#define __LIBEXT2_H__ + +#include "openbios/config.h" +#include "ext2.h" + +extern ext2_VOLUME* ext2_mount(int fd); +extern int ext2_umount(ext2_VOLUME *volume); +extern ext2_DIR* ext2_opendir(ext2_VOLUME *, const char *name); +extern struct ext2_dir_entry_2* ext2_readdir(ext2_DIR* dir); +extern void ext2_closedir(ext2_DIR *dir); +extern ext2_FILE* ext2_open(ext2_VOLUME *, const char* pathname); +extern size_t ext2_read(ext2_FILE *file, void *buf, size_t count); +extern void ext2_close(ext2_FILE *file); +extern int ext2_lseek(ext2_FILE *file, long offset, int whence); + +#endif /* __LIBEXT2_H__ */ Modified: trunk/openbios-devel/include/openbios/fs.h =================================================================== --- trunk/openbios-devel/include/openbios/fs.h 2009-11-22 09:26:50 UTC (rev 626) +++ trunk/openbios-devel/include/openbios/fs.h 2009-11-22 09:47:08 UTC (rev 627) @@ -68,6 +68,12 @@ static inline int fs_iso9660_open( int fd, fs_ops_t *fs ) { return -1; } #endif +#ifdef CONFIG_EXT2 +extern int fs_ext2_open( int fd, fs_ops_t *fs ); +#else +static inline int fs_ext2_open( int fd, fs_ops_t *fs ) { return -1; } +#endif + #ifdef CONFIG_GRUBFS extern int fs_grubfs_open( int fd, fs_ops_t *fs ); #else Modified: trunk/openbios-devel/modules/filesystems.c =================================================================== --- trunk/openbios-devel/modules/filesystems.c 2009-11-22 09:26:50 UTC (rev 626) +++ trunk/openbios-devel/modules/filesystems.c 2009-11-22 09:47:08 UTC (rev 627) @@ -48,6 +48,7 @@ err=fs_hfsp_open(fd, fs); if( err ) err = fs_hfs_open(fd, fs); if( err ) err = fs_iso9660_open(fd, fs); + if( err ) err = fs_ext2_open(fd, fs); if( err ) err = fs_grubfs_open(fd, fs); }

1 0

r626 - in trunk/openbios-devel: config/examples config/scripts fs fs/iso9660 include/openbios modules
by svn＠openbios.org 22 Nov '09

22 Nov '09

Author: laurent Date: 2009-11-22 10:26:50 +0100 (Sun, 22 Nov 2009) New Revision: 626 Added: trunk/openbios-devel/fs/iso9660/ trunk/openbios-devel/fs/iso9660/build.xml trunk/openbios-devel/fs/iso9660/iso9660.h trunk/openbios-devel/fs/iso9660/iso9660_close.c trunk/openbios-devel/fs/iso9660/iso9660_closedir.c trunk/openbios-devel/fs/iso9660/iso9660_fs.c trunk/openbios-devel/fs/iso9660/iso9660_fs.h trunk/openbios-devel/fs/iso9660/iso9660_lseek.c trunk/openbios-devel/fs/iso9660/iso9660_mount.c trunk/openbios-devel/fs/iso9660/iso9660_open.c trunk/openbios-devel/fs/iso9660/iso9660_opendir.c trunk/openbios-devel/fs/iso9660/iso9660_read.c trunk/openbios-devel/fs/iso9660/iso9660_readdir.c trunk/openbios-devel/fs/iso9660/libiso9660.h Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml trunk/openbios-devel/config/examples/ppc_config.xml trunk/openbios-devel/config/scripts/switch-arch trunk/openbios-devel/fs/build.xml trunk/openbios-devel/include/openbios/fs.h trunk/openbios-devel/modules/filesystems.c Log: Add a cleaner implementation of ISO9660. Enable it for powerpc and cross-powerpc Signed-off-by: Laurent Vivier <Laurent(a)vivier.Eu> Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-11-22 09:04:27 UTC (rev 625) +++ trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-11-22 09:26:50 UTC (rev 626) @@ -50,6 +50,7 @@ <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="true"/> <option name="CONFIG_HFSP" type="boolean" value="true"/> + <option name="CONFIG_ISO9660" type="boolean" value="true"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> @@ -58,7 +59,7 @@ <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_UFS" type="boolean" value="false"/> - <option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/> + <option name="CONFIG_FSYS_ISO9660" type="boolean" value="false"/> <option name="CONFIG_FSYS_FFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/examples/ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml 2009-11-22 09:04:27 UTC (rev 625) +++ trunk/openbios-devel/config/examples/ppc_config.xml 2009-11-22 09:26:50 UTC (rev 626) @@ -51,6 +51,7 @@ <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="true"/> <option name="CONFIG_HFSP" type="boolean" value="true"/> + <option name="CONFIG_ISO9660" type="boolean" value="true"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> @@ -59,7 +60,7 @@ <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_UFS" type="boolean" value="false"/> - <option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/> + <option name="CONFIG_FSYS_ISO9660" type="boolean" value="false"/> <option name="CONFIG_FSYS_FFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/scripts/switch-arch =================================================================== --- trunk/openbios-devel/config/scripts/switch-arch 2009-11-22 09:04:27 UTC (rev 625) +++ trunk/openbios-devel/config/scripts/switch-arch 2009-11-22 09:26:50 UTC (rev 626) @@ -166,6 +166,7 @@ mkdir -p $OBJDIR/target/fs/grubfs mkdir -p $OBJDIR/target/fs/hfs mkdir -p $OBJDIR/target/fs/hfsplus + mkdir -p $OBJDIR/target/fs/iso9660 mkdir -p $OBJDIR/target/drivers mkdir -p $OBJDIR/target/libc mkdir -p $OBJDIR/host/include Modified: trunk/openbios-devel/fs/build.xml =================================================================== --- trunk/openbios-devel/fs/build.xml 2009-11-22 09:04:27 UTC (rev 625) +++ trunk/openbios-devel/fs/build.xml 2009-11-22 09:26:50 UTC (rev 626) @@ -8,5 +8,6 @@ <include href="grubfs/build.xml"/> <include href="hfs/build.xml"/> <include href="hfsplus/build.xml"/> + <include href="iso9660/build.xml"/> </build> Added: trunk/openbios-devel/fs/iso9660/build.xml =================================================================== --- trunk/openbios-devel/fs/iso9660/build.xml (rev 0) +++ trunk/openbios-devel/fs/iso9660/build.xml 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,13 @@ +<build> + <library name="fs" type="static" target="target"> + <object source="iso9660_fs.c" condition="ISO9660"/> + <object source="iso9660_close.c" condition="ISO9660"/> + <object source="iso9660_closedir.c" condition="ISO9660"/> + <object source="iso9660_lseek.c" condition="ISO9660"/> + <object source="iso9660_mount.c" condition="ISO9660"/> + <object source="iso9660_open.c" condition="ISO9660"/> + <object source="iso9660_opendir.c" condition="ISO9660"/> + <object source="iso9660_read.c" condition="ISO9660"/> + <object source="iso9660_readdir.c" condition="ISO9660"/> + </library> +</build> Added: trunk/openbios-devel/fs/iso9660/iso9660.h =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660.h (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660.h 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,58 @@ +/* + * + * (c) 2005-2009 Laurent Vivier <Laurent(a)vivier.eu> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#ifndef __ISO9660_H__ +#define __ISO9660_H__ + +#include "iso9660_fs.h" + +typedef struct iso9660_VOLUME { + int ucs_level; + struct iso_primary_descriptor *descriptor; + int fd; +} iso9660_VOLUME; + +typedef struct iso9660_DIR { + iso9660_VOLUME *volume; + int extent; + int len; + int index; + unsigned char buffer[ISOFS_BLOCK_SIZE]; +} iso9660_DIR; + +typedef struct iso9660_FILE { + iso9660_VOLUME *volume; + char *path; + int base; /* first extent of the file */ + int size; /* size of the file */ + int offset; + int current; + unsigned char buffer[ISOFS_BLOCK_SIZE]; +} iso9660_FILE; + +static inline int isonum_721(char *p) +{ + return ((p[0] & 0xff) + | ((p[1] & 0xff) << 8)); +} + +static inline int isonum_723(char *p) +{ + return (isonum_721(p)); +} + +static inline int isonum_733(char *p) +{ + return ((p[0] & 0xff) | ((p[1] & 0xff) << 8) | + ((p[2] & 0xff) << 16) | ((p[3] & 0xff) << 24)); +} + +extern struct iso_directory_record *iso9660_get_root_node(iso9660_VOLUME* volume); +extern struct iso_directory_record* iso9660_get_node(iso9660_VOLUME *volume, struct iso_directory_record *dirnode, const char *path); + +#endif /* __ISO9660_H__ */ Added: trunk/openbios-devel/fs/iso9660/iso9660_close.c =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_close.c (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660_close.c 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,15 @@ +/* + * + * (c) 2005-2009 Laurent Vivier <Laurent(a)vivier.eu> + * + * This file has been copied from EMILE bootloader, http://emile.sf.net + * + */ + +#include "libiso9660.h" + +void iso9660_close(iso9660_FILE *file) +{ + free(file->path); + free(file); +} Added: trunk/openbios-devel/fs/iso9660/iso9660_closedir.c =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_closedir.c (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660_closedir.c 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,19 @@ +/* + * + * (c) 2005-2009 Laurent Vivier <Laurent(a)vivier.eu> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libiso9660.h" + +int iso9660_closedir(iso9660_DIR *dir) +{ + if (dir == NULL) + return -1; + + free(dir); + + return 0; +} Added: trunk/openbios-devel/fs/iso9660/iso9660_fs.c =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_fs.c (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660_fs.c 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,104 @@ +/* + * + * (c) 2009 Laurent Vivier <Laurent(a)vivier.eu> + * + */ + +#include "libiso9660.h" +#include "openbios/fs.h" + +static void +umount( fs_ops_t *fs ) +{ + iso9660_VOLUME *volume = (iso9660_VOLUME *)fs->fs_data; + + iso9660_umount( volume ); +} + +static file_desc_t * +open_path( fs_ops_t *fs, const char *path ) +{ + iso9660_VOLUME *volume = (iso9660_VOLUME *)fs->fs_data; + iso9660_FILE *file; + + file = iso9660_open(volume, path); + + return (file_desc_t *)file; +} + +static char * +get_path( file_desc_t *fd, char *buf, int size ) +{ + iso9660_FILE *file = (iso9660_FILE*)fd; + + strncpy(buf, file->path, size); + + return buf; +} + +static int +file_lseek( file_desc_t *fd, off_t offs, int whence ) +{ + iso9660_FILE *file = (iso9660_FILE*)fd; + + return iso9660_lseek(file, offs, whence); +} + +static void +file_close( file_desc_t *fd ) +{ + iso9660_FILE *file = (iso9660_FILE*)fd; + + iso9660_close(file); +} + +static int +file_read( file_desc_t *fd, void *buf, size_t count ) +{ + iso9660_FILE *file = (iso9660_FILE*)fd; + + return iso9660_read(file, buf, count); +} + +static char * +vol_name( fs_ops_t *fs, char *buf, int size ) +{ + iso9660_VOLUME *volume = (iso9660_VOLUME *)fs->fs_data; + + strncpy(buf, volume->descriptor->volume_id, size); + + return buf; +} + +static const char * +get_fstype( fs_ops_t *fs ) +{ + return "ISO9660"; +} + +static const fs_ops_t iso9660_ops = { + .close_fs = umount, + + .open_path = open_path, + .get_path = get_path, + .close = file_close, + .read = file_read, + .lseek = file_lseek, + + .vol_name = vol_name, + .get_fstype = get_fstype, +}; + +int fs_iso9660_open(int fd, fs_ops_t *fs) +{ + iso9660_VOLUME *volume; + + volume = iso9660_mount(fd); + if (volume == NULL) + return -1; + + *fs = iso9660_ops; + fs->fs_data = volume; + + return 0; +} Added: trunk/openbios-devel/fs/iso9660/iso9660_fs.h =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_fs.h (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660_fs.h 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,161 @@ +#ifndef _ISO9660_FS_H +#define _ISO9660_FS_H + +/* this file has been copied from linux 2.6.26 */ + +/* + * The isofs filesystem constants/structures + */ + +/* This part borrowed from the bsd386 isofs */ +#define ISODCL(from, to) (to - from + 1) + +struct iso_volume_descriptor { + char type[ISODCL(1,1)]; /* 711 */ + char id[ISODCL(2,6)]; + char version[ISODCL(7,7)]; + char data[ISODCL(8,2048)]; +}; + +/* volume descriptor types */ +#define ISO_VD_PRIMARY 1 +#define ISO_VD_SUPPLEMENTARY 2 +#define ISO_VD_END 255 + +#define ISO_STANDARD_ID "CD001" + +struct iso_primary_descriptor { + char type [ISODCL ( 1, 1)]; /* 711 */ + char id [ISODCL ( 2, 6)]; + char version [ISODCL ( 7, 7)]; /* 711 */ + char unused1 [ISODCL ( 8, 8)]; + char system_id [ISODCL ( 9, 40)]; /* achars */ + char volume_id [ISODCL ( 41, 72)]; /* dchars */ + char unused2 [ISODCL ( 73, 80)]; + char volume_space_size [ISODCL ( 81, 88)]; /* 733 */ + char unused3 [ISODCL ( 89, 120)]; + char volume_set_size [ISODCL (121, 124)]; /* 723 */ + char volume_sequence_number [ISODCL (125, 128)]; /* 723 */ + char logical_block_size [ISODCL (129, 132)]; /* 723 */ + char path_table_size [ISODCL (133, 140)]; /* 733 */ + char type_l_path_table [ISODCL (141, 144)]; /* 731 */ + char opt_type_l_path_table [ISODCL (145, 148)]; /* 731 */ + char type_m_path_table [ISODCL (149, 152)]; /* 732 */ + char opt_type_m_path_table [ISODCL (153, 156)]; /* 732 */ + char root_directory_record [ISODCL (157, 190)]; /* 9.1 */ + char volume_set_id [ISODCL (191, 318)]; /* dchars */ + char publisher_id [ISODCL (319, 446)]; /* achars */ + char preparer_id [ISODCL (447, 574)]; /* achars */ + char application_id [ISODCL (575, 702)]; /* achars */ + char copyright_file_id [ISODCL (703, 739)]; /* 7.5 dchars */ + char abstract_file_id [ISODCL (740, 776)]; /* 7.5 dchars */ + char bibliographic_file_id [ISODCL (777, 813)]; /* 7.5 dchars */ + char creation_date [ISODCL (814, 830)]; /* 8.4.26.1 */ + char modification_date [ISODCL (831, 847)]; /* 8.4.26.1 */ + char expiration_date [ISODCL (848, 864)]; /* 8.4.26.1 */ + char effective_date [ISODCL (865, 881)]; /* 8.4.26.1 */ + char file_structure_version [ISODCL (882, 882)]; /* 711 */ + char unused4 [ISODCL (883, 883)]; + char application_data [ISODCL (884, 1395)]; + char unused5 [ISODCL (1396, 2048)]; +}; + +/* Almost the same as the primary descriptor but two fields are specified */ +struct iso_supplementary_descriptor { + char type [ISODCL ( 1, 1)]; /* 711 */ + char id [ISODCL ( 2, 6)]; + char version [ISODCL ( 7, 7)]; /* 711 */ + char flags [ISODCL ( 8, 8)]; /* 853 */ + char system_id [ISODCL ( 9, 40)]; /* achars */ + char volume_id [ISODCL ( 41, 72)]; /* dchars */ + char unused2 [ISODCL ( 73, 80)]; + char volume_space_size [ISODCL ( 81, 88)]; /* 733 */ + char escape [ISODCL ( 89, 120)]; /* 856 */ + char volume_set_size [ISODCL (121, 124)]; /* 723 */ + char volume_sequence_number [ISODCL (125, 128)]; /* 723 */ + char logical_block_size [ISODCL (129, 132)]; /* 723 */ + char path_table_size [ISODCL (133, 140)]; /* 733 */ + char type_l_path_table [ISODCL (141, 144)]; /* 731 */ + char opt_type_l_path_table [ISODCL (145, 148)]; /* 731 */ + char type_m_path_table [ISODCL (149, 152)]; /* 732 */ + char opt_type_m_path_table [ISODCL (153, 156)]; /* 732 */ + char root_directory_record [ISODCL (157, 190)]; /* 9.1 */ + char volume_set_id [ISODCL (191, 318)]; /* dchars */ + char publisher_id [ISODCL (319, 446)]; /* achars */ + char preparer_id [ISODCL (447, 574)]; /* achars */ + char application_id [ISODCL (575, 702)]; /* achars */ + char copyright_file_id [ISODCL (703, 739)]; /* 7.5 dchars */ + char abstract_file_id [ISODCL (740, 776)]; /* 7.5 dchars */ + char bibliographic_file_id [ISODCL (777, 813)]; /* 7.5 dchars */ + char creation_date [ISODCL (814, 830)]; /* 8.4.26.1 */ + char modification_date [ISODCL (831, 847)]; /* 8.4.26.1 */ + char expiration_date [ISODCL (848, 864)]; /* 8.4.26.1 */ + char effective_date [ISODCL (865, 881)]; /* 8.4.26.1 */ + char file_structure_version [ISODCL (882, 882)]; /* 711 */ + char unused4 [ISODCL (883, 883)]; + char application_data [ISODCL (884, 1395)]; + char unused5 [ISODCL (1396, 2048)]; +}; + + +#define HS_STANDARD_ID "CDROM" + +struct hs_volume_descriptor { + char foo [ISODCL ( 1, 8)]; /* 733 */ + char type [ISODCL ( 9, 9)]; /* 711 */ + char id [ISODCL ( 10, 14)]; + char version [ISODCL ( 15, 15)]; /* 711 */ + char data[ISODCL(16,2048)]; +}; + + +struct hs_primary_descriptor { + char foo [ISODCL ( 1, 8)]; /* 733 */ + char type [ISODCL ( 9, 9)]; /* 711 */ + char id [ISODCL ( 10, 14)]; + char version [ISODCL ( 15, 15)]; /* 711 */ + char unused1 [ISODCL ( 16, 16)]; /* 711 */ + char system_id [ISODCL ( 17, 48)]; /* achars */ + char volume_id [ISODCL ( 49, 80)]; /* dchars */ + char unused2 [ISODCL ( 81, 88)]; /* 733 */ + char volume_space_size [ISODCL ( 89, 96)]; /* 733 */ + char unused3 [ISODCL ( 97, 128)]; /* 733 */ + char volume_set_size [ISODCL (129, 132)]; /* 723 */ + char volume_sequence_number [ISODCL (133, 136)]; /* 723 */ + char logical_block_size [ISODCL (137, 140)]; /* 723 */ + char path_table_size [ISODCL (141, 148)]; /* 733 */ + char type_l_path_table [ISODCL (149, 152)]; /* 731 */ + char unused4 [ISODCL (153, 180)]; /* 733 */ + char root_directory_record [ISODCL (181, 214)]; /* 9.1 */ +}; + +/* We use this to help us look up the parent inode numbers. */ + +struct iso_path_table{ + unsigned char name_len[2]; /* 721 */ + char extent[4]; /* 731 */ + char parent[2]; /* 721 */ + char name[0]; +} __attribute__((packed)); + +/* high sierra is identical to iso, except that the date is only 6 bytes, and + there is an extra reserved byte after the flags */ + +struct iso_directory_record { + char length [ISODCL (1, 1)]; /* 711 */ + char ext_attr_length [ISODCL (2, 2)]; /* 711 */ + char extent [ISODCL (3, 10)]; /* 733 */ + char size [ISODCL (11, 18)]; /* 733 */ + char date [ISODCL (19, 25)]; /* 7 by 711 */ + char flags [ISODCL (26, 26)]; + char file_unit_size [ISODCL (27, 27)]; /* 711 */ + char interleave [ISODCL (28, 28)]; /* 711 */ + char volume_sequence_number [ISODCL (29, 32)]; /* 723 */ + unsigned char name_len [ISODCL (33, 33)]; /* 711 */ + char name [0]; +} __attribute__((packed)); + +#define ISOFS_BLOCK_BITS 11 +#define ISOFS_BLOCK_SIZE (1 << ISOFS_BLOCK_BITS) + +#endif /* _ISO9660_FS_H */ Added: trunk/openbios-devel/fs/iso9660/iso9660_lseek.c =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_lseek.c (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660_lseek.c 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,37 @@ +/* + * + * (c) 2005-2009 Laurent Vivier <Laurent(a)vivier.eu> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libiso9660.h" + +int iso9660_lseek(iso9660_FILE *_file, long offset, int whence) +{ + iso9660_FILE *file = (iso9660_FILE*)_file; + long new_offset; + + switch(whence) + { + case SEEK_SET: + new_offset = offset; + break; + case SEEK_CUR: + new_offset = file->offset + offset; + break; + case SEEK_END: + new_offset = file->size + offset; + break; + default: + return -1; + } + + if ( (new_offset < 0) || (new_offset > file->size) ) + return -1; + + file->offset = new_offset; + + return new_offset; +} Added: trunk/openbios-devel/fs/iso9660/iso9660_mount.c =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_mount.c (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660_mount.c 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,195 @@ +/* + * + * (c) 2005-2009 Laurent Vivier <Laurent(a)vivier.eu> + * + * This file has been copied from EMILE, http://emile.sf.net + * + * some parts from mkisofs (c) J. Schilling + * + */ + +#include "libiso9660.h" +#include "openbios/bindings.h" +#include "libc/diskio.h" + +void iso9660_name(iso9660_VOLUME *volume, struct iso_directory_record *idr, char *buffer) +{ + int j; + unsigned char uh, ul, uc; + + buffer[0] = 0; + if (idr->name_len[0] == 1 && idr->name[0] == 0) + strcpy(buffer, "."); + else if (idr->name_len[0] == 1 && idr->name[0] == 1) + strcpy(buffer, ".."); + else { + switch (volume->ucs_level) { + case 3: + case 2: + case 1: + /* + * Unicode name. + */ + + for (j = 0; j < (int)idr->name_len[0] / 2; j++) { + uh = idr->name[j*2]; + ul = idr->name[j*2+1]; + + /* + * unicode convertion + * up = unls->unls_uni2cs[uh]; + * + * if (up == NULL) + * uc = '\0'; + * else + * uc = up[ul]; + * + * we use only low byte + */ + + uc = ul; + + buffer[j] = uc ? uc : '_'; + } + buffer[idr->name_len[0]/2] = '\0'; + break; + case 0: + /* + * Normal non-Unicode name. + */ + strncpy(buffer, idr->name, idr->name_len[0]); + buffer[idr->name_len[0]] = 0; + break; + default: + /* + * Don't know how to do these yet. Maybe they are the same + * as one of the above. + */ + break; + } + } +} + +iso9660_VOLUME *iso9660_mount(int fd) +{ + iso9660_VOLUME* volume; + struct iso_primary_descriptor *jpd; + struct iso_primary_descriptor ipd; + int block; + int ucs_level = 0; + + /* read filesystem descriptor */ + + seek_io(fd, 16 * ISOFS_BLOCK_SIZE); + read_io(fd, &ipd, sizeof (ipd)); + + /* + * High sierra: + * + * DESC TYPE == 1 (VD_SFS) offset 8 len 1 + * STR ID == "CDROM" offset 9 len 5 + * STD_VER == 1 offset 14 len 1 + */ + + /* High Sierra format ? */ + + if ((((char *)&ipd)[8] == 1) && + (strncmp(&((char *)&ipd)[9], "CDROM", 5) == 0) && + (((char *)&ipd)[14] == 1)) { + printk("Incompatible format: High Sierra format\n"); + return NULL; + } + + /* + * ISO 9660: + * + * DESC TYPE == 1 (VD_PVD) offset 0 len 1 + * STR ID == "CD001" offset 1 len 5 + * STD_VER == 1 offset 6 len 1 + */ + + /* NOT ISO 9660 format ? */ + + if ((ipd.type[0] != ISO_VD_PRIMARY) || + (strncmp(ipd.id, ISO_STANDARD_ID, sizeof (ipd.id)) != 0) || + (ipd.version[0] != 1)) { + return NULL; + } + + /* UCS info */ + + block = 16; + + jpd = (struct iso_primary_descriptor *) + malloc(sizeof(struct iso_primary_descriptor)); + if (jpd == NULL) + return NULL; + + memcpy(jpd, &ipd, sizeof (ipd)); + while ((uint8_t)jpd->type[0] != ISO_VD_END) { + + /* + * If Joliet UCS escape sequence found, we may be wrong + */ + + if (jpd->unused3[0] == '%' && + jpd->unused3[1] == '/' && + (jpd->unused3[3] == '\0' || + jpd->unused3[3] == ' ') && + (jpd->unused3[2] == '@' || + jpd->unused3[2] == 'C' || + jpd->unused3[2] == 'E')) { + + if (jpd->version[0] != 1) + break; + } + + block++; + seek_io(fd, block * ISOFS_BLOCK_SIZE); + read_io(fd, jpd, sizeof (*jpd)); + } + + ucs_level = 0; + if (((unsigned char) jpd->type[0] == ISO_VD_END)) { + memcpy(jpd, &ipd, sizeof (ipd)); + } else { + switch (jpd->unused3[2]) { + case '@': + ucs_level = 1; + break; + case 'C': + ucs_level = 2; + break; + case 'E': + ucs_level = 3; + break; + } + + if (ucs_level && jpd->unused3[3] == ' ') + printk("Warning: Joliet escape sequence uses illegal space at offset 3\n"); + } + + volume = (iso9660_VOLUME*)malloc(sizeof(iso9660_VOLUME)); + if (volume == NULL) + return NULL; + + volume->descriptor = jpd; + volume->ucs_level = ucs_level; + volume->fd = fd; + + return volume; +} + +int iso9660_umount(iso9660_VOLUME* volume) +{ + if (volume == NULL) + return -1; + free(volume->descriptor); + free(volume); + return 0; +} + +struct iso_directory_record *iso9660_get_root_node(iso9660_VOLUME* volume) +{ + return (struct iso_directory_record *)volume->descriptor->root_directory_record; +} Added: trunk/openbios-devel/fs/iso9660/iso9660_open.c =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_open.c (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660_open.c 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,39 @@ +/* + * + * (c) 2005-2009 Laurent Vivier <Laurent(a)vivier.eu> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libiso9660.h" + +iso9660_FILE* iso9660_open(iso9660_VOLUME *volume, const char* pathname) +{ + struct iso_directory_record *root; + struct iso_directory_record *idr; + iso9660_FILE *file; + + root = iso9660_get_root_node(volume); + if (root == NULL) + return NULL; + + idr = iso9660_get_node(volume, root, pathname); + if (idr == NULL) + return NULL; + + file = (iso9660_FILE*)malloc(sizeof(iso9660_FILE)); + if (file == NULL) + return NULL; + + file->base = isonum_733((char *)idr->extent); + file->size = isonum_733((char *)idr->size); + file->offset = 0; + file->current = -1; + file->volume = volume; + file->path = strdup(pathname); + + free(idr); + + return file; +} Added: trunk/openbios-devel/fs/iso9660/iso9660_opendir.c =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_opendir.c (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660_opendir.c 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,133 @@ +/* + * + * (c) 2005-2009 Laurent Vivier <Laurent(a)vivier.eu> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libiso9660.h" + +static inline int iso9660_is_directory(struct iso_directory_record * idr) +{ + return ((idr->flags[0] & 2) != 0); +} + +static iso9660_DIR* iso9660_opendir_node(iso9660_VOLUME *volume, struct iso_directory_record *node) +{ + iso9660_DIR *dir; + + dir = (iso9660_DIR*)malloc(sizeof(iso9660_DIR)); + if (dir == NULL) + return NULL; + + dir->extent = isonum_733((char *)node->extent); + dir->len = isonum_733((char *)node->size); + dir->index = sizeof (dir->buffer); + dir->volume = volume; + + return dir; +} + +static struct iso_directory_record* idr_new(struct iso_directory_record* idr) +{ + struct iso_directory_record* result; + int size = sizeof(*idr) + (int)idr->name_len[0]; + + result = (struct iso_directory_record*)malloc(size); + memcpy(result, idr, size); + + return result; +} + +static struct iso_directory_record * seek_name(iso9660_VOLUME *volume, + struct iso_directory_record *idr, + char *name) +{ + struct iso_directory_record *result; + char name_buf[256]; + iso9660_DIR *dir; + + dir = iso9660_opendir_node(volume, idr); + if (dir == NULL) + return NULL; + + while ((idr = iso9660_readdir(dir)) != NULL) + { + iso9660_name(volume, idr, name_buf); + if (strcmp(name, name_buf) == 0) + { + result = idr_new(idr); + iso9660_closedir(dir); + return result; + } + } + iso9660_closedir(dir); + return NULL; +} + +struct iso_directory_record* iso9660_get_node( + iso9660_VOLUME *volume, + struct iso_directory_record *dirnode, + const char *path) +{ + struct iso_directory_record* result; + struct iso_directory_record* current; + char name[256]; + int i; + + current = idr_new(dirnode); + while(1) + { + /* ignore head '\' */ + + while (*path && *path == '\\') + path++; + + if (*path == 0) + break; + + /* extract first path component */ + + i = 0; + while (*path && *path != '\\') + name[i++] = *path++; + name[i] = 0; + + /* seek first component in current directory */ + + result = seek_name(volume, current, name); + if (result == NULL) + return NULL; + + free(current); + current = result; + } + return current; +} + +iso9660_DIR* iso9660_opendir(iso9660_VOLUME *volume, const char *name) +{ + iso9660_DIR *dir; + struct iso_directory_record *node; + + node = iso9660_get_root_node((iso9660_VOLUME*)volume); + if (node == NULL) + return NULL; + + node = iso9660_get_node((iso9660_VOLUME*)volume, node, name); + if (node == NULL) + return NULL; + if (!iso9660_is_directory(node)) { + free(node); + return NULL; + } + + dir = iso9660_opendir_node((iso9660_VOLUME*)volume, node); + + free(node); + + dir->volume = (iso9660_VOLUME*)volume; + + return dir; +} Added: trunk/openbios-devel/fs/iso9660/iso9660_read.c =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_read.c (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660_read.c 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,74 @@ +/* + * + * (c) 2005-2009 Laurent Vivier <Laurent(a)vivier.eu> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libiso9660.h" +#include "openbios/bindings.h" +#include "libc/diskio.h" + +size_t iso9660_read(iso9660_FILE *_file, char *buf, size_t count) +{ + iso9660_FILE *file = (iso9660_FILE*)_file; + size_t read = 0; + + if ( count > (file->size - file->offset) ) + count = file->size - file->offset; + + while (count > 0) + { + size_t part; + int offset_extent; + int offset_index; + + offset_extent = file->base + + (file->offset / ISOFS_BLOCK_SIZE); + offset_index = file->offset % ISOFS_BLOCK_SIZE; + + if (file->current != offset_extent) + { + if ( (offset_index == 0) && + (count >= ISOFS_BLOCK_SIZE) ) + { + /* direct i/o */ + + int extents_nb; + + extents_nb = count / ISOFS_BLOCK_SIZE; + + part = extents_nb * ISOFS_BLOCK_SIZE; + + seek_io(file->volume->fd, + offset_extent * ISOFS_BLOCK_SIZE); + read_io(file->volume->fd, buf + read, part); + + file->offset += part; + count -= part; + read += part; + + continue; + } + + file->current = offset_extent; + seek_io(file->volume->fd, + offset_extent * ISOFS_BLOCK_SIZE); + read_io(file->volume->fd, file->buffer, + ISOFS_BLOCK_SIZE); + } + + part = ISOFS_BLOCK_SIZE - offset_index; + if (count < part) + part = count; + + memcpy(buf + read, file->buffer + offset_index, part); + + file->offset += part; + count -= part; + read += part; + } + + return read; +} Added: trunk/openbios-devel/fs/iso9660/iso9660_readdir.c =================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_readdir.c (rev 0) +++ trunk/openbios-devel/fs/iso9660/iso9660_readdir.c 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,50 @@ +/* + * + * (c) 2005-2009 Laurent Vivier <Laurent(a)vivier.eu> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#include "libiso9660.h" +#include "openbios/bindings.h" +#include "libc/diskio.h" + +#define offsetof(t,m) ((long)&(((t *)0)->m)) + +static void read_extent(iso9660_DIR *dir) +{ + seek_io(dir->volume->fd, dir->extent * ISOFS_BLOCK_SIZE); + read_io(dir->volume->fd, dir->buffer, ISOFS_BLOCK_SIZE); + + dir->len -= ISOFS_BLOCK_SIZE; + dir->extent ++; + dir->index = 0; +} + +struct iso_directory_record *iso9660_readdir(iso9660_DIR *dir) +{ + struct iso_directory_record *idr; + + if (dir->index > + ISOFS_BLOCK_SIZE - offsetof(struct iso_directory_record, name[0])) + { + if (dir->len <= 0) + return NULL; + + read_extent(dir); + } + + idr = (struct iso_directory_record *) &dir->buffer[dir->index]; + if (idr->length[0] == 0) { + if (dir->len <= 0) + return NULL; + + read_extent(dir); + idr = (struct iso_directory_record *) &dir->buffer[dir->index]; + } + + dir->index += dir->buffer[dir->index]; + + return idr; +} Added: trunk/openbios-devel/fs/iso9660/libiso9660.h =================================================================== --- trunk/openbios-devel/fs/iso9660/libiso9660.h (rev 0) +++ trunk/openbios-devel/fs/iso9660/libiso9660.h 2009-11-22 09:26:50 UTC (rev 626) @@ -0,0 +1,26 @@ +/* + * + * (c) 2005-2009 Laurent Vivier <Laurent(a)vivier.eu> + * + * This file has been copied from EMILE, http://emile.sf.net + * + */ + +#ifndef __LIBISO9660_H__ +#define __LIBISO9660_H__ + +#include "openbios/config.h" +#include "iso9660.h" + +extern iso9660_VOLUME* iso9660_mount(int fd); +extern int iso9660_umount(iso9660_VOLUME *volume); +extern iso9660_DIR* iso9660_opendir(iso9660_VOLUME *, const char *name); +extern iso9660_FILE* iso9660_open(iso9660_VOLUME *, const char *pathname); +extern int iso9660_closedir(iso9660_DIR *dir); +extern struct iso_directory_record *iso9660_readdir(iso9660_DIR *dir); +extern size_t iso9660_read(iso9660_FILE *file, char *buf, size_t count); +extern void iso9660_close(iso9660_FILE *file); +extern int iso9660_lseek(iso9660_FILE *file, long offset, int whence); +extern void iso9660_name(iso9660_VOLUME *volume, struct iso_directory_record * idr, char *buffer); + +#endif /* __LIBISO9660_H__ */ Modified: trunk/openbios-devel/include/openbios/fs.h =================================================================== --- trunk/openbios-devel/include/openbios/fs.h 2009-11-22 09:04:27 UTC (rev 625) +++ trunk/openbios-devel/include/openbios/fs.h 2009-11-22 09:26:50 UTC (rev 626) @@ -62,6 +62,12 @@ static inline int fs_hfs_open( int fd, fs_ops_t *fs ) { return -1; } #endif +#ifdef CONFIG_ISO9660 +extern int fs_iso9660_open( int fd, fs_ops_t *fs ); +#else +static inline int fs_iso9660_open( int fd, fs_ops_t *fs ) { return -1; } +#endif + #ifdef CONFIG_GRUBFS extern int fs_grubfs_open( int fd, fs_ops_t *fs ); #else Modified: trunk/openbios-devel/modules/filesystems.c =================================================================== --- trunk/openbios-devel/modules/filesystems.c 2009-11-22 09:04:27 UTC (rev 625) +++ trunk/openbios-devel/modules/filesystems.c 2009-11-22 09:26:50 UTC (rev 626) @@ -47,6 +47,7 @@ if( !err ) { err=fs_hfsp_open(fd, fs); if( err ) err = fs_hfs_open(fd, fs); + if( err ) err = fs_iso9660_open(fd, fs); if( err ) err = fs_grubfs_open(fd, fs); }

1 0

r625 - trunk/openbios-devel/forth/system
by svn＠openbios.org 22 Nov '09

22 Nov '09

Author: laurent Date: 2009-11-22 10:04:27 +0100 (Sun, 22 Nov 2009) New Revision: 625 Modified: trunk/openbios-devel/forth/system/ciface.fs Log: Revert commit r624 (breaks ppc and sparc64 boot) Modified: trunk/openbios-devel/forth/system/ciface.fs =================================================================== --- trunk/openbios-devel/forth/system/ciface.fs 2009-11-20 19:09:04 UTC (rev 624) +++ trunk/openbios-devel/forth/system/ciface.fs 2009-11-22 09:04:27 UTC (rev 625) @@ -189,12 +189,14 @@ : call-method ( ihandle method -- xxxx catch-result ) dup 0= if ." call of null method" -1 exit then + dup >r + dup cstrlen \ ." call-method " 2dup type cr - rot ?ihandle ['] $call-method catch if + rot ?ihandle ['] $call-method catch dup if \ not necessary an error but very useful for debugging... ." call-method " r@ dup cstrlen type ." : exception " dup . cr then - \ r> drop + r> drop ; @@ -210,16 +212,21 @@ close-dev ; -: read ( len addr ihandle -- actual ) - rot swap " read" call-method +: read ( ihandle addr len -- actual ) + rot dup ihandle>phandle " read" rot find-method + if swap call-package else 3drop -1 then ; -: write ( len addr ihandle -- actual ) - rot swap " write" call-method +: write ( ihandle addr len -- actual ) + rot dup ihandle>phandle " write" rot find-method + if swap call-package else 3drop -1 then ; -: seek ( pos_lo pos_hi ihandle -- status ) - " seek" call-method +: seek ( ihandle pos_hi pos_lo -- status ) + \ package methods uses ( pos_lo pos_hi -- status ) + swap + rot dup ihandle>phandle " seek" rot find-method + if swap call-package else 3drop -1 then ; @@ -254,7 +261,7 @@ : interpret ( xxx cmdstring -- ??? catch-reult ) dup cstrlen - \ ." INTERPRET: --- " 2dup type + \ ." INTERPRETE: --- " 2dup type ['] evaluate catch dup if \ this is not necessary an error... ." interpret: exception " dup . ." caught" cr

1 0

Re: [OpenBIOS] Sparc64 OpenBIOS
by Nick Couchman 20 Nov '09

20 Nov '09

>>> On 2009/11/17 at 10:37, Tarl Neustaedter <Tarl.Neustaedter(a)Sun.COM> wrote: > [...] >> Based on that output, it's hard for me to tell what about "open-package'" > failed >> > > Yup. What I spot: > > : mount-root ( Empty ) > 00000000ffe35d28: boot-dev$ ( ffe357a8 6 ) > 00000000ffe35d30: fs-pkg$ ( ffe357a8 6 ffe317c0 10 ) > 00000000ffe35d38: $open-package > : $open-package ( ffe357a8 6 ffe317c0 10 ) > > It looks like fs-pkg$ names the package it's opening. I'm guessing > that's hsfs-file-system, but you should probably verify that's what is > in that string (do a "2dup type" before calling $open-package). If > that's correct, then rather than descending into open-package, you > probably want to put a breakpoint at "open" in > /packages/hsfs-file-system, which is where that will end up after much > wandering around. Then proceed from there - you really don't want to > trace through instance creation. Okay, I was able to do a "2dup type" and verify that hsfs-file-system is the name of the file that it's trying to open. Again, forgive my ignorance (being new to this whole development process), but what's the best way to insert a breakpoint where you've suggested? Thanks! -Nick > > The reason you weren't able to see all that (which would have been > overwhelming) is a bit further down: > > 00000000ffe135f0: (lit) ( 1 ffe2fe38 ffe4b1d8 ffe4b548 ffe135e0 4 ffe4b558 > ffe13310 ) > 00000000ffe13600: catch ( 1 ffe2fe38 ffe4b1d8 ffe4b548 ffffffffffffffff 0 ) > > > That's basically a subroutine call to ffe13310, which it didn't show. -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

7 45

r624 - trunk/openbios-devel/forth/system
by svn＠openbios.org 20 Nov '09

20 Nov '09

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. >From Mark Cave-Ayland and me. Modified: trunk/openbios-devel/forth/system/ciface.fs =================================================================== --- trunk/openbios-devel/forth/system/ciface.fs 2009-11-20 19:04:41 UTC (rev 623) +++ trunk/openbios-devel/forth/system/ciface.fs 2009-11-20 19:09:04 UTC (rev 624) @@ -189,14 +189,12 @@ : call-method ( ihandle method -- xxxx catch-result ) dup 0= if ." call of null method" -1 exit then - dup >r - dup cstrlen \ ." call-method " 2dup type cr - rot ?ihandle ['] $call-method catch dup if + rot ?ihandle ['] $call-method catch if \ not necessary an error but very useful for debugging... ." call-method " r@ dup cstrlen type ." : exception " dup . cr then - r> drop + \ r> drop ; @@ -212,21 +210,16 @@ close-dev ; -: read ( ihandle addr len -- actual ) - rot dup ihandle>phandle " read" rot find-method - if swap call-package else 3drop -1 then +: read ( len addr ihandle -- actual ) + rot swap " read" call-method ; -: write ( ihandle addr len -- actual ) - rot dup ihandle>phandle " write" rot find-method - if swap call-package else 3drop -1 then +: write ( len addr ihandle -- actual ) + rot swap " write" call-method ; -: seek ( ihandle pos_hi pos_lo -- status ) - \ package methods uses ( pos_lo pos_hi -- status ) - swap - rot dup ihandle>phandle " seek" rot find-method - if swap call-package else 3drop -1 then +: seek ( pos_lo pos_hi ihandle -- status ) + " seek" call-method ; @@ -261,7 +254,7 @@ : interpret ( xxx cmdstring -- ??? catch-reult ) dup cstrlen - \ ." INTERPRETE: --- " 2dup type + \ ." INTERPRET: --- " 2dup type ['] evaluate catch dup if \ this is not necessary an error... ." interpret: exception " dup . ." caught" cr

1 0

r623 - trunk/openbios-devel/kernel
by svn＠openbios.org 20 Nov '09

20 Nov '09

Author: stepan Date: 2009-11-20 20:04:41 +0100 (Fri, 20 Nov 2009) New Revision: 623 Modified: trunk/openbios-devel/kernel/bootstrap.c trunk/openbios-devel/kernel/dict.c Log: Another nice patch from Mark Cave-Ayland: This patch corrects a couple of (minor) bugs in the Forth source debugger; firstly the number of wordlists is held in #order, rather than #vocs which is the total number of wordlists which can be held simultaneously. Secondly, the initial interruptforth setting in kernel/bootstrap.c is actually wrong, but since this is reset by enterforth() it is not needed anyway. Hence this line can simply be removed. Modified: trunk/openbios-devel/kernel/bootstrap.c =================================================================== --- trunk/openbios-devel/kernel/bootstrap.c 2009-11-20 19:03:46 UTC (rev 622) +++ trunk/openbios-devel/kernel/bootstrap.c 2009-11-20 19:04:41 UTC (rev 623) @@ -909,7 +909,6 @@ if (verbose) printk("Jumping to dictionary..."); - interruptforth = 1; enterforth((xt_t)PC); } Modified: trunk/openbios-devel/kernel/dict.c =================================================================== --- trunk/openbios-devel/kernel/dict.c 2009-11-20 19:03:46 UTC (rev 622) +++ trunk/openbios-devel/kernel/dict.c 2009-11-20 19:04:41 UTC (rev 623) @@ -173,7 +173,7 @@ if (read_ucell(cell2pointer(usesvocab))) { /* Vocabularies are in use, so search each one in turn */ - ucell numvocabs = findword("#vocs") + sizeof(cell); + ucell numvocabs = findword("#order") + sizeof(cell); for (i = 0; i < read_ucell(cell2pointer(numvocabs)); i++) { ucell vocabs = findword("vocabularies") + 2 * sizeof(cell); @@ -228,7 +228,7 @@ if (read_ucell(cell2pointer(usesvocab))) { /* Vocabularies are in use, so search each one in turn */ - ucell numvocabs = findword("#vocs") + sizeof(cell); + ucell numvocabs = findword("#order") + sizeof(cell); for (i = 0; i < read_ucell(cell2pointer(numvocabs)); i++) { ucell vocabs = findword("vocabularies") + 2 * sizeof(cell);

1 0

r622 - in trunk/openbios-devel/kernel: . include
by svn＠openbios.org 20 Nov '09

20 Nov '09

Author: stepan Date: 2009-11-20 20:03:46 +0100 (Fri, 20 Nov 2009) New Revision: 622 Modified: trunk/openbios-devel/kernel/dict.c trunk/openbios-devel/kernel/include/dict.h Log: findsemis_wordlist is only used by findsemis() so let's remove it from the "API" Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/openbios-devel/kernel/dict.c =================================================================== --- trunk/openbios-devel/kernel/dict.c 2009-11-20 18:54:38 UTC (rev 621) +++ trunk/openbios-devel/kernel/dict.c 2009-11-20 19:03:46 UTC (rev 622) @@ -128,7 +128,7 @@ * from the NFA. */ -ucell findsemis_wordlist(ucell xt, ucell wordlist) +static ucell findsemis_wordlist(ucell xt, ucell wordlist) { ucell tmplfa, nextlfa, nextcfa; Modified: trunk/openbios-devel/kernel/include/dict.h =================================================================== --- trunk/openbios-devel/kernel/include/dict.h 2009-11-20 18:54:38 UTC (rev 621) +++ trunk/openbios-devel/kernel/include/dict.h 2009-11-20 19:03:46 UTC (rev 622) @@ -41,7 +41,6 @@ void dump_header(dictionary_header_t *header); ucell fstrlen(ucell fstr); void fstrncpy(char *dest, ucell src, unsigned int maxlen); -ucell findsemis_wordlist(ucell xt, ucell wordlist); ucell findsemis(ucell xt); ucell findxtfromcell_wordlist(ucell incell, ucell wordlist); ucell findxtfromcell(ucell incell);

1 0

r621 - trunk/openbios-devel/forth/lib
by svn＠openbios.org 20 Nov '09

20 Nov '09

Author: stepan Date: 2009-11-20 19:54:38 +0100 (Fri, 20 Nov 2009) New Revision: 621 Modified: trunk/openbios-devel/forth/lib/64bit.fs Log: - drop commented out functions, they're in others.fs already - fix another stack diagram typo Modified: trunk/openbios-devel/forth/lib/64bit.fs =================================================================== --- trunk/openbios-devel/forth/lib/64bit.fs 2009-11-20 16:37:41 UTC (rev 620) +++ trunk/openbios-devel/forth/lib/64bit.fs 2009-11-20 18:54:38 UTC (rev 621) @@ -53,7 +53,7 @@ unaligned-x@ \ for now ; -: x! ( oaddr o -- ) +: x! ( o oaddr -- ) unaligned-x! \ for now ; @@ -65,22 +65,6 @@ x! ; -\ : rx@ ( oaddr - o ) -\ compile? if -\ h# 22e get-token if compile, else execute then -\ else -\ h# 22e get-token drop execute -\ then -\ ; immediate - -\ : rx! ( o oaddr -- ) -\ compile? if -\ h# 22f get-token if compile, else execute then -\ else -\ h# 22f get-token drop execute -\ then -\ ; immediate - : x, ( o -- ) here /x allot x! ;

1 0

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