Mercurial > flash_v2
changeset 1139:e38842dfa4cc
* src/os-ecos.h: Added new #defines require for the recent jffs2
import.
* src/fs-ecos.c: Changed the return error code to be negative as
expected by jffs2_flash_read() and jffs2_flash_write().
| author | asl |
|---|---|
| date | Sun, 27 Jul 2003 14:05:12 +0000 |
| parents | 0f92f267b392 |
| children | 9ee8574b23ed |
| files | packages/fs/jffs2/current/ChangeLog packages/fs/jffs2/current/src/fs-ecos.c packages/fs/jffs2/current/src/os-ecos.h |
| diffstat | 3 files changed, 16 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/fs/jffs2/current/ChangeLog +++ b/packages/fs/jffs2/current/ChangeLog @@ -1,3 +1,13 @@ +2003-07-27 Andrew Lunn <andrew.lunn@ascom.ch> + + * src/os-ecos.h: Added new #defines require for the recent jffs2 + import. + +2003-07-27 Michael Checky <Michael_Checky@ThermoKing.com> + + * src/fs-ecos.c: Changed the return error code to be negative as + expected by jffs2_flash_read() and jffs2_flash_write(). + 2003-04-23 Bob Koninckx <bob.koninckx@mech.kuleuven.ac.be> * src/fs-ecos.c: mtab -> cyg_mtab. Ditto cyg_mtab_end.
--- a/packages/fs/jffs2/current/src/fs-ecos.c +++ b/packages/fs/jffs2/current/src/fs-ecos.c @@ -1823,7 +1823,7 @@ cyg_bool jffs2_flash_read(struct jffs2_s err = cyg_io_bread(sb->s_dev, write_buffer, &len, read_buffer_offset); *return_size = (size_t) len; - return (err != ENOERR); + return ((err == ENOERR) ? ENOERR : -EIO); } cyg_bool jffs2_flash_write(struct jffs2_sb_info * c, @@ -1843,7 +1843,7 @@ cyg_bool jffs2_flash_write(struct jffs2_ err = cyg_io_bwrite(sb->s_dev, read_buffer, &len, write_buffer_offset); *return_size = (size_t) len; - return (err != ENOERR); + return ((err == ENOERR) ? ENOERR : -EIO); } int
--- a/packages/fs/jffs2/current/src/os-ecos.h +++ b/packages/fs/jffs2/current/src/os-ecos.h @@ -18,6 +18,7 @@ #include <sys/types.h> #include <asm/atomic.h> #include <linux/stat.h> +#include <linux/compiler.h> #include "jffs2port.h" #define CONFIG_JFFS2_FS_DEBUG 0 @@ -233,6 +234,9 @@ int jffs2_commit_write (struct inode *d_ #define jffs2_flush_wbuf(c, flag) do { ; } while(0) #define jffs2_nand_read_failcnt(c,jeb) do { ; } while(0) #define jffs2_write_nand_badblock(c,jeb) do { ; } while(0) +#define jffs2_nand_flash_setup(c) (0) +#define jffs2_nand_flash_cleanup(c) do {} while(0) +#define jffs2_wbuf_dirty(c) (0) #define jffs2_flash_writev jffs2_flash_writev #define jffs2_wbuf_timeout NULL #define jffs2_wbuf_process NULL