diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 18 | ||||
| -rw-r--r-- | src/mm-errors.c | 33 | ||||
| -rw-r--r-- | src/mm-errors.h | 17 | ||||
| -rw-r--r-- | src/mm-manager.h | 3 | ||||
| -rw-r--r-- | src/tests/Makefile.am | 20 |
5 files changed, 34 insertions, 57 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 77e059da..62555bd5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,7 +14,14 @@ noinst_LTLIBRARIES = libmodem-helpers.la libserial.la libmodem_helpers_la_CPPFLAGS = \ $(MM_CFLAGS) \ - -I$(top_srcdir)/include + -I$(top_srcdir) \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/libmm-common \ + -I$(top_builddir)/libmm-common + +libmodem_helpers_la_LIBADD = \ + $(top_builddir)/libmm-common/libmm-common.la libmodem_helpers_la_SOURCES = \ mm-errors.c \ @@ -30,7 +37,11 @@ libmodem_helpers_la_SOURCES = \ libserial_la_CPPFLAGS = \ $(MM_CFLAGS) \ - -I$(top_srcdir) + -I$(top_srcdir) \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/libmm-common \ + -I$(top_builddir)/libmm-common libserial_la_SOURCES = \ mm-port.c \ @@ -49,6 +60,9 @@ modem_manager_CPPFLAGS = \ $(GUDEV_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/include \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/libmm-common \ + -I$(top_builddir)/libmm-common \ -I${top_builddir}/marshallers \ -DPLUGINDIR=\"$(pkglibdir)\" diff --git a/src/mm-errors.c b/src/mm-errors.c index 841ad0fa..ba74d015 100644 --- a/src/mm-errors.c +++ b/src/mm-errors.c @@ -22,39 +22,6 @@ #define ENUM_ENTRY(NAME, DESC) { NAME, "" #NAME "", DESC } GQuark -mm_serial_error_quark (void) -{ - static GQuark ret = 0; - - if (ret == 0) - ret = g_quark_from_static_string ("mm_serial_error"); - - return ret; -} - -GType -mm_serial_error_get_type (void) -{ - static GType etype = 0; - - if (etype == 0) { - static const GEnumValue values[] = { - ENUM_ENTRY (MM_SERIAL_ERROR_OPEN_FAILED, "SerialOpenFailed"), - ENUM_ENTRY (MM_SERIAL_ERROR_SEND_FAILED, "SerialSendfailed"), - ENUM_ENTRY (MM_SERIAL_ERROR_RESPONSE_TIMEOUT, "SerialResponseTimeout"), - ENUM_ENTRY (MM_SERIAL_ERROR_OPEN_FAILED_NO_DEVICE, "SerialOpenFailedNoDevice"), - ENUM_ENTRY (MM_SERIAL_ERROR_FLASH_FAILED, "SerialFlashFailed"), - ENUM_ENTRY (MM_SERIAL_ERROR_NOT_OPEN, "SerialNotOpen"), - { 0, 0, 0 } - }; - - etype = g_enum_register_static ("MMSerialError", values); - } - - return etype; -} - -GQuark mm_modem_error_quark (void) { static GQuark ret = 0; diff --git a/src/mm-errors.h b/src/mm-errors.h index dd11fdc5..a183b70b 100644 --- a/src/mm-errors.h +++ b/src/mm-errors.h @@ -19,21 +19,8 @@ #include <glib-object.h> -enum { - MM_SERIAL_ERROR_OPEN_FAILED = 0, - MM_SERIAL_ERROR_SEND_FAILED = 1, - MM_SERIAL_ERROR_RESPONSE_TIMEOUT = 2, - MM_SERIAL_ERROR_OPEN_FAILED_NO_DEVICE = 3, - MM_SERIAL_ERROR_FLASH_FAILED = 4, - MM_SERIAL_ERROR_NOT_OPEN = 5, -}; - -#define MM_SERIAL_ERROR (mm_serial_error_quark ()) -#define MM_TYPE_SERIAL_ERROR (mm_serial_error_get_type ()) - -GQuark mm_serial_error_quark (void); -GType mm_serial_error_get_type (void); - +#include <ModemManager-errors.h> +#include <mm-errors-types.h> enum { MM_MODEM_ERROR_GENERAL = 0, diff --git a/src/mm-manager.h b/src/mm-manager.h index c6a64bd6..b1b4b159 100644 --- a/src/mm-manager.h +++ b/src/mm-manager.h @@ -28,9 +28,6 @@ #define MM_IS_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), MM_TYPE_MANAGER)) #define MM_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_MANAGER, MMManagerClass)) -#define MM_DBUS_SERVICE "org.freedesktop.ModemManager" -#define MM_DBUS_PATH "/org/freedesktop/ModemManager" - typedef struct { GObject parent; } MMManager; diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index df7157e4..2bcfeb0b 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -13,7 +13,10 @@ test_modem_helpers_CPPFLAGS = \ $(MM_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/include + -I$(top_srcdir)/include \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/libmm-common \ + -I$(top_builddir)/libmm-common test_modem_helpers_LDADD = \ $(top_builddir)/src/libmodem-helpers.la \ @@ -26,7 +29,10 @@ test_charsets_CPPFLAGS = \ $(MM_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/include + -I$(top_srcdir)/include \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/libmm-common \ + -I$(top_builddir)/libmm-common test_charsets_LDADD = \ $(top_builddir)/src/libmodem-helpers.la \ @@ -39,7 +45,10 @@ test_qcdm_serial_port_CPPFLAGS = \ $(MM_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/include + -I$(top_srcdir)/include \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/libmm-common \ + -I$(top_builddir)/libmm-common test_qcdm_serial_port_LDADD = \ $(MM_LIBS) \ @@ -69,7 +78,10 @@ test_sms_CPPFLAGS = \ $(MM_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/include + -I$(top_srcdir)/include \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/libmm-common \ + -I$(top_builddir)/libmm-common test_sms_LDADD = \ $(top_builddir)/src/libmodem-helpers.la \ |