X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_25lc1024.c;h=fac0a430f1b97406fefa92d31a4936c5b2fd2aa9;hb=fb0fb6f4beab484e7fe55b39d18c1f19778f1211;hp=738f8ce6094efb4543ca976c35146091afcd9292;hpb=9513be7f9d3d0b0ec29f6487fa9dc8f1ac24d0de;p=fw%2Faltos

diff --git a/src/drivers/ao_25lc1024.c b/src/drivers/ao_25lc1024.c
index 738f8ce6..fac0a430 100644
--- a/src/drivers/ao_25lc1024.c
+++ b/src/drivers/ao_25lc1024.c
@@ -38,8 +38,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 +50,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 +64,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 +73,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 +85,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 +112,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 +131,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();
 }
 
@@ -167,7 +168,7 @@ ao_storage_device_write(uint32_t pos, __xdata void *buf, uint16_t len) __reentra
 			ao_ee_flush_internal();
 			ao_ee_block = block;
 		}
-		memcpy(ao_ee_data + (uint16_t) (pos & 0xff), buf, len);
+		ao_xmemcpy(ao_ee_data + (uint16_t) (pos & 0xff), buf, len);
 		ao_ee_block_dirty = 1;
 	} ao_mutex_put(&ao_ee_mutex);
 	return 1;
@@ -181,7 +182,7 @@ ao_storage_device_read(uint32_t pos, __xdata void *buf, uint16_t len) __reentran
 	/* Transfer the data */
 	ao_mutex_get(&ao_ee_mutex); {
 		ao_ee_fill(block);
-		memcpy(buf, ao_ee_data + (uint16_t) (pos & 0xff), len);
+		ao_xmemcpy(buf, ao_ee_data + (uint16_t) (pos & 0xff), len);
 	} ao_mutex_put(&ao_ee_mutex);
 	return 1;
 }
@@ -200,7 +201,7 @@ ao_storage_erase(uint32_t pos) __reentrant
 	ao_mutex_get(&ao_ee_mutex); {
 		ao_ee_flush_internal();
 		ao_ee_block = (uint16_t) (pos >> EE_BLOCK_SHIFT);
-		memset(ao_ee_data, 0xff, EE_BLOCK_SIZE);
+		ao_xmemset(ao_ee_data, 0xff, EE_BLOCK_SIZE);
 		ao_ee_block_dirty = 1;
 	} ao_mutex_put(&ao_ee_mutex);
 	return 1;
@@ -235,7 +236,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);
 }