Version 1.0.11

Install the library with exe permissions.

.gitignore

@@ -1,13 +1,11 @@
 *~
 debian/files
-debian/libgbinder-radio-dev.debhelper.log
-debian/libgbinder-radio-dev.substvars
 debian/libgbinder-radio-dev
-debian/libgbinder-radio.debhelper.log
-debian/libgbinder-radio.postinst.debhelper
-debian/libgbinder-radio.postrm.debhelper
-debian/libgbinder-radio.substvars
 debian/libgbinder-radio
+debian/*.debhelper.log
+debian/*.debhelper
+debian/*.substvars
+debian/*.install
 debian/tmp
 documentation.list
 installroot

AUTHORS

@@ -0,0 +1,3 @@
+Danct12 <danct12@disroot.org>
+Frajo Haider <f_haider@gmx.at>
+Slava Monich <slava@monich.com>

Makefile

@@ -23,7 +23,7 @@ all: debug release pkgconfig
 
 VERSION_MAJOR = 1
 VERSION_MINOR = 0
-VERSION_RELEASE = 1
+VERSION_RELEASE = 11
 
 # Version for pkg-config
 PCVERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
@@ -78,10 +78,7 @@ DEBUG_FLAGS = -g
 RELEASE_FLAGS =
 COVERAGE_FLAGS = -g
 
-ifndef KEEP_SYMBOLS
-KEEP_SYMBOLS = 0
-endif
-
+KEEP_SYMBOLS ?= 0
 ifneq ($(KEEP_SYMBOLS),0)
 RELEASE_FLAGS += -g
 endif
@@ -144,9 +141,10 @@ pkgconfig: $(PKGCONFIG)
 clean:
 	rm -f *~ $(SRC_DIR)/*~ $(INCLUDE_DIR)/*~
 	rm -fr $(BUILD_DIR) RPMS installroot
-	rm -fr debian/tmp debian/libgbinder debian/libgbinder-dev
+	rm -fr debian/tmp debian/libgbinder-radio debian/libgbinder-radio-dev
 	rm -f documentation.list debian/files debian/*.substvars
 	rm -f debian/*.debhelper.log debian/*.debhelper debian/*~
+	rm -f debian/*.install
 
 $(BUILD_DIR):
 	mkdir -p $@
@@ -192,25 +190,34 @@ $(COVERAGE_LIB): $(COVERAGE_OBJS)
 	$(AR) rc $@ $?
 	ranlib $@
 
+#
+# LIBDIR usually gets substituted with arch specific dir.
+# It's relative in deb build and can be whatever in rpm build.
+#
+
+LIBDIR ?= usr/lib
+ABS_LIBDIR := $(shell echo /$(LIBDIR) | sed -r 's|/+|/|g')
+
 $(PKGCONFIG): $(LIB_NAME).pc.in Makefile
-	sed -e 's/\[version\]/'$(PCVERSION)/g $< > $@
+	sed -e 's|@version@|$(PCVERSION)|g' -e 's|@libdir@|$(ABS_LIBDIR)|g' $< > $@
+
+debian/%.install: debian/%.install.in
+	sed 's|@LIBDIR@|$(LIBDIR)|g' $< > $@
 
 #
 # Install
 #
 
-INSTALL_PERM  = 644
-
 INSTALL = install
 INSTALL_DIRS = $(INSTALL) -d
-INSTALL_FILES = $(INSTALL) -m $(INSTALL_PERM)
+INSTALL_FILES = $(INSTALL) -m 644
 
-INSTALL_LIB_DIR = $(DESTDIR)/usr/lib
+INSTALL_LIB_DIR = $(DESTDIR)$(ABS_LIBDIR)
 INSTALL_INCLUDE_DIR = $(DESTDIR)/usr/include/$(NAME)
-INSTALL_PKGCONFIG_DIR = $(DESTDIR)/usr/lib/pkgconfig
+INSTALL_PKGCONFIG_DIR = $(DESTDIR)$(ABS_LIBDIR)/pkgconfig
 
 install: $(INSTALL_LIB_DIR)
-	$(INSTALL_FILES) $(RELEASE_SO) $(INSTALL_LIB_DIR)
+	$(INSTALL) -m 755 $(RELEASE_SO) $(INSTALL_LIB_DIR)
 	ln -sf $(LIB_SO) $(INSTALL_LIB_DIR)/$(LIB_SYMLINK2)
 	ln -sf $(LIB_SYMLINK2) $(INSTALL_LIB_DIR)/$(LIB_SYMLINK1)
 

debian/changelog

@@ -0,0 +1,21 @@
+libgbinder-radio (1.0.11) unstable; urgency=medium
+
+  * Make library executable on RPM based systems
+  * Added req => resp mapping for radio@1.1 calls
+
+ -- Slava Monich <slava.monich@jolla.com>  Thu, 01 Oct 2020 21:04:59 +0300
+
+libgbinder-radio (1.0.10) unstable; urgency=medium
+
+  * Hide internal symbols
+  * Respect arch specific lib dir
+  * Ignore GLib deprecation warnings
+  * Added constants for android.hardware.radio@1.1 interfaces
+
+ -- Slava Monich <slava.monich@jolla.com>  Wed, 03 Jun 2020 15:24:17 +0300
+
+libgbinder-radio (1.0.9) unstable; urgency=medium
+
+  * Added packaging for Debian-based distros.
+
+ -- Danct12 <danct12@disroot.org>  Tue, 24 Mar 2020 02:55:50 +0700

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -0,0 +1,17 @@
+Source: libgbinder-radio
+Priority: optional
+Maintainer: Danct12 <danct12@disroot.org>
+Build-Depends: debhelper (>=9), libgbinder-dev (>= 1.0.9)
+Standards-Version: 3.9.6
+
+Package: libgbinder-radio-dev
+Section: libdevel
+Architecture: any
+Depends: libgbinder-radio (= ${binary:Version}), ${misc:Depends}
+Description: Development files for libgbinder-radio
+
+Package: libgbinder-radio
+Section: libs
+Architecture: any
+Depends: libgbinder (>= 1.0.9), ${shlibs:Depends}, ${misc:Depends}
+Description: Binder client library for Android radio interfaces

debian/copyright

@@ -0,0 +1,33 @@
+Copyright (C) 2018-2020 Jolla Ltd.
+Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com>
+
+You may use this file under the terms of the BSD license as follows:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+  3. Neither the names of the copyright holders nor the names of its
+     contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation
+are those of the authors and should not be interpreted as representing
+any official policies, either expressed or implied.

debian/libgbinder-radio-dev.install.in

@@ -0,0 +1,3 @@
+debian/tmp/@LIBDIR@/libgbinder-radio.so @LIBDIR@
+debian/tmp/@LIBDIR@/pkgconfig/libgbinder-radio.pc @LIBDIR@/pkgconfig
+debian/tmp/usr/include/* usr/include

debian/libgbinder-radio.install.in

@@ -0,0 +1 @@
+debian/tmp/@LIBDIR@/libgbinder-radio.so.* @LIBDIR@

debian/rules

@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+# Uncomment to enable verbose build
+#export DH_VERBOSE = 1
+
+LIBDIR=usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+override_dh_auto_build:
+	dh_auto_build -- LIBDIR=$(LIBDIR) release pkgconfig debian/libgbinder-radio.install debian/libgbinder-radio-dev.install
+
+override_dh_auto_install:
+	dh_auto_install -- LIBDIR=$(LIBDIR) install-dev
+
+%:
+	dh $@ 

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

include/radio_instance.h

@@ -52,14 +52,12 @@ struct radio_instance {
     const char* dev;
     const char* slot;
     const char* key;
+    /* Since 1.0.7 */
+    const char* modem;  /* D-Bus path */
+    int slot_index;     /* 0 for SIM1, 1 for SIM2 and so on */
+    gboolean enabled;
 };
 
