X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fdrivers%2Fao_25lc1024.c;h=a9c897b3154f8d26f97e5bfec2deee746d637306;hp=2d047a44bf7b254471fe194e9cbfb66ff70fb228;hb=bea42e45952df85d61428662caefbb100465a585;hpb=258b75498916183ed250d3abb3282fe3d843e7a1

diff --git a/src/drivers/ao_25lc1024.c b/src/drivers/ao_25lc1024.c
index 2d047a44..a9c897b3 100644
--- 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)
+#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;
@@ -63,7 +65,7 @@ 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,7 +86,7 @@ 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();
 }
 
@@ -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();
 }
 
@@ -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);
 }