makefiles: improve build order

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

diff --git a/src/flash/str7x.h b/src/flash/str7x.h
index a3372f59bad77f5ccb78d04adb267e759a0b3c52..ecbbc761af34949b1ad8957d23cc88aec73b574e 100644 (file)
--- a/src/flash/str7x.h
+++ b/src/flash/str7x.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,14 +24,13 @@
 #define STR7X_H
 
 #include "flash.h"
-#include "target.h"
 
 typedef struct str7x_flash_bank_s
 {
-       u32 *sector_bits;
-       u32 disable_bit;
-       u32 busy_bits;
-       u32 register_base;
+       uint32_t *sector_bits;
+       uint32_t disable_bit;
+       uint32_t busy_bits;
+       uint32_t register_base;
        working_area_t *write_algorithm;
 } str7x_flash_bank_t;
 
@@ -57,14 +59,14 @@ enum str7x_status_codes
 #define FLASH_AR               0x00000010
 #define FLASH_ER               0x00000014
 #define FLASH_NVWPAR   0x0000DFB0
-#define FLASH_NVAPR0   0x0000DFB8
-#define FLASH_NVAPR1   0x0000DFBC
+#define FLASH_NVAPR0   0x0000DFB8
+#define FLASH_NVAPR1   0x0000DFBC
 
 /* FLASH_CR0 register bits */
 
 #define FLASH_WMS              0x80000000
 #define FLASH_SUSP             0x40000000
-#define FLASH_WPG      0x20000000
+#define FLASH_WPG              0x20000000
 #define FLASH_DWPG             0x10000000
 #define FLASH_SER              0x08000000
 #define FLASH_SPR              0x01000000
@@ -74,7 +76,7 @@ enum str7x_status_codes
 #define FLASH_BSYA1            0x00000004
 #define FLASH_BSYA0            0x00000002
 
-/* FLASH_CR1 regsiter bits */
+/* FLASH_CR1 register bits */
 
 #define FLASH_B1S              0x02000000
 #define FLASH_B0S              0x01000000
@@ -100,10 +102,9 @@ enum str7x_status_codes
 #define FLASH_ERR              0x00000001
 
 typedef struct str7x_mem_layout_s {
-       u32 sector_start;
-       u32 sector_size;
-       u32 sector_bit;
+       uint32_t sector_start;
+       uint32_t sector_size;
+       uint32_t sector_bit;
 } str7x_mem_layout_t;
 
 #endif /* STR7X_H */
-