projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Disable telemetry while getting config data
[fw/altos]
/
src
/
drivers
/
ao_at45db161d.c
diff --git
a/src/drivers/ao_at45db161d.c
b/src/drivers/ao_at45db161d.c
index aee9877ac2b52887e293563c05f25f67c9774215..e7e74153db6c46298eba0556e088380d24351f8f 100644
(file)
--- a/
src/drivers/ao_at45db161d.c
+++ b/
src/drivers/ao_at45db161d.c
@@
-43,9
+43,9
@@
__xdata uint8_t ao_flash_mutex;
_asm nop _endasm; \
} while(0)
_asm nop _endasm; \
} while(0)
-#define ao_flash_cs_low() ao_spi_get_bit(FLASH_CS)
+#define ao_flash_cs_low() ao_spi_get_bit(FLASH_CS
_PORT, FLASH_CS_PIN, FLASH_CS, AO_FLASH_SPI_BUS, AO_SPI_SPEED_FAST
)
-#define ao_flash_cs_high() ao_spi_put_bit(FLASH_CS)
+#define ao_flash_cs_high() ao_spi_put_bit(FLASH_CS
_PORT, FLASH_CS_PIN, FLASH_CS, AO_FLASH_SPI_BUS
)
struct ao_flash_instruction {
uint8_t instruction;
struct ao_flash_instruction {
uint8_t instruction;
@@
-60,7
+60,7
@@
ao_flash_set_pagesize_512(void)
ao_flash_instruction.address[0] = FLASH_SET_512_BYTE_0;
ao_flash_instruction.address[1] = FLASH_SET_512_BYTE_1;
ao_flash_instruction.address[2] = FLASH_SET_512_BYTE_2;
ao_flash_instruction.address[0] = FLASH_SET_512_BYTE_0;
ao_flash_instruction.address[1] = FLASH_SET_512_BYTE_1;
ao_flash_instruction.address[2] = FLASH_SET_512_BYTE_2;
- ao_spi_send(&ao_flash_instruction, 4);
+ ao_spi_send(&ao_flash_instruction, 4
, AO_FLASH_SPI_BUS
);
ao_flash_cs_high();
}
ao_flash_cs_high();
}
@@
-70,8
+70,8
@@
ao_flash_read_status(void)
{
ao_flash_cs_low();
ao_flash_instruction.instruction = FLASH_READ_STATUS;
{
ao_flash_cs_low();
ao_flash_instruction.instruction = FLASH_READ_STATUS;
- ao_spi_send(&ao_flash_instruction, 1);
- ao_spi_recv(&ao_flash_instruction, 1);
+ ao_spi_send(&ao_flash_instruction, 1
, AO_FLASH_SPI_BUS
);
+ ao_spi_recv(&ao_flash_instruction, 1
, AO_FLASH_SPI_BUS
);
ao_flash_cs_high();
return ao_flash_instruction.instruction;
}
ao_flash_cs_high();
return ao_flash_instruction.instruction;
}
@@
-190,8
+190,8
@@
ao_flash_write_block(void)
ao_flash_instruction.address[0] = ao_flash_block >> (16 - ao_flash_block_shift);
ao_flash_instruction.address[1] = ao_flash_block << (ao_flash_block_shift - 8);
ao_flash_instruction.address[2] = 0;
ao_flash_instruction.address[0] = ao_flash_block >> (16 - ao_flash_block_shift);
ao_flash_instruction.address[1] = ao_flash_block << (ao_flash_block_shift - 8);
ao_flash_instruction.address[2] = 0;
- ao_spi_send(&ao_flash_instruction, 4);
- ao_spi_send(ao_flash_data, ao_storage_block);
+ ao_spi_send(&ao_flash_instruction, 4
, AO_FLASH_SPI_BUS
);
+ ao_spi_send(ao_flash_data, ao_storage_block
, AO_FLASH_SPI_BUS
);
ao_flash_cs_high();
ao_flash_write_pending = 1;
}
ao_flash_cs_high();
ao_flash_write_pending = 1;
}
@@
-208,8
+208,8
@@
ao_flash_read_block(void)
ao_flash_instruction.address[0] = ao_flash_block >> (16 - ao_flash_block_shift);
ao_flash_instruction.address[1] = ao_flash_block << (ao_flash_block_shift - 8);
ao_flash_instruction.address[2] = 0;
ao_flash_instruction.address[0] = ao_flash_block >> (16 - ao_flash_block_shift);
ao_flash_instruction.address[1] = ao_flash_block << (ao_flash_block_shift - 8);
ao_flash_instruction.address[2] = 0;
- ao_spi_send(&ao_flash_instruction, 4);
- ao_spi_recv(ao_flash_data, ao_flash_block_size);
+ ao_spi_send(&ao_flash_instruction, 4
, AO_FLASH_SPI_BUS
);
+ ao_spi_recv(ao_flash_data, ao_flash_block_size
, AO_FLASH_SPI_BUS
);
ao_flash_cs_high();
}
ao_flash_cs_high();
}
@@
-245,7
+245,7
@@
ao_storage_device_write(uint32_t pos, __xdata void *buf, uint16_t len) __reentra
ao_flash_flush_internal();
ao_flash_block = block;
}
ao_flash_flush_internal();
ao_flash_block = block;
}
- memcpy(ao_flash_data + (uint16_t) (pos & ao_flash_block_mask),
+
ao_x
memcpy(ao_flash_data + (uint16_t) (pos & ao_flash_block_mask),
buf,
len);
ao_flash_block_dirty = 1;
buf,
len);
ao_flash_block_dirty = 1;
@@
-261,7
+261,7
@@
ao_storage_device_read(uint32_t pos, __xdata void *buf, uint16_t len) __reentran
/* Transfer the data */
ao_mutex_get(&ao_flash_mutex); {
ao_flash_fill(block);
/* Transfer the data */
ao_mutex_get(&ao_flash_mutex); {
ao_flash_fill(block);
- memcpy(buf,
+
ao_x
memcpy(buf,
ao_flash_data + (uint16_t) (pos & ao_flash_block_mask),
len);
} ao_mutex_put(&ao_flash_mutex);
ao_flash_data + (uint16_t) (pos & ao_flash_block_mask),
len);
} ao_mutex_put(&ao_flash_mutex);
@@
-282,7
+282,7
@@
ao_storage_erase(uint32_t pos) __reentrant
ao_mutex_get(&ao_flash_mutex); {
ao_flash_flush_internal();
ao_flash_block = (uint16_t) (pos >> ao_flash_block_shift);
ao_mutex_get(&ao_flash_mutex); {
ao_flash_flush_internal();
ao_flash_block = (uint16_t) (pos >> ao_flash_block_shift);
- memset(ao_flash_data, 0xff, ao_flash_block_size);
+
ao_x
memset(ao_flash_data, 0xff, ao_flash_block_size);
ao_flash_block_dirty = 1;
} ao_mutex_put(&ao_flash_mutex);
return 1;
ao_flash_block_dirty = 1;
} ao_mutex_put(&ao_flash_mutex);
return 1;