More efficiency in eeprom write on simu

This commit is contained in:
bsongis
2012-02-25 10:57:42 +00:00
parent e91ac3d7cf
commit 7e39ccf80c
2 changed files with 11 additions and 16 deletions
+10 -15
View File
@@ -39,7 +39,8 @@
volatile uint8_t pinb=0, pinc=0xff, pind, pine=0xff, ping=0xff, pinh=0xff, pinj=0xff, pinl=0; volatile uint8_t pinb=0, pinc=0xff, pind, pine=0xff, ping=0xff, pinh=0xff, pinj=0xff, pinl=0;
uint8_t portb, portc, porth=0, dummyport; uint8_t portb, portc, porth=0, dummyport;
uint16_t dummyport16; uint16_t dummyport16;
const char *eepromFile; const char *eepromFile = NULL;
FILE *fp = NULL;
extern uint16_t eeprom_pointer; extern uint16_t eeprom_pointer;
extern const char* eeprom_buffer_data; extern const char* eeprom_buffer_data;
@@ -70,15 +71,6 @@ void *eeprom_write_function(void *)
if (!eeprom_thread_running) if (!eeprom_thread_running)
return NULL; return NULL;
FILE *fp = NULL;
if (eepromFile) {
fp = fopen(eepromFile, "r+");
if (!fp)
fp = fopen(eepromFile, "w+");
assert(fp);
}
while (--eeprom_buffer_size) { while (--eeprom_buffer_size) {
assert(eeprom_buffer_size > 0); assert(eeprom_buffer_size > 0);
if (fp) { if (fp) {
@@ -95,7 +87,7 @@ void *eeprom_write_function(void *)
eeprom_buffer_data++; eeprom_buffer_data++;
if (fp && eeprom_buffer_size == 1) { if (fp && eeprom_buffer_size == 1) {
fclose(fp); fflush(fp);
} }
} }
} }
@@ -164,6 +156,12 @@ pthread_t eeprom_thread_pid;
void StartEepromThread(const char *filename) void StartEepromThread(const char *filename)
{ {
eepromFile = filename; eepromFile = filename;
if (eepromFile) {
fp = fopen(eepromFile, "r+");
if (!fp)
fp = fopen(eepromFile, "w+");
if (!fp) perror("error in fopen");
}
sem_init(&eeprom_write_sem, 0, 0); sem_init(&eeprom_write_sem, 0, 0);
eeprom_thread_running = true; eeprom_thread_running = true;
assert(!pthread_create(&eeprom_thread_pid, NULL, &eeprom_write_function, NULL)); assert(!pthread_create(&eeprom_thread_pid, NULL, &eeprom_write_function, NULL));
@@ -180,12 +178,9 @@ void eeprom_read_block (void *pointer_ram,
const void *pointer_eeprom, const void *pointer_eeprom,
size_t size) size_t size)
{ {
if (eepromFile) { if (fp) {
FILE *fp=fopen(eepromFile, "r");
if (!fp) { perror("error in fopen"); return; }
if (fseek(fp, (long) pointer_eeprom, SEEK_SET)==-1) perror("error in seek"); if (fseek(fp, (long) pointer_eeprom, SEEK_SET)==-1) perror("error in seek");
if (fread(pointer_ram, size, 1, fp) <= 0) perror("error in read"); if (fread(pointer_ram, size, 1, fp) <= 0) perror("error in read");
fclose(fp);
} }
else { else {
memcpy(pointer_ram, &eeprom[(uint64_t)pointer_eeprom], size); memcpy(pointer_ram, &eeprom[(uint64_t)pointer_eeprom], size);
+1 -1
View File
@@ -225,6 +225,6 @@ void eeprom_read_block (void *pointer_ram,
#undef offsetof #undef offsetof
#define offsetof(st, m) ((size_t) ( (char *)&((st *)(0))->m - (char *)0 )) #define offsetof(st, m) ((size_t) ( (char *)&((st *)(0))->m - (char *)0 ))
#define wdt_reset() #define wdt_reset() sleep(1)
#endif #endif