@@ -76,7 +76,7 @@ void Programmer::connectCb(int ret)
76
76
77
77
int Programmer::connect ()
78
78
{
79
- Cmd cmd = { . code = CMD_VERSION_GET } ;
79
+ Cmd cmd;
80
80
81
81
if (serialPortConnect ())
82
82
return -1 ;
@@ -85,6 +85,8 @@ int Programmer::connect()
85
85
QObject::connect (&reader, SIGNAL (result (int )), this ,
86
86
SLOT (connectCb (int )));
87
87
88
+ cmd.code = CMD_VERSION_GET;
89
+
88
90
writeData.clear ();
89
91
writeData.append (reinterpret_cast <const char *>(&cmd), sizeof (cmd));
90
92
reader.init (usbDevName, SERIAL_PORT_SPEED,
@@ -135,11 +137,13 @@ void Programmer::readChipIdCb(int ret)
135
137
136
138
void Programmer::readChipId (ChipId *chipId)
137
139
{
138
- Cmd cmd = { . code = CMD_NAND_READ_ID } ;
140
+ Cmd cmd;
139
141
140
142
QObject::connect (&reader, SIGNAL (result (int )), this ,
141
143
SLOT (readChipIdCb (int )));
142
144
145
+ cmd.code = CMD_NAND_READ_ID;
146
+
143
147
writeData.clear ();
144
148
writeData.append (reinterpret_cast <const char *>(&cmd), sizeof (cmd));
145
149
reader.init (usbDevName, SERIAL_PORT_SPEED,
@@ -158,13 +162,16 @@ void Programmer::eraseChipCb(int ret)
158
162
159
163
void Programmer::eraseChip (uint32_t addr, uint32_t len)
160
164
{
161
- Cmd cmd = { .code = CMD_NAND_ERASE };
162
- EraseCmd eraseCmd = { .cmd = cmd, .addr = addr, .len = len,
163
- .flags = { .skipBB = skipBB } };
165
+ EraseCmd eraseCmd;
164
166
165
167
QObject::connect (&reader, SIGNAL (result (int )), this ,
166
168
SLOT (eraseChipCb (int )));
167
169
170
+ eraseCmd.cmd .code = CMD_NAND_ERASE;
171
+ eraseCmd.addr = addr;
172
+ eraseCmd.len = len;
173
+ eraseCmd.flags .skipBB = skipBB;
174
+
168
175
writeData.clear ();
169
176
writeData.append (reinterpret_cast <const char *>(&eraseCmd),
170
177
sizeof (eraseCmd));
@@ -183,12 +190,15 @@ void Programmer::readCb(int ret)
183
190
void Programmer::readChip (uint8_t *buf, uint32_t addr, uint32_t len,
184
191
bool isReadLess)
185
192
{
186
- Cmd cmd = { .code = CMD_NAND_READ };
187
- ReadCmd readCmd = { .cmd = cmd, .addr = addr, .len = len,
188
- .flags = { .skipBB = skipBB} };
193
+ ReadCmd readCmd;
189
194
190
195
QObject::connect (&reader, SIGNAL (result (int )), this , SLOT (readCb (int )));
191
196
197
+ readCmd.cmd .code = CMD_NAND_READ;
198
+ readCmd.addr = addr;
199
+ readCmd.len = len;
200
+ readCmd.flags .skipBB = skipBB;
201
+
192
202
writeData.clear ();
193
203
writeData.append (reinterpret_cast <const char *>(&readCmd), sizeof (readCmd));
194
204
reader.init (usbDevName, SERIAL_PORT_SPEED, buf, len,
@@ -223,11 +233,13 @@ void Programmer::readChipBadBlocksCb(int ret)
223
233
224
234
void Programmer::readChipBadBlocks ()
225
235
{
226
- Cmd cmd = { . code = CMD_NAND_READ_BB } ;
236
+ Cmd cmd;
227
237
228
238
QObject::connect (&reader, SIGNAL (result (int )), this ,
229
239
SLOT (readChipBadBlocksCb (int )));
230
240
241
+ cmd.code = CMD_NAND_READ_BB;
242
+
231
243
writeData.clear ();
232
244
writeData.append (reinterpret_cast <const char *>(&cmd), sizeof (cmd));
233
245
reader.init (usbDevName, SERIAL_PORT_SPEED, nullptr , 0 ,
@@ -247,11 +259,10 @@ void Programmer::confChip(ChipInfo *chipInfo)
247
259
{
248
260
ConfCmd confCmd;
249
261
StmParams params;
250
- Cmd cmd = { .code = CMD_NAND_CONF };
251
262
252
263
chipInfoToStmParams (chipInfo, ¶ms);
253
264
254
- confCmd.cmd = cmd ;
265
+ confCmd.cmd . code = CMD_NAND_CONF ;
255
266
confCmd.pageSize = chipInfo->params [CHIP_PARAM_PAGE_SIZE];
256
267
confCmd.blockSize = chipInfo->params [CHIP_PARAM_BLOCK_SIZE];
257
268
confCmd.size = chipInfo->params [CHIP_PARAM_SIZE];
0 commit comments