Cosmetics

This commit is contained in:
Bertrand Songis
2016-08-23 07:18:26 +02:00
parent 0ff601a3fa
commit f34de72e25
2 changed files with 16 additions and 16 deletions
+13 -13
View File
@@ -41,23 +41,23 @@ inline void eeprom_write_byte()
} }
ISR(EE_READY_vect) ISR(EE_READY_vect)
{ {
if (--eeprom_buffer_size > 0) { if (--eeprom_buffer_size > 0) {
eeprom_write_byte(); eeprom_write_byte();
}
else {
#if defined(CPUM2560) || defined(CPUM2561)
EECR &= ~(1<<EERIE);
#else
EECR &= ~(1<<EERIE);
#endif
}
} }
else {
#if defined(CPUM2560) || defined(CPUM2561)
EECR &= ~(1<<EERIE);
#else
EECR &= ~(1<<EERIE);
#endif
}
}
void eepromStartWrite(uint8_t * buffer, size_t address, size_t size) void eepromStartWrite(uint8_t * buffer, size_t address, size_t size)
{ {
assert(eeprom_buffer_size == 0); assert(eeprom_buffer_size == 0);
eeprom_pointer = address; eeprom_pointer = address;
eeprom_buffer_data = buffer; eeprom_buffer_data = buffer;
eeprom_buffer_size = size+1; eeprom_buffer_size = size+1;
@@ -78,7 +78,7 @@ extern uint8_t s_sync_write;
void eepromWriteBlock(uint8_t * buffer, size_t address, size_t size) void eepromWriteBlock(uint8_t * buffer, size_t address, size_t size)
{ {
eepromStartWrite(buffer, address, size); eepromStartWrite(buffer, address, size);
if (s_sync_write) { if (s_sync_write) {
while (!eepromIsTransferComplete()) { while (!eepromIsTransferComplete()) {
wdt_reset(); wdt_reset();
+3 -3
View File
@@ -57,7 +57,7 @@ void eepromReadBlock (uint8_t * buffer, size_t address, size_t size)
void eepromSimuWriteBlock(uint8_t * buffer, size_t address, size_t size) void eepromSimuWriteBlock(uint8_t * buffer, size_t address, size_t size)
{ {
assert(size); assert(size);
if (fp) { if (fp) {
// TRACE("EEPROM write (pos=%d, size=%d)", pointer_eeprom, size); // TRACE("EEPROM write (pos=%d, size=%d)", pointer_eeprom, size);
if (fseek(fp, address, SEEK_SET) < 0) if (fseek(fp, address, SEEK_SET) < 0)
@@ -132,7 +132,7 @@ void eepromStartWrite(uint8_t * buffer, size_t address, size_t size)
void eepromWriteBlock(uint8_t * buffer, size_t address, size_t size) void eepromWriteBlock(uint8_t * buffer, size_t address, size_t size)
{ {
eepromStartWrite(buffer, address, size); eepromStartWrite(buffer, address, size);
while (!eepromIsTransferComplete()) { while (!eepromIsTransferComplete()) {
sleep(1/*ms*/); sleep(1/*ms*/);
} }
@@ -156,7 +156,7 @@ void StartEepromThread(const char * filename)
eeprom_write_sem = (sem_t *)malloc(sizeof(sem_t)); eeprom_write_sem = (sem_t *)malloc(sizeof(sem_t));
sem_init(eeprom_write_sem, 0, 0); sem_init(eeprom_write_sem, 0, 0);
#endif #endif
eeprom_thread_running = true; eeprom_thread_running = true;
assert(!pthread_create(&eeprom_thread_pid, NULL, &eeprom_thread_function, NULL)); assert(!pthread_create(&eeprom_thread_pid, NULL, &eeprom_thread_function, NULL));
} }