From c272ea410efac24b4a4828035e8faa8cb0edd526 Mon Sep 17 00:00:00 2001
From: Karl Palsson <karlp@tweak.net.au>
Date: Mon, 23 Jul 2018 09:41:15 +0000
Subject: [PATCH] stm32: flash: move clear all status flags to single common
 header

We've got a "f" flash file for common apis now, use it.
---
 include/libopencm3/stm32/common/flash_common_f.h    | 7 +++++++
 include/libopencm3/stm32/common/flash_common_f01.h  | 1 -
 include/libopencm3/stm32/common/flash_common_f234.h | 1 -
 include/libopencm3/stm32/f7/flash.h                 | 1 -
 include/libopencm3/stm32/l4/flash.h                 | 1 -
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/libopencm3/stm32/common/flash_common_f.h b/include/libopencm3/stm32/common/flash_common_f.h
index 6a52e60c..006e8ae0 100644
--- a/include/libopencm3/stm32/common/flash_common_f.h
+++ b/include/libopencm3/stm32/common/flash_common_f.h
@@ -29,4 +29,11 @@ BEGIN_DECLS
  */
 void flash_clear_eop_flag(void);
 
+/**
+ * Clear all status flags.
+ * The number of bits can vary across families.
+ */
+void flash_clear_status_flags(void);
+
+
 END_DECLS
\ No newline at end of file
diff --git a/include/libopencm3/stm32/common/flash_common_f01.h b/include/libopencm3/stm32/common/flash_common_f01.h
index e4f7d60f..42417931 100644
--- a/include/libopencm3/stm32/common/flash_common_f01.h
+++ b/include/libopencm3/stm32/common/flash_common_f01.h
@@ -104,7 +104,6 @@ BEGIN_DECLS
 
 void flash_clear_pgerr_flag(void);
 void flash_clear_wrprterr_flag(void);
-void flash_clear_status_flags(void);
 uint32_t flash_get_status_flags(void);
 void flash_wait_for_last_operation(void);
 void flash_program_word(uint32_t address, uint32_t data);
diff --git a/include/libopencm3/stm32/common/flash_common_f234.h b/include/libopencm3/stm32/common/flash_common_f234.h
index e1bb37d3..e7377924 100644
--- a/include/libopencm3/stm32/common/flash_common_f234.h
+++ b/include/libopencm3/stm32/common/flash_common_f234.h
@@ -75,7 +75,6 @@
 
 BEGIN_DECLS
 
-void flash_clear_status_flags(void);
 void flash_wait_for_last_operation(void);
 
 END_DECLS
diff --git a/include/libopencm3/stm32/f7/flash.h b/include/libopencm3/stm32/f7/flash.h
index 9b9cb120..297cce55 100644
--- a/include/libopencm3/stm32/f7/flash.h
+++ b/include/libopencm3/stm32/f7/flash.h
@@ -164,7 +164,6 @@ void flash_clear_pgaerr_flag(void);
 void flash_art_enable(void);
 void flash_art_disable(void);
 void flash_art_reset(void);
-void flash_clear_status_flags(void);
 void flash_erase_all_sectors(uint32_t program_size);
 void flash_erase_sector(uint8_t sector, uint32_t program_size);
 void flash_program_double_word(uint32_t address, uint64_t data);
diff --git a/include/libopencm3/stm32/l4/flash.h b/include/libopencm3/stm32/l4/flash.h
index b5442b6d..e324a92e 100644
--- a/include/libopencm3/stm32/l4/flash.h
+++ b/include/libopencm3/stm32/l4/flash.h
@@ -227,7 +227,6 @@ void flash_wait_for_last_operation(void);
 void flash_clear_pgserr_flag(void);
 void flash_clear_pgaerr_flag(void);
 void flash_clear_wrperr_flag(void);
-void flash_clear_status_flags(void);
 void flash_lock_option_bytes(void);
 void flash_program_word(uint32_t address, uint32_t data);
 void flash_program(uint32_t address, uint8_t *data, uint32_t len);