aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore4
-rw-r--r--plugins/huawei/mm-plugin-huawei.c2
-rw-r--r--src/Makefile.am44
-rw-r--r--src/mm-base-modem.c2
-rw-r--r--src/mm-bearer-mbim.c2
-rw-r--r--src/mm-bearer-qmi.c2
-rw-r--r--src/mm-broadband-bearer.c2
-rw-r--r--src/tests/Makefile.am4
8 files changed, 31 insertions, 31 deletions
diff --git a/.gitignore b/.gitignore
index 8608a5d5..e58522e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,8 +44,8 @@ libmm-glib/*.typelib
src/ModemManager
src/mm-daemon-enums-types.c
src/mm-daemon-enums-types.h
-src/mm-serial-enums-types.c
-src/mm-serial-enums-types.h
+src/mm-port-enums-types.c
+src/mm-port-enums-types.h
src/mm-marshal.[ch]
src/tests/test-modem-helpers
src/tests/test-modem-helpers-qmi
diff --git a/plugins/huawei/mm-plugin-huawei.c b/plugins/huawei/mm-plugin-huawei.c
index 6bc72a02..bae9ab1a 100644
--- a/plugins/huawei/mm-plugin-huawei.c
+++ b/plugins/huawei/mm-plugin-huawei.c
@@ -23,7 +23,7 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
-#include "mm-serial-enums-types.h"
+#include "mm-port-enums-types.h"
#include "mm-log.h"
#include "mm-plugin-huawei.h"
#include "mm-broadband-modem-huawei.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index 80b22197..4a6cb457 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ udevrules_DATA = \
77-mm-usb-serial-adapters-greylist.rules \
80-mm-candidate.rules
-noinst_LTLIBRARIES = libmodem-helpers.la libserial.la
+noinst_LTLIBRARIES = libmodem-helpers.la libport.la
libmodem_helpers_la_CPPFLAGS = \
$(MM_CFLAGS) \
@@ -52,25 +52,25 @@ libmodem_helpers_la_SOURCES += \
libmodem_helpers_la_CPPFLAGS += $(MBIM_CFLAGS)
endif
-# libserial specific enum types
-SERIAL_ENUMS = \
+# libport specific enum types
+PORT_ENUMS = \
$(srcdir)/mm-port.h \
$(srcdir)/mm-port-serial-at.h
-mm-serial-enums-types.h: Makefile.am $(SERIAL_ENUMS) $(top_srcdir)/build-aux/mm-enums-template.h
+mm-port-enums-types.h: Makefile.am $(PORT_ENUMS) $(top_srcdir)/build-aux/mm-enums-template.h
$(AM_V_GEN) $(GLIB_MKENUMS) \
- --fhead "#include \"mm-port.h\"\n#include \"mm-port-serial-at.h\"\n#ifndef __MM_SERIAL_ENUMS_TYPES_H__\n#define __MM_SERIAL_ENUMS_TYPES_H__\n" \
+ --fhead "#include \"mm-port.h\"\n#include \"mm-port-serial-at.h\"\n#ifndef __MM_PORT_ENUMS_TYPES_H__\n#define __MM_PORT_ENUMS_TYPES_H__\n" \
--template $(top_srcdir)/build-aux/mm-enums-template.h \
- --ftail "#endif /* __MM_SERIAL_ENUMS_TYPES_H__ */\n" \
- $(SERIAL_ENUMS) > $@
+ --ftail "#endif /* __MM_PORT_ENUMS_TYPES_H__ */\n" \
+ $(PORT_ENUMS) > $@
-mm-serial-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-template.c mm-serial-enums-types.h
+mm-port-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-template.c mm-port-enums-types.h
$(AM_V_GEN) $(GLIB_MKENUMS) \
- --fhead "#include \"mm-serial-enums-types.h\"" \
+ --fhead "#include \"mm-port-enums-types.h\"" \
--template $(top_srcdir)/build-aux/mm-enums-template.c \
- $(SERIAL_ENUMS) > $@
+ $(PORT_ENUMS) > $@
-libserial_la_CPPFLAGS = \
+libport_la_CPPFLAGS = \
$(MM_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/include \
@@ -79,11 +79,11 @@ libserial_la_CPPFLAGS = \
-I${top_srcdir}/libmm-glib/generated \
-I${top_builddir}/libmm-glib/generated
-nodist_libserial_la_SOURCES = \
- mm-serial-enums-types.h \
- mm-serial-enums-types.c
+nodist_libport_la_SOURCES = \
+ mm-port-enums-types.h \
+ mm-port-enums-types.c
-libserial_la_SOURCES = \
+libport_la_SOURCES = \
mm-port.c \
mm-port.h \
mm-port-serial.c \
@@ -97,18 +97,18 @@ libserial_la_SOURCES = \
# Additional QMI support in libserial
if WITH_QMI
-libserial_la_SOURCES += \
+libport_la_SOURCES += \
mm-port-qmi.c \
mm-port-qmi.h
-libserial_la_CPPFLAGS += $(QMI_CFLAGS)
+libport_la_CPPFLAGS += $(QMI_CFLAGS)
endif
# Additional MBIM support in libserial
if WITH_MBIM
-libserial_la_SOURCES += \
+libport_la_SOURCES += \
mm-port-mbim.c \
mm-port-mbim.h
-libserial_la_CPPFLAGS += $(MBIM_CFLAGS)
+libport_la_CPPFLAGS += $(MBIM_CFLAGS)
endif
# Daemon specific enum types
@@ -147,7 +147,7 @@ ModemManager_LDADD = \
$(MM_LIBS) \
$(GUDEV_LIBS) \
$(builddir)/libmodem-helpers.la \
- $(builddir)/libserial.la \
+ $(builddir)/libport.la \
$(top_builddir)/libqcdm/src/libqcdm.la
nodist_ModemManager_SOURCES = \
@@ -269,5 +269,5 @@ EXTRA_DIST = \
CLEANFILES = \
mm-daemon-enums-types.h \
mm-daemon-enums-types.c \
- mm-serial-enums-types.h \
- mm-serial-enums-types.c
+ mm-port-enums-types.h \
+ mm-port-enums-types.c
diff --git a/src/mm-base-modem.c b/src/mm-base-modem.c
index ee731ff2..bd169afe 100644
--- a/src/mm-base-modem.c
+++ b/src/mm-base-modem.c
@@ -30,7 +30,7 @@
#include "mm-base-modem.h"
#include "mm-log.h"
-#include "mm-serial-enums-types.h"
+#include "mm-port-enums-types.h"
#include "mm-serial-parsers.h"
#include "mm-modem-helpers.h"
diff --git a/src/mm-bearer-mbim.c b/src/mm-bearer-mbim.c
index d84ad0cc..e9e51a7b 100644
--- a/src/mm-bearer-mbim.c
+++ b/src/mm-bearer-mbim.c
@@ -28,7 +28,7 @@
#include "mm-iface-modem.h"
#include "mm-modem-helpers-mbim.h"
-#include "mm-serial-enums-types.h"
+#include "mm-port-enums-types.h"
#include "mm-bearer-mbim.h"
#include "mm-log.h"
diff --git a/src/mm-bearer-qmi.c b/src/mm-bearer-qmi.c
index 66404478..438d0d0f 100644
--- a/src/mm-bearer-qmi.c
+++ b/src/mm-bearer-qmi.c
@@ -29,7 +29,7 @@
#include "mm-iface-modem.h"
#include "mm-bearer-qmi.h"
#include "mm-modem-helpers-qmi.h"
-#include "mm-serial-enums-types.h"
+#include "mm-port-enums-types.h"
#include "mm-log.h"
G_DEFINE_TYPE (MMBearerQmi, mm_bearer_qmi, MM_TYPE_BEARER);
diff --git a/src/mm-broadband-bearer.c b/src/mm-broadband-bearer.c
index 0ae84169..b67c9947 100644
--- a/src/mm-broadband-bearer.c
+++ b/src/mm-broadband-bearer.c
@@ -34,7 +34,7 @@
#include "mm-base-modem-at.h"
#include "mm-log.h"
#include "mm-modem-helpers.h"
-#include "mm-serial-enums-types.h"
+#include "mm-port-enums-types.h"
static void async_initable_iface_init (GAsyncInitableIface *iface);
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 2d13f25d..c52e4d1d 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -102,7 +102,7 @@ test_qcdm_serial_port_CPPFLAGS = \
test_qcdm_serial_port_LDADD = \
$(MM_LIBS) \
- $(top_builddir)/src/libserial.la \
+ $(top_builddir)/src/libport.la \
$(top_builddir)/src/libmodem-helpers.la \
$(top_builddir)/libqcdm/src/libqcdm.la \
-lutil
@@ -129,7 +129,7 @@ test_at_serial_port_CPPFLAGS = \
test_at_serial_port_LDADD = \
$(MM_LIBS) \
- $(top_builddir)/src/libserial.la \
+ $(top_builddir)/src/libport.la \
$(top_builddir)/src/libmodem-helpers.la \
-lutil
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-06-07 18:31:36 +0000