Duane Ellis: fix warnings

[fw/openocd] / src / flash / flash.c

diff --git a/src/flash/flash.c b/src/flash/flash.c
index 01bc6e70b3a340bf53ee6db5a8b0b559751fc634..71d054f5051bde8f4056a8bbc2b932424d66d65e 100644 (file)
--- a/src/flash/flash.c
+++ b/src/flash/flash.c
@@ -2,6 +2,9 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                      *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -41,10 +44,6 @@
 #include <errno.h>
 #include <inttypes.h>
 
-#include "jim.h"
-extern Jim_Interp *interp;
-
-
 /* command handlers */
 int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
@@ -143,14 +142,14 @@ int flash_register_commands(struct command_context_s *cmd_ctx)
        return ERROR_OK;
 }
 
-static int Jim_Command_flash_banks(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+static int jim_flash_banks(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
+       flash_bank_t *p;
+       
        if (argc != 1) {
                Jim_WrongNumArgs(interp, 1, argv, "no arguments to flash_banks command");
                return JIM_ERR;
        }
-       flash_bank_t *p;
-       int i = 0;
 
        if (!flash_banks)
        {
@@ -162,7 +161,6 @@ static int Jim_Command_flash_banks(Jim_Interp *interp, int argc, Jim_Obj *const
        {
                Jim_Obj *elem=Jim_NewListObj(interp, NULL, 0);
                
-
                Jim_ListAppendElement(interp, elem, Jim_NewStringObj(interp, "name", -1));
                Jim_ListAppendElement(interp, elem, Jim_NewStringObj(interp, p->driver->name, -1));
                Jim_ListAppendElement(interp, elem, Jim_NewStringObj(interp, "base", -1));
@@ -174,7 +172,7 @@ static int Jim_Command_flash_banks(Jim_Interp *interp, int argc, Jim_Obj *const
                Jim_ListAppendElement(interp, elem, Jim_NewStringObj(interp, "chip_width", -1));
                Jim_ListAppendElement(interp, elem, Jim_NewIntObj(interp, p->chip_width));
                
-           Jim_ListAppendElement(interp, list, elem);
+               Jim_ListAppendElement(interp, list, elem);
        }
 
        Jim_SetResult(interp, list);
@@ -182,12 +180,11 @@ static int Jim_Command_flash_banks(Jim_Interp *interp, int argc, Jim_Obj *const
        return JIM_OK;
 }
 
-
 int flash_init_drivers(struct command_context_s *cmd_ctx)
 {
        if (flash_banks)
        {
-               Jim_CreateCommand(interp, "openocd_flash_banks", Jim_Command_flash_banks, NULL, NULL );
+               register_jim(cmd_ctx, "ocd_flash_banks", jim_flash_banks, "return information about the flash banks");
                
                register_command(cmd_ctx, flash_cmd, "info", handle_flash_info_command, COMMAND_EXEC,
                                                 "print info about flash bank <num>");
@@ -236,7 +233,7 @@ flash_bank_t *get_flash_bank_by_num_noprobe(int num)
        return NULL;
 }
 
-int flash_get_bank_count()
+int flash_get_bank_count(void)
 {
        flash_bank_t *p;
        int i = 0;