From ae26f4c4d57d0287f086a3f2f9015a4a2e3d36d2 Mon Sep 17 00:00:00 2001 From: bsongis Date: Tue, 7 Apr 2015 22:38:36 +0200 Subject: [PATCH] Cosmetics --- radio/src/eeprom_raw.cpp | 10 +--------- radio/src/eeprom_raw.h | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/radio/src/eeprom_raw.cpp b/radio/src/eeprom_raw.cpp index c4a3664d8..967057eab 100644 --- a/radio/src/eeprom_raw.cpp +++ b/radio/src/eeprom_raw.cpp @@ -163,7 +163,7 @@ void eeSwapModels(uint8_t id1, uint8_t id2) } // Read eeprom data starting at random address -void read32_eeprom_data(uint32_t eeAddress, register uint8_t *buffer, uint32_t size, uint32_t immediate) +void read32_eeprom_data(uint32_t eeAddress, register uint8_t *buffer, uint32_t size) { #ifdef SIMU assert(size); @@ -182,9 +182,6 @@ void read32_eeprom_data(uint32_t eeAddress, register uint8_t *buffer, uint32_t s spi_PDC_action( p, 0, buffer, 4, size ) ; #endif - if (immediate ) - return ; - while (!Spi_complete) { #ifdef SIMU sleep(5/*ms*/); @@ -540,11 +537,6 @@ void ee32_process() eeAddress = File_system[Eeprom32_file_index].block_no ^ 1 ; eeAddress <<= 12 ; // Block start address Eeprom32_address = eeAddress ; // Where to put new data -#if 0 - x = Eeprom32_data_size + sizeof( struct t_eeprom_header ) ; // Size needing to be checked - p = (uint8_t *) &Eeprom_buffer ; - read32_eeprom_data( eeAddress, p, x, EE_NOWAIT ) ; -#endif Eeprom32_process_state = E32_READSENDING ; } diff --git a/radio/src/eeprom_raw.h b/radio/src/eeprom_raw.h index 027089820..7692988fb 100644 --- a/radio/src/eeprom_raw.h +++ b/radio/src/eeprom_raw.h @@ -93,7 +93,7 @@ extern uint8_t Spi_rx_buf[] ; void eeprom_write_enable(); uint32_t eeprom_read_status(); -void read32_eeprom_data(uint32_t eeAddress, register uint8_t *buffer, uint32_t size, uint32_t immediate=0); +void read32_eeprom_data(uint32_t eeAddress, register uint8_t *buffer, uint32_t size); uint32_t spi_PDC_action( register uint8_t *command, register uint8_t *tx, register uint8_t *rx, register uint32_t comlen, register uint32_t count ); #if defined(SDCARD)