laforge submitted this change.

View Change

Approvals: lynxis lazus: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified
ccid: Fix [unused] RDR_to_PC_Hardware_Error struct definition

Our definition of the message was wrong; it is an interrupt endpoint
message without the full header of the bulk-in endpoint. Luckily the
definition was not used in the code base, so this is not fixing any
problem visible on the protocol level.

Change-Id: Ieb756c37402c4ebea32cc3cd23ba3842f4c0df3e
---
M ccid_common/ccid_proto.h
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ccid_common/ccid_proto.h b/ccid_common/ccid_proto.h
index ac03938..19f1333 100644
--- a/ccid_common/ccid_proto.h
+++ b/ccid_common/ccid_proto.h
@@ -402,9 +402,11 @@
uint8_t bmSlotCCState[0]; /* as long as bNumSlots/4 padded to next byte */
} __attribute__ ((packed));

-/* Section 6.3.1 */
+/* Section 6.3.2 - Interrupt IN message (4 bytes, NOT bulk header format) */
struct ccid_rdr_to_pc_hardware_error {
- struct ccid_header hdr;
+ uint8_t bMessageType; /* 0x51 */
+ uint8_t bSlot;
+ uint8_t bSeq;
uint8_t bHardwareErrorCode;
} __attribute__ ((packed));


To view, visit change 42303. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: Ieb756c37402c4ebea32cc3cd23ba3842f4c0df3e
Gerrit-Change-Number: 42303
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge@osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-CC: Hoernchen <ewild@sysmocom.de>