muflax
/
ergodox-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(lib/eeprom: fixed casting error)

partial-rewrite
Ben Blazak 2013-06-11 00:08:31 -07:00
parent f6252243cc
commit b8156b4329
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/lib/eeprom/atmega32u4.c
View File

@ -40,10 +40,10 @@
* careful about when this function is called.
*/
uint8_t eeprom__read(uint8_t * address) {
while (EECR & (1<<EEPE)); // wait for previous write to complete
EEAR = address; // set up address register
EECR |= (1<<EERE); // start EEPROM read (then halt, 4 clock cycles)
return EEDR; // return the value in the data register
while (EECR & (1<<EEPE)); // wait for previous write to complete
EEAR = (uint16_t) address; // set up address register
EECR |= (1<<EERE); // start EEPROM read (then halt, 4 clock cycles)
return EEDR; // return the value in the data register
}
/** functions/eeprom__write/description
@ -79,8 +79,8 @@ void eeprom__write(uint8_t * address, uint8_t data) {
EECR &= ~(1<<EEPM0); // clear
}
EEAR = address; // set up address register
EEDR = data; // set up data register
EEAR = (uint16_t) address; // set up address register
EEDR = data; // set up data register
// - interrupts must be disabled between these two operations, or else
// "EEPROM Master Programming Enable" may time out (since it's cleared by