Refactor: rename data-connection to gprs

Keep the name specific to GSM, other implementations will probably
require their own interfaces

diff --git a/Makefile.am b/Makefile.am
index eb2de7d..b4546cf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ include_HEADERS = include/log.h include/plugin.h include/history.h \
                        include/sms.h include/sim.h include/message-waiting.h \
                        include/netreg.h include/voicecall.h include/devinfo.h \
                        include/cbs.h include/call-volume.h \
-                       include/data-connection.h
+                       include/gprs.h
 
 nodist_include_HEADERS = include/version.h
 
@@ -113,7 +113,7 @@ builtin_sources += $(gatchat_sources) \
                                drivers/atmodem/vendor.h \
                                drivers/atmodem/atutil.h \
                                drivers/atmodem/atutil.c \
-                               drivers/atmodem/data-connection.c
+                               drivers/atmodem/gprs.c
 
 builtin_modules += calypsomodem
 builtin_sources += drivers/atmodem/atutil.h \
@@ -179,7 +179,7 @@ src_ofonod_SOURCES = $(gdbus_sources) $(builtin_sources) \
                        src/phonebook.c src/history.c src/message-waiting.c \
                        src/simutil.h src/simutil.c src/storage.h \
                        src/storage.c src/cbs.c src/watch.c src/call-volume.c \
-                       src/data-connection.c
+                       src/gprs.c
 
 src_ofonod_LDADD = $(builtin_libadd) \
                        @GLIB_LIBS@ @GTHREAD_LIBS@ @DBUS_LIBS@ -ldl

diff --git a/drivers/atmodem/data-connection.c b/drivers/atmodem/gprs.c
similarity index 99%
rename from drivers/atmodem/data-connection.c
rename to drivers/atmodem/gprs.c
index 47a90e5..332e5cf 100644 (file)
--- a/drivers/atmodem/data-connection.c
+++ b/drivers/atmodem/gprs.c
@@ -32,7 +32,7 @@
 
 #include <ofono/log.h>
 #include <ofono/modem.h>
-#include <ofono/data-connection.h>
+#include <ofono/gprs.h>
 
 #include "gatchat.h"
 #include "gatresult.h"

diff --git a/include/data-connection.h b/include/gprs.h
similarity index 100%
rename from include/data-connection.h
rename to include/gprs.h

diff --git a/plugins/phonesim.c b/plugins/phonesim.c
index 071cbc9..6ac36db 100644 (file)
--- a/plugins/phonesim.c
+++ b/plugins/phonesim.c
@@ -54,7 +54,7 @@
 #include <ofono/ssn.h>
 #include <ofono/ussd.h>
 #include <ofono/voicecall.h>
-#include <ofono/data-connection.h>
+#include <ofono/gprs.h>
 
 #include <drivers/atmodem/vendor.h>
 

diff --git a/src/data-connection.c b/src/gprs.c
similarity index 100%
rename from src/data-connection.c
rename to src/gprs.c

diff --git a/src/ofono.h b/src/ofono.h
index 177e1fd..6e6fa3d 100644 (file)
--- a/src/ofono.h
+++ b/src/ofono.h
@@ -161,7 +161,7 @@ void __ofono_atom_free(struct ofono_atom *atom);
 #include <ofono/sms.h>
 #include <ofono/sim.h>
 #include <ofono/voicecall.h>
-#include <ofono/data-connection.h>
+#include <ofono/gprs.h>
 
 #include <ofono/ssn.h>