diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/cmd_mem.h | 3 | ||||
-rw-r--r-- | include/common.h | 6 | ||||
-rw-r--r-- | include/config.h | 10 |
3 files changed, 13 insertions, 6 deletions
diff --git a/include/cmd_mem.h b/include/cmd_mem.h index 05227cc..782c10a 100644 --- a/include/cmd_mem.h +++ b/include/cmd_mem.h @@ -19,15 +19,12 @@ extern command_ret_t do_mem_cp(cmd_tbl_t *, int, int, char * const []); extern command_ret_t do_mem_cmp(cmd_tbl_t *, int, int, char * const []); extern command_ret_t do_mem_base(cmd_tbl_t *, int, int, char * const []); extern command_ret_t do_mem_loop(cmd_tbl_t *, int, int, char * const []); -#ifdef CONFIG_LOOPW extern command_ret_t do_mem_loopw(cmd_tbl_t *, int, int, char * const []); -#endif #ifdef CONFIG_CMD_MEMTEST extern command_ret_t do_mem_mtest(cmd_tbl_t *, int, int, char * const []); #endif #ifdef CONFIG_MX_CYCLIC extern command_ret_t do_mem_mdc(cmd_tbl_t *, int, int, char * const []); -extern command_ret_t do_mem_mwc(cmd_tbl_t *, int, int, char * const []); #endif /* CONFIG_MX_CYCLIC */ #endif /* CMD_MEM_H */ diff --git a/include/common.h b/include/common.h index cfbbae5..10c4417 100644 --- a/include/common.h +++ b/include/common.h @@ -52,6 +52,12 @@ struct bits { #define FSTR(X) ((const FLASH char[]) { X } ) #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#define MIN(a,b) ({ typeof (a) _a = (a); \ + typeof (b) _b = (b); \ + _a < _b ? _a : _b; }) +#define MAX(a,b) ({ typeof (a) _a = (a); \ + typeof (b) _b = (b); \ + _a > _b ? _a : _b; }) #ifdef __AVR__ #define Stat GPIOR0 diff --git a/include/config.h b/include/config.h index e40d016..99e4e78 100644 --- a/include/config.h +++ b/include/config.h @@ -12,7 +12,11 @@ #define ENV_BAUDRATE "baudrate" #define ENV_BOOTDELAY "bootdelay" #define ENV_BOOTCMD "bootcmd" +#define ENV_PATH_CPM3SYS "cpm3_file" #define ENV_PINALIAS "pin_alias" +#define ENV_STARTADDRESS "startaddress" + +#define CONFIG_PATH_CPM3SYS "1:/cpm3.sys" #define CONFIG_ENV_SIZE 1600 #define CONFIG_ENV_OFFSET 0 @@ -23,9 +27,9 @@ #define CONFIG_BOOTDELAY 4 //#define CONFIG_ZERO_BOOTDELAY_CHECK 1 -//#define CONFIG_LOOPW -//#define CONFIG_CMD_MEMTEST -//#define CONFIG_MX_CYCLIC +#define CONFIG_CMD_MEMTEST +#define CONFIG_MX_CYCLIC +#define CONFIG_SYS_RAMSIZE_MAX (1l<<19) /* max. addressable memory */ #define CONFIG_CMD_DATE 1 |