phone-side
/
osmocom-bb
mirror of https://gerrit.osmocom.org/osmocom-bb
9
0
Fork 0
Code Issues Releases Wiki Activity

layer23/sap_interface.c: prettify value_string definitions 

Change-Id: Ib3aa81986987027718e2a8b461afd28787bda4c2
This commit is contained in:
Vadim Yanitskiy 2018-12-24 03:12:37 +07:00 committed by Harald Welte
parent cec6573cb5
commit f1a948f71a
2 changed files with 58 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/host/layer23/include/osmocom/bb/common/sap_interface.h
View File

@ -17,7 +17,7 @@ enum osmosap_state {
SAP_PROCESSING_APDU_REQUEST SAP_PROCESSING_APDU_REQUEST
}; };
/* BTSAP 1.13 */ /* Table 5.1: Message Overview */
enum osmosap_msg_type { enum osmosap_msg_type {
SAP_CONNECT_REQ = 0x00, SAP_CONNECT_REQ = 0x00,
SAP_CONNECT_RESP = 0x01, SAP_CONNECT_RESP = 0x01,
@ -42,7 +42,7 @@ enum osmosap_msg_type {
SAP_SET_TRANSPORT_PROTOCOL_RESP = 0x14 SAP_SET_TRANSPORT_PROTOCOL_RESP = 0x14
}; };
/* BTSAP 5.2 */ /* Table 5.15: List of Parameter IDs */
enum osmosap_param_type { enum osmosap_param_type {
SAP_MAX_MSG_SIZE = 0x00, SAP_MAX_MSG_SIZE = 0x00,
SAP_CONNECTION_STATUS = 0x01, SAP_CONNECTION_STATUS = 0x01,

108
src/host/layer23/src/common/sap_interface.c
View File

@ -47,71 +47,75 @@
static void sap_connect(struct osmocom_ms *ms); static void sap_connect(struct osmocom_ms *ms);
/* Table 5.15: List of Parameter IDs */
static const struct value_string sap_param_names[] = { static const struct value_string sap_param_names[] = {
{SAP_MAX_MSG_SIZE, "MaxMsgSize"}, { SAP_MAX_MSG_SIZE, "MaxMsgSize" },
{SAP_CONNECTION_STATUS, "ConnectionStatus"}, { SAP_CONNECTION_STATUS, "ConnectionStatus" },
{SAP_RESULT_CODE, "ResultCode"}, { SAP_RESULT_CODE, "ResultCode" },
{SAP_DISCONNECTION_TYPE, "DisconnectionType"}, { SAP_DISCONNECTION_TYPE, "DisconnectionType" },
{SAP_COMMAND_APDU, "CommandAPDU"}, { SAP_COMMAND_APDU, "CommandAPDU" },
{SAP_COMMAND_APDU_7816, "CommandAPDU7816"}, { SAP_COMMAND_APDU_7816, "CommandAPDU7816" },
{SAP_RESPONSE_APDU, "ResponseAPDU"}, { SAP_RESPONSE_APDU, "ResponseAPDU" },
{SAP_ATR, "ATR"}, { SAP_ATR, "ATR" },
{SAP_CARD_READER_STATUS, "CardReaderStatus"}, { SAP_CARD_READER_STATUS, "CardReaderStatus" },
{SAP_STATUS_CHANGE, "StatusChange"}, { SAP_STATUS_CHANGE, "StatusChange" },
{SAP_TRANSPORT_PROTOCOL, "TransportProtocol"} { SAP_TRANSPORT_PROTOCOL, "TransportProtocol" },
}; };
/* Table 5.1: Message Overview */
static const struct value_string sap_msg_names[] = { static const struct value_string sap_msg_names[] = {
{SAP_CONNECT_REQ, "CONNECT_REQ"}, { SAP_CONNECT_REQ, "CONNECT_REQ" },
{SAP_CONNECT_RESP, "CONNECT_RESP"}, { SAP_CONNECT_RESP, "CONNECT_RESP" },
{SAP_DISCONNECT_REQ, "DISCONNECT_REQ"}, { SAP_DISCONNECT_REQ, "DISCONNECT_REQ" },
{SAP_DISCONNECT_RESP, "DISCONNECT_RESP"}, { SAP_DISCONNECT_RESP, "DISCONNECT_RESP" },
{SAP_DISCONNECT_IND, "DISCONNECT_IND"}, { SAP_DISCONNECT_IND, "DISCONNECT_IND" },
{SAP_TRANSFER_APDU_REQ, "TRANSFER_APDU_REQ"}, { SAP_TRANSFER_APDU_REQ, "TRANSFER_APDU_REQ" },
{SAP_TRANSFER_APDU_RESP, "TRANSFER_APDU_RESP"}, { SAP_TRANSFER_APDU_RESP, "TRANSFER_APDU_RESP" },
{SAP_TRANSFER_ATR_REQ, "TRANSFER_ATR_REQ"}, { SAP_TRANSFER_ATR_REQ, "TRANSFER_ATR_REQ" },
{SAP_TRANSFER_ATR_RESP, "TRANSFER_ATR_RESP"}, { SAP_TRANSFER_ATR_RESP, "TRANSFER_ATR_RESP" },
{SAP_POWER_SIM_OFF_REQ, "POWER_SIM_OFF_REQ"}, { SAP_POWER_SIM_OFF_REQ, "POWER_SIM_OFF_REQ" },
{SAP_POWER_SIM_OFF_RESP, "POWER_SIM_OFF_RESP"}, { SAP_POWER_SIM_OFF_RESP, "POWER_SIM_OFF_RESP" },
{SAP_POWER_SIM_ON_REQ, "POWER_SIM_ON_REQ"}, { SAP_POWER_SIM_ON_REQ, "POWER_SIM_ON_REQ" },
{SAP_POWER_SIM_ON_RESP, "POWER_SIM_ON_RESP"}, { SAP_POWER_SIM_ON_RESP, "POWER_SIM_ON_RESP" },
{SAP_RESET_SIM_REQ, "RESET_SIM_REQ"}, { SAP_RESET_SIM_REQ, "RESET_SIM_REQ" },
{SAP_RESET_SIM_RESP, "RESET_SIM_RESP"}, { SAP_RESET_SIM_RESP, "RESET_SIM_RESP" },
{SAP_TRANSFER_CARD_READER_STATUS_REQ, "TRANSFER_CARD_READER_STATUS_REQ"}, { SAP_TRANSFER_CARD_READER_STATUS_REQ, "TRANSFER_CARD_READER_STATUS_REQ" },
{SAP_TRANSFER_CARD_READER_STATUS_RESP, "TRANSFER_CARD_READER_STATUS_RESP"}, { SAP_TRANSFER_CARD_READER_STATUS_RESP, "TRANSFER_CARD_READER_STATUS_RESP" },
{SAP_STATUS_IND, "STATUS_IND"}, { SAP_STATUS_IND, "STATUS_IND" },
{SAP_ERROR_RESP, "ERROR_RESP"}, { SAP_ERROR_RESP, "ERROR_RESP" },
{SAP_SET_TRANSPORT_PROTOCOL_REQ, "SET_TRANSPORT_PROTOCOL_REQ"}, { SAP_SET_TRANSPORT_PROTOCOL_REQ, "SET_TRANSPORT_PROTOCOL_REQ" },
{SAP_SET_TRANSPORT_PROTOCOL_RESP, "SET_TRANSPORT_PROTOCOL_RESP"} { SAP_SET_TRANSPORT_PROTOCOL_RESP, "SET_TRANSPORT_PROTOCOL_RESP" },
}; };
/* BTSAP table 5.18 */ /* Table 5.18: Possible values for ResultCode */
static const struct value_string sap_result_names[] = { static const struct value_string sap_result_names[] = {
{0, "OK, request processed correctly"}, { 0, "OK, request processed correctly" },
{1, "Error, no reason defined"}, { 1, "Error, no reason defined" },
{2, "Error, card not accessible"}, { 2, "Error, card not accessible" },
{3, "Error, card (already) powered off"}, { 3, "Error, card (already) powered off" },
{4, "Error, card removed"}, { 4, "Error, card removed" },
{5, "Error, card already powered on"}, { 5, "Error, card already powered on" },
{6, "Error, data not available"}, { 6, "Error, data not available" },
{7, "Error, not supported"} { 7, "Error, not supported "},
}; };
/* Table 5.19: Possible values for StatusChange */
static const struct value_string sap_status_change_names[] = { static const struct value_string sap_status_change_names[] = {
{0, "Unknown Error"}, { 0, "Unknown Error" },
{1, "Card reset"}, { 1, "Card reset" },
{2, "Card not accessible"}, { 2, "Card not accessible" },
{3, "Card removed"}, { 3, "Card removed" },
{4, "Card inserted"}, { 4, "Card inserted" },
{5, "Card recovered"}, { 5, "Card recovered" },
}; };
/* Table 5.16: Possible values for ConnectionStatus */
static const struct value_string sap_status_names[] = { static const struct value_string sap_status_names[] = {
{0, "OK, Server can fulfill requirements"}, { 0, "OK, Server can fulfill requirements" },
{1, "Error, Server unable to establish connection"}, { 1, "Error, Server unable to establish connection" },
{2, "Error, Server does not support maximum message size"}, { 2, "Error, Server does not support maximum message size" },
{3, "Error, maximum message size by Client is too small"}, { 3, "Error, maximum message size by Client is too small" },
{4, "OK, ongoing call"} { 4, "OK, ongoing call" },
}; };
static struct msgb *sap_create_msg(uint8_t id, uint8_t num_params, struct sap_param *params) static struct msgb *sap_create_msg(uint8_t id, uint8_t num_params, struct sap_param *params)