diff options
Diffstat (limited to 'projects/hsm/mgmt-cli.c')
| -rw-r--r-- | projects/hsm/mgmt-cli.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/projects/hsm/mgmt-cli.c b/projects/hsm/mgmt-cli.c index d9c0bd9..61c8c35 100644 --- a/projects/hsm/mgmt-cli.c +++ b/projects/hsm/mgmt-cli.c @@ -45,15 +45,16 @@ #include "mgmt-fpga.h" #include "mgmt-misc.h" #include "mgmt-show.h" +#include "mgmt-keystore.h" +#include "mgmt-masterkey.h" #ifndef CLI_UART_RECVBUF_SIZE -#define CLI_UART_RECVBUF_SIZE 256 /* This must be a power of 2 */ +#define CLI_UART_RECVBUF_SIZE 256 #endif -#define CLI_UART_RECVBUF_MASK (CLI_UART_RECVBUF_SIZE - 1) typedef struct { int ridx; - int widx; + volatile int widx; mgmt_cli_dma_state_t rx_state; uint8_t buf[CLI_UART_RECVBUF_SIZE]; } ringbuf_t; @@ -82,20 +83,6 @@ inline void ringbuf_write_char(ringbuf_t *rb, uint8_t c) rb->widx = 0; } -/* some possibly-useful functions */ -inline int ringbuf_empty(ringbuf_t *rb) -{ - return (rb->ridx == rb->widx); -} - -inline int ringbuf_count(ringbuf_t *rb) -{ - int len = rb->widx - rb->ridx; - if (len < 0) - len += sizeof(rb->buf); - return len; -} - static ringbuf_t uart_ringbuf; /* current character received from UART */ @@ -244,6 +231,8 @@ int cli_main(void) configure_cli_fpga(&cli); configure_cli_misc(&cli); configure_cli_dfu(&cli); + configure_cli_keystore(&cli); + configure_cli_masterkey(&cli); while (1) { embedded_cli_loop(&cli); |