@@ -76,7 +76,7 @@ void Programmer::connectCb(int ret)
7676
7777int Programmer::connect ()
7878{
79- Cmd cmd = { . code = CMD_VERSION_GET } ;
79+ Cmd cmd;
8080
8181 if (serialPortConnect ())
8282 return -1 ;
@@ -85,6 +85,8 @@ int Programmer::connect()
8585 QObject::connect (&reader, SIGNAL (result (int )), this ,
8686 SLOT (connectCb (int )));
8787
88+ cmd.code = CMD_VERSION_GET;
89+
8890 writeData.clear ();
8991 writeData.append (reinterpret_cast <const char *>(&cmd), sizeof (cmd));
9092 reader.init (usbDevName, SERIAL_PORT_SPEED,
@@ -135,11 +137,13 @@ void Programmer::readChipIdCb(int ret)
135137
136138void Programmer::readChipId (ChipId *chipId)
137139{
138- Cmd cmd = { . code = CMD_NAND_READ_ID } ;
140+ Cmd cmd;
139141
140142 QObject::connect (&reader, SIGNAL (result (int )), this ,
141143 SLOT (readChipIdCb (int )));
142144
145+ cmd.code = CMD_NAND_READ_ID;
146+
143147 writeData.clear ();
144148 writeData.append (reinterpret_cast <const char *>(&cmd), sizeof (cmd));
145149 reader.init (usbDevName, SERIAL_PORT_SPEED,
@@ -158,13 +162,16 @@ void Programmer::eraseChipCb(int ret)
158162
159163void Programmer::eraseChip (uint32_t addr, uint32_t len)
160164{
161- Cmd cmd = { .code = CMD_NAND_ERASE };
162- EraseCmd eraseCmd = { .cmd = cmd, .addr = addr, .len = len,
163- .flags = { .skipBB = skipBB } };
165+ EraseCmd eraseCmd;
164166
165167 QObject::connect (&reader, SIGNAL (result (int )), this ,
166168 SLOT (eraseChipCb (int )));
167169
170+ eraseCmd.cmd .code = CMD_NAND_ERASE;
171+ eraseCmd.addr = addr;
172+ eraseCmd.len = len;
173+ eraseCmd.flags .skipBB = skipBB;
174+
168175 writeData.clear ();
169176 writeData.append (reinterpret_cast <const char *>(&eraseCmd),
170177 sizeof (eraseCmd));
@@ -183,12 +190,15 @@ void Programmer::readCb(int ret)
183190void Programmer::readChip (uint8_t *buf, uint32_t addr, uint32_t len,
184191 bool isReadLess)
185192{
186- Cmd cmd = { .code = CMD_NAND_READ };
187- ReadCmd readCmd = { .cmd = cmd, .addr = addr, .len = len,
188- .flags = { .skipBB = skipBB} };
193+ ReadCmd readCmd;
189194
190195 QObject::connect (&reader, SIGNAL (result (int )), this , SLOT (readCb (int )));
191196
197+ readCmd.cmd .code = CMD_NAND_READ;
198+ readCmd.addr = addr;
199+ readCmd.len = len;
200+ readCmd.flags .skipBB = skipBB;
201+
192202 writeData.clear ();
193203 writeData.append (reinterpret_cast <const char *>(&readCmd), sizeof (readCmd));
194204 reader.init (usbDevName, SERIAL_PORT_SPEED, buf, len,
@@ -223,11 +233,13 @@ void Programmer::readChipBadBlocksCb(int ret)
223233
224234void Programmer::readChipBadBlocks ()
225235{
226- Cmd cmd = { . code = CMD_NAND_READ_BB } ;
236+ Cmd cmd;
227237
228238 QObject::connect (&reader, SIGNAL (result (int )), this ,
229239 SLOT (readChipBadBlocksCb (int )));
230240
241+ cmd.code = CMD_NAND_READ_BB;
242+
231243 writeData.clear ();
232244 writeData.append (reinterpret_cast <const char *>(&cmd), sizeof (cmd));
233245 reader.init (usbDevName, SERIAL_PORT_SPEED, nullptr , 0 ,
@@ -247,11 +259,10 @@ void Programmer::confChip(ChipInfo *chipInfo)
247259{
248260 ConfCmd confCmd;
249261 StmParams params;
250- Cmd cmd = { .code = CMD_NAND_CONF };
251262
252263 chipInfoToStmParams (chipInfo, ¶ms);
253264
254- confCmd.cmd = cmd ;
265+ confCmd.cmd . code = CMD_NAND_CONF ;
255266 confCmd.pageSize = chipInfo->params [CHIP_PARAM_PAGE_SIZE];
256267 confCmd.blockSize = chipInfo->params [CHIP_PARAM_BLOCK_SIZE];
257268 confCmd.size = chipInfo->params [CHIP_PARAM_SIZE];
0 commit comments