aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mm-plugin.h3
-rw-r--r--src/mm-shared.h35
-rw-r--r--src/plugins/fibocom/mm-shared.c6
-rw-r--r--src/plugins/foxconn/mm-shared.c7
-rw-r--r--src/plugins/icera/mm-shared.c6
-rw-r--r--src/plugins/mm-shared-common.h41
-rw-r--r--src/plugins/novatel/mm-shared.c6
-rw-r--r--src/plugins/option/mm-shared.c6
-rw-r--r--src/plugins/sierra/mm-shared.c6
-rw-r--r--src/plugins/telit/mm-shared.c6
-rw-r--r--src/plugins/xmm/mm-shared.c6
11 files changed, 60 insertions, 68 deletions
diff --git a/src/mm-plugin.h b/src/mm-plugin.h
index 7bcb4313..89170167 100644
--- a/src/mm-plugin.h
+++ b/src/mm-plugin.h
@@ -31,6 +31,9 @@
#define MM_PLUGIN_MAJOR_VERSION 5
#define MM_PLUGIN_MINOR_VERSION 0
+#define MM_SHARED_MAJOR_VERSION 1
+#define MM_SHARED_MINOR_VERSION 0
+
#define MM_TYPE_PLUGIN (mm_plugin_get_type ())
#define MM_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN, MMPlugin))
#define MM_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_PLUGIN, MMPluginClass))
diff --git a/src/mm-shared.h b/src/mm-shared.h
index 4fc7cef5..e69de29b 100644
--- a/src/mm-shared.h
+++ b/src/mm-shared.h
@@ -1,35 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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:
- *
- * Copyright (C) 2019 Aleksander Morgado <aleksander@aleksander.es>
- */
-
-#ifndef MM_SHARED_H
-#define MM_SHARED_H
-
-#include <glib.h>
-#include <glib-object.h>
-
-#define MM_SHARED_MAJOR_VERSION 1
-#define MM_SHARED_MINOR_VERSION 0
-
-#if defined (G_HAVE_GNUC_VISIBILITY)
-#define VISIBILITY __attribute__((visibility("protected")))
-#else
-#define VISIBILITY
-#endif
-
-#define MM_SHARED_DEFINE_MAJOR_VERSION VISIBILITY int mm_shared_major_version = MM_SHARED_MAJOR_VERSION;
-#define MM_SHARED_DEFINE_MINOR_VERSION VISIBILITY int mm_shared_minor_version = MM_SHARED_MINOR_VERSION;
-#define MM_SHARED_DEFINE_NAME(NAME) VISIBILITY const char *mm_shared_name = #NAME;
-
-#endif /* MM_SHARED_H */
diff --git a/src/plugins/fibocom/mm-shared.c b/src/plugins/fibocom/mm-shared.c
index b99bc3aa..d4e85d68 100644
--- a/src/plugins/fibocom/mm-shared.c
+++ b/src/plugins/fibocom/mm-shared.c
@@ -13,8 +13,6 @@
* Copyright (C) 2022 Aleksander Morgado <aleksander@aleksander.es>
*/
-#include "mm-shared.h"
+#include "mm-shared-common.h"
-MM_SHARED_DEFINE_MAJOR_VERSION
-MM_SHARED_DEFINE_MINOR_VERSION
-MM_SHARED_DEFINE_NAME(Intel)
+MM_DEFINE_SHARED (fibocom)
diff --git a/src/plugins/foxconn/mm-shared.c b/src/plugins/foxconn/mm-shared.c
index 3b017574..b1d6b874 100644
--- a/src/plugins/foxconn/mm-shared.c
+++ b/src/plugins/foxconn/mm-shared.c
@@ -13,8 +13,5 @@
* Copyright (C) 2019 Aleksander Morgado <aleksander@aleksander.es>
*/
-#include "mm-shared.h"
-
-MM_SHARED_DEFINE_MAJOR_VERSION
-MM_SHARED_DEFINE_MINOR_VERSION
-MM_SHARED_DEFINE_NAME(Foxconn)
+#include "mm-shared-common.h"
+MM_DEFINE_SHARED (foxconn)
diff --git a/src/plugins/icera/mm-shared.c b/src/plugins/icera/mm-shared.c
index 735d61bf..46f77718 100644
--- a/src/plugins/icera/mm-shared.c
+++ b/src/plugins/icera/mm-shared.c
@@ -13,8 +13,6 @@
* Copyright (C) 2019 Aleksander Morgado <aleksander@aleksander.es>
*/
-#include "mm-shared.h"
+#include "mm-shared-common.h"
-MM_SHARED_DEFINE_MAJOR_VERSION
-MM_SHARED_DEFINE_MINOR_VERSION
-MM_SHARED_DEFINE_NAME(Icera)
+MM_DEFINE_SHARED (icera)
diff --git a/src/plugins/mm-shared-common.h b/src/plugins/mm-shared-common.h
new file mode 100644
index 00000000..a9183ee6
--- /dev/null
+++ b/src/plugins/mm-shared-common.h
@@ -0,0 +1,41 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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:
+ *
+ * Copyright (C) 2019 Aleksander Morgado <aleksander@aleksander.es>
+ * Copyright (C) 2022 Google, Inc.
+ */
+
+#ifndef MM_SHARED_COMMON_H
+#define MM_SHARED_COMMON_H
+
+#if !defined MM_MODULE_NAME
+# error MM_MODULE_NAME must be defined
+#endif
+
+#include <config.h>
+#include <glib.h>
+#include <glib-object.h>
+
+#include "mm-plugin.h"
+
+#if defined (G_HAVE_GNUC_VISIBILITY)
+#define MM_VISIBILITY __attribute__((visibility("protected")))
+#else
+#define MM_VISIBILITY
+#endif
+
+#define MM_DEFINE_SHARED(MyShared) \
+ MM_VISIBILITY int mm_shared_major_version = MM_SHARED_MAJOR_VERSION; \
+ MM_VISIBILITY int mm_shared_minor_version = MM_SHARED_MINOR_VERSION; \
+ MM_VISIBILITY const char *mm_shared_name = #MyShared;
+
+#endif /* MM_SHARED_COMMON_H */
diff --git a/src/plugins/novatel/mm-shared.c b/src/plugins/novatel/mm-shared.c
index 6bd11e4b..07879be2 100644
--- a/src/plugins/novatel/mm-shared.c
+++ b/src/plugins/novatel/mm-shared.c
@@ -13,8 +13,6 @@
* Copyright (C) 2019 Aleksander Morgado <aleksander@aleksander.es>
*/
-#include "mm-shared.h"
+#include "mm-shared-common.h"
-MM_SHARED_DEFINE_MAJOR_VERSION
-MM_SHARED_DEFINE_MINOR_VERSION
-MM_SHARED_DEFINE_NAME(Novatel)
+MM_DEFINE_SHARED (novatel)
diff --git a/src/plugins/option/mm-shared.c b/src/plugins/option/mm-shared.c
index 3f89d86a..bca0fe03 100644
--- a/src/plugins/option/mm-shared.c
+++ b/src/plugins/option/mm-shared.c
@@ -13,8 +13,6 @@
* Copyright (C) 2019 Aleksander Morgado <aleksander@aleksander.es>
*/
-#include "mm-shared.h"
+#include "mm-shared-common.h"
-MM_SHARED_DEFINE_MAJOR_VERSION
-MM_SHARED_DEFINE_MINOR_VERSION
-MM_SHARED_DEFINE_NAME(Option)
+MM_DEFINE_SHARED (option)
diff --git a/src/plugins/sierra/mm-shared.c b/src/plugins/sierra/mm-shared.c
index 665aceca..384cca1e 100644
--- a/src/plugins/sierra/mm-shared.c
+++ b/src/plugins/sierra/mm-shared.c
@@ -13,8 +13,6 @@
* Copyright (C) 2019 Aleksander Morgado <aleksander@aleksander.es>
*/
-#include "mm-shared.h"
+#include "mm-shared-common.h"
-MM_SHARED_DEFINE_MAJOR_VERSION
-MM_SHARED_DEFINE_MINOR_VERSION
-MM_SHARED_DEFINE_NAME(Sierra)
+MM_DEFINE_SHARED (sierra)
diff --git a/src/plugins/telit/mm-shared.c b/src/plugins/telit/mm-shared.c
index ad2843dd..33813b7d 100644
--- a/src/plugins/telit/mm-shared.c
+++ b/src/plugins/telit/mm-shared.c
@@ -13,8 +13,6 @@
* Copyright (C) 2019 Aleksander Morgado <aleksander@aleksander.es>
*/
-#include "mm-shared.h"
+#include "mm-shared-common.h"
-MM_SHARED_DEFINE_MAJOR_VERSION
-MM_SHARED_DEFINE_MINOR_VERSION
-MM_SHARED_DEFINE_NAME(Telit)
+MM_DEFINE_SHARED (telit)
diff --git a/src/plugins/xmm/mm-shared.c b/src/plugins/xmm/mm-shared.c
index 203f0fbb..85da8aff 100644
--- a/src/plugins/xmm/mm-shared.c
+++ b/src/plugins/xmm/mm-shared.c
@@ -13,8 +13,6 @@
* Copyright (C) 2019 Aleksander Morgado <aleksander@aleksander.es>
*/
-#include "mm-shared.h"
+#include "mm-shared-common.h"
-MM_SHARED_DEFINE_MAJOR_VERSION
-MM_SHARED_DEFINE_MINOR_VERSION
-MM_SHARED_DEFINE_NAME(Xmm)
+MM_DEFINE_SHARED (xmm)
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-06-07 15:55:53 +0000