From 01b4c494477150a2630c5bf734119e2f8fa53c67 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Wed, 12 Aug 2009 16:47:31 -0500 Subject: [PATCH] Move certain parts of driver.h to types.h --- include/Makefile.am | 3 ++- include/types.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/driver.h | 21 ++------------------- src/ofono.h | 2 ++ 4 files changed, 59 insertions(+), 20 deletions(-) create mode 100644 include/types.h diff --git a/include/Makefile.am b/include/Makefile.am index 4f63c77..ced92cf 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,7 +1,8 @@ includedir = @includedir@/ofono -include_HEADERS = log.h plugin.h history.h dbus.h modem.h +include_HEADERS = log.h plugin.h history.h dbus.h modem.h \ + types.h nodist_include_HEADERS = version.h diff --git a/include/types.h b/include/types.h new file mode 100644 index 0000000..76f8fec --- /dev/null +++ b/include/types.h @@ -0,0 +1,53 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2008-2009 Intel Corporation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifndef __OFONO_TYPES_H +#define __OFONO_TYPES_H + +#ifdef __cplusplus +extern "C" { +#endif + +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; +}; + +#define OFONO_MAX_PHONE_NUMBER_LENGTH 20 + +struct ofono_phone_number { + char number[OFONO_MAX_PHONE_NUMBER_LENGTH + 1]; + int type; +}; + +#ifdef __cplusplus +} +#endif + +#endif /* __OFONO_TYPES_H */ diff --git a/src/driver.h b/src/driver.h index f05961b..14f05c3 100644 --- a/src/driver.h +++ b/src/driver.h @@ -19,13 +19,9 @@ * */ -struct ofono_modem; +#include -#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 418a29b..f627da5 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 + #include int __ofono_plugin_init(const char *pattern, const char *exclude); -- 2.7.4