Trims to Offsets re-implemented (still untested)

FrSky flash saving

src/eeprom_arm.h

@@ -20,18 +20,33 @@
 #include <inttypes.h>
 #include <stdint.h>
 
+extern uint8_t  s_eeDirtyMsk;
+extern uint16_t s_eeDirtyTime10ms;
 
-extern void init_eeprom( void ) ;
+// States in Eeprom32_process_state
+#define E32_IDLE                                                        1
+#define E32_ERASESENDING                        2
+#define E32_ERASEWAITING                        3
+#define E32_WRITESENDING                        4
+#define E32_WRITEWAITING                        5
+#define E32_READSENDING                         6
+#define E32_READWAITING                         7
+#define E32_BLANKCHECK                          8
+#define E32_WRITESTART                          9
+extern uint8_t Eeprom32_process_state ;
 
-extern uint32_t ee32_check_finished( void ) ;
-extern void ee32StoreGeneral( void ) ;
-extern void ee32StoreModel( uint8_t modelNumber, uint8_t trim ) ;
+extern void eeprom_init( void ) ;
+extern void end_spi(); // TODO not public
+extern void ee32_process( void ) ;
 extern bool ee32LoadGeneral( void ) ;
-extern void ee32LoadModel(uint8_t id) ;
-extern void ee32WaitLoadModel(uint8_t id) ;
-extern void ee32_delete_model( uint8_t id ) ;
-extern bool ee32ModelExists(uint8_t id) ;
-extern uint32_t ee32_process( void ) ;
+
+extern void eeWaitFinished();
+
+extern void eeDeleteModel( uint8_t id ) ;
+extern bool eeModelExists(uint8_t id) ;
+extern bool eeCopyModel(uint8_t dst, uint8_t src);
+extern void eeSwapModels(uint8_t id1, uint8_t id2);
+
 
 #define DISPLAY_PROGRESS_BAR(x)
 
@@ -44,7 +59,7 @@ struct t_file_entry
 } ;
 
 extern struct t_file_entry File_system[] ;
-extern unsigned char ModelNames[][sizeof(g_model.name)] ;		// Allow for general
+extern char ModelNames[][sizeof(g_model.name)] ;		// Allow for general
 
 extern EEGeneral  g_eeGeneral;
 extern ModelData  g_model;
@@ -52,64 +67,5 @@ extern ModelData  g_model;
 extern uint8_t Spi_tx_buf[] ;
 extern uint8_t Spi_rx_buf[] ;
 
-/// fileId of general file
-//#define FILE_GENERAL   0
-/// convert model number 0..MAX_MODELS-1  int fileId
-//#define FILE_MODEL(n) (1+n)
-//#define FILE_TMP      (1+16)
-
-//bool EeFsOpen();
-//int8_t EeFsck();
-//void EeFsFormat();
-//uint16_t EeFsGetFree();
-//#define ERR_NONE 0
-//#define ERR_FULL 1
-//#define ERR_TMO  2
-//class EFile
-//{
-//  uint8_t  m_fileId;    //index of file in directory = filename
-//  uint16_t m_pos;       //over all filepos
-//  uint8_t  m_currBlk;   //current block.id
-//  uint8_t  m_ofs;       //offset inside of the current block
-//  uint8_t  m_bRlc;      //control byte for run length decoder
-//  uint8_t  m_err;       //error reasons
-//  uint16_t m_stopTime10ms; //maximum point of time for writing
-//public:
-  ///remove contents of given file
-//  static void rm(uint8_t i_fileId); 
-
-  ///swap contents of file1 with them of file2
-//  static void swap(uint8_t i_fileId1,uint8_t i_fileId2); 
-
-  ///return true if the file with given fileid exists
-//  static bool exists(uint8_t i_fileId); 
-
-  ///open file for reading, no close necessary
-  ///for writing use writeRlc() or create()
-//  uint8_t openRd(uint8_t i_fileId); 
-  /// create a new file with given fileId, 
-  /// !!! if this file already exists, then all blocks are reused
-  /// and all contents will be overwritten.
-  /// after writing closeTrunc has to be called
-//  void    create(uint8_t i_fileId, uint8_t typ, uint16_t maxTme10ms);
-  /// close file and truncate the blockchain if to long.
-//  void    closeTrunc();
-
-  ///open file, write to file and close it. 
-  ///If file existed before, then contents is overwritten. 
-  ///If file was larger before, then unused blocks are freed
-//  uint16_t writeRlc(uint8_t i_fileId, uint8_t typ,uint8_t*buf,uint16_t i_len, uint8_t maxTme10ms); 
-
-//  uint8_t read(uint8_t*buf,uint16_t i_len);
-//  uint8_t write(uint8_t*buf,uint8_t i_len);
-
-  ///return size of compressed file without block overhead
-//  uint16_t size(); 
-  ///read from opened file and decode rlc-coded data
-//  uint16_t readRlc(uint8_t*buf,uint16_t i_len);
-  ///deliver current errno, this is reset in open
-//  uint8_t errno(){return m_err;}
-//};
-
 #endif
-/*eof*/
+