X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fcli.h;h=f95f26e84a0f1e4ee82ae1d2c17039d40a372314;hb=35dc9566e40c9f68fa216c70eaa6d5b0597448fe;hp=182611d4e5170c823b0b60f73c343f9418df36ee;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0;p=avr-crypto-lib.git
diff --git a/test_src/cli.h b/test_src/cli.h
index 182611d..f95f26e 100644
--- a/test_src/cli.h
+++ b/test_src/cli.h
@@ -16,43 +16,59 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see .
*/
+
#ifndef CLI_H_
#define CLI_H_
#include
#include
+#ifndef VOID_FPT
+#define VOID_FPT
typedef void(*void_fpt)(void);
-
-#ifdef CLI_OLD
-
-int16_t findstring_d0(const char* str, const char* v);
-int16_t findstring_d0_P(const char* str, PGM_P v);
-
-int16_t execcommand_d0_P(const char* str, PGM_P v, void(*fpt[])(void) );
-
-#else
-
+#endif
typedef char (*cli_rx_fpt)(void);
typedef void (*cli_tx_fpt)(char);
#define CLI_BUFFER_BS 20
+#define CMDLIST_ENTRY_SIZE 8
+
+typedef struct {
+ uint16_t option_flags;
+ PGM_VOID_P options[];
+} cmdoption_t;
+
+#define CLI_OPTION_DESC 0x01
+#define CLI_OPTION_MANP 0x02
typedef struct {
- PGM_P cmd_name; /* string containing the function name */
- PGM_P cmd_param_str; /* param descriptor string */
- void_fpt cmd_function; /* function pointer */
+ PGM_P cmd_name; /* string containing the function name */
+ PGM_P cmd_param_str; /* param descriptor string */
+ void_fpt cmd_function; /* function pointer */
+ cmdoption_t* options;
} cmdlist_entry_t;
extern cli_rx_fpt cli_rx;
extern cli_tx_fpt cli_tx;
extern uint8_t cli_echo;
-void echo_ctrl(char* s);
-int8_t cmd_interface(PGM_VOID_P cmd_desc);
-#endif
+void cli_putc(char c);
+uint16_t cli_getc(void);
+uint16_t cli_getc_cecho(void);
+uint8_t cli_getsn(char* s, uint16_t n);
+uint8_t cli_getsn_cecho(char* s, uint16_t n);
+void cli_putstr(const char* s);
+void cli_putstr_P(PGM_P s);
+void cli_hexdump_byte(uint8_t byte);
+void cli_hexdump(const void* data, uint16_t length);
+void cli_hexdump_rev(const void* data, uint16_t length);
+void cli_hexdump2(const void* data, uint16_t length);
+void cli_hexdump_block(const void* data, uint16_t length, uint8_t indent, uint8_t width);
+
+void echo_ctrl(char* s);
+int8_t cmd_interface(PGM_VOID_P cmd_desc);
#endif /*CLI_H_*/