From fcf1d5b30bd3b341fb7596aef395f347c6dc97b4 Mon Sep 17 00:00:00 2001 From: Leo C Date: Sat, 21 Jul 2018 13:13:16 +0200 Subject: commandtable, flags: int --> uint8_t/uint_fast8_t. Macro UNUSED for Parameters/Variables # Conflicts: # avr/cmd_fat.c --- avr/cmd_fat.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'avr/cmd_fat.c') diff --git a/avr/cmd_fat.c b/avr/cmd_fat.c index a1de1b6..2257ddc 100644 --- a/avr/cmd_fat.c +++ b/avr/cmd_fat.c @@ -169,7 +169,7 @@ FRESULT scan_files ( * fatstat path - Show logical drive status * */ -command_ret_t do_stat(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_stat(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) { FATFS *fs; DWORD nfreeclst; @@ -241,7 +241,7 @@ command_ret_t do_stat(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * pwd - Print current directory of the current drive. * */ -command_ret_t do_pwd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_pwd(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) { FRESULT res; char *buf; @@ -273,7 +273,7 @@ command_ret_t do_pwd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * cd - Change the current/working directory. * */ -command_ret_t do_cd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_cd(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) { char *arg; FRESULT res = 0; @@ -312,7 +312,7 @@ command_ret_t do_cd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * fatls path - Directory listing * */ -command_ret_t do_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_ls(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) { FATFS *fs; DIR Dir; /* Directory object */ @@ -416,7 +416,7 @@ FRESULT mkpath(TCHAR *path) * read [bytes [pos]] * write */ -command_ret_t do_rw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_rw(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) { FIL File; uint32_t addr; @@ -424,7 +424,7 @@ command_ret_t do_rw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) unsigned long pos; unsigned long bytes_rw; - bool dowrite = (argv[0][3] == 'w'); + bool dowrite = (argv[0][0] == 'w'); FRESULT res = FR_OK; bool buserr = 0; uint32_t timer; @@ -537,26 +537,26 @@ command_ret_t do_rw(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static -command_ret_t do_help(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); +command_ret_t do_help(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]); cmd_tbl_t cmd_fat_sub[] = { CMD_TBL_ITEM( - stat, 2, 1, do_stat, + stat, 2, CTBL_REPEAT, do_stat, "Show logical drive status", "dev" ), CMD_TBL_ITEM( - pwd, 2, 1, do_pwd, + pwd, 2, CTBL_REPEAT, do_pwd, "Print name of current/working directory", "" ), CMD_TBL_ITEM( - cd, 2, 1, do_cd, + cd, 2, CTBL_REPEAT, do_cd, "Change the current/working directory.", "path" ), CMD_TBL_ITEM( - ls, 2, 1, do_ls, + ls, 2, CTBL_REPEAT, do_ls, "Directory listing", "path" ), @@ -580,7 +580,7 @@ CMD_TBL_ITEM( ), CMD_TBL_ITEM( - help, CONFIG_SYS_MAXARGS, 1, do_help, + help, CONFIG_SYS_MAXARGS, CTBL_REPEAT, do_help, "Print sub command description/usage", "\n" " - print brief description of all sub commands\n" @@ -601,13 +601,13 @@ CMD_TBL_ITEM( }; static -command_ret_t do_help(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_help(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) { return _do_help(cmd_fat_sub, ARRAY_SIZE(cmd_fat_sub), cmdtp, flag, argc, argv); } -command_ret_t do_fat(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_fat(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) { cmd_tbl_t *cp; -- cgit v1.2.3