Version 1.0.5

Add HardwareConfig types

Makefile

@@ -23,7 +23,7 @@ all: debug release pkgconfig
 
 VERSION_MAJOR = 1
 VERSION_MINOR = 0
-VERSION_RELEASE = 2
+VERSION_RELEASE = 5
 
 # Version for pkg-config
 PCVERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
@@ -144,9 +144,6 @@ 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 -f documentation.list debian/files debian/*.substvars
-	rm -f debian/*.debhelper.log debian/*.debhelper debian/*~
 
 $(BUILD_DIR):
 	mkdir -p $@
@@ -199,18 +196,17 @@ $(PKGCONFIG): $(LIB_NAME).pc.in Makefile
 # Install
 #
 
-INSTALL_PERM  = 644
-
 INSTALL = install
 INSTALL_DIRS = $(INSTALL) -d
-INSTALL_FILES = $(INSTALL) -m $(INSTALL_PERM)
+INSTALL_LIBS = $(INSTALL) -m 755
+INSTALL_FILES = $(INSTALL) -m 644
 
 INSTALL_LIB_DIR = $(DESTDIR)/usr/lib
 INSTALL_INCLUDE_DIR = $(DESTDIR)/usr/include/$(NAME)
 INSTALL_PKGCONFIG_DIR = $(DESTDIR)/usr/lib/pkgconfig
 
 install: $(INSTALL_LIB_DIR)
-	$(INSTALL_FILES) $(RELEASE_SO) $(INSTALL_LIB_DIR)
+	$(INSTALL_LIBS) $(RELEASE_SO) $(INSTALL_LIB_DIR)
 	ln -sf $(LIB_SO) $(INSTALL_LIB_DIR)/$(LIB_SYMLINK2)
 	ln -sf $(LIB_SYMLINK2) $(INSTALL_LIB_DIR)/$(LIB_SYMLINK1)
 

include/radio_types.h

@@ -175,6 +175,14 @@ 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_card_state {
     RADIO_CARD_STATE_ABSENT,
     RADIO_CARD_STATE_PRESENT,
@@ -337,7 +345,7 @@ typedef struct radio_data_profile {
     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);
@@ -651,6 +659,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) \

rpm/libgbinder-radio.spec

@@ -1,5 +1,5 @@
 Name: libgbinder-radio
-Version: 1.0.2
+Version: 1.0.5
 Release: 0
 Summary: Binder client library for Android radio interfaces
 Group: Development/Libraries

src/radio_instance.c

@@ -665,7 +665,7 @@ 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;
 }
 
 void