<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12439">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: define missing enums and use them<br><br>Change-Id: I4ba5a8a42bf25d04b152ac3f1f0e4d7eac7f068f<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, 55 insertions(+), 24 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 b8a3420..270c565 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>@@ -57,6 +57,37 @@</span><br><span> SAP_TRANSPORT_PROTOCOL = 0x09</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Table 5.18: Possible values for ResultCode */</span><br><span style="color: hsl(120, 100%, 40%);">+enum sap_result_type {</span><br><span style="color: hsl(120, 100%, 40%);">+ SAP_RESULT_OK_REQ_PROC_CORR = 0x00,</span><br><span style="color: hsl(120, 100%, 40%);">+ SAP_RESULT_ERROR_NO_REASON = 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ SAP_RESULT_ERROR_CARD_NOT_ACC = 0x02,</span><br><span style="color: hsl(120, 100%, 40%);">+ SAP_RESULT_ERROR_CARD_POWERED_OFF = 0x03,</span><br><span style="color: hsl(120, 100%, 40%);">+ SAP_RESULT_ERROR_CARD_REMOVED = 0x04,</span><br><span style="color: hsl(120, 100%, 40%);">+ SAP_RESULT_ERROR_CARD_POWERED_ON = 0x05,</span><br><span style="color: hsl(120, 100%, 40%);">+ SAP_RESULT_ERROR_DATA_UNAVAIL = 0x06,</span><br><span style="color: hsl(120, 100%, 40%);">+ SAP_RESULT_ERROR_NOT_SUPPORTED = 0x07,</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%);">+/* Table 5.19: Possible values for StatusChange */</span><br><span style="color: hsl(120, 100%, 40%);">+enum sap_card_status_type {</span><br><span style="color: hsl(120, 100%, 40%);">+ SAP_CARD_STATUS_UNKNOWN_ERROR = 0x00,</span><br><span style="color: hsl(120, 100%, 40%);">+ SAP_CARD_STATUS_RESET = 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ SAP_CARD_STATUS_NOT_ACC = 0x02,</span><br><span style="color: hsl(120, 100%, 40%);">+ SAP_CARD_STATUS_REMOVED = 0x03,</span><br><span style="color: hsl(120, 100%, 40%);">+ SAP_CARD_STATUS_INSERTED = 0x04,</span><br><span style="color: hsl(120, 100%, 40%);">+ SAP_CARD_STATUS_RECOVERED = 0x05,</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%);">+/* Table 5.16: Possible values for ConnectionStatus */</span><br><span style="color: hsl(120, 100%, 40%);">+enum sap_conn_status_type {</span><br><span style="color: hsl(120, 100%, 40%);">+ SAP_CONN_STATUS_OK_READY = 0x00,</span><br><span style="color: hsl(120, 100%, 40%);">+ SAP_CONN_STATUS_ERROR_CONN = 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ SAP_CONN_STATUS_ERROR_MAX_MSG_SIZE = 0x02,</span><br><span style="color: hsl(120, 100%, 40%);">+ SAP_CONN_STATUS_ERROR_SMALL_MSG_SIZE = 0x03,</span><br><span style="color: hsl(120, 100%, 40%);">+ SAP_CONN_STATUS_OK_CALL = 0x04,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct sap_param {</span><br><span> uint8_t id;</span><br><span> uint16_t len;</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 3faa949..ab683f9 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>@@ -91,35 +91,35 @@</span><br><span> </span><br><span> /* 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%);">+ { SAP_RESULT_OK_REQ_PROC_CORR, "OK, request processed correctly" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_RESULT_ERROR_NO_REASON, "Error, no reason defined" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_RESULT_ERROR_CARD_NOT_ACC, "Error, card not accessible" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_RESULT_ERROR_CARD_POWERED_OFF, "Error, card (already) powered off" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_RESULT_ERROR_CARD_REMOVED, "Error, card removed" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_RESULT_ERROR_CARD_POWERED_ON, "Error, card already powered on" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_RESULT_ERROR_DATA_UNAVAIL, "Error, data not available" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_RESULT_ERROR_NOT_SUPPORTED, "Error, not supported "},</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span> /* Table 5.19: Possible values for StatusChange */</span><br><span style="color: hsl(0, 100%, 40%);">-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%);">+static const struct value_string sap_card_status_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_CARD_STATUS_UNKNOWN_ERROR, "Unknown Error" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_CARD_STATUS_RESET, "Card reset" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_CARD_STATUS_NOT_ACC, "Card not accessible" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_CARD_STATUS_REMOVED, "Card removed" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_CARD_STATUS_INSERTED, "Card inserted" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_CARD_STATUS_RECOVERED, "Card recovered" },</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span> /* Table 5.16: Possible values for ConnectionStatus */</span><br><span style="color: hsl(0, 100%, 40%);">-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%);">+static const struct value_string sap_conn_status_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_CONN_STATUS_OK_READY, "OK, Server can fulfill requirements" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_CONN_STATUS_ERROR_CONN, "Error, Server unable to establish connection" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_CONN_STATUS_ERROR_MAX_MSG_SIZE, "Error, Server does not support maximum message size" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_CONN_STATUS_ERROR_SMALL_MSG_SIZE, "Error, maximum message size by Client is too small" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { SAP_CONN_STATUS_OK_CALL, "OK, ongoing call" },</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span>@@ -319,7 +319,7 @@</span><br><span> </span><br><span> switch(msg->id){</span><br><span> case SAP_CONNECT_RESP:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSAP, LOGL_INFO, "Status: %s\n", get_value_string(sap_status_names, msg->params[0].value[0]));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSAP, LOGL_INFO, "Status: %s\n", get_value_string(sap_conn_status_names, msg->params[0].value[0]));</span><br><span> if(msg->params[0].value[0] == 0){</span><br><span> ms->sap_entity.sap_state = SAP_IDLE;</span><br><span> }</span><br><span>@@ -335,9 +335,9 @@</span><br><span> ms->sap_entity.sap_state = SAP_NOT_CONNECTED;</span><br><span> break;</span><br><span> case SAP_STATUS_IND:</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSAP, LOGL_INFO, "New card state: %s\n", get_value_string(sap_status_change_names,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSAP, LOGL_INFO, "New card state: %s\n", get_value_string(sap_card_status_names,</span><br><span> msg->params[0].value[0]));</span><br><span style="color: hsl(0, 100%, 40%);">- if(msg->params[0].value[0] != 1){</span><br><span style="color: hsl(120, 100%, 40%);">+ if(msg->params[0].value[0] != SAP_CARD_STATUS_RESET){</span><br><span> /* TODO: handle case in which the card is not ready yet */</span><br><span> }</span><br><span> break;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12439">change 12439</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/12439"/><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: I4ba5a8a42bf25d04b152ac3f1f0e4d7eac7f068f </div>
<div style="display:none"> Gerrit-Change-Number: 12439 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </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>