ubports-volte/ofono-binder-plugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39 from monich/build_fixes

Browse Source 
Build fixes
This commit is contained in:
Slava Monich
2024-10-28 18:21:22 +02:00
committed by GitHub
parent 8d3a7a6048 c413645fff
commit 59d4bfb259
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rpm/ofono-binder-plugin.spec
View File

@@ -12,7 +12,7 @@ Source: %{name}-%{version}.tar.bz2
%define libgbinder_radio_version 1.6.0
%define libmce_version 1.0.6
%define libofonobinderpluginext_version 1.1.0
%define ofono_version 1.28+git8
%define ofono_version 1.29+git8
BuildRequires: pkgconfig
BuildRequires: ofono-devel >= %{ofono_version}
@@ -26,6 +26,9 @@ BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(rpm)
%define license_support %(pkg-config --exists 'rpm >= 4.11'; echo $?)
# make_build macro appeared in rpm 4.12
%{!?make_build:%define make_build make %{_smp_mflags}}
Requires: ofono >= %{ofono_version}
Requires: libofonobinderpluginext >= %{libofonobinderpluginext_version}
Requires: libgbinder >= %{libgbinder_version}
@@ -48,8 +51,8 @@ Binder plugin for Sailfish OS fork of ofono
%setup -q -n %{name}-%{version}
%build
make %{_smp_mflags} PLUGINDIR=%{plugin_dir} KEEP_SYMBOLS=1 release
make %{_smp_mflags} -C lib LIBDIR=%{_libdir} KEEP_SYMBOLS=1 release pkgconfig
%make_build PLUGINDIR=%{plugin_dir} KEEP_SYMBOLS=1 release
%make_build -C lib LIBDIR=%{_libdir} KEEP_SYMBOLS=1 release pkgconfig
%check
make test

19
src/binder_plugin.c
View File

@@ -468,7 +468,9 @@ void
binder_logger_dump_update_slot(
BinderSlot* slot)
{
for (RADIO_AIDL_INTERFACE i = 0; i < RADIO_AIDL_INTERFACE_COUNT; i++) {
RADIO_AIDL_INTERFACE i;
for (i = 0; i < RADIO_AIDL_INTERFACE_COUNT; i++) {
if (binder_logger_dump.flags & OFONO_DEBUG_FLAG_PRINT) {
if (!slot->log_dump[i] && slot->instance[i]) {
slot->log_dump[i] = binder_logger_new_radio_dump(slot->instance[i],
@@ -486,7 +488,9 @@ void
binder_logger_trace_update_slot(
BinderSlot* slot)
{
for (RADIO_AIDL_INTERFACE i = 0; i < RADIO_AIDL_INTERFACE_COUNT; i++) {
RADIO_AIDL_INTERFACE i;
for (i = 0; i < RADIO_AIDL_INTERFACE_COUNT; i++) {
if (binder_logger_trace.flags & OFONO_DEBUG_FLAG_PRINT) {
if (!slot->log_trace[i] && slot->instance[i]) {
slot->log_trace[i] = binder_logger_new_radio_trace(slot->instance[i],
@@ -530,7 +534,9 @@ gboolean
binder_plugin_is_slot_client_connected(
BinderSlot* slot)
{
for (RADIO_AIDL_INTERFACE i = 0; i < RADIO_AIDL_INTERFACE_COUNT; i++) {
RADIO_AIDL_INTERFACE i;
for (i = 0; i < RADIO_AIDL_INTERFACE_COUNT; i++) {
if (slot->client[i]) return TRUE;
}
return FALSE;
@@ -600,12 +606,14 @@ binder_plugin_slot_shutdown(
}
if (binder_plugin_is_slot_client_connected(slot)) {
RADIO_AIDL_INTERFACE i;
radio_request_drop(slot->caps_check_req);
radio_request_drop(slot->imei_req);
slot->caps_check_req = NULL;
slot->imei_req = NULL;
for (RADIO_AIDL_INTERFACE i = 0; i < RADIO_AIDL_INTERFACE_COUNT; i++) {
for (i = 0; i < RADIO_AIDL_INTERFACE_COUNT; i++) {
if (!slot->client[i])
continue;
@@ -783,8 +791,9 @@ binder_plugin_slot_enabled_changed(
void* user_data)
{
BinderSlot* slot = user_data;
RADIO_AIDL_INTERFACE i;
for (RADIO_AIDL_INTERFACE i = 0; i < RADIO_AIDL_INTERFACE_COUNT; i++) {
for (i = 0; i < RADIO_AIDL_INTERFACE_COUNT; i++) {
if (!slot->instance[i]) continue;
if (ofono_slot->enabled) {