projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Fix new GCC warnings
[fw/altos]
/
src
/
drivers
/
ao_at45db161d.c
diff --git
a/src/drivers/ao_at45db161d.c
b/src/drivers/ao_at45db161d.c
index 6cd689e5440b253df6288918a4492cee34117922..abba3f1fe64170e83cd0b82c1a70d77c82506c09 100644
(file)
--- a/
src/drivers/ao_at45db161d.c
+++ b/
src/drivers/ao_at45db161d.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
*
* 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
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-43,9
+44,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
+61,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
+71,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
+191,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
+209,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();
}