struct fileio: improve member types

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

diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 698cd16e7aa1850d0884097d7c7010f32986f94d..4356f2709b30e812e8f836ad3addc8b0b133036e 100644 (file)
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -22,6 +22,7 @@
 #endif
 
 #include "mflash.h"
 #endif
 
 #include "mflash.h"

+#include "target.h"

 #include "time_support.h"
 #include "fileio.h"
 #include "log.h"
 #include "time_support.h"
 #include "fileio.h"
 #include "log.h"


@@ -32,7 +33,7 @@ static int s3c2440_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val
 static int pxa270_set_gpio_to_output (struct mflash_gpio_num gpio);
 static int pxa270_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val);
 
 static int pxa270_set_gpio_to_output (struct mflash_gpio_num gpio);
 static int pxa270_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val);
 

-static command_t *mflash_cmd;
+static struct command *mflash_cmd;

 
 static struct mflash_bank *mflash_bank;
 
 
 static struct mflash_bank *mflash_bank;
 


@@ -749,7 +750,7 @@ COMMAND_HANDLER(mg_write_cmd)
 
        if (duration_measure(&bench) == ERROR_OK)
        {
 
        if (duration_measure(&bench) == ERROR_OK)
        {

-               command_print(cmd_ctx, "wrote %lli byte from file %s "
+               command_print(cmd_ctx, "wrote %zu byte from file %s "

                                "in %fs (%0.3f kB/s)", fileio.size, args[1],
                                duration_elapsed(&bench), duration_kbps(&bench, fileio.size));
        }
                                "in %fs (%0.3f kB/s)", fileio.size, args[1],
                                duration_elapsed(&bench), duration_kbps(&bench, fileio.size));
        }


@@ -1265,7 +1266,7 @@ COMMAND_HANDLER(mg_config_cmd)
        }
 }
 
        }
 }
 

-int mflash_init_drivers(struct command_context_s *cmd_ctx)
+int mflash_init_drivers(struct command_context *cmd_ctx)

 {
        if (mflash_bank) {
                register_command(cmd_ctx, mflash_cmd, "probe", mg_probe_cmd, COMMAND_EXEC, NULL);
 {
        if (mflash_bank) {
                register_command(cmd_ctx, mflash_cmd, "probe", mg_probe_cmd, COMMAND_EXEC, NULL);


@@ -1320,7 +1321,7 @@ COMMAND_HANDLER(mg_bank_cmd)
        return ERROR_OK;
 }
 
        return ERROR_OK;
 }
 

-int mflash_register_commands(struct command_context_s *cmd_ctx)
+int mflash_register_commands(struct command_context *cmd_ctx)

 {
        mflash_cmd = register_command(cmd_ctx, NULL, "mflash", NULL, COMMAND_ANY, NULL);
        register_command(cmd_ctx, mflash_cmd, "bank", mg_bank_cmd, COMMAND_CONFIG,
 {
        mflash_cmd = register_command(cmd_ctx, NULL, "mflash", NULL, COMMAND_ANY, NULL);
        register_command(cmd_ctx, mflash_cmd, "bank", mg_bank_cmd, COMMAND_CONFIG,