From 3740a716679e0377a54427c683f5fe475c9fff2e Mon Sep 17 00:00:00 2001 From: charles Date: Wed, 19 Feb 2003 00:29:54 +0000 Subject: [PATCH] *** empty log message *** --- direct/dtest.c | 25 +++++++++++++++++++------ direct/yaffscfg.c | 2 +- direct/yaffsfs.c | 4 ++-- yaffsdev.proj | Bin 53248 -> 53248 bytes 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/direct/dtest.c b/direct/dtest.c index 7f69638..965d808 100644 --- a/direct/dtest.c +++ b/direct/dtest.c @@ -286,6 +286,7 @@ int main(int argc, char *argv[]) yaffs_mount("/boot"); yaffs_mount("/data"); yaffs_mount("/flash"); + yaffs_mount("/ram"); printf("\nDirectory look-up of /boot\n"); dumpDir("/boot"); @@ -294,14 +295,17 @@ int main(int argc, char *argv[]) printf("\nDirectory look-up of /flash\n"); dumpDir("/flash"); - leave_unlinked_file("/flash",20000,0); - leave_unlinked_file("/data",20000,0); + //leave_unlinked_file("/flash",20000,0); + //leave_unlinked_file("/data",20000,0); + + leave_unlinked_file("/ram",20,0); + f = yaffs_open("/boot/b1", O_RDONLY,0); printf("open /boot/b1 readonly, f=%d\n",f); - f = yaffs_open("/boot/b1", O_CREAT,0); + f = yaffs_open("/boot/b1", O_CREAT,S_IREAD | S_IWRITE); printf("open /boot/b1 O_CREAT, f=%d\n",f); @@ -323,12 +327,12 @@ int main(int argc, char *argv[]) r = yaffs_write(f,"world",3); printf("write %d attempted to write to a writeable file\n",r); - r= yaffs_lseek(f,SEEK_END,0); + r= yaffs_lseek(f,0,SEEK_END); printf("seek end %d\n",r); memset(buffer,0,20); r = yaffs_read(f,buffer,10); printf("read %d \"%s\"\n",r,buffer); - r= yaffs_lseek(f,SEEK_SET,0); + r= yaffs_lseek(f,0,SEEK_SET); printf("seek set %d\n",r); memset(buffer,0,20); r = yaffs_read(f,buffer,10); @@ -336,7 +340,16 @@ int main(int argc, char *argv[]) memset(buffer,0,20); r = yaffs_read(f,buffer,10); printf("read %d \"%s\"\n",r,buffer); - + + // Check values reading at end. + // A read past end of file should return 0 for 0 bytes read. + + r= yaffs_lseek(f,0,SEEK_END); + r = yaffs_read(f,buffer,10); + printf("read at end returned %d\n",r); + r= yaffs_lseek(f,500,SEEK_END); + r = yaffs_read(f,buffer,10); + printf("read past end returned %d\n",r); r = yaffs_close(f); diff --git a/direct/yaffscfg.c b/direct/yaffscfg.c index 466b381..83f2277 100644 --- a/direct/yaffscfg.c +++ b/direct/yaffscfg.c @@ -73,7 +73,7 @@ int yaffs_StartUp(void) // /ram ramDev.nBytesPerChunk = YAFFS_BYTES_PER_CHUNK; ramDev.nChunksPerBlock = YAFFS_CHUNKS_PER_BLOCK; - ramDev.nReservedBlocks = 1; // Set this smaller for RAM + ramDev.nReservedBlocks = 2; // Set this smaller for RAM ramDev.startBlock = 1; // Can't use block 0 ramDev.endBlock = 127; // Last block in 2MB. ramDev.useNANDECC = 1; diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c index 8f2f06e..6fc0c82 100644 --- a/direct/yaffsfs.c +++ b/direct/yaffsfs.c @@ -25,7 +25,7 @@ #endif -const char *yaffsfs_c_version="$Id: yaffsfs.c,v 1.2 2003-01-31 00:57:35 charles Exp $"; +const char *yaffsfs_c_version="$Id: yaffsfs.c,v 1.3 2003-02-19 00:29:55 charles Exp $"; // configurationList is the list of devices that are supported static yaffsfs_DeviceConfiguration *yaffsfs_configurationList; @@ -546,7 +546,7 @@ int yaffs_read(int fd, void *buf, unsigned int nbyte) } else { - //todo error + nRead = 0; } } diff --git a/yaffsdev.proj b/yaffsdev.proj index fa40e294daa7c7730fda1cf8e35ce49bf0e8c1f3..968816228bc6f770e3d929d6d03b7e6ee04d691d 100644 GIT binary patch delta 160 zcmZozz}&Ead4e^g>qZ-=3C!EMEH^h!*uf=HoL^d$oSK(drfZ;JWNcwzsgRMMn_7@O zIdHbDjG2OwiMfKYiJ^jtr6q{20MgoKX4*!ECY!rvuVRrhW6@-hW8r1tX8Fndo%t2> zOJ*hx28P){dgH}AOp~=1@1L9>EIFBHiHT@>YDs)%UVcidLQ!gB3Y0n7VacM+Zg0YFA zf{7)Vt^m^7W=7hEmS&r~X0KwAa$qrL(O?m05oKX!VPyHj{F#}FgMncwkluLl4%1|< v#rru^6I1f@aw-{=C+7uAP0m