makefiles: improve build order

[fw/openocd] / src / flash / str9x.h

diff --git a/src/flash/str9x.h b/src/flash/str9x.h
index f3100ce38aed6b2452123cef67319d6601aa85fc..834488549afba313d4a41579a7d23470db8bbf2b 100644 (file)
--- a/src/flash/str9x.h
+++ b/src/flash/str9x.h
@@ -2,6 +2,9 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   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     *
@@ -21,11 +24,10 @@
 #define STR9X_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct str9x_flash_bank_s
 {
-       u32 *sector_bits;
+       uint32_t *sector_bits;
        int variant;
        int bank1;
        working_area_t *write_algorithm;
@@ -47,7 +49,7 @@ enum str9x_status_codes
        STR9X_BUSY = 11
 };
 
-/*  Flash registers */
+/* Flash registers */
 
 #define FLASH_BBSR             0x54000000              /* Boot Bank Size Register                */
 #define FLASH_NBBSR            0x54000004              /* Non-Boot Bank Size Register            */
@@ -58,4 +60,3 @@ enum str9x_status_codes
 #define FLASH_BCE5ADDR 0x54000020              /* BC Fifth Entry Target Address Register */
 
 #endif /* STR9X_H */
-