<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12438">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">layer23/sap_interface.c: prettify value_string definitions<br><br>Change-Id: Ib3aa81986987027718e2a8b461afd28787bda4c2<br>---<br>M src/host/layer23/include/osmocom/bb/common/sap_interface.h<br>M src/host/layer23/src/common/sap_interface.c<br>2 files changed, 58 insertions(+), 54 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/include/osmocom/bb/common/sap_interface.h b/src/host/layer23/include/osmocom/bb/common/sap_interface.h</span><br><span>index e78320e..b8a3420 100644</span><br><span>--- a/src/host/layer23/include/osmocom/bb/common/sap_interface.h</span><br><span>+++ b/src/host/layer23/include/osmocom/bb/common/sap_interface.h</span><br><span>@@ -17,7 +17,7 @@</span><br><span> SAP_PROCESSING_APDU_REQUEST</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* BTSAP 1.13 */</span><br><span style="color: hsl(120, 100%, 40%);">+/* Table 5.1: Message Overview */</span><br><span> enum osmosap_msg_type {</span><br><span> SAP_CONNECT_REQ = 0x00,</span><br><span> SAP_CONNECT_RESP = 0x01,</span><br><span>@@ -42,7 +42,7 @@</span><br><span> SAP_SET_TRANSPORT_PROTOCOL_RESP = 0x14</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* BTSAP 5.2 */</span><br><span style="color: hsl(120, 100%, 40%);">+/* Table 5.15: List of Parameter IDs */</span><br><span> enum osmosap_param_type {</span><br><span> SAP_MAX_MSG_SIZE = 0x00,</span><br><span> SAP_CONNECTION_STATUS = 0x01,</span><br><span>diff --git a/src/host/layer23/src/common/sap_interface.c b/src/host/layer23/src/common/sap_interface.c</span><br><span>index b39a57f..6a85bf2 100644</span><br><span>--- a/src/host/layer23/src/common/sap_interface.c</span><br><span>+++ b/src/host/layer23/src/common/sap_interface.c</span><br><span>@@ -47,71 +47,75 @@</span><br><span> </span><br><span> static void sap_connect(struct osmocom_ms *ms);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Table 5.15: List of Parameter IDs */</span><br><span> static const struct value_string sap_param_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_MAX_MSG_SIZE, "MaxMsgSize"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_CONNECTION_STATUS, "ConnectionStatus"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_RESULT_CODE, "ResultCode"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_DISCONNECTION_TYPE, "DisconnectionType"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_COMMAND_APDU, "CommandAPDU"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_COMMAND_APDU_7816, "CommandAPDU7816"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_RESPONSE_APDU, "ResponseAPDU"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_ATR, "ATR"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_CARD_READER_STATUS, "CardReaderStatus"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_STATUS_CHANGE, "StatusChange"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_TRANSPORT_PROTOCOL, "TransportProtocol"}</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_MAX_MSG_SIZE, "MaxMsgSize" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_CONNECTION_STATUS, "ConnectionStatus" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_RESULT_CODE, "ResultCode" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_DISCONNECTION_TYPE, "DisconnectionType" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_COMMAND_APDU, "CommandAPDU" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_COMMAND_APDU_7816, "CommandAPDU7816" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_RESPONSE_APDU, "ResponseAPDU" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_ATR, "ATR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_CARD_READER_STATUS, "CardReaderStatus" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_STATUS_CHANGE, "StatusChange" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_TRANSPORT_PROTOCOL, "TransportProtocol" },</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Table 5.1: Message Overview */</span><br><span> static const struct value_string sap_msg_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_CONNECT_REQ, "CONNECT_REQ"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_CONNECT_RESP, "CONNECT_RESP"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_DISCONNECT_REQ, "DISCONNECT_REQ"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_DISCONNECT_RESP, "DISCONNECT_RESP"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_DISCONNECT_IND, "DISCONNECT_IND"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_TRANSFER_APDU_REQ, "TRANSFER_APDU_REQ"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_TRANSFER_APDU_RESP, "TRANSFER_APDU_RESP"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_TRANSFER_ATR_REQ, "TRANSFER_ATR_REQ"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_TRANSFER_ATR_RESP, "TRANSFER_ATR_RESP"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_POWER_SIM_OFF_REQ, "POWER_SIM_OFF_REQ"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_POWER_SIM_OFF_RESP, "POWER_SIM_OFF_RESP"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_POWER_SIM_ON_REQ, "POWER_SIM_ON_REQ"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_POWER_SIM_ON_RESP, "POWER_SIM_ON_RESP"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_RESET_SIM_REQ, "RESET_SIM_REQ"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_RESET_SIM_RESP, "RESET_SIM_RESP"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_TRANSFER_CARD_READER_STATUS_REQ, "TRANSFER_CARD_READER_STATUS_REQ"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_TRANSFER_CARD_READER_STATUS_RESP, "TRANSFER_CARD_READER_STATUS_RESP"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_STATUS_IND, "STATUS_IND"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_ERROR_RESP, "ERROR_RESP"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_SET_TRANSPORT_PROTOCOL_REQ, "SET_TRANSPORT_PROTOCOL_REQ"},</span><br><span style="color: hsl(0, 100%, 40%);">- {SAP_SET_TRANSPORT_PROTOCOL_RESP, "SET_TRANSPORT_PROTOCOL_RESP"}</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_CONNECT_REQ, "CONNECT_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_CONNECT_RESP, "CONNECT_RESP" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_DISCONNECT_REQ, "DISCONNECT_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_DISCONNECT_RESP, "DISCONNECT_RESP" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_DISCONNECT_IND, "DISCONNECT_IND" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_TRANSFER_APDU_REQ, "TRANSFER_APDU_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_TRANSFER_APDU_RESP, "TRANSFER_APDU_RESP" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_TRANSFER_ATR_REQ, "TRANSFER_ATR_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_TRANSFER_ATR_RESP, "TRANSFER_ATR_RESP" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_POWER_SIM_OFF_REQ, "POWER_SIM_OFF_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_POWER_SIM_OFF_RESP, "POWER_SIM_OFF_RESP" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_POWER_SIM_ON_REQ, "POWER_SIM_ON_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_POWER_SIM_ON_RESP, "POWER_SIM_ON_RESP" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_RESET_SIM_REQ, "RESET_SIM_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_RESET_SIM_RESP, "RESET_SIM_RESP" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_TRANSFER_CARD_READER_STATUS_REQ, "TRANSFER_CARD_READER_STATUS_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_TRANSFER_CARD_READER_STATUS_RESP, "TRANSFER_CARD_READER_STATUS_RESP" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_STATUS_IND, "STATUS_IND" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_ERROR_RESP, "ERROR_RESP" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_SET_TRANSPORT_PROTOCOL_REQ, "SET_TRANSPORT_PROTOCOL_REQ" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_SET_TRANSPORT_PROTOCOL_RESP, "SET_TRANSPORT_PROTOCOL_RESP" },</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* BTSAP table 5.18 */</span><br><span style="color: hsl(120, 100%, 40%);">+/* Table 5.18: Possible values for ResultCode */</span><br><span> static const struct value_string sap_result_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- {0, "OK, request processed correctly"},</span><br><span style="color: hsl(0, 100%, 40%);">- {1, "Error, no reason defined"},</span><br><span style="color: hsl(0, 100%, 40%);">- {2, "Error, card not accessible"},</span><br><span style="color: hsl(0, 100%, 40%);">- {3, "Error, card (already) powered off"},</span><br><span style="color: hsl(0, 100%, 40%);">- {4, "Error, card removed"},</span><br><span style="color: hsl(0, 100%, 40%);">- {5, "Error, card already powered on"},</span><br><span style="color: hsl(0, 100%, 40%);">- {6, "Error, data not available"},</span><br><span style="color: hsl(0, 100%, 40%);">- {7, "Error, not supported"}</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, "OK, request processed correctly" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 1, "Error, no reason defined" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 2, "Error, card not accessible" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 3, "Error, card (already) powered off" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 4, "Error, card removed" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 5, "Error, card already powered on" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 6, "Error, data not available" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 7, "Error, not supported "},</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Table 5.19: Possible values for StatusChange */</span><br><span> static const struct value_string sap_status_change_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- {0, "Unknown Error"},</span><br><span style="color: hsl(0, 100%, 40%);">- {1, "Card reset"},</span><br><span style="color: hsl(0, 100%, 40%);">- {2, "Card not accessible"},</span><br><span style="color: hsl(0, 100%, 40%);">- {3, "Card removed"},</span><br><span style="color: hsl(0, 100%, 40%);">- {4, "Card inserted"},</span><br><span style="color: hsl(0, 100%, 40%);">- {5, "Card recovered"},</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, "Unknown Error" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 1, "Card reset" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 2, "Card not accessible" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 3, "Card removed" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 4, "Card inserted" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 5, "Card recovered" },</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Table 5.16: Possible values for ConnectionStatus */</span><br><span> static const struct value_string sap_status_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- {0, "OK, Server can fulfill requirements"},</span><br><span style="color: hsl(0, 100%, 40%);">- {1, "Error, Server unable to establish connection"},</span><br><span style="color: hsl(0, 100%, 40%);">- {2, "Error, Server does not support maximum message size"},</span><br><span style="color: hsl(0, 100%, 40%);">- {3, "Error, maximum message size by Client is too small"},</span><br><span style="color: hsl(0, 100%, 40%);">- {4, "OK, ongoing call"}</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, "OK, Server can fulfill requirements" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 1, "Error, Server unable to establish connection" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 2, "Error, Server does not support maximum message size" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 3, "Error, maximum message size by Client is too small" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 4, "OK, ongoing call" },</span><br><span> };</span><br><span> </span><br><span> static struct msgb *sap_create_msg(uint8_t id, uint8_t num_params, struct sap_param *params)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12438">change 12438</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/12438"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib3aa81986987027718e2a8b461afd28787bda4c2 </div>
<div style="display:none"> Gerrit-Change-Number: 12438 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>