colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plugins: Fix port enums includes

Browse Source 
The `broadmobi`, `dlink`, `telit` and `tplink` plugins include the
`mm-port-enums-types.h` header. However, they do not use any symbol
defined there.

The `huawei` plugin as includes the `mm-port-enums-types.h` header
but it does not include the build targets as dependencies.

These issues have been fixed by removing the unnecessary includes
from `broadmobi`, `dlink`, `telit` and `tplink` plugins and by
including the enums build target in the `huawei` target.
This commit is contained in:
Iñigo Martínez
2022-03-01 08:29:54 +01:00
parent 17dca109dd
commit 2bc697ce32
6 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/broadmobi/mm-plugin-broadmobi.c
View File

@@ -19,7 +19,6 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-port-enums-types.h"
#include "mm-log-object.h"
#include "mm-plugin-broadmobi.h"
#include "mm-broadband-modem.h"

1
plugins/dlink/mm-plugin-dlink.c
View File

@@ -19,7 +19,6 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-port-enums-types.h"
#include "mm-log-object.h"
#include "mm-plugin-dlink.h"
#include "mm-broadband-modem.h"

2
plugins/meson.build
View File

@@ -449,7 +449,7 @@ if plugins_options['huawei']
plugins += {'plugin-huawei': {
'plugin': true,
'helper': {'sources': files('huawei/mm-modem-helpers-huawei.c'), 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']},
'module': {'sources': sources + enums_sources, 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']},
'module': {'sources': sources + enums_sources + port_enums_sources, 'include_directories': plugins_incs + [huawei_inc], 'c_args': common_c_args + ['-DMM_MODULE_NAME="huawei"']},
'test': {'sources': files('huawei/tests/test-modem-helpers-huawei.c') + enums_sources, 'include_directories': huawei_inc, 'dependencies': libhelpers_dep},
}}

1
plugins/telit/mm-plugin-telit.c
View File

@@ -21,7 +21,6 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-port-enums-types.h"
#include "mm-log-object.h"
#include "mm-modem-helpers.h"
#include "mm-plugin-telit.h"

1
plugins/tplink/mm-plugin-tplink.c
View File

@@ -19,7 +19,6 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-port-enums-types.h"
#include "mm-log-object.h"
#include "mm-plugin-tplink.h"
#include "mm-broadband-modem.h"