Merge pull request #54 from Sasasu/sa/odr

bbogush · web-flow · commit 272f28f80792 · 2023-03-05T12:29:29.000+02:00
Qt: fix compile error when ODR check enabled.
diff --git a/qt/parallel_chip_info.cpp b/qt/parallel_chip_info.cpp
@@ -33,7 +33,7 @@ typedef struct __attribute__((__packed__))
     uint8_t enableEccAddr;
     uint8_t enableEccValue;
     uint8_t disableEccValue;
-} Conf;
+} ParallelChipConf;
 
 ParallelChipInfo::ParallelChipInfo()
 {
@@ -120,7 +120,7 @@ void ParallelChipInfo::chipInfoToStmParams(StmParams *stmParams)
 
 const QByteArray &ParallelChipInfo::getHalConf()
 {
-    Conf conf;
+    ParallelChipConf conf;
     StmParams stmParams;
 
     chipInfoToStmParams(&stmParams);
diff --git a/qt/spi_chip_info.cpp b/qt/spi_chip_info.cpp
@@ -17,7 +17,7 @@ typedef struct __attribute__((__packed__))
     uint8_t busy_bit;
     uint8_t busy_state;
     uint32_t freq;
-} Conf;
+} SpiChipConf;
 
 SpiChipInfo::SpiChipInfo()
 {
@@ -30,7 +30,7 @@ SpiChipInfo::~SpiChipInfo()
 
 const QByteArray &SpiChipInfo::getHalConf()
 {
-    Conf conf;
+    SpiChipConf conf;
 
     conf.page_offset = static_cast<uint8_t>(params[CHIP_PARAM_PAGE_OFF]);
     conf.read_cmd = static_cast<uint8_t>(params[CHIP_PARAM_READ_CMD]);

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ typedef struct __attribute__((__packed__))`
`33`	`33`	`uint8_t enableEccAddr;`
`34`	`34`	`uint8_t enableEccValue;`
`35`	`35`	`uint8_t disableEccValue;`
`36`		`-} Conf;`
	`36`	`+} ParallelChipConf;`
`37`	`37`
`38`	`38`	`ParallelChipInfo::ParallelChipInfo()`
`39`	`39`	`{`
`@@ -120,7 +120,7 @@ void ParallelChipInfo::chipInfoToStmParams(StmParams *stmParams)`
`120`	`120`
`121`	`121`	`const QByteArray &ParallelChipInfo::getHalConf()`
`122`	`122`	`{`
`123`		`- Conf conf;`
	`123`	`+ ParallelChipConf conf;`
`124`	`124`	`StmParams stmParams;`
`125`	`125`
`126`	`126`	`chipInfoToStmParams(&stmParams);`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ typedef struct __attribute__((__packed__))`
`17`	`17`	`uint8_t busy_bit;`
`18`	`18`	`uint8_t busy_state;`
`19`	`19`	`uint32_t freq;`
`20`		`-} Conf;`
	`20`	`+} SpiChipConf;`
`21`	`21`
`22`	`22`	`SpiChipInfo::SpiChipInfo()`
`23`	`23`	`{`
`@@ -30,7 +30,7 @@ SpiChipInfo::~SpiChipInfo()`
`30`	`30`
`31`	`31`	`const QByteArray &SpiChipInfo::getHalConf()`
`32`	`32`	`{`
`33`		`- Conf conf;`
	`33`	`+ SpiChipConf conf;`
`34`	`34`
`35`	`35`	`conf.page_offset = static_cast<uint8_t>(params[CHIP_PARAM_PAGE_OFF]);`
`36`	`36`	`conf.read_cmd = static_cast<uint8_t>(params[CHIP_PARAM_READ_CMD]);`