Commit 8a40fb148efa442d6526eac46a2001e4c64d28ff
1 parent
507641d249
Exists in
master
and in
54 other branches
move cmd_get_data_size to command.c
add CMD_DATA_SIZE macro to enable it Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Showing 8 changed files with 33 additions and 38 deletions Side-by-side Diff
board/amcc/yucca/cmd_yucca.c
... | ... | @@ -33,8 +33,6 @@ |
33 | 33 | static int setBootStrapClock(cmd_tbl_t *cmdtp, int incrflag, |
34 | 34 | int flag, int argc, char *argv[]); |
35 | 35 | |
36 | -extern int cmd_get_data_size(char* arg, int default_size); | |
37 | - | |
38 | 36 | /* ------------------------------------------------------------------------- */ |
39 | 37 | int do_evb440spe(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) |
40 | 38 | { |
common/cmd_i2c.c
common/cmd_itest.c
common/cmd_mem.c
... | ... | @@ -37,35 +37,6 @@ |
37 | 37 | #endif |
38 | 38 | #include <watchdog.h> |
39 | 39 | |
40 | -#if defined(CONFIG_CMD_MEMORY) \ | |
41 | - || defined(CONFIG_CMD_I2C) \ | |
42 | - || defined(CONFIG_CMD_ITEST) \ | |
43 | - || defined(CONFIG_CMD_PCI) \ | |
44 | - || defined(CONFIG_CMD_PORTIO) | |
45 | - | |
46 | -int cmd_get_data_size(char* arg, int default_size) | |
47 | -{ | |
48 | - /* Check for a size specification .b, .w or .l. | |
49 | - */ | |
50 | - int len = strlen(arg); | |
51 | - if (len > 2 && arg[len-2] == '.') { | |
52 | - switch(arg[len-1]) { | |
53 | - case 'b': | |
54 | - return 1; | |
55 | - case 'w': | |
56 | - return 2; | |
57 | - case 'l': | |
58 | - return 4; | |
59 | - case 's': | |
60 | - return -2; | |
61 | - default: | |
62 | - return -1; | |
63 | - } | |
64 | - } | |
65 | - return default_size; | |
66 | -} | |
67 | -#endif | |
68 | - | |
69 | 40 | #if defined(CONFIG_CMD_MEMORY) |
70 | 41 | |
71 | 42 | #ifdef CMD_MEM_DEBUG |
common/cmd_pci.c
common/cmd_portio.c
common/command.c
... | ... | @@ -654,4 +654,28 @@ |
654 | 654 | } |
655 | 655 | |
656 | 656 | #endif |
657 | + | |
658 | +#ifdef CMD_DATA_SIZE | |
659 | +int cmd_get_data_size(char* arg, int default_size) | |
660 | +{ | |
661 | + /* Check for a size specification .b, .w or .l. | |
662 | + */ | |
663 | + int len = strlen(arg); | |
664 | + if (len > 2 && arg[len-2] == '.') { | |
665 | + switch(arg[len-1]) { | |
666 | + case 'b': | |
667 | + return 1; | |
668 | + case 'w': | |
669 | + return 2; | |
670 | + case 'l': | |
671 | + return 4; | |
672 | + case 's': | |
673 | + return -2; | |
674 | + default: | |
675 | + return -1; | |
676 | + } | |
677 | + } | |
678 | + return default_size; | |
679 | +} | |
680 | +#endif |
include/command.h
... | ... | @@ -78,6 +78,15 @@ |
78 | 78 | |
79 | 79 | typedef void command_t (cmd_tbl_t *, int, int, char *[]); |
80 | 80 | |
81 | +#if defined(CONFIG_CMD_MEMORY) \ | |
82 | + || defined(CONFIG_CMD_I2C) \ | |
83 | + || defined(CONFIG_CMD_ITEST) \ | |
84 | + || defined(CONFIG_CMD_PCI) \ | |
85 | + || defined(CONFIG_CMD_PORTIO) | |
86 | +#define CMD_DATA_SIZE | |
87 | +extern int cmd_get_data_size(char* arg, int default_size); | |
88 | +#endif | |
89 | + | |
81 | 90 | #endif /* __ASSEMBLY__ */ |
82 | 91 | |
83 | 92 | /* |