Aligned size of BB, write ack and error responses

bbogush · May 14, 2023 · 322a849 · 322a849
1 parent 167070a
commit 322a849
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/firmware/programmer/nand_programmer.c b/firmware/programmer/nand_programmer.c
@@ -157,6 +157,8 @@ typedef struct __attribute__((__packed__))
     chip_id_t nand_id;
 } np_resp_id_t;
 
+/* BB, write ack and error responses are aligned to the same size to avoid
+ * receiver wait for additional data */
 typedef struct __attribute__((__packed__))
 {
     np_resp_t header;
@@ -168,12 +170,14 @@ typedef struct __attribute__((__packed__))
 {
     np_resp_t header;
     uint64_t bytes_ack;
+    uint8_t dummy[4];
 } np_resp_write_ack_t;
 
 typedef struct __attribute__((__packed__))
 {
     np_resp_t header;
     uint8_t err_code;
+    uint8_t dummy[11];
 } np_resp_err_t;
 
 typedef struct __attribute__((__packed__))

diff --git a/qt/cmd.h b/qt/cmd.h
@@ -133,6 +133,8 @@ typedef struct __attribute__((__packed__))
     ChipId nandId;
 } RespId;
 
+/* BB, write ack and error responses are aligned to the same size to avoid
+ * receiver wait for additional data */
 typedef struct __attribute__((__packed__))
 {
     RespHeader header;
@@ -144,12 +146,14 @@ typedef struct __attribute__((__packed__))
 {
     RespHeader header;
     uint64_t ackBytes;
+    uint8_t dummy[4];
 } RespWriteAck;
 
 typedef struct __attribute__((__packed__))
 {
     RespHeader header;
     uint8_t errCode;
+    uint8_t dummy[11];
 } RespError;
 
 typedef struct __attribute__((__packed__))

diff --git a/qt/writer.cpp b/qt/writer.cpp
@@ -301,7 +301,7 @@ int Writer::writeData()
             break;
     }
 
-    if (read(pbuf, writeDataAckLen))
+    if (read(pbuf, sizeof(RespWriteAck)))
         return -1;
 
     return 0;

diff --git a/qt/writer.h b/qt/writer.h
@@ -16,7 +16,6 @@ class Writer : public QObject
     Q_OBJECT
 
     static const uint32_t bufSize = 64;
-    static const uint32_t writeDataAckLen = 10;
 
     SerialPort *serialPort = nullptr;
     QString portName;