+++ /dev/null
-From 0411aa492849de5838d2794a9a9cd78095cae63d Mon Sep 17 00:00:00 2001
-From: Marcel Holtmann <marcel@holtmann.org>
-Date: Fri, 10 Feb 2012 11:45:34 +0100
-Subject: [PATCH 1/7] ifxmodem: Add support for IPv6 and dual mode contexts
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
----
- drivers/ifxmodem/gprs-context.c | 22 +++++++++++++++-------
- 1 files changed, 15 insertions(+), 7 deletions(-)
-
-diff --git a/drivers/ifxmodem/gprs-context.c b/drivers/ifxmodem/gprs-context.c
-index 6902f17..f66e1a1 100644
---- a/drivers/ifxmodem/gprs-context.c
-+++ b/drivers/ifxmodem/gprs-context.c
-@@ -320,11 +320,7 @@ static void ifx_gprs_activate_primary(struct ofono_gprs_context *gc,
- {
- struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
- char buf[OFONO_GPRS_MAX_APN_LENGTH + 128];
-- int len;
--
-- /* IPv6 support not implemented */
-- if (ctx->proto != OFONO_GPRS_PROTO_IP)
-- goto error;
-+ int len = 0;
-
- DBG("cid %u", ctx->cid);
-
-@@ -336,7 +332,20 @@ static void ifx_gprs_activate_primary(struct ofono_gprs_context *gc,
-
- gcd->state = STATE_ENABLING;
-
-- len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IP\"", ctx->cid);
-+ switch (ctx->proto) {
-+ case OFONO_GPRS_PROTO_IP:
-+ len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IP\"",
-+ ctx->cid);
-+ break;
-+ case OFONO_GPRS_PROTO_IPV6:
-+ len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IPV6\"",
-+ ctx->cid);
-+ break;
-+ case OFONO_GPRS_PROTO_IPV4V6:
-+ len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IPV4V6\"",
-+ ctx->cid);
-+ break;
-+ }
-
- if (ctx->apn)
- snprintf(buf + len, sizeof(buf) - len - 3,
-@@ -346,7 +355,6 @@ static void ifx_gprs_activate_primary(struct ofono_gprs_context *gc,
- setup_cb, gc, NULL) > 0)
- return;
-
--error:
- CALLBACK_WITH_FAILURE(cb, data);
- }
-
---
-1.7.5.4
-
+++ /dev/null
-From b34e1a6e19467baff678e4c22afd234f0e0b137b Mon Sep 17 00:00:00 2001
-From: Marcel Holtmann <marcel@holtmann.org>
-Date: Fri, 10 Feb 2012 12:02:42 +0100
-Subject: [PATCH 2/7] ifxmodem: Add support for dynamic DNS for IPv6 and dual
- mode contexts
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
----
- drivers/ifxmodem/gprs-context.c | 18 +++++++++++++++++-
- 1 files changed, 17 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/ifxmodem/gprs-context.c b/drivers/ifxmodem/gprs-context.c
-index f66e1a1..4cca265 100644
---- a/drivers/ifxmodem/gprs-context.c
-+++ b/drivers/ifxmodem/gprs-context.c
-@@ -64,6 +64,7 @@ struct gprs_context_data {
- char password[OFONO_GPRS_MAX_PASSWORD_LENGTH + 1];
- GAtRawIP *rawip;
- enum state state;
-+ enum ofono_gprs_proto proto;
- char address[32];
- char dns1[32];
- char dns2[32];
-@@ -301,11 +302,25 @@ static void setup_cb(gboolean ok, GAtResult *result, gpointer user_data)
- if (g_at_chat_send(gcd->chat, buf, none_prefix, NULL, NULL, NULL) == 0)
- goto error;
-
-- sprintf(buf, "AT+XDNS=%u,1", gcd->active_context);
-+ g_at_chat_send(gcd->chat, "AT+XDNS=?", none_prefix, NULL, NULL, NULL);
-+
-+ switch (gcd->proto) {
-+ case OFONO_GPRS_PROTO_IP:
-+ sprintf(buf, "AT+XDNS=%u,1", gcd->active_context);
-+ break;
-+ case OFONO_GPRS_PROTO_IPV6:
-+ sprintf(buf, "AT+XDNS=%u,2", gcd->active_context);
-+ break;
-+ case OFONO_GPRS_PROTO_IPV4V6:
-+ sprintf(buf, "AT+XDNS=%u,3", gcd->active_context);
-+ break;
-+ }
-+
- if (g_at_chat_send(gcd->chat, buf, none_prefix, NULL, NULL, NULL) == 0)
- goto error;
-
- sprintf(buf, "AT+CGACT=1,%u", gcd->active_context);
-+
- if (g_at_chat_send(gcd->chat, buf, none_prefix,
- activate_cb, gc, NULL) > 0)
- return;
-@@ -331,6 +346,7 @@ static void ifx_gprs_activate_primary(struct ofono_gprs_context *gc,
- memcpy(gcd->password, ctx->password, sizeof(ctx->password));
-
- gcd->state = STATE_ENABLING;
-+ gcd->proto = ctx->proto;
-
- switch (ctx->proto) {
- case OFONO_GPRS_PROTO_IP:
---
-1.7.5.4
-
+++ /dev/null
-From dd1e6b2ff3e3d1be2ea09350e6684a77a667005f Mon Sep 17 00:00:00 2001
-From: Marcel Holtmann <marcel@holtmann.org>
-Date: Fri, 10 Feb 2012 12:19:42 +0100
-Subject: [PATCH 3/7] ifx: Setup CSCS to use GSM for the aux port
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-This change is needed since otherwise umlauts and other characters
-for USSD responses will not work properly.
----
- plugins/ifx.c | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/plugins/ifx.c b/plugins/ifx.c
-index d1b622c..552b461 100644
---- a/plugins/ifx.c
-+++ b/plugins/ifx.c
-@@ -308,6 +308,10 @@ static void xgendata_query(gboolean ok, GAtResult *result, gpointer user_data)
-
- DBG("\n%s", gendata);
-
-+ /* switch to GSM character set instead of IRA */
-+ g_at_chat_send(data->dlcs[AUX_DLC], "AT+CSCS=\"GSM\"", none_prefix,
-+ NULL, NULL, NULL);
-+
- /* disable UART for power saving */
- g_at_chat_send(data->dlcs[AUX_DLC], "AT+XPOW=0,0,0", none_prefix,
- NULL, NULL, NULL);
---
-1.7.5.4
-
+++ /dev/null
-From d8a084c7484e2794d175c395debee019e4dacf00 Mon Sep 17 00:00:00 2001
-From: Marcel Holtmann <marcel@holtmann.org>
-Date: Tue, 14 Feb 2012 15:23:59 +0100
-Subject: [PATCH 4/7] atmodem: Fix handling of IFX signal strength indication
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
----
- drivers/atmodem/network-registration.c | 10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/atmodem/network-registration.c b/drivers/atmodem/network-registration.c
-index 936a674..9c639c0 100644
---- a/drivers/atmodem/network-registration.c
-+++ b/drivers/atmodem/network-registration.c
-@@ -692,12 +692,18 @@ static void ifx_xciev_notify(GAtResult *result, gpointer user_data)
- if (!g_at_result_iter_next_number(&iter, &ind))
- return;
-
-- if (ind == 0)
-+ /*
-+ * Radio signal strength indicators are defined for 0-7,
-+ * but in some cases XCIEV just returns CSQ 0-31,99 values.
-+ */
-+ if (ind == 0 || ind == 99)
- strength = -1;
- else if (ind == 7)
- strength = 100;
-- else
-+ else if (ind < 7)
- strength = (ind * 15);
-+ else if (ind > 7)
-+ strength = (ind * 100) / 31;
-
- ofono_netreg_strength_notify(netreg, strength);
- }
---
-1.7.5.4
-
+++ /dev/null
-From 65a65eb70ca5f2af4efccb2fc7d4e00661631520 Mon Sep 17 00:00:00 2001
-From: Philippe Nunes <philippe.nunes@linux.intel.com>
-Date: Wed, 15 Feb 2012 11:38:59 +0100
-Subject: [PATCH] call-volume.c: Register the call-volume interface just after the +CMUT query
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-With this change, the mute status and the volume level are initialised in the
-call-volume atom. This allows also to expose the call-volume interface even
-if the command +CLVL is not supported as it is the case for IFX.
----
- drivers/atmodem/call-volume.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/atmodem/call-volume.c b/drivers/atmodem/call-volume.c
-index e2535b1..4c32ba7 100644
---- a/drivers/atmodem/call-volume.c
-+++ b/drivers/atmodem/call-volume.c
-@@ -65,6 +65,7 @@ static void cmut_query(gboolean ok, GAtResult *result, gpointer user_data)
- if (g_at_result_iter_next_number(&iter, &muted) == FALSE)
- return;
-
-+ ofono_call_volume_register(cv);
- ofono_call_volume_set_muted(cv, muted);
- }
-
-@@ -94,7 +95,6 @@ static void clvl_query(gboolean ok, GAtResult *result, gpointer user_data)
- (cvd->clvl_max - cvd->clvl_min);
-
- ofono_call_volume_set_speaker_volume(cv, percent);
-- ofono_call_volume_register(cv);
- }
-
- static void clvl_range_query(gboolean ok, GAtResult *result, gpointer user_data)
---
-1.7.1
-
+++ /dev/null
-From dc41204950b570771efcb0ca1d4b219572216b36 Mon Sep 17 00:00:00 2001
-From: Marcel Holtmann <marcel@holtmann.org>
-Date: Mon, 19 Mar 2012 16:12:12 -0700
-Subject: [PATCH 5/6] gisi: Remove includes of <glib/gtypes.h>
-
----
- gisi/client.h | 1 -
- gisi/message.h | 2 +-
- gisi/modem.h | 1 -
- 3 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/gisi/client.h b/gisi/client.h
-index 8224cd2..77b04fe 100644
---- a/gisi/client.h
-+++ b/gisi/client.h
-@@ -27,7 +27,6 @@ extern "C" {
- #endif
-
- #include <stdint.h>
--#include <glib/gtypes.h>
-
- #include "modem.h"
-
-diff --git a/gisi/message.h b/gisi/message.h
-index 5bdd7ba..f28b889 100644
---- a/gisi/message.h
-+++ b/gisi/message.h
-@@ -27,7 +27,7 @@ extern "C" {
- #endif
-
- #include <stdint.h>
--#include <glib/gtypes.h>
-+#include <glib.h>
-
- #include "phonet.h"
-
-diff --git a/gisi/modem.h b/gisi/modem.h
-index 0a741f6..46370ee 100644
---- a/gisi/modem.h
-+++ b/gisi/modem.h
-@@ -23,7 +23,6 @@
- #define __GISI_MODEM_H
-
- #include <stdint.h>
--#include <glib/gtypes.h>
-
- #include "phonet.h"
- #include "message.h"
---
-1.7.2.2
-
+++ /dev/null
-From 6b0880f8a77b2f161ae9ad14e247a5a1ab769447 Mon Sep 17 00:00:00 2001
-From: Marcel Holtmann <marcel@holtmann.org>
-Date: Mon, 19 Mar 2012 16:12:36 -0700
-Subject: [PATCH 7/7] isimodem: Remove includes of <glib/gtypes.h>
-
----
- drivers/isimodem/uicc-util.h | 1 -
- drivers/isimodem/uicc.h | 2 --
- 2 files changed, 0 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/isimodem/uicc-util.h b/drivers/isimodem/uicc-util.h
-index 7c8179e..aa846d0 100644
---- a/drivers/isimodem/uicc-util.h
-+++ b/drivers/isimodem/uicc-util.h
-@@ -27,7 +27,6 @@
- extern "C" {
- #endif
-
--#include <glib/gtypes.h>
- #include <gisi/client.h>
-
- struct uicc_sim_data;
-diff --git a/drivers/isimodem/uicc.h b/drivers/isimodem/uicc.h
-index dfcd476..b715932 100644
---- a/drivers/isimodem/uicc.h
-+++ b/drivers/isimodem/uicc.h
-@@ -27,8 +27,6 @@
- extern "C" {
- #endif
-
--#include <glib/gtypes.h>
--
- #include <gisi/client.h>
- #include <gisi/modem.h>
-
---
-1.7.2.2
-
* Fri Jun 8 09:02:47 CST 2012 Arron <arron.wang@intel.com> - 1.6
+- Remove already merged patches, remove tar file in the packaging directory
+
+* Fri Jun 8 09:02:47 CST 2012 Arron <arron.wang@intel.com> - 1.6
- Merge with version 1.0 release
* Wed May 30 03:17:39 UTC 2012 - Lin Yang <lin.a.yang@intel.con> - 1.4-6
URL: http://ofono.org
Source0: %{name}-%{version}.tar.bz2
Source1: init_ofono
-Patch0: 0001-ifxmodem-Add-support-for-IPv6-and-dual-mode-contexts.patch
-Patch1: 0002-ifxmodem-Add-support-for-dynamic-DNS-for-IPv6-and-du.patch
-Patch2: 0003-ifx-Setup-CSCS-to-use-GSM-for-the-aux-port.patch
-Patch3: 0004-atmodem-Fix-handling-of-IFX-signal-strength-indicati.patch
-Patch4: 0005-call-volume.c-Register-the-call-volume-interface-jus.patch
-Patch5: 0006-gisi-Remove-includes-of-glib-gtypes.h.patch
-Patch6: 0007-isimodem-Remove-includes-of-glib-gtypes.h.patch
Requires(post): /bin/ln
Requires: dbus
%prep
%setup -q -n %{name}-%{version}
-# 0001-ifxmodem-Add-support-for-IPv6-and-dual-mode-contexts.patch
-%patch0 -p1
-# 0002-ifxmodem-Add-support-for-dynamic-DNS-for-IPv6-and-du.patch
-%patch1 -p1
-# 0003-ifx-Setup-CSCS-to-use-GSM-for-the-aux-port.patch
-%patch2 -p1
-# 0004-atmodem-Fix-handling-of-IFX-signal-strength-indicati.patch
-%patch3 -p1
-# 0005-call-volume.c-Register-the-call-volume-interface-jus.patch
-%patch4 -p1
-# 0001-gisi-Remove-includes-of-glib-gtypes.h.patch
-%patch5 -p1
-# 0002-isimodem-Remove-includes-of-glib-gtypes.h.patch
-%patch6 -p1
%build
autoreconf --force --install
projects / profile / ivi / ofono.git / commitdiff