ubports-volte/libgbinder-radio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[gbinder-radio] Fixed getCellInfoList/getDataCallList response mapping

Browse Source 
Since getCellInfoListResponse_1_5 is the last one, it must be returned
not just for 1.5 but also for all subsequent versions of the interface.

The same logic applies to getDataCallListResponse_1_5
This commit is contained in:
Slava Monich
2022-09-16 14:08:05 +03:00
parent ad536645e7
commit 499e48df9a
2 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/radio_util.c
View File

@@ -273,14 +273,9 @@ radio_req_resp2(
return RADIO_RESP_GET_CELL_INFO_LIST_1_2;
case RADIO_INTERFACE_1_4:
return RADIO_RESP_GET_CELL_INFO_LIST_1_4;
case RADIO_INTERFACE_1_5:
return RADIO_RESP_GET_CELL_INFO_LIST_1_5;
/*
default:
return RADIO_RESP_GET_CELL_INFO_LIST_1_5;
*/
case RADIO_INTERFACE_NONE:
case RADIO_INTERFACE_COUNT:
break;
}
return RADIO_RESP_NONE;
@@ -296,7 +291,7 @@ radio_req_resp2(
case RADIO_INTERFACE_1_0:
case RADIO_INTERFACE_1_1:
return RADIO_RESP_GET_CURRENT_CALLS;
default:
default: /* The last one */
return RADIO_RESP_GET_CURRENT_CALLS_1_2;
case RADIO_INTERFACE_NONE:
break;
@@ -314,7 +309,7 @@ radio_req_resp2(
case RADIO_INTERFACE_1_0:
case RADIO_INTERFACE_1_1:
return RADIO_RESP_GET_SIGNAL_STRENGTH;
default:
default: /* The last one */
return RADIO_RESP_GET_SIGNAL_STRENGTH_1_2;
case RADIO_INTERFACE_NONE:
break;
@@ -332,7 +327,7 @@ radio_req_resp2(
case RADIO_INTERFACE_1_0:
case RADIO_INTERFACE_1_1:
return RADIO_RESP_GET_VOICE_REGISTRATION_STATE;
default:
default: /* The last one */
return RADIO_RESP_GET_VOICE_REGISTRATION_STATE_1_2;
case RADIO_INTERFACE_NONE:
break;
@@ -354,7 +349,7 @@ radio_req_resp2(
case RADIO_INTERFACE_1_2:
case RADIO_INTERFACE_1_3:
return RADIO_RESP_GET_DATA_REGISTRATION_STATE_1_2;
default:
default: /* The last one */
return RADIO_RESP_GET_DATA_REGISTRATION_STATE_1_4;
case RADIO_INTERFACE_NONE:
break;
@@ -377,14 +372,9 @@ radio_req_resp2(
return RADIO_RESP_GET_DATA_CALL_LIST;
case RADIO_INTERFACE_1_4:
return RADIO_RESP_GET_DATA_CALL_LIST_1_4;
case RADIO_INTERFACE_1_5:
default: /* The last one */
return RADIO_RESP_GET_DATA_CALL_LIST_1_5;
/*
default:
return RADIO_RESP_GET_DATA_CALL_LIST_1_5;
*/
case RADIO_INTERFACE_NONE:
case RADIO_INTERFACE_COUNT:
break;
}
return RADIO_RESP_NONE;

18
unit/unit_util/unit_util.c
View File

@@ -1,6 +1,6 @@
/*
* Copyright (C) 2021 Jolla Ltd.
* Copyright (C) 2021 Slava Monich <slava.monich@jolla.com>
* Copyright (C) 2022 Jolla Ltd.
* Copyright (C) 2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of the BSD license as follows:
*
@@ -66,6 +66,8 @@ test_req_name(
"setSystemSelectionChannels");
g_assert_cmpstr(radio_req_name(RADIO_REQ_EMERGENCY_DIAL),==,
"emergencyDial");
g_assert_cmpstr(radio_req_name(RADIO_REQ_ENABLE_UICC_APPLICATIONS),==,
"enableUiccApplications");
}
/*==========================================================================*
@@ -89,6 +91,8 @@ test_resp_name(
"setSystemSelectionChannelsResponse");
g_assert_cmpstr(radio_resp_name(RADIO_RESP_EMERGENCY_DIAL),==,
"emergencyDialResponse");
g_assert_cmpstr(radio_resp_name(RADIO_RESP_ENABLE_UICC_APPLICATIONS),==,
"enableUiccApplicationsResponse");
}
/*==========================================================================*
@@ -110,6 +114,8 @@ test_ind_name(
"currentLinkCapacityEstimate");
g_assert_cmpstr(radio_ind_name(RADIO_IND_CURRENT_EMERGENCY_NUMBER_LIST),==,
"currentEmergencyNumberList");
g_assert_cmpstr(radio_ind_name(RADIO_IND_REGISTRATION_FAILED),==,
"registrationFailed");
}
/*==========================================================================*
@@ -220,10 +226,8 @@ test_req_resp2(
RADIO_RESP_GET_ICC_CARD_STATUS_1_4 },
{ RADIO_REQ_GET_ICC_CARD_STATUS, RADIO_INTERFACE_1_5,
RADIO_RESP_GET_ICC_CARD_STATUS_1_5 },
/*
{ RADIO_REQ_GET_ICC_CARD_STATUS, RADIO_INTERFACE_COUNT,
RADIO_RESP_GET_ICC_CARD_STATUS_1_5 },
*/
RADIO_RESP_NONE },
{ RADIO_REQ_GET_ICC_CARD_STATUS, RADIO_INTERFACE_NONE,
RADIO_RESP_NONE },
@@ -239,10 +243,8 @@ test_req_resp2(
RADIO_RESP_GET_CELL_INFO_LIST_1_4 },
{ RADIO_REQ_GET_CELL_INFO_LIST, RADIO_INTERFACE_1_5,
RADIO_RESP_GET_CELL_INFO_LIST_1_5 },
/*
{ RADIO_REQ_GET_CELL_INFO_LIST, RADIO_INTERFACE_COUNT,
RADIO_RESP_GET_CELL_INFO_LIST_1_5 },
*/
{ RADIO_REQ_GET_CELL_INFO_LIST, RADIO_INTERFACE_NONE,
RADIO_RESP_NONE },
@@ -318,10 +320,8 @@ test_req_resp2(
RADIO_RESP_GET_DATA_CALL_LIST_1_4 },
{ RADIO_REQ_GET_DATA_CALL_LIST, RADIO_INTERFACE_1_5,
RADIO_RESP_GET_DATA_CALL_LIST_1_5 },
/*
{ RADIO_REQ_GET_DATA_CALL_LIST, RADIO_INTERFACE_COUNT,
RADIO_RESP_GET_DATA_CALL_LIST_1_5 },
*/
{ RADIO_REQ_GET_DATA_CALL_LIST, RADIO_INTERFACE_NONE,
RADIO_RESP_NONE }
};