X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_ee.c;h=a2fe8dc19a974384706b4cc5b0b7efcd1fdb90ed;hp=7de05b7be3b8cddb09a6a39941dd5e9e564e9d0b;hb=93ecaf7f18f8f4c15953c2e80dc9e1b20d04fdfa;hpb=569a1dac55b70c30f01afa7bcb74442ecdd85d85

diff --git a/src/ao_ee.c b/src/ao_ee.c
index 7de05b7b..a2fe8dc1 100644
--- a/src/ao_ee.c
+++ b/src/ao_ee.c
@@ -19,19 +19,20 @@
 #include "25lc1024.h"
 
 #define EE_BLOCK_SIZE	((uint16_t) (256))
+#define EE_BLOCK_SHIFT	8
 #define EE_DEVICE_SIZE	((uint32_t) 128 * (uint32_t) 1024)
 
 /* Total bytes of available storage */
-__xdata uint32_t	ao_storage_total;
+__pdata uint32_t	ao_storage_total;
 
 /* Block size - device is erased in these units. At least 256 bytes */
-__xdata uint32_t	ao_storage_block;
+__pdata uint32_t	ao_storage_block;
 
 /* Byte offset of config block. Will be ao_storage_block bytes long */
-__xdata uint32_t	ao_storage_config;
+__pdata uint32_t	ao_storage_config;
 
 /* Storage unit size - device reads and writes must be within blocks of this size. Usually 256 bytes. */
-__xdata uint16_t	ao_storage_unit;
+__pdata uint16_t	ao_storage_unit;
 
 /*
  * Using SPI on USART 0, with P1_2 as the chip select
@@ -48,19 +49,9 @@ static __xdata uint8_t ao_ee_mutex;
 	_asm nop _endasm; \
 } while(0)
 
-static void ao_ee_cs_low(void)
-{
-	ao_ee_delay();
-	EE_CS = 0;
-	ao_ee_delay();
-}
+#define ao_ee_cs_low()	ao_spi_get_bit(EE_CS)
 
-static void ao_ee_cs_high(void)
-{
-	ao_ee_delay();
-	EE_CS = 1;
-	ao_ee_delay();
-}
+#define ao_ee_cs_high()	ao_spi_put_bit(EE_CS)
 
 struct ao_ee_instruction {
 	uint8_t	instruction;
@@ -166,7 +157,7 @@ ao_ee_fill(uint16_t block)
 uint8_t
 ao_storage_device_write(uint32_t pos, __xdata void *buf, uint16_t len) __reentrant
 {
-	uint16_t block = (uint16_t) (pos >> 8);
+	uint16_t block = (uint16_t) (pos >> EE_BLOCK_SHIFT);
 
 	/* Transfer the data */
 	ao_mutex_get(&ao_ee_mutex); {
@@ -185,7 +176,7 @@ ao_storage_device_write(uint32_t pos, __xdata void *buf, uint16_t len) __reentra
 uint8_t
 ao_storage_device_read(uint32_t pos, __xdata void *buf, uint16_t len) __reentrant
 {
-	uint16_t block = (uint16_t) (pos >> 8);
+	uint16_t block = (uint16_t) (pos >> EE_BLOCK_SHIFT);
 
 	/* Transfer the data */
 	ao_mutex_get(&ao_ee_mutex); {
@@ -207,8 +198,8 @@ uint8_t
 ao_storage_erase(uint32_t pos) __reentrant
 {
 	ao_mutex_get(&ao_ee_mutex); {
-		uint16_t block = (uint16_t) (pos >> 8);
-		ao_ee_fill(block);
+		ao_ee_flush_internal();
+		ao_ee_block = (uint16_t) (pos >> EE_BLOCK_SHIFT);
 		memset(ao_ee_data, 0xff, EE_BLOCK_SIZE);
 		ao_ee_block_dirty = 1;
 	} ao_mutex_put(&ao_ee_mutex);