* 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 *
#define STM32X_H
#include "flash.h"
-#include "target.h"
typedef struct stm32x_options_s
{
- u16 RDP;
- u16 user_options;
- u16 protection[4];
+ uint16_t RDP;
+ uint16_t user_options;
+ uint16_t protection[4];
} stm32x_options_t;
typedef struct stm32x_flash_bank_s
{
stm32x_options_t option_bytes;
working_area_t *write_algorithm;
+ int ppage_size;
+ int probed;
} stm32x_flash_bank_t;
/* stm32x register locations */
#define FLASH_PG (1<<0)
#define FLASH_PER (1<<1)
-#define FLASH_MER (1<<2)
+#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_PGERR (1<<2)
#define FLASH_WRPRTERR (1<<4)
#define FLASH_EOP (1<<5)
} stm32x_mem_layout_t;
#endif /* STM32X_H */
-