-typedef struct radio_response_info {
-    RADIO_RESP_TYPE type;
-    guint32 serial;
-    guint32 error;
-} RadioResponseInfo;
-
 typedef
 void
 (*RadioInstanceFunc)(
@@ -119,6 +117,13 @@ radio_instance_new(
     const char* dev,
     const char* name);
 
+RadioInstance*
+radio_instance_new_with_modem_and_slot(
+    const char* dev,
+    const char* name,
+    const char* modem,
+    int slot_index); /* Since 1.0.7 */
+
 RadioInstance*
 radio_instance_get(
     const char* dev,
@@ -166,6 +171,11 @@ radio_instance_send_request_sync(
     RADIO_REQ code,
     GBinderLocalRequest* args);
 
+void
+radio_instance_set_enabled(
+    RadioInstance* radio,
+    gboolean enabled); /* Since 1.0.7 */
+
 gulong
 radio_instance_add_indication_handler(
     RadioInstance* radio,
@@ -206,6 +216,12 @@ radio_instance_add_death_handler(
     RadioInstanceFunc func,
     gpointer user_data);
 
+gulong
+radio_instance_add_enabled_handler(
+    RadioInstance* radio,
+    RadioInstanceFunc func,
+    gpointer user_data); /* Since 1.0.7 */
+
 void
 radio_instance_remove_handler(
     RadioInstance* radio,

include/radio_types.h

@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2018-2019 Jolla Ltd.
- * Copyright (C) 2018-2019 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2020 Jolla Ltd.
+ * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com>
  *
  * You may use this file under the terms of the BSD license as follows:
  *
@@ -46,9 +46,13 @@ typedef struct radio_registry RadioRegistry;
 
 #define RADIO_IFACE_PREFIX     "android.hardware.radio@"
 #define RADIO_IFACE_1_0(x)     RADIO_IFACE_PREFIX "1.0::" x
+#define RADIO_IFACE_1_1(x)     RADIO_IFACE_PREFIX "1.1::" x
 #define RADIO_1_0              RADIO_IFACE_1_0("IRadio")
+#define RADIO_1_1              RADIO_IFACE_1_1("IRadio")
 #define RADIO_RESPONSE_1_0     RADIO_IFACE_1_0("IRadioResponse")
+#define RADIO_RESPONSE_1_1     RADIO_IFACE_1_1("IRadioResponse")
 #define RADIO_INDICATION_1_0   RADIO_IFACE_1_0("IRadioIndication")
+#define RADIO_INDICATION_1_1   RADIO_IFACE_1_1("IRadioIndication")
 
 /* Types defined in types.hal */
 
@@ -175,6 +179,44 @@ typedef enum radio_access_family {
 } RADIO_ACCESS_FAMILY;
 G_STATIC_ASSERT(sizeof(RADIO_ACCESS_FAMILY) == 4);
 
+typedef enum radio_apn_auth_type {
+    RADIO_APN_AUTH_NONE,
+    RADIO_APN_AUTH_PAP,
+    RADIO_APN_AUTH_CHAP,
+    RADIO_APN_AUTH_PAP_CHAP
+} RADIO_APN_AUTH_TYPE;
+G_STATIC_ASSERT(sizeof(RADIO_APN_AUTH_TYPE) == 4);
+
+typedef enum radio_apn_types {
+    RADIO_APN_TYPE_NONE = 0,
+    RADIO_APN_TYPE_DEFAULT = 1 << 0,
+    RADIO_APN_TYPE_MMS = 1 << 1,
+    RADIO_APN_TYPE_SUPL = 1 << 2,
+    RADIO_APN_TYPE_DUN = 1 << 3,
+    RADIO_APN_TYPE_HIPRI = 1 << 4,
+    RADIO_APN_TYPE_FOTA = 1 << 5,
+    RADIO_APN_TYPE_IMS = 1 << 6,
+    RADIO_APN_TYPE_CBS = 1 << 7,
+    RADIO_APN_TYPE_IA = 1 << 8,
+    RADIO_APN_TYPE_EMERGENCY = 1 << 9,
+    RADIO_APN_TYPE_ALL = RADIO_APN_TYPE_DEFAULT | RADIO_APN_TYPE_MMS |
+        RADIO_APN_TYPE_SUPL | RADIO_APN_TYPE_DUN | RADIO_APN_TYPE_HIPRI |
+        RADIO_APN_TYPE_FOTA | RADIO_APN_TYPE_IMS | RADIO_APN_TYPE_CBS |
+        RADIO_APN_TYPE_IA | RADIO_APN_TYPE_EMERGENCY
+} RADIO_APN_TYPES;
+G_STATIC_ASSERT(sizeof(RADIO_APN_TYPES) == 4);
+
+typedef enum radio_data_profile_id {
+    RADIO_DATA_PROFILE_INVALID = -1,
+    RADIO_DATA_PROFILE_DEFAULT = 0,
+    RADIO_DATA_PROFILE_TETHERED = 1,
+    RADIO_DATA_PROFILE_IMS = 2,
+    RADIO_DATA_PROFILE_FOTA = 3,
+    RADIO_DATA_PROFILE_CBS = 4,
+    RADIO_DATA_PROFILE_OEM_BASE = 1000
+} RADIO_DATA_PROFILE_ID;
+G_STATIC_ASSERT(sizeof(RADIO_DATA_PROFILE_ID) == 4);
+
 typedef enum radio_card_state {
     RADIO_CARD_STATE_ABSENT,
     RADIO_CARD_STATE_PRESENT,
@@ -258,6 +300,20 @@ typedef enum radio_capability_status {
 } RADIO_CAPABILITY_STATUS;
 G_STATIC_ASSERT(sizeof(RADIO_CAPABILITY_STATUS) == 4);
 
+typedef enum radio_device_state {
+    RADIO_DEVICE_STATE_POWER_SAVE_MODE,
+    RADIO_DEVICE_STATE_CHARGING_STATE,
+    RADIO_DEVICE_STATE_LOW_DATA_EXPECTED
+} RADIO_DEVICE_STATE;
+G_STATIC_ASSERT(sizeof(RADIO_DEVICE_STATE) == 4);
+
+typedef struct radio_response_info {
+    RADIO_RESP_TYPE type RADIO_ALIGNED(4);
+    guint32 serial RADIO_ALIGNED(4);
+    guint32 error RADIO_ALIGNED(4);
+} RadioResponseInfo;
+G_STATIC_ASSERT(sizeof(RadioResponseInfo) == 12);
+
 typedef struct radio_card_status {
     RADIO_CARD_STATE cardState RADIO_ALIGNED(4);
     RADIO_PIN_STATE universalPinState RADIO_ALIGNED(4);
@@ -326,11 +382,11 @@ typedef struct radio_operator_info {
 G_STATIC_ASSERT(sizeof(RadioOperatorInfo) == 56);
 
 typedef struct radio_data_profile {
-    gint32 profileId RADIO_ALIGNED(4);
+    RADIO_DATA_PROFILE_ID profileId RADIO_ALIGNED(4);
     GBinderHidlString apn RADIO_ALIGNED(8);
     GBinderHidlString protocol RADIO_ALIGNED(8);
     GBinderHidlString roamingProtocol RADIO_ALIGNED(8);
-    gint32 authType RADIO_ALIGNED(4);
+    RADIO_APN_AUTH_TYPE authType RADIO_ALIGNED(4);
     GBinderHidlString user RADIO_ALIGNED(8);
     GBinderHidlString password RADIO_ALIGNED(8);
     gint32 type RADIO_ALIGNED(4);
@@ -338,8 +394,8 @@ typedef struct radio_data_profile {
     gint32 maxConns RADIO_ALIGNED(4);
     gint32 waitTime RADIO_ALIGNED(4);
     guint8 enabled RADIO_ALIGNED(1);
-    gint32 supportedApnTypesBitmap RADIO_ALIGNED(4);
-    gint32 bearerBitmap RADIO_ALIGNED(4);
+    RADIO_APN_TYPES supportedApnTypesBitmap RADIO_ALIGNED(4);
+    RADIO_ACCESS_FAMILY bearerBitmap RADIO_ALIGNED(4);
     gint32 mtu RADIO_ALIGNED(4);
     gint32 mvnoType RADIO_ALIGNED(4);
     GBinderHidlString mvnoMatchData RADIO_ALIGNED(8);
@@ -360,7 +416,6 @@ typedef struct radio_data_call {
     gint32 mtu RADIO_ALIGNED(4);
 } RADIO_ALIGNED(8) RadioDataCall;
 G_STATIC_ASSERT(sizeof(RadioDataCall) == 120);
-#define DATA_CALL_VERSION (11)
 
 #define DATA_CALL_VERSION (11)
 
@@ -645,6 +700,29 @@ typedef struct radio_activity_stats_info {
 } RADIO_ALIGNED(4) RadioActivityStatsInfo;
 G_STATIC_ASSERT(sizeof(RadioActivityStatsInfo) == 32);
 
+typedef struct radio_hardware_config {
+    gint32 type RADIO_ALIGNED(4);
+    GBinderHidlString uuid RADIO_ALIGNED(8);
+    gint32 state RADIO_ALIGNED(4);
+    GBinderHidlVec modem RADIO_ALIGNED(8); /* vec<RadioHardwareConfigModem> */
+    GBinderHidlVec sim RADIO_ALIGNED(8);   /* vec<RadioHardwareConfigSim> */
+} RADIO_ALIGNED(8) RadioHardwareConfig;
+G_STATIC_ASSERT(sizeof(RadioHardwareConfig) == 64);
+
+typedef struct radio_hardware_config_modem {
+    gint32 rilModel RADIO_ALIGNED(4);
+    guint32 rat RADIO_ALIGNED(4);
+    gint32 maxVoice RADIO_ALIGNED(4);
+    gint32 maxData RADIO_ALIGNED(4);
+    gint32 maxStandby RADIO_ALIGNED(4);
+} RADIO_ALIGNED(4) RadioHardwareConfigModem;
+G_STATIC_ASSERT(sizeof(RadioHardwareConfigModem) == 20);
+
+typedef struct radio_hardware_config_sim {
+    GBinderHidlString modemUuid RADIO_ALIGNED(8);
+} RADIO_ALIGNED(8) RadioHardwareConfigSim;
+G_STATIC_ASSERT(sizeof(RadioHardwareConfigSim) == 16);
+
 /* c(req,resp,callName,CALL_NAME) */
 #define RADIO_CALL_1_0(c) \
     c(2,1,getIccCardStatus,GET_ICC_CARD_STATUS) \
@@ -776,6 +854,18 @@ G_STATIC_ASSERT(sizeof(RadioActivityStatsInfo) == 32);
     c(128,127,setIndicationFilter,SET_INDICATION_FILTER) \
     c(129,128,setSimCardPower,SET_SIM_CARD_POWER)
 
+#define RADIO_1_0_REQ_LAST RADIO_REQ_RESPONSE_ACKNOWLEDGEMENT
+
+#define RADIO_CALL_1_1(c) \
+    c(131,130,setCarrierInfoForImsiEncryption,SET_CARRIER_INFO_FOR_IMSI_ENCRYPTION) \
+    c(132,131,setSimCardPower_1_1,SET_SIM_CARD_POWER_1_1) \
+    c(133,132,startNetworkScan,START_NETWORK_SCAN) \
+    c(134,133,stopNetworkScan,STOP_NETWORK_SCAN) \
+    c(135,134,startKeepalive,START_KEEPALIVE) \
+    c(136,135,stopKeepalive,STOP_KEEPALIVE)
+
+#define RADIO_1_1_REQ_LAST RADIO_REQ_STOP_KEEPALIVE
+
 /* e(code,eventName,EVENT_NAME) */
 #define RADIO_EVENT_1_0(e) \
     e(1,radioStateChanged,RADIO_STATE_CHANGED) \
@@ -824,14 +914,20 @@ G_STATIC_ASSERT(sizeof(RadioActivityStatsInfo) == 32);
     e(44,pcoData,PCO_DATA) \
     e(45,modemReset,MODEM_RESET)
 
+#define RADIO_EVENT_1_1(e) \
+    e(46,carrierInfoForImsiEncryption,CARRIER_INFO_FOR_IMSI_ENCRYPTION) \
+    e(47,networkScanResult,NETWORK_SCAN_RESULT) \
+    e(48,keepaliveStatus,KEEPALIVE_STATUS)
+
 typedef enum radio_req {
     RADIO_REQ_ANY = 0,
     RADIO_REQ_NONE = 0,
     RADIO_REQ_SET_RESPONSE_FUNCTIONS = 1, /* setResponseFunctions */
 #define RADIO_REQ_(req,resp,Name,NAME) RADIO_REQ_##NAME = req,
     RADIO_CALL_1_0(RADIO_REQ_)
+    RADIO_REQ_RESPONSE_ACKNOWLEDGEMENT = 130,  /* responseAcknowledgement */
+    RADIO_CALL_1_1(RADIO_REQ_)
 #undef RADIO_REQ_
-    RADIO_REQ_RESPONSE_ACKNOWLEDGEMENT = 130   /* responseAcknowledgement */
 } RADIO_REQ;
 
 typedef enum radio_resp {
@@ -839,8 +935,9 @@ typedef enum radio_resp {
     RADIO_RESP_NONE = 0,
 #define RADIO_RESP_(req,resp,Name,NAME) RADIO_RESP_##NAME = resp,
     RADIO_CALL_1_0(RADIO_RESP_)
+    RADIO_RESP_ACKNOWLEDGE_REQUEST = 129, /* acknowledgeRequest */
+    RADIO_CALL_1_1(RADIO_RESP_)
 #undef RADIO_RESP_
-    RADIO_RESP_ACKNOWLEDGE_REQUEST = 129
 } RADIO_RESP;
 
 typedef enum radio_ind {
@@ -848,6 +945,7 @@ typedef enum radio_ind {
     RADIO_IND_NONE = 0,
 #define RADIO_IND_(code,Name,NAME) RADIO_IND_##NAME = code,
     RADIO_EVENT_1_0(RADIO_IND_)
+    RADIO_EVENT_1_1(RADIO_IND_)
 #undef RADIO_IND_
 } RADIO_IND;
 

libgbinder-radio.pc.in

@@ -1,10 +1,10 @@
 name=gbinder-radio
-libdir=/usr/lib
+libdir=@libdir@
 includedir=/usr/include
 
 Name: libgbinder-radio
 Description: Binder client library for Android radio interfaces
-Version: [version]
-Requires: glib-2.0 libglibutil libgbinder
+Version: @version@
+Requires.private: glib-2.0 libglibutil libgbinder
 Libs: -L${libdir} -l${name}
 Cflags: -I${includedir} -I${includedir}/${name}

rpm/libgbinder-radio.spec

@@ -1,14 +1,18 @@
 Name: libgbinder-radio
-Version: 1.0.1
+Version: 1.0.11
 Release: 0
 Summary: Binder client library for Android radio interfaces
 Group: Development/Libraries
 License: BSD
 URL: https://github.com/mer-hybris/libgbinder-radio
 Source: %{name}-%{version}.tar.bz2
+
+%define libgbinder_version 1.0.9
+
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(libglibutil)
-BuildRequires: pkgconfig(libgbinder)
+BuildRequires: pkgconfig(libgbinder) >= %{libgbinder_version}
+Requires: libgbinder >= %{libgbinder_version}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -27,11 +31,11 @@ This package contains the development library for %{name}.
 %setup -q
 
 %build
-make KEEP_SYMBOLS=1 release pkgconfig
+make LIBDIR=%{_libdir} KEEP_SYMBOLS=1 release pkgconfig
 
 %install
 rm -rf %{buildroot}
-make install-dev DESTDIR=%{buildroot}
+make LIBDIR=%{_libdir} DESTDIR=%{buildroot} install-dev
 
 %post -p /sbin/ldconfig
 

src/radio_instance.c

@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2018-2019 Jolla Ltd.
- * Copyright (C) 2018-2019 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2020 Jolla Ltd.
+ * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com>
  *
  * You may use this file under the terms of the BSD license as follows:
  *
@@ -34,6 +34,8 @@
  * any official policies, either expressed or implied.
  */
 
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+
 #include "radio_instance.h"
 #include "radio_registry_p.h"
 #include "radio_util.h"
@@ -59,6 +61,7 @@ struct radio_instance_priv {
     char* dev;
     char* slot;
     char* key;
+    char* modem;
 };
 
 G_DEFINE_TYPE(RadioInstance, radio_instance, G_TYPE_OBJECT)
@@ -70,6 +73,7 @@ enum radio_instance_signal {
     SIGNAL_OBSERVE_RESPONSE,
     SIGNAL_ACK,
     SIGNAL_DEATH,
+    SIGNAL_ENABLED,
     SIGNAL_COUNT
 };
 
@@ -79,6 +83,7 @@ enum radio_instance_signal {
 #define SIGNAL_OBSERVE_RESPONSE_NAME   "radio-instance-observe-response"
 #define SIGNAL_ACK_NAME                "radio-instance-ack"
 #define SIGNAL_DEATH_NAME              "radio-instance-death"
+#define SIGNAL_ENABLED_NAME            "radio-instance-enabled"
 
 static guint radio_instance_signals[SIGNAL_COUNT] = { 0 };
 
@@ -217,14 +222,12 @@ radio_instance_response(
         } else {
             /* All other responses have RadioResponseInfo */
             GBinderReader reader;
-            GBinderBuffer* buf;
+            const RadioResponseInfo* info;
 
             gbinder_remote_request_init_reader(req, &reader);
-            buf = gbinder_reader_read_buffer(&reader);
-            GASSERT(buf && buf->size == sizeof(RadioResponseInfo));
-            if (buf && buf->size == sizeof(RadioResponseInfo)) {
+            info = gbinder_reader_read_hidl_struct(&reader, RadioResponseInfo);
+            if (info) {
                 GQuark quark = radio_instance_resp_quark(self, code);
-                const RadioResponseInfo* info = buf->data;
                 gboolean handled = FALSE;
 
                 g_signal_emit(self,
@@ -238,7 +241,6 @@ radio_instance_response(
                     radio_instance_ack(self);
                 }
             }
-            gbinder_buffer_free(buf);
         }
         *status = GBINDER_STATUS_OK;
     } else {
@@ -323,7 +325,9 @@ RadioInstance*
 radio_instance_create(
     const char* dev,
     const char* slot,
-    const char* key)
+    const char* key,
+    const char* modem,
+    int slot_index)
 {
     RadioInstance* self = NULL;
     GBinderServiceManager* sm = gbinder_servicemanager_new(dev);
@@ -351,6 +355,8 @@ radio_instance_create(
             self->slot = priv->slot = g_strdup(slot);
             self->dev = priv->dev = g_strdup(dev);
             self->key = priv->key = g_strdup(key);
+            self->modem = priv->modem = g_strdup(modem);
+            self->slot_index = slot_index;
 
             priv->remote = remote;
             priv->client = gbinder_client_new(remote, iface);
@@ -403,6 +409,33 @@ RadioInstance*
 radio_instance_new(
     const char* dev,
     const char* name)
+{
+    if (name && name[0]) {
+        const char* modem;
+        int slot;
+
+        if (!g_strcmp0(name, "slot1")) {
+            modem = "/ril_0";
+            slot = 0;
+        } else if (!g_strcmp0(name, "slot2")) {
+            modem = "/ril_1";
+            slot = 1;
+        } else {
+            GWARN("Unexpected slot '%s'", name);
+            modem = NULL;
+            slot = 0;
+        }
+        return radio_instance_new_with_modem_and_slot(dev, name, modem, slot);
+    }
+    return NULL;
+}
+
+RadioInstance*
+radio_instance_new_with_modem_and_slot(
+    const char* dev,
+    const char* name,
+    const char* modem,
+    int slot) /* Since 1.0.7 */
 {
     if (dev && dev[0] && name && name[0]) {
         char* key = radio_instance_make_key(dev, name);
@@ -415,7 +448,7 @@ radio_instance_new(
             g_free(key);
             return radio_instance_ref(self);
         } else {
-            self = radio_instance_create(dev, name, key);
+            self = radio_instance_create(dev, name, key, modem, slot);
             if (self) {
                 if (!radio_instance_table) {
                     radio_instance_table = g_hash_table_new_full
@@ -596,6 +629,18 @@ radio_instance_send_request_sync(
     return FALSE;
 }
 
+void
+radio_instance_set_enabled(
+    RadioInstance* self,
+    gboolean enabled) /* Since 1.0.7 */
+{
+    if (G_LIKELY(self) && self->enabled != enabled) {
+        self->enabled = enabled;
+        GDEBUG("%s %sabled", self->slot, enabled ? "en" : "dis");
+        g_signal_emit(self, radio_instance_signals[SIGNAL_ENABLED], 0);
+    }
+}
+
 gulong
 radio_instance_add_indication_handler(
     RadioInstance* self,
@@ -668,7 +713,17 @@ radio_instance_add_death_handler(
     gpointer user_data)
 {
     return (G_LIKELY(self) && G_LIKELY(func)) ? g_signal_connect(self,
-        SIGNAL_ACK_NAME, G_CALLBACK(func), user_data) : 0;
+        SIGNAL_DEATH_NAME, G_CALLBACK(func), user_data) : 0;
+}
+
+gulong
+radio_instance_add_enabled_handler(
+    RadioInstance* self,
+    RadioInstanceFunc func,
+    gpointer user_data) /* Since 1.0.7 */
+{
+    return (G_LIKELY(self) && G_LIKELY(func)) ? g_signal_connect(self,
+        SIGNAL_ENABLED_NAME, G_CALLBACK(func), user_data) : 0;
 }
 
 void
@@ -724,6 +779,7 @@ radio_instance_finalize(
     g_free(priv->slot);
     g_free(priv->dev);
     g_free(priv->key);
+    g_free(priv->modem);
     G_OBJECT_CLASS(radio_instance_parent_class)->finalize(object);
 }
 
@@ -764,6 +820,10 @@ radio_instance_class_init(
         g_signal_new(SIGNAL_DEATH_NAME, type,
             G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL,
             G_TYPE_NONE, 0);
+    radio_instance_signals[SIGNAL_ENABLED] =
+        g_signal_new(SIGNAL_ENABLED_NAME, type,
+            G_SIGNAL_RUN_FIRST, 0, NULL, NULL, NULL,
+            G_TYPE_NONE, 0);
 }
 
 /*

src/radio_registry_p.h

@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2018-2019 Jolla Ltd.
- * Copyright (C) 2018-2019 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2020 Jolla Ltd.
+ * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com>
  *
  * You may use this file under the terms of the BSD license as follows:
  *
@@ -41,11 +41,13 @@
 
 void
 radio_registry_instance_added(
-    RadioInstance* instance);
+    RadioInstance* instance)
+    G_GNUC_INTERNAL;
 
 void
 radio_registry_instance_removed(
-    const char* key);
+    const char* key)
+    G_GNUC_INTERNAL;
 
 #endif /* RADIO_REGISTRY_PRIVATE_H */
 

src/radio_util.c

@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2018-2019 Jolla Ltd.
- * Copyright (C) 2018-2019 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2020 Jolla Ltd.
+ * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com>
  *
  * You may use this file under the terms of the BSD license as follows:
  *
@@ -49,6 +49,7 @@ radio_req_name(
 #define RADIO_REQ_(req,resp,Name,NAME) \
     case RADIO_REQ_##NAME: return #Name;
     RADIO_CALL_1_0(RADIO_REQ_)
+    RADIO_CALL_1_1(RADIO_REQ_)
 #undef RADIO_REQ_
     case RADIO_REQ_ANY:
         break;
@@ -65,6 +66,7 @@ radio_resp_name(
 #define RADIO_RESP_(req,resp,Name,NAME) \
     case RADIO_RESP_##NAME: return #Name "Response";
     RADIO_CALL_1_0(RADIO_RESP_)
+    RADIO_CALL_1_1(RADIO_RESP_)
 #undef RADIO_RESP_
     case RADIO_RESP_ANY:
         break;
@@ -80,6 +82,7 @@ radio_ind_name(
 #define RADIO_IND_(code,Name,NAME) \
     case RADIO_IND_##NAME: return #Name;
     RADIO_EVENT_1_0(RADIO_IND_)
+    RADIO_EVENT_1_1(RADIO_IND_)
 #undef RADIO_IND_
     case RADIO_IND_ANY:
         break;
@@ -95,10 +98,14 @@ radio_req_resp(
 #define RADIO_REQ_(req,resp,Name,NAME) \
     case RADIO_REQ_##NAME: return RADIO_RESP_##NAME;
     RADIO_CALL_1_0(RADIO_REQ_)
+    RADIO_CALL_1_1(RADIO_REQ_)
 #undef RADIO_REQ_
-    default:
-        return RADIO_RESP_NONE;
+    case RADIO_REQ_SET_RESPONSE_FUNCTIONS:
+    case RADIO_REQ_RESPONSE_ACKNOWLEDGEMENT:
+    case RADIO_REQ_ANY:
+        break;
     }
+    return RADIO_RESP_NONE;
 }
 
 /*