altos/telefireone-v1.0: Track ao_led_init API change

[fw/altos] / src / drivers / ao_25lc1024.c

diff --git a/src/drivers/ao_25lc1024.c b/src/drivers/ao_25lc1024.c
index 2d047a44bf7b254471fe194e9cbfb66ff70fb228..c73f54df8edaa15c7febe6e1eab4a1df4b244d42 100644 (file)
--- a/src/drivers/ao_25lc1024.c
+++ b/src/drivers/ao_25lc1024.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,25 +24,26 @@
 #define EE_DEVICE_SIZE ((uint32_t) 128 * (uint32_t) 1024)
 
 /* Total bytes of available storage */
-__pdata uint32_t       ao_storage_total;
+uint32_t       ao_storage_total;
 
 /* Block size - device is erased in these units. At least 256 bytes */
-__pdata uint32_t       ao_storage_block;
+uint32_t       ao_storage_block;
 
 /* Byte offset of config block. Will be ao_storage_block bytes long */
-__pdata uint32_t       ao_storage_config;
+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;
+uint16_t       ao_storage_unit;
 
 /*
  * Using SPI on USART 0, with P1_2 as the chip select
  */
 
+#define EE_CS_PORT     P1
 #define EE_CS          P1_2
-#define EE_CS_INDEX    2
+#define EE_CS_PIN      2
 
-static __xdata uint8_t ao_ee_mutex;
+static uint8_t ao_ee_mutex;
 
 #define ao_ee_delay() do { \
        _asm nop _endasm; \
@@ -49,21 +51,21 @@ static __xdata uint8_t ao_ee_mutex;
        _asm nop _endasm; \
 } while(0)
 
-#define ao_ee_cs_low() ao_spi_get_bit(EE_CS)
+#define ao_ee_cs_low() ao_spi_get_bit(EE_CS_PORT, EE_CS_PIN, EE_CS, AO_EE_SPI_BUS, AO_SPI_SPEED_FAST)
 
-#define ao_ee_cs_high()        ao_spi_put_bit(EE_CS)
+#define ao_ee_cs_high()        ao_spi_put_bit(EE_CS_PORT, EE_CS_PIN, EE_CS, AO_EE_SPI_BUS)
 
 struct ao_ee_instruction {
        uint8_t instruction;
        uint8_t address[3];
-} __xdata ao_ee_instruction;
+} ao_ee_instruction;
 
 static void
 ao_ee_write_enable(void)
 {
        ao_ee_cs_low();
        ao_ee_instruction.instruction = EE_WREN;
-       ao_spi_send(&ao_ee_instruction, 1);
+       ao_spi_send(&ao_ee_instruction, 1, AO_EE_SPI_BUS);
        ao_ee_cs_high();
 }
 
@@ -72,8 +74,8 @@ ao_ee_rdsr(void)
 {
        ao_ee_cs_low();
        ao_ee_instruction.instruction = EE_RDSR;
-       ao_spi_send(&ao_ee_instruction, 1);
-       ao_spi_recv(&ao_ee_instruction, 1);
+       ao_spi_send(&ao_ee_instruction, 1, AO_EE_SPI_BUS);
+       ao_spi_recv(&ao_ee_instruction, 1, AO_EE_SPI_BUS);
        ao_ee_cs_high();
        return ao_ee_instruction.instruction;
 }
@@ -84,15 +86,15 @@ ao_ee_wrsr(uint8_t status)
        ao_ee_cs_low();
        ao_ee_instruction.instruction = EE_WRSR;
        ao_ee_instruction.address[0] = status;
-       ao_spi_send(&ao_ee_instruction, 2);
+       ao_spi_send(&ao_ee_instruction, 2, AO_EE_SPI_BUS);
        ao_ee_cs_high();
 }
 
 #define EE_BLOCK_NONE  0xffff
 
-static __xdata uint8_t ao_ee_data[EE_BLOCK_SIZE];
-static __pdata uint16_t ao_ee_block = EE_BLOCK_NONE;
-static __pdata uint8_t ao_ee_block_dirty;
+static uint8_t ao_ee_data[EE_BLOCK_SIZE];
+static uint16_t ao_ee_block = EE_BLOCK_NONE;
+static uint8_t ao_ee_block_dirty;
 
 /* Write the current block to the EEPROM */
 static void
@@ -111,8 +113,8 @@ ao_ee_write_block(void)
        ao_ee_instruction.address[0] = ao_ee_block >> 8;
        ao_ee_instruction.address[1] = ao_ee_block;
        ao_ee_instruction.address[2] = 0;
-       ao_spi_send(&ao_ee_instruction, 4);
-       ao_spi_send(ao_ee_data, EE_BLOCK_SIZE);
+       ao_spi_send(&ao_ee_instruction, 4, AO_EE_SPI_BUS);
+       ao_spi_send(ao_ee_data, EE_BLOCK_SIZE, AO_EE_SPI_BUS);
        ao_ee_cs_high();
        for (;;) {
                uint8_t status = ao_ee_rdsr();
@@ -130,8 +132,8 @@ ao_ee_read_block(void)
        ao_ee_instruction.address[0] = ao_ee_block >> 8;
        ao_ee_instruction.address[1] = ao_ee_block;
        ao_ee_instruction.address[2] = 0;
-       ao_spi_send(&ao_ee_instruction, 4);
-       ao_spi_recv(ao_ee_data, EE_BLOCK_SIZE);
+       ao_spi_send(&ao_ee_instruction, 4, AO_EE_SPI_BUS);
+       ao_spi_recv(ao_ee_data, EE_BLOCK_SIZE, AO_EE_SPI_BUS);
        ao_ee_cs_high();
 }
 
@@ -155,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
+ao_storage_device_write(uint32_t pos, void *buf, uint16_t len) 
 {
        uint16_t block = (uint16_t) (pos >> EE_BLOCK_SHIFT);
 
@@ -174,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
+ao_storage_device_read(uint32_t pos, void *buf, uint16_t len) 
 {
        uint16_t block = (uint16_t) (pos >> EE_BLOCK_SHIFT);
 
@@ -187,7 +189,7 @@ ao_storage_device_read(uint32_t pos, __xdata void *buf, uint16_t len) __reentran
 }
 
 void
-ao_storage_flush(void) __reentrant
+ao_storage_flush(void) 
 {
        ao_mutex_get(&ao_ee_mutex); {
                ao_ee_flush_internal();
@@ -195,7 +197,7 @@ ao_storage_flush(void) __reentrant
 }
 
 uint8_t
-ao_storage_erase(uint32_t pos) __reentrant
+ao_storage_erase(uint32_t pos) 
 {
        ao_mutex_get(&ao_ee_mutex); {
                ao_ee_flush_internal();
@@ -207,7 +209,7 @@ ao_storage_erase(uint32_t pos) __reentrant
 }
 
 static void
-ee_store(void) __reentrant
+ee_store(void) 
 {
 }
 
@@ -223,7 +225,7 @@ ao_storage_setup(void)
 }
 
 void
-ao_storage_device_info(void) __reentrant
+ao_storage_device_info(void) 
 {
 }
 
@@ -235,7 +237,5 @@ void
 ao_storage_device_init(void)
 {
        /* set up CS */
-       EE_CS = 1;
-       P1DIR |= (1 << EE_CS_INDEX);
-       P1SEL &= ~(1 << EE_CS_INDEX);
+       ao_enable_output(EE_CS_PORT, EE_CS_PIN, EE_CS, 1);
 }