X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2Fao_eeprom_stm.c;h=4207a8607e3d593df3482505ad5ca42eb411d385;hb=6a9546413d6a236c010e806b50506d870961d074;hp=5a75a97d86d6be05f1128529493fdf1c52b9af30;hpb=eb1a9a8c3f3d3993d5986925bc4ad112c2bbc119;p=fw%2Faltos

diff --git a/src/stm/ao_eeprom_stm.c b/src/stm/ao_eeprom_stm.c
index 5a75a97d..4207a860 100644
--- a/src/stm/ao_eeprom_stm.c
+++ b/src/stm/ao_eeprom_stm.c
@@ -16,19 +16,10 @@
  */
 
 #include <ao.h>
-#include <ao_storage.h>
+#include <ao_eeprom.h>
 
 /* Total bytes of available storage */
-ao_pos_t	ao_storage_total = 4096;
-
-/* Block size - device is erased in these units. */
-ao_pos_t	ao_storage_block = 1024;
-
-/* Byte offset of config block. Will be ao_storage_block bytes long */
-ao_pos_t	ao_storage_config = 0;
-
-/* Storage unit size - device reads and writes must be within blocks of this size. */
-uint16_t	ao_storage_unit = 1024;
+const ao_pos_t ao_eeprom_total = 4096;
 
 /* Location of eeprom in address space */
 #define stm_eeprom	((uint8_t *) 0x08080000)
@@ -42,23 +33,19 @@ uint16_t	ao_storage_unit = 1024;
  * the same contents, or append to an existing page easily enough
  */
 
-/*
- * Erase the specified sector
- */
-uint8_t
-ao_storage_erase(ao_pos_t pos) __reentrant
-{
-	/* Not necessary */
-	return 1;
-}
-
 static void
 ao_intflash_unlock(void)
 {
+	/* Disable backup write protection */
+	stm_pwr.cr |= (1 << STM_PWR_CR_DBP);
+
 	/* Unlock Data EEPROM and FLASH_PECR register */
 	stm_flash.pekeyr = STM_FLASH_PEKEYR_PEKEY1;
 	stm_flash.pekeyr = STM_FLASH_PEKEYR_PEKEY2;
 
+	if (stm_flash.pecr & (1 << STM_FLASH_PECR_PELOCK))
+		printf ("eeprom unlock failed\n");
+
 	/* Configure the FTDW bit (FLASH_PECR[8]) to execute
 	 * word write, whatever the previous value of the word
 	 * being written to
@@ -68,8 +55,8 @@ ao_intflash_unlock(void)
 			  (0 << STM_FLASH_PECR_EOPIE) |
 			  (0 << STM_FLASH_PECR_FPRG) |
 			  (0 << STM_FLASH_PECR_ERASE) |
-			  (0 << STM_FLASH_PECR_FTDW) |
-			  (1 << STM_FLASH_PECR_DATA) |
+			  (1 << STM_FLASH_PECR_FTDW) |
+			  (0 << STM_FLASH_PECR_DATA) |
 			  (0 << STM_FLASH_PECR_PROG) |
 			  (0 << STM_FLASH_PECR_OPTLOCK) |
 			  (0 << STM_FLASH_PECR_PRGLOCK) |
@@ -97,15 +84,9 @@ ao_intflash_write32(uint16_t pos, uint32_t w)
 
 	addr = (uint32_t *) (stm_eeprom + pos);
 
-	/* Erase previous word */
-	*addr = 0;
+	/* Write a word to a valid address in the data EEPROM */
+	*addr = w;
 	ao_intflash_wait();
-
-	if (w) {
-		/* Write a word to a valid address in the data EEPROM */
-		*addr = w;
-		ao_intflash_wait();
-	}
 }
 
 static void
@@ -131,16 +112,16 @@ ao_intflash_read(uint16_t pos)
 }
 
 /*
- * Write to flash
+ * Write to eeprom
  */
 
 uint8_t
-ao_storage_device_write(ao_pos_t pos32, __xdata void *v, uint16_t len) __reentrant
+ao_eeprom_write(ao_pos_t pos32, __xdata void *v, uint16_t len)
 {
 	uint16_t pos = pos32;
 	__xdata uint8_t *d = v;
 
-	if (pos >= ao_storage_total || pos + len > ao_storage_total)
+	if (pos >= ao_eeprom_total || pos + len > ao_eeprom_total)
 		return 0;
 
 	ao_intflash_unlock();
@@ -166,38 +147,26 @@ ao_storage_device_write(ao_pos_t pos32, __xdata void *v, uint16_t len) __reentra
 }
 
 /*
- * Read from flash
+ * Read from eeprom
  */
 uint8_t
-ao_storage_device_read(ao_pos_t pos, __xdata void *v, uint16_t len) __reentrant
+ao_eeprom_read(ao_pos_t pos, __xdata void *v, uint16_t len)
 {
 	uint8_t	*d = v;
 	
-	if (pos >= ao_storage_total || pos + len > ao_storage_total)
+	if (pos >= ao_eeprom_total || pos + len > ao_eeprom_total)
 		return 0;
 	while (len--)
 		*d++ = ao_intflash_read(pos++);
 	return 1;
 }
 
-void
-ao_storage_flush(void) __reentrant
-{
-}
-
-void
-ao_storage_setup(void)
-{
-}
-
-void
-ao_storage_device_info(void) __reentrant
-{
-	uint8_t	i;
-	printf ("Using internal flash\n");
-}
+/*
+ * Initialize eeprom
+ */
 
 void
-ao_storage_device_init(void)
+ao_eeprom_init(void)
 {
+	/* Nothing to do here */
 }