Massive clean thanks to Schwabe : unifdef -m -DCPUARM -UCPUM64 -UCPUM2560 -UPCBSTD -UPCBMEGA2560 -UPCBGRUVIN9X -UPCB9X $(find . -name "*.cpp" -or -name "*.h")

This commit is contained in:
3djc
2018-07-05 08:04:55 +02:00
parent c032b30247
commit dd632969f3
106 changed files with 27 additions and 6626 deletions
-4
View File
@@ -78,7 +78,6 @@ void selectModel(uint8_t sub)
eeLoadModel(sub);
}
#if defined(CPUARM)
ModelHeader modelHeaders[MAX_MODELS];
void eeLoadModelHeaders()
{
@@ -86,7 +85,6 @@ void eeLoadModelHeaders()
eeLoadModelHeader(i, &modelHeaders[i]);
}
}
#endif
void storageReadRadioSettings()
{
@@ -97,14 +95,12 @@ void storageReadRadioSettings()
eeLoadModelHeaders();
}
#if defined(CPUARM)
for (uint8_t i=0; languagePacks[i]!=NULL; i++) {
if (!strncmp(g_eeGeneral.ttsLanguage, languagePacks[i]->id, 2)) {
currentLanguagePackIdx = i;
currentLanguagePack = languagePacks[i];
}
}
#endif
}
void storageReadCurrentModel()
-4
View File
@@ -30,13 +30,9 @@ void ConvertModel(int id, int version);
uint8_t eeFindEmptyModel(uint8_t id, bool down);
void selectModel(uint8_t sub);
#if defined(CPUARM)
extern ModelHeader modelHeaders[MAX_MODELS];
void eeLoadModelHeader(uint8_t id, ModelHeader *header);
void eeLoadModelHeaders();
#else
#define eeLoadModelHeaders()
#endif
void storageReadRadioSettings();
void storageReadCurrentModel();
-2
View File
@@ -194,14 +194,12 @@ enum Telemetry216Source {
TELEM216_GPS_TIME,
};
#if defined(CPUARM)
PACK(typedef struct {
uint8_t type:3;
uint8_t smooth:1;
uint8_t spare:4;
int8_t points;
}) CurveData_v216;
#endif
#if defined(PCBTARANIS)
PACK(typedef struct {
-47
View File
@@ -27,9 +27,7 @@ uint8_t s_write_err = 0; // error reasons
RlcFile theFile; //used for any file operation
EeFs eeFs;
#if defined(CPUARM)
blkid_t freeBlocks = 0;
#endif
uint8_t s_sync_write = false;
@@ -42,13 +40,9 @@ static uint8_t EeFsRead(blkid_t blk, uint8_t ofs)
static blkid_t EeFsGetLink(blkid_t blk)
{
#if defined(CPUARM)
blkid_t ret;
eepromReadBlock((uint8_t *)&ret, blk*BS+BLOCKS_OFFSET, sizeof(blkid_t));
return ret;
#else
return EeFsRead(blk, 0);
#endif
}
static void EeFsSetLink(blkid_t blk, blkid_t val)
@@ -85,16 +79,7 @@ static void EeFsFlush()
uint16_t EeFsGetFree()
{
#if defined(CPUARM)
int32_t ret = freeBlocks * (BS-sizeof(blkid_t));
#else
int16_t ret = 0;
blkid_t i = eeFs.freeList;
while (i) {
ret += BS-sizeof(blkid_t);
i = EeFsGetLink(i);
}
#endif
ret += eeFs.files[FILE_TMP].size;
ret -= eeFs.files[FILE_MODEL(g_eeGeneral.currModel)].size;
return (ret > 0 ? ret : 0);
@@ -106,15 +91,11 @@ static void EeFsFree(blkid_t blk)
blkid_t i = blk;
blkid_t tmp;
#if defined(CPUARM)
freeBlocks++;
#endif
while ((tmp=EeFsGetLink(i))) {
i = tmp;
#if defined(CPUARM)
freeBlocks++;
#endif
}
EeFsSetLink(i, eeFs.freeList);
@@ -130,13 +111,9 @@ void eepromCheck()
memclear(bufp, BLOCKS);
blkid_t blk ;
#if defined(CPUARM)
blkid_t blocksCount;
#endif
for (uint8_t i=0; i<=MAXFILES; i++) {
#if defined(CPUARM)
blocksCount = 0;
#endif
blkid_t blk = (i==MAXFILES ? eeFs.freeList : eeFs.files[i].startBlk);
blkid_t lastBlk = 0;
while (blk) {
@@ -153,9 +130,7 @@ void eepromCheck()
blk = 0; // abort
}
else {
#if defined(CPUARM)
blocksCount++;
#endif
bufp[blk] = i+1;
lastBlk = blk;
blk = EeFsGetLink(blk);
@@ -163,15 +138,11 @@ void eepromCheck()
}
}
#if defined(CPUARM)
freeBlocks = blocksCount;
#endif
for (blk=FIRSTBLK; blk<BLOCKS; blk++) {
if (!bufp[blk]) { // unused block
#if defined(CPUARM)
freeBlocks++;
#endif
EeFsSetLink(blk, eeFs.freeList);
eeFs.freeList = blk; // chain in front
EeFsFlushFreelist();
@@ -201,9 +172,7 @@ void storageFormat()
}
EeFsSetLink(BLOCKS-1, 0);
eeFs.freeList = FIRSTBLK;
#if defined(CPUARM)
freeBlocks = BLOCKS;
#endif
EeFsFlush();
ENABLE_SYNC_WRITE(false);
@@ -358,9 +327,7 @@ void RlcFile::nextWriteStep()
if (!m_currBlk && m_pos==0) {
eeFs.files[FILE_TMP].startBlk = m_currBlk = eeFs.freeList;
if (m_currBlk) {
#if defined(CPUARM)
freeBlocks--;
#endif
eeFs.freeList = EeFsGetLink(m_currBlk);
m_write_step |= WRITE_FIRST_LINK;
EeFsFlushFreelist();
@@ -397,9 +364,7 @@ void RlcFile::nextWriteStep()
switch (m_write_step & 0x0f) {
case WRITE_NEXT_LINK_1:
m_currBlk = eeFs.freeList;
#if defined(CPUARM)
freeBlocks--;
#endif
eeFs.freeList = EeFsGetLink(eeFs.freeList);
m_write_step += 1;
EeFsFlushFreelist();
@@ -636,9 +601,7 @@ const pm_char * eeRestoreModel(uint8_t i_fileDst, char *model_name)
}
#endif
#if defined(CPUARM)
eeLoadModelHeader(i_fileDst, &modelHeaders[i_fileDst]);
#endif
return NULL;
}
@@ -722,14 +685,10 @@ void RlcFile::nextRlcWriteStep()
// TODO reuse EeFsFree!!!
blkid_t prev_freeList = eeFs.freeList;
eeFs.freeList = fri;
#if defined(CPUARM)
freeBlocks++;
#endif
while (EeFsGetLink(fri)) {
fri = EeFsGetLink(fri);
#if defined(CPUARM)
freeBlocks++;
#endif
}
m_write_step = WRITE_FREE_UNUSED_BLOCKS_STEP1;
EeFsSetLink(fri, prev_freeList);
@@ -795,20 +754,16 @@ void RlcFile::drawProgressBar(uint8_t x)
#endif
// For conversions ...
#if defined(CPUARM)
uint16_t eeLoadGeneralSettingsData()
{
memset(&g_eeGeneral, 0, sizeof(g_eeGeneral));
theFile.openRlc(FILE_GENERAL);
return theFile.readRlc((uint8_t*)&g_eeGeneral, sizeof(g_eeGeneral));
}
#endif
uint16_t eeLoadModelData(uint8_t index)
{
#if defined(CPUARM)
memset(&g_model, 0, sizeof(g_model));
#endif
theFile.openRlc(FILE_MODEL(index));
return theFile.readRlc((uint8_t*)&g_model, sizeof(g_model));
}
@@ -886,7 +841,6 @@ void storageCheck(bool immediately)
}
}
#if defined(CPUARM)
void eeLoadModelHeader(uint8_t id, ModelHeader *header)
{
memclear(header, sizeof(ModelHeader));
@@ -922,7 +876,6 @@ void eeDeleteModel(uint8_t idx)
EFile::rm(FILE_MODEL(idx));
memset(&modelHeaders[idx], 0, sizeof(ModelHeader));
}
#endif
#if defined(SDCARD)
void eepromBackup()
-32
View File
@@ -23,22 +23,10 @@
#include "definitions.h"
#if defined(CPUARM)
#define blkid_t uint16_t
#define EEFS_VERS 5
#define MAXFILES 62
#define BS 64
#elif defined(CPUM2560) || defined(CPUM2561) || defined(CPUM128)
#define blkid_t uint8_t
#define EEFS_VERS 5
#define MAXFILES 36
#define BS 16
#else
#define blkid_t uint8_t
#define EEFS_VERS 4
#define MAXFILES 20
#define BS 16
#endif
PACK(struct DirEnt {
blkid_t startBlk;
@@ -46,11 +34,7 @@ PACK(struct DirEnt {
uint16_t typ:4;
});
#if defined(CPUARM)
#define EEFS_EXTRA_FIELDS uint8_t spare[2];
#else
#define EEFS_EXTRA_FIELDS
#endif
PACK(struct EeFs {
uint8_t version;
@@ -74,15 +58,9 @@ extern EeFs eeFs;
#define RESV sizeof(EeFs) //reserv for eeprom header with directory (eeFs)
#if defined(CPUM64)
#define FIRSTBLK (RESV/BS)
#define BLOCKS (EEPROM_SIZE/BS)
#define BLOCKS_OFFSET 0
#else
#define FIRSTBLK 1
#define BLOCKS (1+(EEPROM_SIZE-RESV)/BS)
#define BLOCKS_OFFSET (RESV-BS)
#endif
uint16_t EeFsGetFree();
@@ -200,15 +178,9 @@ inline void eepromWriteProcess()
#define DISPLAY_PROGRESS_BAR(x)
#endif
#if defined(CPUARM)
bool eeCopyModel(uint8_t dst, uint8_t src);
void eeSwapModels(uint8_t id1, uint8_t id2);
void eeDeleteModel(uint8_t idx);
#else
#define eeCopyModel(dst, src) theFile.copy(FILE_MODEL(dst), FILE_MODEL(src))
#define eeSwapModels(id1, id2) EFile::swap(FILE_MODEL(id1), FILE_MODEL(id2))
#define eeDeleteModel(idx) EFile::rm(FILE_MODEL(idx))
#endif
#if defined(SDCARD)
const pm_char * eeBackupModel(uint8_t i_fileSrc);
@@ -216,17 +188,14 @@ const pm_char * eeRestoreModel(uint8_t i_fileDst, char *model_name);
#endif
// For conversions
#if defined(CPUARM)
void loadRadioSettingsSettings();
void loadModel(int index, bool alarms=true);
#endif
bool eepromOpen();
void eeLoadModelName(uint8_t id, char *name);
bool eeLoadGeneral();
// For EEPROM backup/restore
#if defined(CPUARM)
inline bool isEepromStart(const void * buffer)
{
// OpenTX EEPROM
@@ -249,6 +218,5 @@ inline bool isEepromStart(const void * buffer)
}
void eepromBackup();
#endif
#endif // _EEPROM_RLC_H_
-2
View File
@@ -193,14 +193,12 @@ void storageReadAll()
storageEraseAll(true);
}
#if defined(CPUARM)
for (uint8_t i=0; languagePacks[i]!=NULL; i++) {
if (!strncmp(g_eeGeneral.ttsLanguage, languagePacks[i]->id, 2)) {
currentLanguagePackIdx = i;
currentLanguagePack = languagePacks[i];
}
}
#endif
if (loadModel(g_eeGeneral.currModelFilename, false) != NULL) {
sdCheckAndCreateDirectory(MODELS_PATH);
-2
View File
@@ -29,8 +29,6 @@
#define WRITE_DELAY_10MS 500
#elif defined(PCBSKY9X) && !defined(REV0)
#define WRITE_DELAY_10MS 500
#elif defined(PCBGRUVIN9X) && !defined(REV0)
#define WRITE_DELAY_10MS 500
#else
#define WRITE_DELAY_10MS 200
#endif
-8
View File
@@ -41,9 +41,7 @@ void storageDirty(uint8_t msk)
void preModelLoad()
{
#if defined(CPUARM)
watchdogSuspend(500/*5s*/);
#endif
#if defined(SDCARD)
logsClose();
@@ -76,7 +74,6 @@ void postModelLoad(bool alarms)
restoreTimers();
#if defined(CPUARM)
for (int i=0; i<MAX_TELEMETRY_SENSORS; i++) {
TelemetrySensor & sensor = g_model.telemetrySensors[i];
if (sensor.type == TELEM_TYPE_CALCULATED && sensor.persistent) {
@@ -84,7 +81,6 @@ void postModelLoad(bool alarms)
telemetryItems[i].lastReceived = TELEMETRY_VALUE_OLD; // #3595: make value visible even before the first new value is received)
}
}
#endif
LOAD_MODEL_CURVES();
@@ -120,7 +116,6 @@ void storageFlushCurrentModel()
{
saveTimers();
#if defined(CPUARM)
for (int i=0; i<MAX_TELEMETRY_SENSORS; i++) {
TelemetrySensor & sensor = g_model.telemetrySensors[i];
if (sensor.type == TELEM_TYPE_CALCULATED && sensor.persistent && sensor.persistentValue != telemetryItems[i].value) {
@@ -128,9 +123,7 @@ void storageFlushCurrentModel()
storageDirty(EE_MODEL);
}
}
#endif
#if defined(CPUARM)
if (g_model.potsWarnMode == POTS_WARN_AUTO) {
for (int i=0; i<NUM_POTS+NUM_SLIDERS; i++) {
if (!(g_model.potsWarnEnabled & (1 << i))) {
@@ -139,5 +132,4 @@ void storageFlushCurrentModel()
}
storageDirty(EE_MODEL);
}
#endif
}