altos/chaoskey-v1.0: Add endpoint for reading flash contents

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

diff --git a/src/drivers/ao_25lc1024.c b/src/drivers/ao_25lc1024.c
index f0fb13c97ddfb91087231356e5249f13e9fd3d40..a9c897b3154f8d26f97e5bfec2deee746d637306 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
@@ -38,8 +39,9 @@ __pdata 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;
 
@@ -49,9 +51,9 @@ static __xdata uint8_t ao_ee_mutex;
        _asm nop _endasm; \
 } while(0)
 
-#define ao_ee_cs_low() ao_spi_get_bit(EE_CS, AO_EE_SPI_BUS)
+#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, AO_EE_SPI_BUS)
+#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;
@@ -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);
 }