From: Keith Packard <keithp@keithp.com>
Date: Wed, 6 Jul 2011 22:52:25 +0000 (-0700)
Subject: altos: Switch flash drivers __xdata to __pdata
X-Git-Tag: 0.9.4.3~8
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=b65140a0139075adeddaccf0f4d5c7a75fac4757

altos: Switch flash drivers __xdata to __pdata

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/ao.h b/src/ao.h
index ac5615bb..e52a2198 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -464,16 +464,16 @@ ao_mutex_put(__xdata uint8_t *ao_mutex) __reentrant;
  */
 
 /* Total bytes of available storage */
-extern __xdata uint32_t	ao_storage_total;
+extern __pdata uint32_t	ao_storage_total;
 
 /* Block size - device is erased in these units. At least 256 bytes */
-extern __xdata uint32_t	ao_storage_block;
+extern __pdata uint32_t	ao_storage_block;
 
 /* Byte offset of config block. Will be ao_storage_block bytes long */
-extern __xdata uint32_t	ao_storage_config;
+extern __pdata uint32_t	ao_storage_config;
 
 /* Storage unit size - device reads and writes must be within blocks of this size. Usually 256 bytes. */
-extern __xdata uint16_t ao_storage_unit;
+extern __pdata uint16_t ao_storage_unit;
 
 #define AO_STORAGE_ERASE_LOG	(ao_storage_config + AO_CONFIG_MAX_SIZE)
 
diff --git a/src/ao_ee.c b/src/ao_ee.c
index e3b41103..83863af5 100644
--- a/src/ao_ee.c
+++ b/src/ao_ee.c
@@ -23,16 +23,16 @@
 #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
diff --git a/src/ao_flash.c b/src/ao_flash.c
index d323926f..00e96398 100644
--- a/src/ao_flash.c
+++ b/src/ao_flash.c
@@ -19,16 +19,16 @@
 #include "at45db161d.h"
 
 /* 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;
 
 #define FLASH_CS		P1_1
 #define FLASH_CS_INDEX		1
diff --git a/src/ao_intflash.c b/src/ao_intflash.c
index 88d1f7f6..d76d954e 100644
--- a/src/ao_intflash.c
+++ b/src/ao_intflash.c
@@ -47,16 +47,16 @@
 __xdata __at(AO_INTFLASH_LOCATION) uint8_t ao_intflash[AO_INTFLASH_SIZE];
 
 /* Total bytes of available storage */
-__xdata uint32_t	ao_storage_total = sizeof(ao_intflash);
+__pdata uint32_t	ao_storage_total = sizeof(ao_intflash);
 
 /* Block size - device is erased in these units. */
-__xdata uint32_t	ao_storage_block = AO_INTFLASH_BLOCK;
+__pdata uint32_t	ao_storage_block = AO_INTFLASH_BLOCK;
 
 /* Byte offset of config block. Will be ao_storage_block bytes long */
-__xdata uint32_t	ao_storage_config = sizeof(ao_intflash) - AO_INTFLASH_BLOCK;
+__pdata uint32_t	ao_storage_config = sizeof(ao_intflash) - AO_INTFLASH_BLOCK;
 
 /* Storage unit size - device reads and writes must be within blocks of this size. */
-__xdata uint16_t	ao_storage_unit = AO_INTFLASH_BLOCK;
+__pdata uint16_t	ao_storage_unit = AO_INTFLASH_BLOCK;
 
 __xdata static uint8_t  ao_intflash_dma_done;
 static uint8_t ao_intflash_dma;
diff --git a/src/ao_m25.c b/src/ao_m25.c
index afd5df76..208c69ba 100644
--- a/src/ao_m25.c
+++ b/src/ao_m25.c
@@ -18,16 +18,16 @@
 #include "ao.h"
 
 /* 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;
 
 /*
  * Each flash chip is arranged in 64kB sectors; the