X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fstm32x.h;h=6cd047e101df2582a6353ccca3d753bdece63eec;hb=7bf1a86e473a12882bf6f71cb4d0d416394b69d4;hp=e4aca6092584f95790c6ddb6f88ec8206c84ef3a;hpb=155c3d763c17f8d32d27a0463a8862a27aab85de;p=openocd.git

diff --git a/src/flash/stm32x.h b/src/flash/stm32x.h
index e4aca60925..6cd047e101 100644
--- a/src/flash/stm32x.h
+++ b/src/flash/stm32x.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,22 +24,21 @@
 #define STM32X_H
 
 #include "flash.h"
-#include "target.h"
 
-typedef struct stm32x_options_s
+struct stm32x_options
 {
-	u16 RDP;
-	u16 user_options;
-	u16 protection[4];
-} stm32x_options_t;
+	uint16_t RDP;
+	uint16_t user_options;
+	uint16_t protection[4];
+};
 
-typedef struct stm32x_flash_bank_s
+struct stm32x_flash_bank
 {
-	stm32x_options_t option_bytes;
-	working_area_t *write_algorithm;
+	struct stm32x_options option_bytes;
+	struct working_area *write_algorithm;
 	int ppage_size;
 	int probed;
-} stm32x_flash_bank_t;
+};
 
 /* stm32x register locations */
 
@@ -62,21 +64,21 @@ typedef struct stm32x_flash_bank_s
 
 /* FLASH_CR register bits */
 
-#define FLASH_PG		(1<<0)
-#define FLASH_PER		(1<<1)
-#define FLASH_MER   	(1<<2)
-#define FLASH_OPTPG		(1<<4)
-#define FLASH_OPTER		(1<<5)
-#define FLASH_STRT		(1<<6)
-#define FLASH_LOCK		(1<<7)
-#define FLASH_OPTWRE	(1<<9)
+#define FLASH_PG		(1 << 0)
+#define FLASH_PER		(1 << 1)
+#define FLASH_MER		(1 << 2)
+#define FLASH_OPTPG		(1 << 4)
+#define FLASH_OPTER		(1 << 5)
+#define FLASH_STRT		(1 << 6)
+#define FLASH_LOCK		(1 << 7)
+#define FLASH_OPTWRE	(1 << 9)
 
-/* FLASH_SR regsiter bits */
+/* FLASH_SR register bits */
 
-#define FLASH_BSY		(1<<0)
-#define FLASH_PGERR   	(1<<2)
-#define FLASH_WRPRTERR	(1<<4)
-#define FLASH_EOP		(1<<5)
+#define FLASH_BSY		(1 << 0)
+#define FLASH_PGERR		(1 << 2)
+#define FLASH_WRPRTERR	(1 << 4)
+#define FLASH_EOP		(1 << 5)
 
 /* STM32_FLASH_OBR bit definitions (reading) */
 
@@ -91,10 +93,9 @@ typedef struct stm32x_flash_bank_s
 #define KEY1			0x45670123
 #define KEY2			0xCDEF89AB
 
-typedef struct stm32x_mem_layout_s {
-	u32 sector_start;
-	u32 sector_size;
-} stm32x_mem_layout_t;
+struct stm32x_mem_layout {
+	uint32_t sector_start;
+	uint32_t sector_size;
+};
 
 #endif /* STM32X_H */
-