diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-02-25 15:25:16 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-02-26 11:29:04 +0000 |
| commit | 76da2ae050d72a31fd47c2fb53f7081781de62ff (patch) | |
| tree | 6da146b5f19ca17ff24d4e74940f14264d38f914 /core/include/fs.h | |
| parent | 41c29c26d70fde563d7c255872bbadad87a39dfa (diff) | |
| parent | 79312306de0150ef64213ef9fbc5aa8580544f03 (diff) | |
| download | syslinux-76da2ae050d72a31fd47c2fb53f7081781de62ff.tar.gz | |
Merge branch 'lwip' into elflink
Welcome to Syslinux 5.10.
Conflicts:
NEWS
com32/lib/Makefile
com32/lib/sys/open.c
com32/lib/syslinux/ipappend.c
com32/modules/Makefile
com32/modules/prdhcp.c
core/Makefile
core/cmdline.inc
core/com32.inc
core/comboot.inc
core/configinit.inc
core/fs/chdir.c
core/fs/fs.c
core/fs/pxe/dnsresolv.c
core/fs/pxe/pxe.c
core/fs/pxe/pxe.h
core/idle.c
core/include/ctype.h
core/init.inc
core/mem/init.c
core/parseconfig.inc
core/runkernel.inc
core/syslinux.ld
core/ui.inc
doc/comboot.txt
version
Diffstat (limited to 'core/include/fs.h')
| -rw-r--r-- | core/include/fs.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/core/include/fs.h b/core/include/fs.h index 5c13f5b5..c7d0fd75 100644 --- a/core/include/fs.h +++ b/core/include/fs.h @@ -12,12 +12,9 @@ #include "disk.h" /* - * Maximum number of open files. This is *currently* constrained by the - * fact that PXE needs to be able to fit all its packet buffers into a - * 64K segment; this should be fixed by moving the packet buffers to high - * memory. + * Maximum number of open files. */ -#define MAX_OPEN_LG2 5 +#define MAX_OPEN_LG2 7 #define MAX_OPEN (1 << MAX_OPEN_LG2) #define FILENAME_MAX_LG2 8 @@ -56,7 +53,7 @@ struct fs_ops { enum fs_flags fs_flags; int (*fs_init)(struct fs_info *); - void (*searchdir)(const char *, struct file *); + void (*searchdir)(const char *, int, struct file *); uint32_t (*getfssec)(struct file *, char *, int, bool *); void (*close_file)(struct file *); void (*mangle_name)(char *, const char *); @@ -191,10 +188,10 @@ extern char *PATH; void pm_mangle_name(com32sys_t *); void pm_searchdir(com32sys_t *); void mangle_name(char *, const char *); -int searchdir(const char *name); +int searchdir(const char *name, int flags); void _close_file(struct file *); size_t pmapi_read_file(uint16_t *handle, void *buf, size_t sectors); -int open_file(const char *name, struct com32_filedata *filedata); +int open_file(const char *name, int flags, struct com32_filedata *filedata); void pm_open_file(com32sys_t *); void close_file(uint16_t handle); void pm_close_file(com32sys_t *); |