From 01b4c494477150a2630c5bf734119e2f8fa53c67 Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Wed, 12 Aug 2009 16:47:31 -0500
Subject: Move certain parts of driver.h to types.h

---
 src/driver.h | 21 ++-------------------
 src/ofono.h  |  2 ++
 2 files changed, 4 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/driver.h b/src/driver.h
index f05961be..14f05c34 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -19,13 +19,9 @@
  *
  */
 
-struct ofono_modem;
+#include <ofono/types.h>
 
-#define OFONO_MAX_PHONE_NUMBER_LENGTH 20
-struct ofono_phone_number {
-	char number[OFONO_MAX_PHONE_NUMBER_LENGTH + 1];
-	int type;
-};
+struct ofono_modem;
 
 /* 27.007 Section 6.2 */
 enum ofono_clir_option {
@@ -40,19 +36,6 @@ enum ofono_cug_option {
 	OFONO_CUG_OPTION_INVOCATION = 1,
 };
 
-enum ofono_error_type {
-	OFONO_ERROR_TYPE_NO_ERROR = 0,
-	OFONO_ERROR_TYPE_CME,
-	OFONO_ERROR_TYPE_CMS,
-	OFONO_ERROR_TYPE_CEER,
-	OFONO_ERROR_TYPE_FAILURE
-};
-
-struct ofono_error {
-	enum ofono_error_type type;
-	int error;
-};
-
 enum ofono_disconnect_reason {
 	OFONO_DISCONNECT_REASON_UNKNOWN = 0,
 	OFONO_DISCONNECT_REASON_LOCAL_HANGUP,
diff --git a/src/ofono.h b/src/ofono.h
index 418a29bc..f627da50 100644
--- a/src/ofono.h
+++ b/src/ofono.h
@@ -52,6 +52,8 @@ DBusMessage *__ofono_error_timed_out(DBusMessage *msg);
 
 void __ofono_dbus_pending_reply(DBusMessage **msg, DBusMessage *reply);
 
+#include <ofono/types.h>
+
 #include <ofono/plugin.h>
 
 int __ofono_plugin_init(const char *pattern, const char *exclude);
-- 
cgit v1.2.3