From 3e6d4237cba86db4f33ec1ea215e3fdc75ed6993 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Wed, 29 Jul 2009 16:53:19 -0500 Subject: [PATCH] Remove all uses of modem.h --- drivers/atmodem/atmodem.c | 2 +- src/call-barring.c | 1 - src/call-forwarding.c | 1 - src/call-meter.c | 1 - src/call-settings.c | 1 - src/cssn.c | 1 - src/history.c | 2 -- src/manager.c | 1 - src/modem.c | 1 - src/network.c | 1 - src/phonebook.c | 2 -- src/sim.c | 1 - src/sms.c | 1 - src/ussd.c | 1 - src/voicecall.c | 1 - 15 files changed, 1 insertion(+), 17 deletions(-) diff --git a/drivers/atmodem/atmodem.c b/drivers/atmodem/atmodem.c index 01cbbab2..fc255b34 100644 --- a/drivers/atmodem/atmodem.c +++ b/drivers/atmodem/atmodem.c @@ -31,11 +31,11 @@ #include #include #include +#include #include "driver.h" #include "at.h" -#include "modem.h" #include "session.h" #define AT_MANAGER_INTERFACE "org.ofono.at.Manager" diff --git a/src/call-barring.c b/src/call-barring.c index 6e78db45..36deaf77 100644 --- a/src/call-barring.c +++ b/src/call-barring.c @@ -35,7 +35,6 @@ #include "driver.h" #include "common.h" -#include "modem.h" #include "cssn.h" #include "ussd.h" diff --git a/src/call-forwarding.c b/src/call-forwarding.c index 56768819..d001bcab 100644 --- a/src/call-forwarding.c +++ b/src/call-forwarding.c @@ -32,7 +32,6 @@ #include "ofono.h" -#include "modem.h" #include "driver.h" #include "common.h" #include "ussd.h" diff --git a/src/call-meter.c b/src/call-meter.c index 4657fe4c..421fe0c0 100644 --- a/src/call-meter.c +++ b/src/call-meter.c @@ -34,7 +34,6 @@ #include "driver.h" #include "common.h" -#include "modem.h" #define CALL_METER_INTERFACE "org.ofono.CallMeter" diff --git a/src/call-settings.c b/src/call-settings.c index 86019924..18e81893 100644 --- a/src/call-settings.c +++ b/src/call-settings.c @@ -34,7 +34,6 @@ #include "driver.h" #include "common.h" -#include "modem.h" #include "ussd.h" #define CALL_SETTINGS_INTERFACE "org.ofono.CallSettings" diff --git a/src/cssn.c b/src/cssn.c index e8b681a6..1e5e3353 100644 --- a/src/cssn.c +++ b/src/cssn.c @@ -31,7 +31,6 @@ #include "ofono.h" #include "driver.h" -#include "modem.h" #include "common.h" #include "cssn.h" diff --git a/src/history.c b/src/history.c index 4f1284b3..bfc82b4b 100644 --- a/src/history.c +++ b/src/history.c @@ -30,8 +30,6 @@ #include "ofono.h" -#include "modem.h" - static GSList *history_drivers = NULL; static struct ofono_history_context *history_context_create( diff --git a/src/manager.c b/src/manager.c index 8a1bd040..07df0e06 100644 --- a/src/manager.c +++ b/src/manager.c @@ -29,7 +29,6 @@ #include "ofono.h" -#include "modem.h" #include "driver.h" static DBusMessage *manager_get_properties(DBusConnection *conn, diff --git a/src/modem.c b/src/modem.c index 5b19b935..f06639ad 100644 --- a/src/modem.c +++ b/src/modem.c @@ -31,7 +31,6 @@ #include "ofono.h" -#include "modem.h" #include "driver.h" #include "common.h" #include "cssn.h" diff --git a/src/network.c b/src/network.c index 312f348a..8135fd21 100644 --- a/src/network.c +++ b/src/network.c @@ -31,7 +31,6 @@ #include "ofono.h" -#include "modem.h" #include "driver.h" #include "common.h" #include "sim.h" diff --git a/src/phonebook.c b/src/phonebook.c index cfdf3d8e..546c80f8 100644 --- a/src/phonebook.c +++ b/src/phonebook.c @@ -34,11 +34,9 @@ #include "ofono.h" -#include "modem.h" #include "driver.h" #include "common.h" - #define PHONEBOOK_INTERFACE "org.ofono.Phonebook" #define LEN_MAX 128 #define TYPE_INTERNATIONAL 145 diff --git a/src/sim.c b/src/sim.c index 73ed7e4a..bdc0728b 100644 --- a/src/sim.c +++ b/src/sim.c @@ -36,7 +36,6 @@ #include "ofono.h" -#include "modem.h" #include "driver.h" #include "common.h" #include "util.h" diff --git a/src/sms.c b/src/sms.c index 87b6dcd0..3a471e31 100644 --- a/src/sms.c +++ b/src/sms.c @@ -31,7 +31,6 @@ #include "ofono.h" -#include "modem.h" #include "driver.h" #include "common.h" #include "util.h" diff --git a/src/ussd.c b/src/ussd.c index b0d92851..6e31cb31 100644 --- a/src/ussd.c +++ b/src/ussd.c @@ -32,7 +32,6 @@ #include "ofono.h" -#include "modem.h" #include "driver.h" #include "common.h" #include "ussd.h" diff --git a/src/voicecall.c b/src/voicecall.c index f71e906c..a06797df 100644 --- a/src/voicecall.c +++ b/src/voicecall.c @@ -34,7 +34,6 @@ #include "driver.h" #include "common.h" -#include "modem.h" #include "cssn.h" #define VOICECALL_MANAGER_INTERFACE "org.ofono.VoiceCallManager"