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

[gbinder-radio] Added RADIO_ACCESS_NETWORKS enum. JB#58746

Browse Source 
There are two similar enums defined in types.hal files, AccessNetwork
and RadioAccessNetworks. They can be easily confused with each other
and yet their enum values e.g. for NGRAN are different (although GERAN,
UTRAN and EUTRAN values match). Our mapping goes like this:

  AccessNetwork => RADIO_ACCESS_NETWORK
  RadioAccessNetworks => RADIO_ACCESS_NETWORKS
This commit is contained in:
Slava Monich
2022-11-19 03:45:29 +02:00
parent db387d213a
commit b38ddeb4c0
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/radio_types.h
View File

@@ -501,6 +501,7 @@ typedef enum radio_data_request_reason {
} RADIO_DATA_REQUEST_REASON; /* Since 1.2.0 */
G_STATIC_ASSERT(sizeof(RADIO_DATA_REQUEST_REASON) == 4);
/* This is AccessNetwork from types.hal */
typedef enum radio_access_network {
RADIO_ACCESS_NETWORK_UNKNOWN,
RADIO_ACCESS_NETWORK_GERAN,
@@ -512,6 +513,17 @@ typedef enum radio_access_network {
} RADIO_ACCESS_NETWORK; /* Since 1.2.0 */
G_STATIC_ASSERT(sizeof(RADIO_ACCESS_NETWORK) == 4);
/* And this is RadioAccessNetworks (easy to confuse with AccessNetwork) */
typedef enum radio_access_networks {
RADIO_ACCESS_NETWORKS_UNKNOWN,
RADIO_ACCESS_NETWORKS_GERAN,
RADIO_ACCESS_NETWORKS_UTRAN,
RADIO_ACCESS_NETWORKS_EUTRAN,
RADIO_ACCESS_NETWORKS_NGRAN,
RADIO_ACCESS_NETWORKS_CDMA2000
} RADIO_ACCESS_NETWORKS; /* Since 1.5.3 */
G_STATIC_ASSERT(sizeof(RADIO_ACCESS_NETWORKS) == 4);
typedef enum radio_data_profile_type {
RADIO_DATA_PROFILE_COMMON,
RADIO_DATA_PROFILE_3GPP,
@@ -2205,7 +2217,7 @@ typedef struct radio_network_scan_result {
G_STATIC_ASSERT(sizeof(RadioNetworkScanResult) == 24);
typedef struct radio_network_scan_specifier {
RADIO_ACCESS_NETWORK radioAccessNetwork RADIO_ALIGNED(4);
RADIO_ACCESS_NETWORKS radioAccessNetwork RADIO_ALIGNED(4);
GBinderHidlVec geranBands RADIO_ALIGNED(8); /* vec<RADIO_GERAN_BAND> */
GBinderHidlVec utranBands RADIO_ALIGNED(8); /* vec<RADIO_UTRAN_BAND> */
GBinderHidlVec eutranBands RADIO_ALIGNED(8); /* vec<RADIO_EUTRAN_BAND> */
@@ -2214,7 +2226,7 @@ typedef struct radio_network_scan_specifier {
G_STATIC_ASSERT(sizeof(RadioAccessSpecifier) == 72);
typedef struct radio_network_scan_specifier_1_5 {
RADIO_ACCESS_NETWORK radioAccessNetwork RADIO_ALIGNED(4);
RADIO_ACCESS_NETWORKS radioAccessNetwork RADIO_ALIGNED(4);
guint8 type RADIO_ALIGNED(8); /* RADIO_NETWORK_SCAN_SPECIFIER_1_5_TYPE */
GBinderHidlVec bands RADIO_ALIGNED(8); /* vec<RADIO_GERAN_BAND> */
/* or vec<RADIO_UTRAN_BAND> */