[neon/forks/ofono/Neon/unstable] debian/patches: refresh patches, remove #0002-qmimodem-Implement-data-capability-bearer-notify.patch which no longer applies
Jonathan Riddell
null at kde.org
Mon Oct 18 14:35:15 BST 2021
Git commit 2e555a0bfdffbddd7a76b4c5a9295d6cff3c1384 by Jonathan Riddell.
Committed on 18/10/2021 at 13:35.
Pushed by jriddell into branch 'Neon/unstable'.
refresh patches, remove #0002-qmimodem-Implement-data-capability-bearer-notify.patch which no longer applies
M +57 -62 debian/patches/0001-common-create-GList-helper-ofono_call_compare.patch
M +12 -15 debian/patches/0001-gprs-Add-Preferred-property-to-contexts.patch
M +54 -57 debian/patches/0002-common-atmodem-move-at_util_call_compare_by_status-t.patch
M +9 -12 debian/patches/0003-qmimodem-Allow-UMTS-and-LTE-to-fallback-to-a-lower-c.patch
M +18 -22 debian/patches/0004-add-call-list-helper-to-manage-voice-call-lists.patch
M +44 -47 debian/patches/0004-qmimodem-HACK-use-fast-dormancy-calls-to-quarry-stat.patch
M +31 -37 debian/patches/0005-qmimodem-implement-voice-calls.patch
D +0 -16 debian/patches/fix-explicit-bzero.patch
M +1 -2 debian/patches/series
M +9 -9 debian/patches/sim-change-notification-for-pin-valies.patch
M +6 -9 debian/patches/support-smdpkt.patch
https://invent.kde.org/neon/forks/ofono/commit/2e555a0bfdffbddd7a76b4c5a9295d6cff3c1384
diff --git a/debian/patches/0001-common-create-GList-helper-ofono_call_compare.patch b/debian/patches/0001-common-create-GList-helper-ofono_call_compare.patch
index 9148e42..155fc7c 100644
--- a/debian/patches/0001-common-create-GList-helper-ofono_call_compare.patch
+++ b/debian/patches/0001-common-create-GList-helper-ofono_call_compare.patch
@@ -25,11 +25,11 @@ to reduce the common code.
create mode 100644 drivers/common/call_list.c
create mode 100644 drivers/common/call_list.h
-diff --git a/Makefile.am b/Makefile.am
-index fbb0eff4..c57f4339 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -351,7 +351,8 @@ builtin_sources += drivers/atmodem/atmodem.h \
+Index: ofono-1.33/Makefile.am
+===================================================================
+--- ofono-1.33.orig/Makefile.am
++++ ofono-1.33/Makefile.am
+@@ -354,7 +354,8 @@ builtin_sources += drivers/atmodem/atmo
drivers/atmodem/gprs.c \
drivers/atmodem/gprs-context.c \
drivers/atmodem/gnss.c \
@@ -39,10 +39,10 @@ index fbb0eff4..c57f4339 100644
builtin_modules += nwmodem
builtin_sources += drivers/atmodem/atutil.h \
-diff --git a/drivers/atmodem/atutil.c b/drivers/atmodem/atutil.c
-index bbdb01c4..3ab930ad 100644
---- a/drivers/atmodem/atutil.c
-+++ b/drivers/atmodem/atutil.c
+Index: ofono-1.33/drivers/atmodem/atutil.c
+===================================================================
+--- ofono-1.33.orig/drivers/atmodem/atutil.c
++++ ofono-1.33/drivers/atmodem/atutil.c
@@ -36,6 +36,8 @@
#include <ofono/types.h>
#include <ofono/modem.h>
@@ -52,7 +52,7 @@ index bbdb01c4..3ab930ad 100644
#include "atutil.h"
#include "vendor.h"
-@@ -105,20 +107,6 @@ gint at_util_call_compare_by_id(gconstpointer a, gconstpointer b)
+@@ -105,20 +107,6 @@ gint at_util_call_compare_by_id(gconstpo
return 0;
}
@@ -73,7 +73,7 @@ index bbdb01c4..3ab930ad 100644
GSList *at_util_parse_clcc(GAtResult *result, unsigned int *ret_mpty_ids)
{
GAtResultIter iter;
-@@ -177,7 +165,7 @@ GSList *at_util_parse_clcc(GAtResult *result, unsigned int *ret_mpty_ids)
+@@ -177,7 +165,7 @@ GSList *at_util_parse_clcc(GAtResult *re
else
call->clip_validity = 2;
@@ -82,11 +82,11 @@ index bbdb01c4..3ab930ad 100644
if (mpty)
mpty_ids |= 1 << id;
-diff --git a/drivers/atmodem/atutil.h b/drivers/atmodem/atutil.h
-index fe2acb39..4a8e26cb 100644
---- a/drivers/atmodem/atutil.h
-+++ b/drivers/atmodem/atutil.h
-@@ -59,7 +59,6 @@ void decode_at_error(struct ofono_error *error, const char *final);
+Index: ofono-1.33/drivers/atmodem/atutil.h
+===================================================================
+--- ofono-1.33.orig/drivers/atmodem/atutil.h
++++ ofono-1.33/drivers/atmodem/atutil.h
+@@ -59,7 +59,6 @@ void decode_at_error(struct ofono_error
gint at_util_call_compare_by_status(gconstpointer a, gconstpointer b);
gint at_util_call_compare_by_phone_number(gconstpointer a, gconstpointer b);
gint at_util_call_compare_by_id(gconstpointer a, gconstpointer b);
@@ -94,10 +94,10 @@ index fe2acb39..4a8e26cb 100644
GSList *at_util_parse_clcc(GAtResult *result, unsigned int *mpty_ids);
gboolean at_util_parse_reg(GAtResult *result, const char *prefix,
int *mode, int *status,
-diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c
-index 7ab6567f..5f5b9e45 100644
---- a/drivers/atmodem/voicecall.c
-+++ b/drivers/atmodem/voicecall.c
+Index: ofono-1.33/drivers/atmodem/voicecall.c
+===================================================================
+--- ofono-1.33.orig/drivers/atmodem/voicecall.c
++++ ofono-1.33/drivers/atmodem/voicecall.c
@@ -33,6 +33,8 @@
#include <ofono/log.h>
#include <ofono/modem.h>
@@ -107,7 +107,7 @@ index 7ab6567f..5f5b9e45 100644
#include "vendor.h"
#include "gatchat.h"
-@@ -131,7 +133,7 @@ static struct ofono_call *create_call(struct ofono_voicecall *vc, int type,
+@@ -131,7 +133,7 @@ static struct ofono_call *create_call(st
call->clip_validity = clip;
call->cnap_validity = CNAP_VALIDITY_NOT_AVAILABLE;
@@ -116,11 +116,10 @@ index 7ab6567f..5f5b9e45 100644
return call;
}
-diff --git a/drivers/common/call_list.c b/drivers/common/call_list.c
-new file mode 100644
-index 00000000..487b85e4
+Index: ofono-1.33/drivers/common/call_list.c
+===================================================================
--- /dev/null
-+++ b/drivers/common/call_list.c
++++ ofono-1.33/drivers/common/call_list.c
@@ -0,0 +1,43 @@
+/*
+ *
@@ -165,11 +164,10 @@ index 00000000..487b85e4
+ return 0;
+}
+
-diff --git a/drivers/common/call_list.h b/drivers/common/call_list.h
-new file mode 100644
-index 00000000..2cca87b2
+Index: ofono-1.33/drivers/common/call_list.h
+===================================================================
--- /dev/null
-+++ b/drivers/common/call_list.h
++++ ofono-1.33/drivers/common/call_list.h
@@ -0,0 +1,29 @@
+/*
+ *
@@ -200,10 +198,10 @@ index 00000000..2cca87b2
+gint ofono_call_compare(gconstpointer a, gconstpointer b);
+
+#endif /* __OFONO_DRIVER_COMMON_CALL_LIST */
-diff --git a/drivers/gemaltomodem/voicecall.c b/drivers/gemaltomodem/voicecall.c
-index ad6d78af..c17dd8c8 100644
---- a/drivers/gemaltomodem/voicecall.c
-+++ b/drivers/gemaltomodem/voicecall.c
+Index: ofono-1.33/drivers/gemaltomodem/voicecall.c
+===================================================================
+--- ofono-1.33.orig/drivers/gemaltomodem/voicecall.c
++++ ofono-1.33/drivers/gemaltomodem/voicecall.c
@@ -35,6 +35,8 @@
#include <ofono/modem.h>
#include <ofono/voicecall.h>
@@ -213,7 +211,7 @@ index ad6d78af..c17dd8c8 100644
#include "gatchat.h"
#include "gatresult.h"
-@@ -363,7 +365,7 @@ static void gemalto_parse_slcc(GAtResult *result, GSList **l,
+@@ -363,7 +365,7 @@ static void gemalto_parse_slcc(GAtResult
else
call->clip_validity = 0;
@@ -222,10 +220,10 @@ index ad6d78af..c17dd8c8 100644
if (ret_mpty)
*ret_mpty = mpty;
-diff --git a/drivers/hfpmodem/voicecall.c b/drivers/hfpmodem/voicecall.c
-index 69667f14..faa25c7f 100644
---- a/drivers/hfpmodem/voicecall.c
-+++ b/drivers/hfpmodem/voicecall.c
+Index: ofono-1.33/drivers/hfpmodem/voicecall.c
+===================================================================
+--- ofono-1.33.orig/drivers/hfpmodem/voicecall.c
++++ ofono-1.33/drivers/hfpmodem/voicecall.c
@@ -35,6 +35,8 @@
#include <ofono/modem.h>
#include <ofono/voicecall.h>
@@ -235,7 +233,7 @@ index 69667f14..faa25c7f 100644
#include "common.h"
#include "hfp.h"
-@@ -128,7 +130,7 @@ static struct ofono_call *create_call(struct ofono_voicecall *vc, int type,
+@@ -128,7 +130,7 @@ static struct ofono_call *create_call(st
call->phone_number.type = num_type;
}
@@ -244,10 +242,10 @@ index 69667f14..faa25c7f 100644
call->clip_validity = clip;
-diff --git a/drivers/huaweimodem/voicecall.c b/drivers/huaweimodem/voicecall.c
-index 3044f602..b0dfdbc7 100644
---- a/drivers/huaweimodem/voicecall.c
-+++ b/drivers/huaweimodem/voicecall.c
+Index: ofono-1.33/drivers/huaweimodem/voicecall.c
+===================================================================
+--- ofono-1.33.orig/drivers/huaweimodem/voicecall.c
++++ ofono-1.33/drivers/huaweimodem/voicecall.c
@@ -34,6 +34,8 @@
#include <ofono/modem.h>
#include <ofono/voicecall.h>
@@ -257,7 +255,7 @@ index 3044f602..b0dfdbc7 100644
#include "gatchat.h"
#include "gatresult.h"
-@@ -75,7 +77,7 @@ static struct ofono_call *create_call(struct ofono_voicecall *vc, int type,
+@@ -75,7 +77,7 @@ static struct ofono_call *create_call(st
call->clip_validity = clip;
@@ -266,10 +264,10 @@ index 3044f602..b0dfdbc7 100644
return call;
}
-diff --git a/drivers/ifxmodem/voicecall.c b/drivers/ifxmodem/voicecall.c
-index ae694e3a..b5db5d3e 100644
---- a/drivers/ifxmodem/voicecall.c
-+++ b/drivers/ifxmodem/voicecall.c
+Index: ofono-1.33/drivers/ifxmodem/voicecall.c
+===================================================================
+--- ofono-1.33.orig/drivers/ifxmodem/voicecall.c
++++ ofono-1.33/drivers/ifxmodem/voicecall.c
@@ -34,6 +34,8 @@
#include <ofono/modem.h>
#include <ofono/voicecall.h>
@@ -279,7 +277,7 @@ index ae694e3a..b5db5d3e 100644
#include "gatchat.h"
#include "gatresult.h"
-@@ -106,7 +108,7 @@ static struct ofono_call *create_call(struct ofono_voicecall *vc, int type,
+@@ -106,7 +108,7 @@ static struct ofono_call *create_call(st
call->clip_validity = clip;
@@ -288,10 +286,10 @@ index ae694e3a..b5db5d3e 100644
return call;
}
-diff --git a/drivers/rilmodem/voicecall.c b/drivers/rilmodem/voicecall.c
-index 13dc5071..5619c40f 100644
---- a/drivers/rilmodem/voicecall.c
-+++ b/drivers/rilmodem/voicecall.c
+Index: ofono-1.33/drivers/rilmodem/voicecall.c
+===================================================================
+--- ofono-1.33.orig/drivers/rilmodem/voicecall.c
++++ ofono-1.33/drivers/rilmodem/voicecall.c
@@ -38,6 +38,8 @@
#include <ofono/modem.h>
#include <ofono/voicecall.h>
@@ -322,7 +320,7 @@ index 13dc5071..5619c40f 100644
static void clcc_poll_cb(struct ril_msg *message, gpointer user_data)
{
struct ofono_voicecall *vc = user_data;
-@@ -208,7 +196,7 @@ static void clcc_poll_cb(struct ril_msg *message, gpointer user_data)
+@@ -208,7 +196,7 @@ static void clcc_poll_cb(struct ril_msg
call->id, call->status, call->type,
call->phone_number.number, call->name);
@@ -331,10 +329,10 @@ index 13dc5071..5619c40f 100644
}
no_calls:
-diff --git a/drivers/stemodem/voicecall.c b/drivers/stemodem/voicecall.c
-index 3fd3c1f4..7abb78eb 100644
---- a/drivers/stemodem/voicecall.c
-+++ b/drivers/stemodem/voicecall.c
+Index: ofono-1.33/drivers/stemodem/voicecall.c
+===================================================================
+--- ofono-1.33.orig/drivers/stemodem/voicecall.c
++++ ofono-1.33/drivers/stemodem/voicecall.c
@@ -35,6 +35,8 @@
#include <ofono/modem.h>
#include <ofono/voicecall.h>
@@ -344,7 +342,7 @@ index 3fd3c1f4..7abb78eb 100644
#include "gatchat.h"
#include "gatresult.h"
#include "common.h"
-@@ -127,7 +129,7 @@ static struct ofono_call *create_call(struct ofono_voicecall *vc, int type,
+@@ -127,7 +129,7 @@ static struct ofono_call *create_call(st
call->clip_validity = clip;
@@ -353,6 +351,3 @@ index 3fd3c1f4..7abb78eb 100644
return call;
}
---
-2.24.1
-
diff --git a/debian/patches/0001-gprs-Add-Preferred-property-to-contexts.patch b/debian/patches/0001-gprs-Add-Preferred-property-to-contexts.patch
index 67f5097..dace712 100644
--- a/debian/patches/0001-gprs-Add-Preferred-property-to-contexts.patch
+++ b/debian/patches/0001-gprs-Add-Preferred-property-to-contexts.patch
@@ -11,10 +11,10 @@ actually used internally.
src/gprs.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 49 insertions(+), 1 deletion(-)
-diff --git a/src/gprs.c b/src/gprs.c
-index 170f615e..66247f3a 100644
---- a/src/gprs.c
-+++ b/src/gprs.c
+Index: ofono-1.33/src/gprs.c
+===================================================================
+--- ofono-1.33.orig/src/gprs.c
++++ ofono-1.33/src/gprs.c
@@ -122,6 +122,7 @@ struct ofono_gprs_context {
struct pri_context {
ofono_bool_t active;
@@ -23,7 +23,7 @@ index 170f615e..66247f3a 100644
char name[MAX_CONTEXT_NAME_LENGTH + 1];
char message_proxy[MAX_MESSAGE_PROXY_LENGTH + 1];
char message_center[MAX_MESSAGE_CENTER_LENGTH + 1];
-@@ -739,7 +740,7 @@ static void append_context_properties(struct pri_context *ctx,
+@@ -748,7 +749,7 @@ static void append_context_properties(st
const char *type = gprs_context_type_to_string(ctx->type);
const char *proto = gprs_proto_to_string(ctx->context.proto);
const char *name = ctx->name;
@@ -32,7 +32,7 @@ index 170f615e..66247f3a 100644
const char *strvalue;
struct context_settings *settings;
const char *interface;
-@@ -749,6 +750,9 @@ static void append_context_properties(struct pri_context *ctx,
+@@ -758,6 +759,9 @@ static void append_context_properties(st
value = ctx->active;
ofono_dbus_dict_append(dict, "Active", DBUS_TYPE_BOOLEAN, &value);
@@ -42,7 +42,7 @@ index 170f615e..66247f3a 100644
ofono_dbus_dict_append(dict, "Type", DBUS_TYPE_STRING, &type);
ofono_dbus_dict_append(dict, "Protocol", DBUS_TYPE_STRING, &proto);
-@@ -890,6 +894,33 @@ static void pri_deactivate_callback(const struct ofono_error *error, void *data)
+@@ -899,6 +903,33 @@ static void pri_deactivate_callback(cons
}
}
@@ -76,7 +76,7 @@ index 170f615e..66247f3a 100644
static void gprs_set_attached_property(struct ofono_gprs *gprs,
ofono_bool_t attached)
{
-@@ -1271,6 +1302,16 @@ static DBusMessage *pri_set_property(DBusConnection *conn,
+@@ -1280,6 +1311,16 @@ static DBusMessage *pri_set_property(DBu
return NULL;
}
@@ -93,7 +93,7 @@ index 170f615e..66247f3a 100644
/* All other properties are read-only when context is active */
if (ctx->active == TRUE)
return __ofono_error_in_use(msg);
-@@ -1910,6 +1951,8 @@ static void write_context_settings(struct ofono_gprs *gprs,
+@@ -1934,6 +1975,8 @@ static void write_context_settings(struc
gprs_context_type_to_string(context->type));
g_key_file_set_string(gprs->settings, context->key, "Protocol",
gprs_proto_to_string(context->context.proto));
@@ -102,7 +102,7 @@ index 170f615e..66247f3a 100644
if (context->type == OFONO_GPRS_CONTEXT_TYPE_MMS) {
g_key_file_set_string(gprs->settings, context->key,
-@@ -3194,6 +3237,7 @@ static gboolean load_context(struct ofono_gprs *gprs, const char *group)
+@@ -3214,6 +3257,7 @@ static gboolean load_context(struct ofon
char *authstr = NULL;
gboolean ret = FALSE;
gboolean legacy = FALSE;
@@ -110,7 +110,7 @@ index 170f615e..66247f3a 100644
struct pri_context *context;
enum ofono_gprs_context_type type;
enum ofono_gprs_proto proto;
-@@ -3229,6 +3273,9 @@ static gboolean load_context(struct ofono_gprs *gprs, const char *group)
+@@ -3249,6 +3293,9 @@ static gboolean load_context(struct ofon
if (gprs_proto_from_string(protostr, &proto) == FALSE)
goto error;
@@ -120,7 +120,7 @@ index 170f615e..66247f3a 100644
username = g_key_file_get_string(gprs->settings, group,
"Username", NULL);
if (username == NULL)
-@@ -3283,6 +3330,7 @@ static gboolean load_context(struct ofono_gprs *gprs, const char *group)
+@@ -3303,6 +3350,7 @@ static gboolean load_context(struct ofon
strcpy(context->context.password, password);
strcpy(context->context.apn, apn);
context->context.proto = proto;
@@ -128,6 +128,3 @@ index 170f615e..66247f3a 100644
context->context.auth_method = auth;
if (msgproxy != NULL)
---
-2.27.0
-
diff --git a/debian/patches/0002-common-atmodem-move-at_util_call_compare_by_status-t.patch b/debian/patches/0002-common-atmodem-move-at_util_call_compare_by_status-t.patch
index 37ccb22..3ad2d17 100644
--- a/debian/patches/0002-common-atmodem-move-at_util_call_compare_by_status-t.patch
+++ b/debian/patches/0002-common-atmodem-move-at_util_call_compare_by_status-t.patch
@@ -16,11 +16,11 @@ at_util_call_compare_by_status is used by several modem drivers.
drivers/ifxmodem/voicecall.c | 10 +++++-----
8 files changed, 36 insertions(+), 37 deletions(-)
-diff --git a/drivers/atmodem/atutil.c b/drivers/atmodem/atutil.c
-index 3ab930ad..df42e60e 100644
---- a/drivers/atmodem/atutil.c
-+++ b/drivers/atmodem/atutil.c
-@@ -73,17 +73,6 @@ void decode_at_error(struct ofono_error *error, const char *final)
+Index: ofono-1.33/drivers/atmodem/atutil.c
+===================================================================
+--- ofono-1.33.orig/drivers/atmodem/atutil.c
++++ ofono-1.33/drivers/atmodem/atutil.c
+@@ -73,17 +73,6 @@ void decode_at_error(struct ofono_error
}
}
@@ -38,10 +38,10 @@ index 3ab930ad..df42e60e 100644
gint at_util_call_compare_by_phone_number(gconstpointer a, gconstpointer b)
{
const struct ofono_call *call = a;
-diff --git a/drivers/atmodem/atutil.h b/drivers/atmodem/atutil.h
-index 4a8e26cb..c26adcbd 100644
---- a/drivers/atmodem/atutil.h
-+++ b/drivers/atmodem/atutil.h
+Index: ofono-1.33/drivers/atmodem/atutil.h
+===================================================================
+--- ofono-1.33.orig/drivers/atmodem/atutil.h
++++ ofono-1.33/drivers/atmodem/atutil.h
@@ -56,7 +56,6 @@ enum at_util_charset {
typedef void (*at_util_sim_inserted_cb_t)(gboolean present, void *userdata);
@@ -50,11 +50,11 @@ index 4a8e26cb..c26adcbd 100644
gint at_util_call_compare_by_phone_number(gconstpointer a, gconstpointer b);
gint at_util_call_compare_by_id(gconstpointer a, gconstpointer b);
GSList *at_util_parse_clcc(GAtResult *result, unsigned int *mpty_ids);
-diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c
-index 5f5b9e45..4c495ce2 100644
---- a/drivers/atmodem/voicecall.c
-+++ b/drivers/atmodem/voicecall.c
-@@ -662,13 +662,13 @@ static void ring_notify(GAtResult *result, gpointer user_data)
+Index: ofono-1.33/drivers/atmodem/voicecall.c
+===================================================================
+--- ofono-1.33.orig/drivers/atmodem/voicecall.c
++++ ofono-1.33/drivers/atmodem/voicecall.c
+@@ -667,13 +667,13 @@ static void ring_notify(GAtResult *resul
/* See comment in CRING */
if (g_slist_find_custom(vd->calls,
GINT_TO_POINTER(CALL_STATUS_WAITING),
@@ -70,7 +70,7 @@ index 5f5b9e45..4c495ce2 100644
return;
/* Generate an incoming call of unknown type */
-@@ -700,13 +700,13 @@ static void cring_notify(GAtResult *result, gpointer user_data)
+@@ -705,13 +705,13 @@ static void cring_notify(GAtResult *resu
*/
if (g_slist_find_custom(vd->calls,
GINT_TO_POINTER(CALL_STATUS_WAITING),
@@ -86,7 +86,7 @@ index 5f5b9e45..4c495ce2 100644
return;
g_at_result_iter_init(&iter, result);
-@@ -750,7 +750,7 @@ static void clip_notify(GAtResult *result, gpointer user_data)
+@@ -755,7 +755,7 @@ static void clip_notify(GAtResult *resul
l = g_slist_find_custom(vd->calls,
GINT_TO_POINTER(CALL_STATUS_INCOMING),
@@ -95,7 +95,7 @@ index 5f5b9e45..4c495ce2 100644
if (l == NULL) {
ofono_error("CLIP for unknown call");
return;
-@@ -812,7 +812,7 @@ static void cdip_notify(GAtResult *result, gpointer user_data)
+@@ -817,7 +817,7 @@ static void cdip_notify(GAtResult *resul
l = g_slist_find_custom(vd->calls,
GINT_TO_POINTER(CALL_STATUS_INCOMING),
@@ -104,7 +104,7 @@ index 5f5b9e45..4c495ce2 100644
if (l == NULL) {
ofono_error("CDIP for unknown call");
return;
-@@ -861,7 +861,7 @@ static void cnap_notify(GAtResult *result, gpointer user_data)
+@@ -866,7 +866,7 @@ static void cnap_notify(GAtResult *resul
l = g_slist_find_custom(vd->calls,
GINT_TO_POINTER(CALL_STATUS_INCOMING),
@@ -113,7 +113,7 @@ index 5f5b9e45..4c495ce2 100644
if (l == NULL) {
ofono_error("CNAP for unknown call");
return;
-@@ -915,7 +915,7 @@ static void ccwa_notify(GAtResult *result, gpointer user_data)
+@@ -920,7 +920,7 @@ static void ccwa_notify(GAtResult *resul
/* Some modems resend CCWA, ignore it the second time around */
if (g_slist_find_custom(vd->calls,
GINT_TO_POINTER(CALL_STATUS_WAITING),
@@ -122,11 +122,11 @@ index 5f5b9e45..4c495ce2 100644
return;
g_at_result_iter_init(&iter, result);
-diff --git a/drivers/common/call_list.c b/drivers/common/call_list.c
-index 487b85e4..14fd9258 100644
---- a/drivers/common/call_list.c
-+++ b/drivers/common/call_list.c
-@@ -41,3 +41,13 @@ gint ofono_call_compare(gconstpointer a, gconstpointer b)
+Index: ofono-1.33/drivers/common/call_list.c
+===================================================================
+--- ofono-1.33.orig/drivers/common/call_list.c
++++ ofono-1.33/drivers/common/call_list.c
+@@ -41,3 +41,13 @@ gint ofono_call_compare(gconstpointer a,
return 0;
}
@@ -140,10 +140,10 @@ index 487b85e4..14fd9258 100644
+
+ return 0;
+}
-diff --git a/drivers/common/call_list.h b/drivers/common/call_list.h
-index 2cca87b2..ffa9dce5 100644
---- a/drivers/common/call_list.h
-+++ b/drivers/common/call_list.h
+Index: ofono-1.33/drivers/common/call_list.h
+===================================================================
+--- ofono-1.33.orig/drivers/common/call_list.h
++++ ofono-1.33/drivers/common/call_list.h
@@ -25,5 +25,6 @@
#include <glib.h>
@@ -151,11 +151,11 @@ index 2cca87b2..ffa9dce5 100644
+gint ofono_call_compare_by_status(gconstpointer a, gconstpointer b);
#endif /* __OFONO_DRIVER_COMMON_CALL_LIST */
-diff --git a/drivers/hfpmodem/voicecall.c b/drivers/hfpmodem/voicecall.c
-index faa25c7f..b463876b 100644
---- a/drivers/hfpmodem/voicecall.c
-+++ b/drivers/hfpmodem/voicecall.c
-@@ -86,12 +86,12 @@ static GSList *find_dialing(GSList *calls)
+Index: ofono-1.33/drivers/hfpmodem/voicecall.c
+===================================================================
+--- ofono-1.33.orig/drivers/hfpmodem/voicecall.c
++++ ofono-1.33/drivers/hfpmodem/voicecall.c
+@@ -86,12 +86,12 @@ static GSList *find_dialing(GSList *call
GSList *c;
c = g_slist_find_custom(calls, GINT_TO_POINTER(CALL_STATUS_DIALING),
@@ -170,7 +170,7 @@ index faa25c7f..b463876b 100644
return c;
}
-@@ -761,7 +761,7 @@ static void ccwa_notify(GAtResult *result, gpointer user_data)
+@@ -761,7 +761,7 @@ static void ccwa_notify(GAtResult *resul
/* CCWA can repeat, ignore if we already have an waiting call */
if (g_slist_find_custom(vd->calls,
GINT_TO_POINTER(CALL_STATUS_WAITING),
@@ -179,7 +179,7 @@ index faa25c7f..b463876b 100644
return;
/* some phones may send extra CCWA after active call is ended
-@@ -770,7 +770,7 @@ static void ccwa_notify(GAtResult *result, gpointer user_data)
+@@ -770,7 +770,7 @@ static void ccwa_notify(GAtResult *resul
*/
if (g_slist_find_custom(vd->calls,
GINT_TO_POINTER(CALL_STATUS_INCOMING),
@@ -188,7 +188,7 @@ index faa25c7f..b463876b 100644
return;
-@@ -813,7 +813,7 @@ static gboolean clip_timeout(gpointer user_data)
+@@ -813,7 +813,7 @@ static gboolean clip_timeout(gpointer us
l = g_slist_find_custom(vd->calls,
GINT_TO_POINTER(CALL_STATUS_INCOMING),
@@ -197,7 +197,7 @@ index faa25c7f..b463876b 100644
if (l == NULL)
return FALSE;
-@@ -842,12 +842,12 @@ static void ring_notify(GAtResult *result, gpointer user_data)
+@@ -842,12 +842,12 @@ static void ring_notify(GAtResult *resul
/* RING can repeat, ignore if we already have an incoming call */
if (g_slist_find_custom(vd->calls,
GINT_TO_POINTER(CALL_STATUS_INCOMING),
@@ -212,7 +212,7 @@ index faa25c7f..b463876b 100644
/* If we started receiving RINGS but have a waiting call, most
* likely all other calls were dropped and we just didn't get
-@@ -892,7 +892,7 @@ static void clip_notify(GAtResult *result, gpointer user_data)
+@@ -892,7 +892,7 @@ static void clip_notify(GAtResult *resul
l = g_slist_find_custom(vd->calls,
GINT_TO_POINTER(CALL_STATUS_INCOMING),
@@ -221,7 +221,7 @@ index faa25c7f..b463876b 100644
if (l == NULL) {
ofono_error("CLIP for unknown call");
-@@ -1008,7 +1008,7 @@ static void ciev_callsetup_notify(struct ofono_voicecall *vc,
+@@ -1008,7 +1008,7 @@ static void ciev_callsetup_notify(struct
waiting = g_slist_find_custom(vd->calls,
GINT_TO_POINTER(CALL_STATUS_WAITING),
@@ -230,7 +230,7 @@ index faa25c7f..b463876b 100644
/* This is a truly bizarre case not covered at all by the specification
* (yes, they are complete idiots). Here we assume the other side is
-@@ -1087,7 +1087,7 @@ static void ciev_callsetup_notify(struct ofono_voicecall *vc,
+@@ -1087,7 +1087,7 @@ static void ciev_callsetup_notify(struct
{
GSList *o = g_slist_find_custom(vd->calls,
GINT_TO_POINTER(CALL_STATUS_DIALING),
@@ -239,11 +239,11 @@ index faa25c7f..b463876b 100644
if (o) {
struct ofono_call *call = o->data;
-diff --git a/drivers/huaweimodem/voicecall.c b/drivers/huaweimodem/voicecall.c
-index b0dfdbc7..1043c84d 100644
---- a/drivers/huaweimodem/voicecall.c
-+++ b/drivers/huaweimodem/voicecall.c
-@@ -180,7 +180,7 @@ static void cring_notify(GAtResult *result, gpointer user_data)
+Index: ofono-1.33/drivers/huaweimodem/voicecall.c
+===================================================================
+--- ofono-1.33.orig/drivers/huaweimodem/voicecall.c
++++ ofono-1.33/drivers/huaweimodem/voicecall.c
+@@ -180,7 +180,7 @@ static void cring_notify(GAtResult *resu
/* CRING can repeat, ignore if we already have an incoming call */
if (g_slist_find_custom(vd->calls,
GINT_TO_POINTER(CALL_STATUS_INCOMING),
@@ -252,7 +252,7 @@ index b0dfdbc7..1043c84d 100644
return;
g_at_result_iter_init(&iter, result);
-@@ -219,7 +219,7 @@ static void clip_notify(GAtResult *result, gpointer user_data)
+@@ -219,7 +219,7 @@ static void clip_notify(GAtResult *resul
l = g_slist_find_custom(vd->calls,
GINT_TO_POINTER(CALL_STATUS_INCOMING),
@@ -261,11 +261,11 @@ index b0dfdbc7..1043c84d 100644
if (l == NULL) {
ofono_error("CLIP for unknown call");
return;
-diff --git a/drivers/ifxmodem/voicecall.c b/drivers/ifxmodem/voicecall.c
-index b5db5d3e..42c1a82c 100644
---- a/drivers/ifxmodem/voicecall.c
-+++ b/drivers/ifxmodem/voicecall.c
-@@ -546,12 +546,12 @@ static void cring_notify(GAtResult *result, gpointer user_data)
+Index: ofono-1.33/drivers/ifxmodem/voicecall.c
+===================================================================
+--- ofono-1.33.orig/drivers/ifxmodem/voicecall.c
++++ ofono-1.33/drivers/ifxmodem/voicecall.c
+@@ -546,12 +546,12 @@ static void cring_notify(GAtResult *resu
*/
if (g_slist_find_custom(vd->calls,
GINT_TO_POINTER(CALL_STATUS_WAITING),
@@ -280,7 +280,7 @@ index b5db5d3e..42c1a82c 100644
if (l == NULL) {
ofono_error("CRING received before XCALLSTAT!!!");
return;
-@@ -590,7 +590,7 @@ static void clip_notify(GAtResult *result, gpointer user_data)
+@@ -590,7 +590,7 @@ static void clip_notify(GAtResult *resul
l = g_slist_find_custom(vd->calls,
GINT_TO_POINTER(CALL_STATUS_INCOMING),
@@ -289,7 +289,7 @@ index b5db5d3e..42c1a82c 100644
if (l == NULL) {
ofono_error("CLIP for unknown call");
return;
-@@ -650,7 +650,7 @@ static void cnap_notify(GAtResult *result, gpointer user_data)
+@@ -650,7 +650,7 @@ static void cnap_notify(GAtResult *resul
*/
l = g_slist_find_custom(vd->calls,
GINT_TO_POINTER(CALL_STATUS_INCOMING),
@@ -298,7 +298,7 @@ index b5db5d3e..42c1a82c 100644
if (l == NULL) {
ofono_error("CNAP for unknown call");
return;
-@@ -696,7 +696,7 @@ static void ccwa_notify(GAtResult *result, gpointer user_data)
+@@ -696,7 +696,7 @@ static void ccwa_notify(GAtResult *resul
l = g_slist_find_custom(vd->calls,
GINT_TO_POINTER(CALL_STATUS_WAITING),
@@ -307,6 +307,3 @@ index b5db5d3e..42c1a82c 100644
if (l == NULL) {
ofono_error("CCWA received before XCALLSTAT!!!");
return;
---
-2.24.1
-
diff --git a/debian/patches/0003-qmimodem-Allow-UMTS-and-LTE-to-fallback-to-a-lower-c.patch b/debian/patches/0003-qmimodem-Allow-UMTS-and-LTE-to-fallback-to-a-lower-c.patch
index 6c2133f..c5e94df 100644
--- a/debian/patches/0003-qmimodem-Allow-UMTS-and-LTE-to-fallback-to-a-lower-c.patch
+++ b/debian/patches/0003-qmimodem-Allow-UMTS-and-LTE-to-fallback-to-a-lower-c.patch
@@ -9,10 +9,10 @@ Subject: [PATCH 3/4] [qmimodem] Allow UMTS and LTE to fallback to a lower
drivers/qmimodem/radio-settings.c | 4 +---
2 files changed, 3 insertions(+), 5 deletions(-)
-diff --git a/drivers/qmimodem/nas.h b/drivers/qmimodem/nas.h
-index 93f541b2..1eada680 100644
---- a/drivers/qmimodem/nas.h
-+++ b/drivers/qmimodem/nas.h
+Index: ofono-1.33/drivers/qmimodem/nas.h
+===================================================================
+--- ofono-1.33.orig/drivers/qmimodem/nas.h
++++ ofono-1.33/drivers/qmimodem/nas.h
@@ -202,8 +202,8 @@ struct qmi_nas_home_network {
#define QMI_NAS_RAT_MODE_PREF_ANY (-1)
@@ -24,11 +24,11 @@ index 93f541b2..1eada680 100644
#define QMI_NAS_PARAM_SYSTEM_SELECTION_PREF_MODE 0x11
-diff --git a/drivers/qmimodem/radio-settings.c b/drivers/qmimodem/radio-settings.c
-index d6f911a1..db311aba 100644
---- a/drivers/qmimodem/radio-settings.c
-+++ b/drivers/qmimodem/radio-settings.c
-@@ -119,15 +119,13 @@ static void qmi_set_rat_mode(struct ofono_radio_settings *rs,
+Index: ofono-1.33/drivers/qmimodem/radio-settings.c
+===================================================================
+--- ofono-1.33.orig/drivers/qmimodem/radio-settings.c
++++ ofono-1.33/drivers/qmimodem/radio-settings.c
+@@ -121,15 +121,13 @@ static void qmi_set_rat_mode(struct ofon
DBG("");
switch (mode) {
@@ -45,6 +45,3 @@ index d6f911a1..db311aba 100644
case OFONO_RADIO_ACCESS_MODE_LTE:
pref = QMI_NAS_RAT_MODE_PREF_LTE;
break;
---
-2.27.0
-
diff --git a/debian/patches/0004-add-call-list-helper-to-manage-voice-call-lists.patch b/debian/patches/0004-add-call-list-helper-to-manage-voice-call-lists.patch
index 8c9ba1e..7e5a577 100644
--- a/debian/patches/0004-add-call-list-helper-to-manage-voice-call-lists.patch
+++ b/debian/patches/0004-add-call-list-helper-to-manage-voice-call-lists.patch
@@ -14,11 +14,11 @@ list and notify ofono for new calls.
4 files changed, 371 insertions(+), 2 deletions(-)
create mode 100644 unit/test-call-list.c
-diff --git a/Makefile.am b/Makefile.am
-index c57f4339..0f88c65b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -907,7 +907,8 @@ unit_tests = unit/test-common unit/test-util \
+Index: ofono-1.33/Makefile.am
+===================================================================
+--- ofono-1.33.orig/Makefile.am
++++ ofono-1.33/Makefile.am
+@@ -916,7 +916,8 @@ unit_tests = unit/test-common unit/test-
unit/test-rilmodem-cs \
unit/test-rilmodem-sms \
unit/test-rilmodem-cb \
@@ -28,7 +28,7 @@ index c57f4339..0f88c65b 100644
noinst_PROGRAMS = $(unit_tests) \
unit/test-sms-root unit/test-mux unit/test-caif
-@@ -945,6 +946,12 @@ unit_test_sms_root_SOURCES = unit/test-sms-root.c \
+@@ -954,6 +955,12 @@ unit_test_sms_root_SOURCES = unit/test-s
unit_test_sms_root_LDADD = @GLIB_LIBS@ $(ell_ldadd)
unit_objects += $(unit_test_sms_root_OBJECTS)
@@ -41,10 +41,10 @@ index c57f4339..0f88c65b 100644
unit_test_mux_SOURCES = unit/test-mux.c $(gatchat_sources)
unit_test_mux_LDADD = @GLIB_LIBS@
unit_objects += $(unit_test_mux_OBJECTS)
-diff --git a/drivers/common/call_list.c b/drivers/common/call_list.c
-index 8b871191..bf638a21 100644
---- a/drivers/common/call_list.c
-+++ b/drivers/common/call_list.c
+Index: ofono-1.33/drivers/common/call_list.c
+===================================================================
+--- ofono-1.33.orig/drivers/common/call_list.c
++++ ofono-1.33/drivers/common/call_list.c
@@ -27,6 +27,14 @@
#include <glib.h>
#include <ofono/types.h>
@@ -60,7 +60,7 @@ index 8b871191..bf638a21 100644
gint ofono_call_compare(gconstpointer a, gconstpointer b)
{
const struct ofono_call *ca = a;
-@@ -65,3 +73,86 @@ gint ofono_call_compare_by_id(gconstpointer a, gconstpointer b)
+@@ -65,3 +73,86 @@ gint ofono_call_compare_by_id(gconstpoin
return 0;
}
@@ -147,10 +147,10 @@ index 8b871191..bf638a21 100644
+ g_slist_free_full(*call_list, g_free);
+ *call_list = calls;
+}
-diff --git a/drivers/common/call_list.h b/drivers/common/call_list.h
-index a06c114f..80d4ffab 100644
---- a/drivers/common/call_list.h
-+++ b/drivers/common/call_list.h
+Index: ofono-1.33/drivers/common/call_list.h
+===================================================================
+--- ofono-1.33.orig/drivers/common/call_list.h
++++ ofono-1.33/drivers/common/call_list.h
@@ -2,7 +2,7 @@
*
* oFono - Open Source Telephony
@@ -189,11 +189,10 @@ index a06c114f..80d4ffab 100644
+ GSList *calls);
+
#endif /* __OFONO_DRIVER_COMMON_CALL_LIST */
-diff --git a/unit/test-call-list.c b/unit/test-call-list.c
-new file mode 100644
-index 00000000..f67178da
+Index: ofono-1.33/unit/test-call-list.c
+===================================================================
--- /dev/null
-+++ b/unit/test-call-list.c
++++ ofono-1.33/unit/test-call-list.c
@@ -0,0 +1,251 @@
+/*
+ *
@@ -446,6 +445,3 @@ index 00000000..f67178da
+ test_notify_disconnected);
+ return g_test_run();
+}
---
-2.24.1
-
diff --git a/debian/patches/0004-qmimodem-HACK-use-fast-dormancy-calls-to-quarry-stat.patch b/debian/patches/0004-qmimodem-HACK-use-fast-dormancy-calls-to-quarry-stat.patch
index 500f7bd..87a7528 100644
--- a/debian/patches/0004-qmimodem-HACK-use-fast-dormancy-calls-to-quarry-stat.patch
+++ b/debian/patches/0004-qmimodem-HACK-use-fast-dormancy-calls-to-quarry-stat.patch
@@ -15,11 +15,11 @@ This uses the fast dormancy calls to quarry the current state of both sms and vo
drivers/qmimodem/voicecall.c | 16 +++++++++++++++-
8 files changed, 91 insertions(+), 4 deletions(-)
-diff --git a/drivers/qmimodem/qmi.c b/drivers/qmimodem/qmi.c
-index 4cd1530f..5e52eb33 100644
---- a/drivers/qmimodem/qmi.c
-+++ b/drivers/qmimodem/qmi.c
-@@ -992,6 +992,21 @@ struct qmi_device *qmi_device_new(int fd)
+Index: ofono-1.33/drivers/qmimodem/qmi.c
+===================================================================
+--- ofono-1.33.orig/drivers/qmimodem/qmi.c
++++ ofono-1.33/drivers/qmimodem/qmi.c
+@@ -992,6 +992,21 @@ struct qmi_device *qmi_device_new(int fd
return device;
}
@@ -41,10 +41,10 @@ index 4cd1530f..5e52eb33 100644
struct qmi_device *qmi_device_ref(struct qmi_device *device)
{
if (!device)
-diff --git a/drivers/qmimodem/qmi.h b/drivers/qmimodem/qmi.h
-index 1202cb35..407ca9d7 100644
---- a/drivers/qmimodem/qmi.h
-+++ b/drivers/qmimodem/qmi.h
+Index: ofono-1.33/drivers/qmimodem/qmi.h
+===================================================================
+--- ofono-1.33.orig/drivers/qmimodem/qmi.h
++++ ofono-1.33/drivers/qmimodem/qmi.h
@@ -58,6 +58,8 @@
#define QMI_SERVICE_RMS 225 /* Remote management service */
#define QMI_SERVICE_OMA 226 /* OMA device management service */
@@ -54,7 +54,7 @@ index 1202cb35..407ca9d7 100644
enum qmi_device_expected_data_format {
QMI_DEVICE_EXPECTED_DATA_FORMAT_UNKNOWN,
QMI_DEVICE_EXPECTED_DATA_FORMAT_802_3,
-@@ -78,6 +80,9 @@ typedef void (*qmi_discover_func_t)(void *user_data);
+@@ -78,6 +80,9 @@ typedef void (*qmi_discover_func_t)(void
struct qmi_device *qmi_device_new(int fd);
@@ -64,10 +64,10 @@ index 1202cb35..407ca9d7 100644
struct qmi_device *qmi_device_ref(struct qmi_device *device);
void qmi_device_unref(struct qmi_device *device);
-diff --git a/drivers/qmimodem/radio-settings.c b/drivers/qmimodem/radio-settings.c
-index db311aba..ccb92b36 100644
---- a/drivers/qmimodem/radio-settings.c
-+++ b/drivers/qmimodem/radio-settings.c
+Index: ofono-1.33/drivers/qmimodem/radio-settings.c
+===================================================================
+--- ofono-1.33.orig/drivers/qmimodem/radio-settings.c
++++ ofono-1.33/drivers/qmimodem/radio-settings.c
@@ -38,6 +38,8 @@ struct settings_data {
struct qmi_service *dms;
uint16_t major;
@@ -77,7 +77,7 @@ index db311aba..ccb92b36 100644
};
static void get_system_selection_pref_cb(struct qmi_result *result,
-@@ -247,6 +249,30 @@ static void create_nas_cb(struct qmi_service *service, void *user_data)
+@@ -252,6 +254,30 @@ static void create_nas_cb(struct qmi_ser
ofono_radio_settings_register(rs);
}
@@ -108,7 +108,7 @@ index db311aba..ccb92b36 100644
static int qmi_radio_settings_probe(struct ofono_radio_settings *rs,
unsigned int vendor, void *user_data)
{
-@@ -264,6 +290,8 @@ static int qmi_radio_settings_probe(struct ofono_radio_settings *rs,
+@@ -269,6 +295,8 @@ static int qmi_radio_settings_probe(stru
qmi_service_create_shared(device, QMI_SERVICE_NAS,
create_nas_cb, rs, NULL);
@@ -117,7 +117,7 @@ index db311aba..ccb92b36 100644
return 0;
}
-@@ -292,6 +320,8 @@ static const struct ofono_radio_settings_driver driver = {
+@@ -297,6 +325,8 @@ static const struct ofono_radio_settings
.set_rat_mode = qmi_set_rat_mode,
.query_rat_mode = qmi_query_rat_mode,
.query_available_rats = qmi_query_available_rats,
@@ -126,11 +126,11 @@ index db311aba..ccb92b36 100644
};
void qmi_radio_settings_init(void)
-diff --git a/drivers/qmimodem/sms.c b/drivers/qmimodem/sms.c
-index 2e962429..485d2820 100644
---- a/drivers/qmimodem/sms.c
-+++ b/drivers/qmimodem/sms.c
-@@ -610,6 +610,15 @@ static void get_msg_protocol(struct ofono_sms *sms)
+Index: ofono-1.33/drivers/qmimodem/sms.c
+===================================================================
+--- ofono-1.33.orig/drivers/qmimodem/sms.c
++++ ofono-1.33/drivers/qmimodem/sms.c
+@@ -610,6 +610,15 @@ static void get_msg_protocol(struct ofon
get_msg_protocol_cb, sms, NULL);
}
@@ -146,7 +146,7 @@ index 2e962429..485d2820 100644
static void event_notify(struct qmi_result *result, void *user_data)
{
struct ofono_sms *sms = user_data;
-@@ -687,6 +696,10 @@ static void set_routes_cb(struct qmi_result *result, void *user_data)
+@@ -687,6 +696,10 @@ static void set_routes_cb(struct qmi_res
* query which mode is active.
*/
get_msg_protocol(sms);
@@ -157,10 +157,10 @@ index 2e962429..485d2820 100644
}
static void get_routes_cb(struct qmi_result *result, void *user_data)
-diff --git a/drivers/qmimodem/voice.h b/drivers/qmimodem/voice.h
-index bb98e693..e897be75 100644
---- a/drivers/qmimodem/voice.h
-+++ b/drivers/qmimodem/voice.h
+Index: ofono-1.33/drivers/qmimodem/voice.h
+===================================================================
+--- ofono-1.33.orig/drivers/qmimodem/voice.h
++++ ofono-1.33/drivers/qmimodem/voice.h
@@ -16,6 +16,7 @@
*/
@@ -169,11 +169,11 @@ index bb98e693..e897be75 100644
#define QMI_VOICE_PARAM_USS_DATA 0x01
-diff --git a/drivers/qmimodem/voice_generated.c b/drivers/qmimodem/voice_generated.c
-index 244a8d2d..aef79c4e 100644
---- a/drivers/qmimodem/voice_generated.c
-+++ b/drivers/qmimodem/voice_generated.c
-@@ -150,18 +150,26 @@ enum parse_error qmi_voice_answer_call_parse(
+Index: ofono-1.33/drivers/qmimodem/voice_generated.c
+===================================================================
+--- ofono-1.33.orig/drivers/qmimodem/voice_generated.c
++++ ofono-1.33/drivers/qmimodem/voice_generated.c
+@@ -150,18 +150,26 @@ enum parse_error qmi_voice_answer_call_p
return err;
}
@@ -201,7 +201,7 @@ index 244a8d2d..aef79c4e 100644
if (call_information)
{
/* verify the length */
-@@ -177,7 +185,8 @@ enum parse_error qmi_voice_ind_call_status(
+@@ -177,7 +185,8 @@ enum parse_error qmi_voice_ind_call_stat
return MISSING_MANDATORY;
/* mandatory */
@@ -211,10 +211,10 @@ index 244a8d2d..aef79c4e 100644
if (remote_party_number) {
const struct qmi_voice_remote_party_number_instance *instance;
int instance_size = sizeof(struct qmi_voice_remote_party_number_instance);
-diff --git a/drivers/qmimodem/voice_generated.h b/drivers/qmimodem/voice_generated.h
-index 471b52ea..dc238efd 100644
---- a/drivers/qmimodem/voice_generated.h
-+++ b/drivers/qmimodem/voice_generated.h
+Index: ofono-1.33/drivers/qmimodem/voice_generated.h
+===================================================================
+--- ofono-1.33.orig/drivers/qmimodem/voice_generated.h
++++ ofono-1.33/drivers/qmimodem/voice_generated.h
@@ -106,7 +106,7 @@ struct qmi_voice_all_call_status_ind {
const struct qmi_voice_remote_party_number_instance *remote_party_number[16];
};
@@ -224,11 +224,11 @@ index 471b52ea..dc238efd 100644
struct qmi_result *qmi_result,
struct qmi_voice_all_call_status_ind *result);
-diff --git a/drivers/qmimodem/voicecall.c b/drivers/qmimodem/voicecall.c
-index cfc6f0b9..d6041a09 100644
---- a/drivers/qmimodem/voicecall.c
-+++ b/drivers/qmimodem/voicecall.c
-@@ -66,7 +66,7 @@ static void all_call_status_ind(struct qmi_result *result, void *user_data)
+Index: ofono-1.33/drivers/qmimodem/voicecall.c
+===================================================================
+--- ofono-1.33.orig/drivers/qmimodem/voicecall.c
++++ ofono-1.33/drivers/qmimodem/voicecall.c
+@@ -66,7 +66,7 @@ static void all_call_status_ind(struct q
int size = 0;
struct qmi_voice_all_call_status_ind status_ind;
@@ -237,7 +237,7 @@ index cfc6f0b9..d6041a09 100644
DBG("Parsing of all call status indication failed");
return;
}
-@@ -128,6 +128,17 @@ static void all_call_status_ind(struct qmi_result *result, void *user_data)
+@@ -128,6 +128,17 @@ static void all_call_status_ind(struct q
ofono_call_list_notify(vc, &vd->call_list, calls);
}
@@ -255,7 +255,7 @@ index cfc6f0b9..d6041a09 100644
static void create_voice_cb(struct qmi_service *service, void *user_data)
{
struct ofono_voicecall *vc = user_data;
-@@ -155,6 +166,9 @@ static void create_voice_cb(struct qmi_service *service, void *user_data)
+@@ -155,6 +166,9 @@ static void create_voice_cb(struct qmi_s
qmi_service_register(data->voice, QMI_VOICE_IND_ALL_STATUS,
all_call_status_ind, vc, NULL);
@@ -265,6 +265,3 @@ index cfc6f0b9..d6041a09 100644
ofono_voicecall_register(vc);
}
---
-2.27.0
-
diff --git a/debian/patches/0005-qmimodem-implement-voice-calls.patch b/debian/patches/0005-qmimodem-implement-voice-calls.patch
index 631b0ee..3d57f28 100644
--- a/debian/patches/0005-qmimodem-implement-voice-calls.patch
+++ b/debian/patches/0005-qmimodem-implement-voice-calls.patch
@@ -18,11 +18,11 @@ They aren't yet generated.
create mode 100644 drivers/qmimodem/voice_generated.c
create mode 100644 drivers/qmimodem/voice_generated.h
-diff --git a/Makefile.am b/Makefile.am
-index 0f88c65b..f863ad71 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -274,7 +274,8 @@ qmi_sources = drivers/qmimodem/qmi.h drivers/qmimodem/qmi.c \
+Index: ofono-1.33/Makefile.am
+===================================================================
+--- ofono-1.33.orig/Makefile.am
++++ ofono-1.33/Makefile.am
+@@ -277,7 +277,8 @@ qmi_sources = drivers/qmimodem/qmi.h dri
drivers/qmimodem/pds.h \
drivers/qmimodem/common.h \
drivers/qmimodem/wda.h \
@@ -32,7 +32,7 @@ index 0f88c65b..f863ad71 100644
builtin_modules += qmimodem
builtin_sources += $(qmi_sources) \
-@@ -283,6 +284,7 @@ builtin_sources += $(qmi_sources) \
+@@ -286,6 +287,7 @@ builtin_sources += $(qmi_sources) \
drivers/qmimodem/qmimodem.c \
drivers/qmimodem/devinfo.c \
drivers/qmimodem/voicecall.c \
@@ -40,10 +40,10 @@ index 0f88c65b..f863ad71 100644
drivers/qmimodem/network-registration.c \
drivers/qmimodem/sim-legacy.c \
drivers/qmimodem/sim.c \
-diff --git a/drivers/qmimodem/qmi.h b/drivers/qmimodem/qmi.h
-index 2665c441..1202cb35 100644
---- a/drivers/qmimodem/qmi.h
-+++ b/drivers/qmimodem/qmi.h
+Index: ofono-1.33/drivers/qmimodem/qmi.h
+===================================================================
+--- ofono-1.33.orig/drivers/qmimodem/qmi.h
++++ ofono-1.33/drivers/qmimodem/qmi.h
@@ -19,6 +19,9 @@
*
*/
@@ -54,7 +54,7 @@ index 2665c441..1202cb35 100644
#include <stdbool.h>
#include <stdint.h>
-@@ -174,3 +177,13 @@ uint16_t qmi_service_register(struct qmi_service *service,
+@@ -174,3 +177,13 @@ uint16_t qmi_service_register(struct qmi
void *user_data, qmi_destroy_func_t destroy);
bool qmi_service_unregister(struct qmi_service *service, uint16_t id);
bool qmi_service_unregister_all(struct qmi_service *service);
@@ -68,11 +68,10 @@ index 2665c441..1202cb35 100644
+};
+
+#endif /* __OFONO_QMI_QMI_H */
-diff --git a/drivers/qmimodem/voice.c b/drivers/qmimodem/voice.c
-new file mode 100644
-index 00000000..76ef8203
+Index: ofono-1.33/drivers/qmimodem/voice.c
+===================================================================
--- /dev/null
-+++ b/drivers/qmimodem/voice.c
++++ ofono-1.33/drivers/qmimodem/voice.c
@@ -0,0 +1,86 @@
+/*
+ *
@@ -160,10 +159,10 @@ index 00000000..76ef8203
+ return qmi_direction - 1;
+}
+
-diff --git a/drivers/qmimodem/voice.h b/drivers/qmimodem/voice.h
-index ca146491..bb98e693 100644
---- a/drivers/qmimodem/voice.h
-+++ b/drivers/qmimodem/voice.h
+Index: ofono-1.33/drivers/qmimodem/voice.h
+===================================================================
+--- ofono-1.33.orig/drivers/qmimodem/voice.h
++++ ofono-1.33/drivers/qmimodem/voice.h
@@ -15,6 +15,9 @@
*
*/
@@ -209,11 +208,10 @@ index ca146491..bb98e693 100644
+uint8_t ofono_to_qmi_direction(enum call_direction ofono_direction);
+enum call_direction qmi_to_ofono_direction(uint8_t qmi_direction);
+int qmi_to_ofono_status(uint8_t status, int *ret);
-diff --git a/drivers/qmimodem/voice_generated.c b/drivers/qmimodem/voice_generated.c
-new file mode 100644
-index 00000000..244a8d2d
+Index: ofono-1.33/drivers/qmimodem/voice_generated.c
+===================================================================
--- /dev/null
-+++ b/drivers/qmimodem/voice_generated.c
++++ ofono-1.33/drivers/qmimodem/voice_generated.c
@@ -0,0 +1,209 @@
+
+#include <stdint.h>
@@ -424,11 +422,10 @@ index 00000000..244a8d2d
+
+ return err;
+}
-diff --git a/drivers/qmimodem/voice_generated.h b/drivers/qmimodem/voice_generated.h
-new file mode 100644
-index 00000000..471b52ea
+Index: ofono-1.33/drivers/qmimodem/voice_generated.h
+===================================================================
--- /dev/null
-+++ b/drivers/qmimodem/voice_generated.h
++++ ofono-1.33/drivers/qmimodem/voice_generated.h
@@ -0,0 +1,113 @@
+
+#ifndef __OFONO_QMI_VOICE_GENERATED_H
@@ -543,10 +540,10 @@ index 00000000..471b52ea
+ struct qmi_voice_all_call_status_ind *result);
+
+#endif /* __OFONO_QMI_VOICE_GENERATED_H */
-diff --git a/drivers/qmimodem/voicecall.c b/drivers/qmimodem/voicecall.c
-index 52dd69b1..cfc6f0b9 100644
---- a/drivers/qmimodem/voicecall.c
-+++ b/drivers/qmimodem/voicecall.c
+Index: ofono-1.33/drivers/qmimodem/voicecall.c
+===================================================================
+--- ofono-1.33.orig/drivers/qmimodem/voicecall.c
++++ ofono-1.33/drivers/qmimodem/voicecall.c
@@ -3,6 +3,7 @@
* oFono - Open Source Telephony
*
@@ -667,7 +664,7 @@ index 52dd69b1..cfc6f0b9 100644
static void create_voice_cb(struct qmi_service *service, void *user_data)
{
struct ofono_voicecall *vc = user_data;
-@@ -58,6 +149,12 @@ static void create_voice_cb(struct qmi_service *service, void *user_data)
+@@ -58,6 +149,12 @@ static void create_voice_cb(struct qmi_s
data->voice = qmi_service_ref(service);
@@ -680,7 +677,7 @@ index 52dd69b1..cfc6f0b9 100644
ofono_voicecall_register(vc);
}
-@@ -77,7 +174,6 @@ static int qmi_voicecall_probe(struct ofono_voicecall *vc,
+@@ -77,7 +174,6 @@ static int qmi_voicecall_probe(struct of
create_voice_cb, vc, NULL);
return 0;
@@ -688,7 +685,7 @@ index 52dd69b1..cfc6f0b9 100644
}
static void qmi_voicecall_remove(struct ofono_voicecall *vc)
-@@ -92,13 +188,225 @@ static void qmi_voicecall_remove(struct ofono_voicecall *vc)
+@@ -92,13 +188,225 @@ static void qmi_voicecall_remove(struct
qmi_service_unref(data->voice);
@@ -914,6 +911,3 @@ index 52dd69b1..cfc6f0b9 100644
};
void qmi_voicecall_init(void)
---
-2.24.1
-
diff --git a/debian/patches/fix-explicit-bzero.patch b/debian/patches/fix-explicit-bzero.patch
deleted file mode 100644
index 855fa6b..0000000
--- a/debian/patches/fix-explicit-bzero.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/ell/missing.h b/ell/missing.h
-index 37d5586..649a5ac 100644
---- a/ell/missing.h
-+++ b/ell/missing.h
-@@ -54,11 +54,3 @@
- # define __NR_getrandom 0xffffffff
- # endif
- #endif
--
--#ifndef HAVE_EXPLICIT_BZERO
--static inline void explicit_bzero(void *s, size_t n)
--{
-- memset(s, 0, n);
-- __asm__ __volatile__ ("" : : "r"(s) : "memory");
--}
--#endif
diff --git a/debian/patches/series b/debian/patches/series
index 3c13837..7a8915b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@
0003-common-atmodem-move-at_util_call_compare_by_id-to-dr.patch
0004-add-call-list-helper-to-manage-voice-call-lists.patch
0005-qmimodem-implement-voice-calls.patch
-fix-explicit-bzero.patch
fix-TEMP_FAILURE_RETRY.patch
skip-broken-test.patch
support-smdpkt.patch
@@ -14,6 +13,6 @@ qmimodem-correct-state-for-incoming-call.patch
sim-change-notification-for-pin-valies.patch
0001-gprs-Add-Preferred-property-to-contexts.patch
-0002-qmimodem-Implement-data-capability-bearer-notify.patch
+#0002-qmimodem-Implement-data-capability-bearer-notify.patch
0003-qmimodem-Allow-UMTS-and-LTE-to-fallback-to-a-lower-c.patch
0004-qmimodem-HACK-use-fast-dormancy-calls-to-quarry-stat.patch
diff --git a/debian/patches/sim-change-notification-for-pin-valies.patch b/debian/patches/sim-change-notification-for-pin-valies.patch
index 98e90ec..1b8dfcf 100644
--- a/debian/patches/sim-change-notification-for-pin-valies.patch
+++ b/debian/patches/sim-change-notification-for-pin-valies.patch
@@ -9,11 +9,11 @@ none after sim_inserted_nofify has been called.
src/sim.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
-diff --git a/src/sim.c b/src/sim.c
-index 535ccbcaf..f8b86a175 100644
---- a/src/sim.c
-+++ b/src/sim.c
-@@ -80,6 +80,7 @@ struct ofono_sim {
+Index: ofono-1.33/src/sim.c
+===================================================================
+--- ofono-1.33.orig/src/sim.c
++++ ofono-1.33/src/sim.c
+@@ -81,6 +81,7 @@ struct ofono_sim {
gboolean locked_pins[OFONO_SIM_PASSWORD_SIM_PUK]; /* Number of PINs */
int pin_retries[OFONO_SIM_PASSWORD_INVALID];
@@ -21,7 +21,7 @@ index 535ccbcaf..f8b86a175 100644
enum ofono_sim_phase phase;
unsigned char mnc_length;
-@@ -2925,6 +2926,8 @@ void ofono_sim_inserted_notify(struct ofono_sim *sim, ofono_bool_t inserted)
+@@ -2927,6 +2928,8 @@ void ofono_sim_inserted_notify(struct of
sim->pin_retries[OFONO_SIM_PASSWORD_SIM_PIN2] = -1;
sim->pin_retries[OFONO_SIM_PASSWORD_SIM_PUK2] = -1;
@@ -30,9 +30,9 @@ index 535ccbcaf..f8b86a175 100644
pin_cache_remove(sim->iccid);
sim_free_state(sim);
-@@ -3212,8 +3215,9 @@ static void sim_pin_query_cb(const struct ofono_error *error,
- return;
- }
+@@ -3216,8 +3219,9 @@ static void sim_pin_query_cb(const struc
+
+ pin_name = sim_passwd_name(pin_type);
- if (sim->pin_type != pin_type) {
+ if (sim->pin_type != pin_type || sim->pin_values_dirty) {
diff --git a/debian/patches/support-smdpkt.patch b/debian/patches/support-smdpkt.patch
index f987333..b2df3f0 100644
--- a/debian/patches/support-smdpkt.patch
+++ b/debian/patches/support-smdpkt.patch
@@ -7,11 +7,11 @@ Subject: [PATCH] support smdpkt
plugins/udevng.c | 64 ++++++++++++++++++++++++++----------------------
1 file changed, 35 insertions(+), 29 deletions(-)
-diff --git a/plugins/udevng.c b/plugins/udevng.c
-index f689b756..c07cae79 100644
---- a/plugins/udevng.c
-+++ b/plugins/udevng.c
-@@ -202,41 +202,45 @@ static gboolean setup_gobi(struct modem_info *modem)
+Index: ofono-1.33/plugins/udevng.c
+===================================================================
+--- ofono-1.33.orig/plugins/udevng.c
++++ ofono-1.33/plugins/udevng.c
+@@ -203,41 +203,45 @@ static gboolean setup_gobi(struct modem_
DBG("%s", modem->syspath);
@@ -86,7 +86,7 @@ index f689b756..c07cae79 100644
ofono_modem_set_string(modem->modem, "Device", qmi);
-@@ -1867,6 +1871,8 @@ static void enumerate_devices(struct udev *context)
+@@ -2074,6 +2078,8 @@ static void enumerate_devices(struct ude
return;
udev_enumerate_add_match_subsystem(enumerate, "tty");
@@ -95,6 +95,3 @@ index f689b756..c07cae79 100644
udev_enumerate_add_match_subsystem(enumerate, "usb");
udev_enumerate_add_match_subsystem(enumerate, "usbmisc");
udev_enumerate_add_match_subsystem(enumerate, "net");
---
-2.22.0
-
More information about the Neon-commits
mailing list