<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14052">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">CICD: Add ccid_proto.c with value_string of important enumerations<br><br>Change-Id: Idc6b3d2f0a22db3a57f0c05d96c776e92b718b07<br>---<br>M ccid/Makefile<br>A ccid/ccid_proto.c<br>M ccid/ccid_proto.h<br>3 files changed, 77 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ccid/Makefile b/ccid/Makefile</span><br><span>index 34df8c9..a259c90 100644</span><br><span>--- a/ccid/Makefile</span><br><span>+++ b/ccid/Makefile</span><br><span>@@ -1,6 +1,6 @@</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ccid_descriptors: ccid_descriptors.o</span><br><span style="color: hsl(120, 100%, 40%);">+ccid_descriptors: ccid_descriptors.o ccid_proto.o</span><br><span> $(CC) -lasan -losmocore -laio -o $@ $^</span><br><span> </span><br><span> %.o: %.c</span><br><span>diff --git a/ccid/ccid_proto.c b/ccid/ccid_proto.c</span><br><span>new file mode 100644</span><br><span>index 0000000..9275cf2</span><br><span>--- /dev/null</span><br><span>+++ b/ccid/ccid_proto.c</span><br><span>@@ -0,0 +1,67 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include "ccid_proto.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string ccid_msg_type_vals[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(RDR_to_PC_NotifySlotChange),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(RDR_to_PC_HardwareError),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(PC_to_RDR_IccPowerOn),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(PC_to_RDR_IccPowerOff),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(PC_to_RDR_GetSlotStatus),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(PC_to_RDR_XfrBlock),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(PC_to_RDR_GetParameters),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(PC_to_RDR_ResetParameters),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(PC_to_RDR_SetParameters),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(PC_to_RDR_Escape),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(PC_to_RDR_IccClock),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(PC_to_RDR_T0APDU),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(PC_to_RDR_Secure),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(PC_to_RDR_Mechanical),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(PC_to_RDR_Abort),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(PC_to_RDR_SetDataRateAndClockFrequency),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(RDR_to_PC_DataBlock),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(RDR_to_PC_SlotStatus),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(RDR_to_PC_Escape),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(RDR_to_PC_DataRateAndClockFrequency),</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string ccid_class_spec_req_vals[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { CLASS_SPEC_CCID_ABORT, "CCID_ABORT" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CLASS_SPEC_CCID_GET_CLOCK_FREQ, "GET_CLOCK_FREQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CLASS_SPEC_CCID_GET_DATA_RATES, "GET_DATA_RATES" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string ccid_power_select_vals[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_PWRSEL_AUTO, "AUTO" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_PWRSEL_5V0, "5.0V" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_PWRSEL_3V0, "3.0V" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_PWRSEL_1V8, "1.8V" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string ccid_clock_command_vals[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_CLOCK_CMD_RESTART, "RESTART" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_CLOCK_CMD_STOP, "STOP" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string ccid_error_code_vals[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_ERR_CMD_ABORTED, "CMD_ABORTED" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_ERR_ICC_MUTE, "ICC_MUTE" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_ERR_XFR_PARITY_ERROR, "XFR_PARITY_ERROR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_ERR_XFR_OVERRUN, "XFR_OVERRUN" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_ERR_HW_ERROR, "HW_ERROR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_ERR_BAD_ATR_TS, "BAD_ATR_TS" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_ERR_BAD_ATR_TCK, "BAD_ATR_TCK" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_ERR_ICC_PROTOCOL_NOT_SUPPORTED, "ICC_PROTOCOL_NOT_SUPPORTED" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_ERR_ICC_CLASS_NOT_SUPPORTED, "ICC_CLASS_NOT_SUPPORTED" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_ERR_PROCEDURE_BYTE_CONFLICT, "PROCEDURE_BYTE_CONFLICT" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_ERR_DEACTIVATED_PROTOCOL, "DEACTIVATED_PROTOCOL" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_ERR_BUSY_WITH_AUTO_SEQUENCE, "BUSY_WITH_AUTO_SEQUENCE" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_ERR_PIN_TIMEOUT, "PIN_TIMEOUT" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_ERR_PIN_CANCELLED, "PIN_CANCELLED" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_ERR_CMD_SLOT_BUSY, "CMD_SLOT_BUSY" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { CCID_ERR_CMD_NOT_SUPPORTED, "CMD_NOT_SUPPORTED" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span>diff --git a/ccid/ccid_proto.h b/ccid/ccid_proto.h</span><br><span>index 470416c..e10be8a 100644</span><br><span>--- a/ccid/ccid_proto.h</span><br><span>+++ b/ccid/ccid_proto.h</span><br><span>@@ -1,5 +1,6 @@</span><br><span> #pragma once</span><br><span> #include <stdint.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span> </span><br><span> /* Identifies the length of type of subordinate descriptors of a CCID device</span><br><span> * Table 5.1-1 Smart Card Device Class descriptors */</span><br><span>@@ -372,3 +373,11 @@</span><br><span> struct ccid_rdr_to_pc_notify_slot_change slot_change;</span><br><span> struct ccid_rdr_to_pc_hardware_error hw_error;</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string ccid_msg_type_vals[];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string ccid_class_spec_req_vals[];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string ccid_power_select_vals[];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string ccid_clock_command_vals[];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string ccid_error_code_vals[];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14052">change 14052</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/14052"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ccid-firmware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Idc6b3d2f0a22db3a57f0c05d96c776e92b718b07 </div>
<div style="display:none"> Gerrit-Change-Number: 14052 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>