From 8205f5a2a78fc7e67680b42fb004f47c522e7c9d Mon Sep 17 00:00:00 2001 From: Charles Manning Date: Thu, 30 Aug 2012 07:23:15 +1200 Subject: [PATCH] yaffs u-boot: Add new ycheck command, fix return types and modify filesize ycheck filename [DIR|REG] checks if the file exists and is of the correct type All functions now return a value that can be tested by $? filesize env vaiable is now set by a read Signed-off-by: Charles Manning --- direct/u-boot/common/cmd_yaffs2.c | 102 +++++-------- direct/u-boot/fs/yaffs2/yaffs_uboot_glue.c | 166 +++++++++++++++------ direct/u-boot/fs/yaffs2/yaffs_uboot_glue.h | 24 +++ 3 files changed, 188 insertions(+), 104 deletions(-) create mode 100644 direct/u-boot/fs/yaffs2/yaffs_uboot_glue.h diff --git a/direct/u-boot/common/cmd_yaffs2.c b/direct/u-boot/common/cmd_yaffs2.c index d43a9d4..23cf000 100644 --- a/direct/u-boot/common/cmd_yaffs2.c +++ b/direct/u-boot/common/cmd_yaffs2.c @@ -17,6 +17,7 @@ #include #include +#include "../fs/yaffs2/yaffs_uboot_glue.h" #ifdef YAFFS2_DEBUG #define PRINTF(fmt, args...) printf(fmt, ##args) @@ -24,41 +25,20 @@ #define PRINTF(fmt, args...) do { } while (0) #endif -extern void cmd_yaffs_dev_ls(void); -extern void cmd_yaffs_tracemask(unsigned set, unsigned mask); -extern void cmd_yaffs_devconfig(char *mp, int flash_dev, - int start_block, int end_block); -extern void cmd_yaffs_mount(char *mp); -extern void cmd_yaffs_umount(char *mp); -extern void cmd_yaffs_read_file(char *fn); -extern void cmd_yaffs_write_file(char *fn, char bval, int sizeOfFile); -extern void cmd_yaffs_ls(const char *mountpt, int longlist); -extern void cmd_yaffs_mwrite_file(char *fn, char *addr, int size); -extern void cmd_yaffs_mread_file(char *fn, char *addr); -extern void cmd_yaffs_mkdir(const char *dir); -extern void cmd_yaffs_rmdir(const char *dir); -extern void cmd_yaffs_rm(const char *path); -extern void cmd_yaffs_mv(const char *oldPath, const char *newPath); - -extern int yaffs_dump_dev(const char *path); /* ytrace - show/set yaffs trace mask */ int do_ytrace(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) { if (argc > 1) - cmd_yaffs_tracemask(1, simple_strtol(argv[1], NULL, 16)); + return cmd_yaffs_tracemask(1, simple_strtol(argv[1], NULL, 16)); else - cmd_yaffs_tracemask(0, 0); - - return 0; + return cmd_yaffs_tracemask(0, 0); } /* ydevls - lists yaffs mount points. */ int do_ydevls(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) { - cmd_yaffs_dev_ls(); - - return 0; + return cmd_yaffs_dev_ls(); } /* ydevconfig mount_pt mtd_dev_num start_block end_block */ @@ -80,9 +60,7 @@ int do_ydevconfig(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) start_block = simple_strtol(argv[3], NULL, 16); end_block = simple_strtol(argv[4], NULL, 16); - cmd_yaffs_devconfig(mtpoint, mtd_dev, start_block, end_block); - - return 0; + return cmd_yaffs_devconfig(mtpoint, mtd_dev, start_block, end_block); } int do_ymount(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) @@ -97,9 +75,7 @@ int do_ymount(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) mtpoint = argv[1]; printf("Mounting yaffs2 mount point %s\n", mtpoint); - cmd_yaffs_mount(mtpoint); - - return 0; + return cmd_yaffs_mount(mtpoint); } int do_yumount(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) @@ -113,9 +89,7 @@ int do_yumount(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) mtpoint = argv[1]; printf("Unmounting yaffs2 mount point %s\n", mtpoint); - cmd_yaffs_umount(mtpoint); - - return 0; + return cmd_yaffs_umount(mtpoint); } int do_yls(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) @@ -129,9 +103,30 @@ int do_yls(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) dirname = argv[argc - 1]; - cmd_yaffs_ls(dirname, (argc > 2) ? 1 : 0); + return cmd_yaffs_ls(dirname, (argc > 2) ? 1 : 0); +} - return 0; +static int ycheck_option_valid(const char *str) +{ + return strcmp(str,"DIR") == 0 || strcmp(str,"REG") == 0; +} + +int do_ycheck(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) +{ + const char *dirname; + const char *str = "ANY"; + + if (argc < 2 || argc > 3 || + (argc == 3 && ! ycheck_option_valid(argv[2]))) { + printf("Bad arguments: ycheck name [DIR|REG]"); + return -1; + } + + dirname = argv[1]; + if(argc>2) + str = argv[2]; + + return cmd_yaffs_check(dirname, str); } int do_yrd(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) @@ -147,10 +142,7 @@ int do_yrd(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) printf("Reading file %s ", filename); - cmd_yaffs_read_file(filename); - - printf("done\n"); - return 0; + return cmd_yaffs_read_file(filename); } int do_ywr(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) @@ -171,10 +163,7 @@ int do_ywr(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) printf("Writing value (%lx) %lx times to %s... ", value, numValues, filename); - cmd_yaffs_write_file(filename, value, numValues); - - printf("done\n"); - return 0; + return cmd_yaffs_write_file(filename, value, numValues); } int do_yrdm(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) @@ -190,9 +179,7 @@ int do_yrdm(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) filename = argv[1]; addr = simple_strtoul(argv[2], NULL, 16); - cmd_yaffs_mread_file(filename, (char *)addr); - - return 0; + return cmd_yaffs_mread_file(filename, (char *)addr); } int do_ywrm(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) @@ -210,9 +197,7 @@ int do_ywrm(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) addr = simple_strtoul(argv[2], NULL, 16); size = simple_strtoul(argv[3], NULL, 16); - cmd_yaffs_mwrite_file(filename, (char *)addr, size); - - return 0; + return cmd_yaffs_mwrite_file(filename, (char *)addr, size); } int do_ymkdir(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) @@ -225,9 +210,7 @@ int do_ymkdir(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) } dirname = argv[1]; - cmd_yaffs_mkdir(dirname); - - return 0; + return cmd_yaffs_mkdir(dirname); } int do_yrmdir(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) @@ -240,9 +223,7 @@ int do_yrmdir(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) } dirname = argv[1]; - cmd_yaffs_rmdir(dirname); - - return 0; + return cmd_yaffs_rmdir(dirname); } int do_yrm(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) @@ -256,9 +237,7 @@ int do_yrm(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) name = argv[1]; - cmd_yaffs_rm(name); - - return 0; + return cmd_yaffs_rm(name); } int do_ymv(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) @@ -274,9 +253,7 @@ int do_ymv(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) oldPath = argv[1]; newPath = argv[2]; - cmd_yaffs_mv(newPath, oldPath); - - return 0; + return cmd_yaffs_mv(newPath, oldPath); } U_BOOT_CMD(ytrace, 2, 0, do_ytrace, @@ -298,6 +275,9 @@ U_BOOT_CMD(yumount, 2, 0, do_yumount, U_BOOT_CMD(yls, 3, 0, do_yls, "yaffs ls", "yls [-l] dirname"); +U_BOOT_CMD(ycheck, 3, 0, do_ycheck, + "ycheck name [DIR|REG]", "checks if the named object exists"); + U_BOOT_CMD(yrd, 2, 0, do_yrd, "read file from yaffs", "yrd path read file from yaffs"); diff --git a/direct/u-boot/fs/yaffs2/yaffs_uboot_glue.c b/direct/u-boot/fs/yaffs2/yaffs_uboot_glue.c index e113e40..f7ac21c 100644 --- a/direct/u-boot/fs/yaffs2/yaffs_uboot_glue.c +++ b/direct/u-boot/fs/yaffs2/yaffs_uboot_glue.c @@ -28,6 +28,8 @@ #include "yaffs_packedtags2.h" #include "yaffs_mtdif.h" #include "yaffs_mtdif2.h" +#include "yaffs_uboot_glue.h" + #if 0 #include #else @@ -142,12 +144,13 @@ static const char *yaffs_error_str(void) extern nand_info_t nand_info[]; -void cmd_yaffs_tracemask(unsigned set, unsigned mask) +int cmd_yaffs_tracemask(unsigned set, unsigned mask) { if (set) yaffs_trace_mask = mask; printf("yaffs trace mask: %08x\n", yaffs_trace_mask); + return 0; } static int yaffs_regions_overlap(int a, int b, int x, int y) @@ -158,7 +161,7 @@ static int yaffs_regions_overlap(int a, int b, int x, int y) (x <= b && b <= y); } -void cmd_yaffs_devconfig(char *_mp, int flash_dev, +int cmd_yaffs_devconfig(char *_mp, int flash_dev, int start_block, int end_block) { struct mtd_info *mtd = NULL; @@ -240,14 +243,15 @@ void cmd_yaffs_devconfig(char *_mp, int flash_dev, printf("Configures yaffs mount %s: dev %d start block %d, end block %d %s\n", mp, flash_dev, start_block, end_block, dev->param.inband_tags ? "using inband tags" : ""); - return; + return 0; err: free(dev); free(mp); + return -1; } -void cmd_yaffs_dev_ls(void) +int cmd_yaffs_dev_ls(void) { struct yaffs_dev *dev; int flash_dev; @@ -258,7 +262,7 @@ void cmd_yaffs_dev_ls(void) while (1) { dev = yaffs_next_dev(); if (!dev) - return; + break; flash_dev = ((unsigned) dev->driver_context - (unsigned) nand_info)/ sizeof(nand_info[0]); @@ -274,12 +278,15 @@ void cmd_yaffs_dev_ls(void) printf("free 0x%x\n", free_space); } + + return 0; } -void make_a_file(char *yaffsName, char bval, int sizeOfFile) +int make_a_file(char *yaffsName, char bval, int sizeOfFile) { int outh; int i; + int written; unsigned char buffer[100]; outh = yaffs_open(yaffsName, @@ -287,26 +294,28 @@ void make_a_file(char *yaffsName, char bval, int sizeOfFile) S_IREAD | S_IWRITE); if (outh < 0) { printf("Error opening file: %d. %s\n", outh, yaffs_error_str()); - return; + return -1; } memset(buffer, bval, 100); - do { - i = sizeOfFile; + written = 0; + while (written < sizeOfFile) { + i = sizeOfFile - written; if (i > 100) i = 100; - sizeOfFile -= i; - - yaffs_write(outh, buffer, i); - - } while (sizeOfFile > 0); + if (yaffs_write(outh, buffer, i) != i) + break; + written += i; + } yaffs_close(outh); + + return (written == sizeOfFile) ? 0 : -1; } -void read_a_file(char *fn) +int read_a_file(char *fn) { int h; int i = 0; @@ -315,7 +324,7 @@ void read_a_file(char *fn) h = yaffs_open(fn, O_RDWR, 0); if (h < 0) { printf("File not found\n"); - return; + return -1; } while (yaffs_read(h, &b, 1) > 0) { @@ -328,40 +337,49 @@ void read_a_file(char *fn) } printf("\n"); yaffs_close(h); + + return 0; } -void cmd_yaffs_mount(char *mp) +int cmd_yaffs_mount(char *mp) { int retval = yaffs_mount(mp); if (retval < 0) printf("Error mounting %s, return value: %d, %s\n", mp, yaffsfs_GetError(), yaffs_error_str()); + return retval; } -void cmd_yaffs_umount(char *mp) +int cmd_yaffs_umount(char *mp) { - if (yaffs_unmount(mp) == -1) + int retval = yaffs_unmount(mp); + + if (retval < 0) printf("Error umounting %s, return value: %d, %s\n", mp, yaffsfs_GetError(), yaffs_error_str()); + return retval; } -void cmd_yaffs_write_file(char *yaffsName, char bval, int sizeOfFile) +int cmd_yaffs_write_file(char *yaffsName, char bval, int sizeOfFile) { - make_a_file(yaffsName, bval, sizeOfFile); + return make_a_file(yaffsName, bval, sizeOfFile); } -void cmd_yaffs_read_file(char *fn) +int cmd_yaffs_read_file(char *fn) { - read_a_file(fn); + return read_a_file(fn); } -void cmd_yaffs_mread_file(char *fn, char *addr) +int cmd_yaffs_mread_file(char *fn, char *addr) { int h; + int retval = 0; struct yaffs_stat s; + int read_size; + char buf[16]; yaffs_stat(fn, &s); @@ -369,31 +387,47 @@ void cmd_yaffs_mread_file(char *fn, char *addr) h = yaffs_open(fn, O_RDWR, 0); if (h < 0) { printf("File not found\n"); - return; + retval = -1; + read_size = 0; + } else { + read_size = (int) s.st_size; + yaffs_read(h, addr, read_size); + printf("\t[DONE]\n"); + + yaffs_close(h); } + sprintf(buf,"%x", read_size); + setenv("filesize", buf); - yaffs_read(h, addr, (int)s.st_size); - printf("\t[DONE]\n"); - - yaffs_close(h); + return retval; } -void cmd_yaffs_mwrite_file(char *fn, char *addr, int size) +int cmd_yaffs_mwrite_file(char *fn, char *addr, int size) { int outh; + int wrote; outh = yaffs_open(fn, O_CREAT | O_RDWR | O_TRUNC, S_IREAD | S_IWRITE); - if (outh < 0) + if (outh < 0) { printf("Error opening file: %d, %s\n", outh, yaffs_error_str()); + return -1; + } - yaffs_write(outh, addr, size); - + wrote = yaffs_write(outh, addr, size); yaffs_close(outh); + + if(wrote != size) { + printf("only wrote %d (0x%x) bytes\n", wrote, wrote); + return -1; + } + return 0; + + } -void cmd_yaffs_ls(const char *mountpt, int longlist) +int cmd_yaffs_ls(const char *mountpt, int longlist) { int i; yaffs_DIR *d; @@ -405,7 +439,7 @@ void cmd_yaffs_ls(const char *mountpt, int longlist) if (!d) { printf("opendir failed, %s\n", yaffs_error_str()); - return; + return -1; } for (i = 0; (de = yaffs_readdir(d)) != NULL; i++) { @@ -424,41 +458,87 @@ void cmd_yaffs_ls(const char *mountpt, int longlist) } yaffs_closedir(d); + + return 0; } +int cmd_yaffs_check(const char *fname, const char *type) +{ + int retval = 0; + int ret; + struct yaffs_stat stat; + + ret = yaffs_stat(fname, &stat); + if (ret < 0) { + printf("%s not found\n", fname); + return -1; + } + + printf("%s is a %s\n", fname, yaffs_file_type_str(&stat)); + + if (strcmp(type, "REG") == 0 && + (stat.st_mode & S_IFMT) != S_IFREG) + retval = -1; -void cmd_yaffs_mkdir(const char *dir) + if (strcmp(type, "DIR") == 0 && + (stat.st_mode & S_IFMT) != S_IFDIR) + retval = -1; + + if (retval == 0) + printf("check ok\n"); + else + printf("check failed\n"); + + return retval; +} + + +int cmd_yaffs_mkdir(const char *dir) { int retval = yaffs_mkdir(dir, 0); - if (retval < 0) + if (retval < 0) { printf("yaffs_mkdir returning error: %d, %s\n", retval, yaffs_error_str()); + return -1; + } + return 0; } -void cmd_yaffs_rmdir(const char *dir) +int cmd_yaffs_rmdir(const char *dir) { int retval = yaffs_rmdir(dir); - if (retval < 0) + if (retval < 0) { printf("yaffs_rmdir returning error: %d, %s\n", retval, yaffs_error_str()); + return -1; + } + return 0; } -void cmd_yaffs_rm(const char *path) +int cmd_yaffs_rm(const char *path) { int retval = yaffs_unlink(path); - if (retval < 0) + if (retval < 0) { printf("yaffs_unlink returning error: %d, %s\n", retval, yaffs_error_str()); + return -1; + } + + return 0; } -void cmd_yaffs_mv(const char *oldPath, const char *newPath) +int cmd_yaffs_mv(const char *oldPath, const char *newPath) { int retval = yaffs_rename(newPath, oldPath); - if (retval < 0) + if (retval < 0) { printf("yaffs_unlink returning error: %d, %s\n", retval, yaffs_error_str()); + return -1; + } + + return 0; } diff --git a/direct/u-boot/fs/yaffs2/yaffs_uboot_glue.h b/direct/u-boot/fs/yaffs2/yaffs_uboot_glue.h new file mode 100644 index 0000000..d3ae162 --- /dev/null +++ b/direct/u-boot/fs/yaffs2/yaffs_uboot_glue.h @@ -0,0 +1,24 @@ + +#ifndef __YAFFS_UBOOT_GLUE_H__ +#define __YAFFS_UBOOT_GLUE_H__ + + +int cmd_yaffs_dev_ls(void); +int cmd_yaffs_tracemask(unsigned set, unsigned mask); +int cmd_yaffs_devconfig(char *mp, int flash_dev, + int start_block, int end_block); +int cmd_yaffs_mount(char *mp); +int cmd_yaffs_umount(char *mp); +int cmd_yaffs_read_file(char *fn); +int cmd_yaffs_write_file(char *fn, char bval, int sizeOfFile); +int cmd_yaffs_ls(const char *mountpt, int longlist); +int cmd_yaffs_check(const char *fn, const char *type); +int cmd_yaffs_mwrite_file(char *fn, char *addr, int size); +int cmd_yaffs_mread_file(char *fn, char *addr); +int cmd_yaffs_mkdir(const char *dir); +int cmd_yaffs_rmdir(const char *dir); +int cmd_yaffs_rm(const char *path); +int cmd_yaffs_mv(const char *oldPath, const char *newPath); + +int yaffs_dump_dev(const char *path); +#endif -- 2.30.2