X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_ee.c;h=83863af562af58bb6f9ff337fda21af8aec0ff4c;hp=575a7b30f19d1b591faea9525e1c663b6b8a5fa5;hb=82e04a0e3a3296288a524ec582785a36fd644331;hpb=e4ba9bf4291bf17c777c8c3ef7c71e4a30b9947a

diff --git a/src/ao_ee.c b/src/ao_ee.c
index 575a7b30..83863af5 100644
--- a/src/ao_ee.c
+++ b/src/ao_ee.c
@@ -19,16 +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. */
+__pdata uint16_t	ao_storage_unit;
 
 /*
  * Using SPI on USART 0, with P1_2 as the chip select
@@ -161,80 +165,34 @@ ao_ee_fill(uint16_t block)
 }
 
 uint8_t
-ao_storage_write(uint32_t pos, __xdata void *buf, uint16_t len) __reentrant
+ao_storage_device_write(uint32_t pos, __xdata void *buf, uint16_t len) __reentrant
 {
-	uint16_t block;
-	uint16_t this_len;
-	uint8_t	this_off;
-
-	if (pos >= ao_storage_total || pos + len > ao_storage_total)
-		return 0;
-	while (len) {
-
-		/* Compute portion of transfer within
-		 * a single block
-		 */
-		this_off = pos;
-		this_len = EE_BLOCK_SIZE - (uint16_t) this_off;
-		block = (uint16_t) (pos >> 8);
-		if (this_len > len)
-			this_len = len;
-		if (this_len & 0xff00)
-			ao_panic(AO_PANIC_EE);
-
-		/* Transfer the data */
-		ao_mutex_get(&ao_ee_mutex); {
-			if (this_len != EE_BLOCK_SIZE)
-				ao_ee_fill(block);
-			else {
-				ao_ee_flush_internal();
-				ao_ee_block = block;
-			}
-			memcpy(ao_ee_data + this_off, buf, this_len);
-			ao_ee_block_dirty = 1;
-		} ao_mutex_put(&ao_ee_mutex);
-
-		/* See how much is left */
-		buf += this_len;
-		len -= this_len;
-		pos += this_len;
-	}
+	uint16_t block = (uint16_t) (pos >> EE_BLOCK_SHIFT);
+
+	/* Transfer the data */
+	ao_mutex_get(&ao_ee_mutex); {
+		if (len != EE_BLOCK_SIZE)
+			ao_ee_fill(block);
+		else {
+			ao_ee_flush_internal();
+			ao_ee_block = block;
+		}
+		memcpy(ao_ee_data + (uint16_t) (pos & 0xff), buf, len);
+		ao_ee_block_dirty = 1;
+	} ao_mutex_put(&ao_ee_mutex);
 	return 1;
 }
 
 uint8_t
-ao_storage_read(uint32_t pos, __xdata void *buf, uint16_t len) __reentrant
+ao_storage_device_read(uint32_t pos, __xdata void *buf, uint16_t len) __reentrant
 {
-	uint16_t block;
-	uint16_t this_len;
-	uint8_t	this_off;
-
-	if (pos >= ao_storage_total || pos + len > ao_storage_total)
-		return 0;
-	while (len) {
-
-		/* Compute portion of transfer within
-		 * a single block
-		 */
-		this_off = pos;
-		this_len = EE_BLOCK_SIZE - (uint16_t) this_off;
-		block = (uint16_t) (pos >> 8);
-		if (this_len > len)
-			this_len = len;
-		if (this_len & 0xff00)
-			ao_panic(AO_PANIC_EE);
-
-		/* Transfer the data */
-		ao_mutex_get(&ao_ee_mutex); {
-			ao_ee_fill(block);
-			memcpy(buf, ao_ee_data + this_off, this_len);
-		} ao_mutex_put(&ao_ee_mutex);
+	uint16_t block = (uint16_t) (pos >> EE_BLOCK_SHIFT);
 
-		/* See how much is left */
-		buf += this_len;
-		len -= this_len;
-		pos += this_len;
-	}
+	/* Transfer the data */
+	ao_mutex_get(&ao_ee_mutex); {
+		ao_ee_fill(block);
+		memcpy(buf, ao_ee_data + (uint16_t) (pos & 0xff), len);
+	} ao_mutex_put(&ao_ee_mutex);
 	return 1;
 }
 
@@ -250,75 +208,19 @@ 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);
 	return 1;
 }
 
-static void
-ee_dump(void) __reentrant
-{
-	static __xdata uint8_t	b;
-	uint16_t block;
-	uint8_t i;
-
-	ao_cmd_hex();
-	block = ao_cmd_lex_i;
-	if (ao_cmd_status != ao_cmd_success)
-		return;
-	i = 0;
-	do {
-		if ((i & 7) == 0) {
-			if (i)
-				putchar('\n');
-			ao_cmd_put16((uint16_t) i);
-		}
-		putchar(' ');
-		ao_storage_read(((uint32_t) block << 8) | i, &b, 1);
-		ao_cmd_put8(b);
-		++i;
-	} while (i != 0);
-	putchar('\n');
-}
-
 static void
 ee_store(void) __reentrant
 {
-	uint16_t block;
-	uint8_t i;
-	uint16_t len;
-	static __xdata uint8_t b;
-	uint32_t addr;
-
-	ao_cmd_hex();
-	block = ao_cmd_lex_i;
-	ao_cmd_hex();
-	i = ao_cmd_lex_i;
-	addr = ((uint32_t) block << 8) | i;
-	ao_cmd_hex();
-	len = ao_cmd_lex_i;
-	if (ao_cmd_status != ao_cmd_success)
-		return;
-	while (len--) {
-		ao_cmd_hex();
-		if (ao_cmd_status != ao_cmd_success)
-			return;
-		b = ao_cmd_lex_i;
-		ao_storage_write(addr, &b, 1);
-		addr++;
-	}
-	ao_storage_flush();
 }
 
-__code struct ao_cmds ao_ee_cmds[] = {
-	{ 'e', ee_dump, 	"e <block>                          Dump a block of EEPROM data" },
-	{ 'w', ee_store,	"w <block> <start> <len> <data> ... Write data to EEPROM" },
-	{ 0,   ee_store, NULL },
-};
-
 void
 ao_storage_setup(void)
 {
@@ -326,20 +228,24 @@ ao_storage_setup(void)
 		ao_storage_total = EE_DEVICE_SIZE;
 		ao_storage_block = EE_BLOCK_SIZE;
 		ao_storage_config = EE_DEVICE_SIZE - EE_BLOCK_SIZE;
+		ao_storage_unit = EE_BLOCK_SIZE;
 	}
 }
 
+void
+ao_storage_device_info(void) __reentrant
+{
+}
+
 /*
  * To initialize the chip, set up the CS line and
  * the SPI interface
  */
 void
-ao_storage_init(void)
+ao_storage_device_init(void)
 {
 	/* set up CS */
 	EE_CS = 1;
 	P1DIR |= (1 << EE_CS_INDEX);
 	P1SEL &= ~(1 << EE_CS_INDEX);
-
-	ao_cmd_register(&ao_ee_cmds[0]);
 }