improve command handling examples

[openocd.git] / src / flash / faux.c

diff --git a/src/flash/faux.c b/src/flash/faux.c
index b997b8733ac67663797631a4147d63b48930f466..caec2c791f39d7350facf10aecb4bf351fc2da66 100644 (file)
--- a/src/flash/faux.c
+++ b/src/flash/faux.c
@@ -23,14 +23,15 @@
 
 #include "flash.h"
 #include "image.h"
+#include "../hello.h"
 
 
-typedef struct faux_flash_bank_s
+struct faux_flash_bank
 {
-       struct target_s *target;
+       struct target *target;
        uint8_t *memory;
        uint32_t start_address;
-} faux_flash_bank_t;
+};
 
 static const int sectorSize = 0x10000;
 
@@ -39,15 +40,15 @@ static const int sectorSize = 0x10000;
  */
 FLASH_BANK_COMMAND_HANDLER(faux_flash_bank_command)
 {
-       faux_flash_bank_t *info;
+       struct faux_flash_bank *info;
 
-       if (argc < 6)
+       if (CMD_ARGC < 6)
        {
                LOG_WARNING("incomplete flash_bank faux configuration");
                return ERROR_FLASH_BANK_INVALID;
        }
 
-       info = malloc(sizeof(faux_flash_bank_t));
+       info = malloc(sizeof(struct faux_flash_bank));
        if (info == NULL)
        {
                LOG_ERROR("no memory for flash bank info");
@@ -66,7 +67,7 @@ FLASH_BANK_COMMAND_HANDLER(faux_flash_bank_command)
        int i = 0;
        uint32_t offset = 0;
        bank->num_sectors = bank->size/sectorSize;
-       bank->sectors = malloc(sizeof(flash_sector_t) * bank->num_sectors);
+       bank->sectors = malloc(sizeof(struct flash_sector) * bank->num_sectors);
        for (i = 0; i < bank->num_sectors; i++)
        {
                bank->sectors[i].offset = offset;
@@ -76,10 +77,10 @@ FLASH_BANK_COMMAND_HANDLER(faux_flash_bank_command)
                bank->sectors[i].is_protected = 0;
        }
 
-       info->target = get_target(args[5]);
+       info->target = get_target(CMD_ARGV[5]);
        if (info->target == NULL)
        {
-               LOG_ERROR("target '%s' not defined", args[5]);
+               LOG_ERROR("target '%s' not defined", CMD_ARGV[5]);
                free(info->memory);
                free(info);
                return ERROR_FAIL;
@@ -87,50 +88,55 @@ FLASH_BANK_COMMAND_HANDLER(faux_flash_bank_command)
        return ERROR_OK;
 }
 
-static int faux_register_commands(struct command_context_s *cmd_ctx)
+static int faux_erase(struct flash_bank *bank, int first, int last)
 {
-       return ERROR_OK;
-}
-
-static int faux_erase(struct flash_bank_s *bank, int first, int last)
-{
-       faux_flash_bank_t *info = bank->driver_priv;
+       struct faux_flash_bank *info = bank->driver_priv;
        memset(info->memory + first*sectorSize, 0xff, sectorSize*(last-first + 1));
        return ERROR_OK;
 }
 
-static int faux_protect(struct flash_bank_s *bank, int set, int first, int last)
+static int faux_protect(struct flash_bank *bank, int set, int first, int last)
 {
        LOG_USER("set protection sector %d to %d to %s", first, last, set?"on":"off");
        return ERROR_OK;
 }
 
-static int faux_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int faux_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
 {
-       faux_flash_bank_t *info = bank->driver_priv;
+       struct faux_flash_bank *info = bank->driver_priv;
        memcpy(info->memory + offset, buffer, count);
        return ERROR_OK;
 }
 
-static int faux_protect_check(struct flash_bank_s *bank)
+static int faux_protect_check(struct flash_bank *bank)
 {
        return ERROR_OK;
 }
 
-static int faux_info(struct flash_bank_s *bank, char *buf, int buf_size)
+static int faux_info(struct flash_bank *bank, char *buf, int buf_size)
 {
        snprintf(buf, buf_size, "faux flash driver");
        return ERROR_OK;
 }
 
-static int faux_probe(struct flash_bank_s *bank)
+static int faux_probe(struct flash_bank *bank)
 {
        return ERROR_OK;
 }
 
-flash_driver_t faux_flash = {
+static const struct command_registration faux_command_handlers[] = {
+       {
+               .name = "faux",
+               .mode = COMMAND_ANY,
+               .help = "faux flash command group",
+               .chain = hello_command_handlers,
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
+struct flash_driver faux_flash = {
                .name = "faux",
-               .register_commands = &faux_register_commands,
+               .commands = faux_command_handlers,
                .flash_bank_command = &faux_flash_bank_command,
                .erase = &faux_erase,
                .protect = &faux_protect,