Update autotools scripts to require automake 1.6. The configure.in script

[openocd.git] / src / flash / flash.h

diff --git a/src/flash/flash.h b/src/flash/flash.h
index 807914ade81e1005ced809764db50495ed8f62d2..817c60628320c53eb42d319aaf51e04c1cae6e7b 100644 (file)
--- a/src/flash/flash.h
+++ b/src/flash/flash.h
@@ -2,9 +2,12 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                      *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
+ *   Copyright (C) 2008 by Spencer Oliver                                  *
+ *   spen@spen-soft.co.uk                                                  *
+ *                                                                         *
  *   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     *
@@ -65,6 +68,7 @@ typedef struct flash_bank_s
        target_t *target;
        flash_driver_t *driver;
        void *driver_priv;
+       int bank_number;
        u32 base;
        u32 size;
        int chip_width;
@@ -80,7 +84,7 @@ extern int flash_init_drivers(struct command_context_s *cmd_ctx);
 extern int flash_erase_address_range(target_t *target, u32 addr, u32 length);
 extern int flash_write(target_t *target, image_t *image, u32 *written, int erase);
 extern void flash_set_dirty(void);
-extern int flash_get_bank_count();
+extern int flash_get_bank_count(void);
 extern int default_flash_blank_check(struct flash_bank_s *bank);
 extern int default_flash_mem_blank_check(struct flash_bank_s *bank);
 
@@ -88,13 +92,13 @@ extern flash_bank_t *get_flash_bank_by_num(int num);
 extern flash_bank_t *get_flash_bank_by_num_noprobe(int num);
 extern flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr);
 
-#define                ERROR_FLASH_BANK_INVALID                (-900)
-#define                ERROR_FLASH_SECTOR_INVALID              (-901)
-#define                ERROR_FLASH_OPERATION_FAILED    (-902)
-#define                ERROR_FLASH_DST_OUT_OF_BANK             (-903)
-#define                ERROR_FLASH_DST_BREAKS_ALIGNMENT (-904)
-#define                ERROR_FLASH_BUSY                                (-905)
-#define                ERROR_FLASH_SECTOR_NOT_ERASED   (-906)
-#define                ERROR_FLASH_BANK_NOT_PROBED             (-907)
+#define ERROR_FLASH_BANK_INVALID                       (-900)
+#define ERROR_FLASH_SECTOR_INVALID                     (-901)
+#define ERROR_FLASH_OPERATION_FAILED           (-902)
+#define ERROR_FLASH_DST_OUT_OF_BANK                    (-903)
+#define ERROR_FLASH_DST_BREAKS_ALIGNMENT       (-904)
+#define ERROR_FLASH_BUSY                                       (-905)
+#define ERROR_FLASH_SECTOR_NOT_ERASED          (-906)
+#define ERROR_FLASH_BANK_NOT_PROBED                    (-907)
 
 #endif /* FLASH_H */