X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fao_m25.c;h=d7208273ff49714353e4992e323d1adc89c63528;hb=01aee9ebe517ed657692e0a39a31ae0ddfb5b8b0;hp=afd5df760aaf1864b0aadb36ac2390957ffd561e;hpb=569a1dac55b70c30f01afa7bcb74442ecdd85d85;p=fw%2Faltos

diff --git a/src/ao_m25.c b/src/ao_m25.c
index afd5df76..d7208273 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
@@ -99,8 +99,8 @@ static __xdata uint8_t ao_m25_mutex;
 
 static __xdata uint8_t	ao_m25_instruction[4];
 
-#define M25_SELECT(cs)			(SPI_CS_PORT &= ~(cs))
-#define M25_DESELECT(cs)		(SPI_CS_PORT |= (cs))
+#define M25_SELECT(cs)		ao_spi_get_mask(SPI_CS_PORT,cs)
+#define M25_DESELECT(cs)	ao_spi_put_mask(SPI_CS_PORT,cs)
 
 #define M25_BLOCK_SHIFT			16
 #define M25_BLOCK			65536L