diff options
author | Thomas Haller <thaller@redhat.com> | 2021-02-12 15:01:09 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2021-02-18 19:46:51 +0100 |
commit | fdf9614ba793a023d9b6c0f6a078beded8143771 (patch) | |
tree | 1c21d90c0873da541302bc0e209428b667029054 /libnm-core/nm-setting-wpan.h | |
parent | 2c1f8e9108a33eb3819b1bda1138a01bfd71746a (diff) | |
download | NetworkManager-fdf9614ba793a023d9b6c0f6a078beded8143771.tar.gz |
build: move "libnm-core/" to "src/" and split it
"libnm-core/" is rather complicated. It provides a static library that
is linked into libnm.so and NetworkManager. It also contains public
headers (like "nm-setting.h") which are part of public libnm API.
Then we have helper libraries ("libnm-core/nm-libnm-core-*/") which
only rely on public API of libnm-core, but are themself static
libraries that can be used by anybody who uses libnm-core. And
"libnm-core/nm-libnm-core-intern" is used by libnm-core itself.
Move "libnm-core/" to "src/". But also split it in different
directories so that they have a clearer purpose.
The goal is to have a flat directory hierarchy. The "src/libnm-core*/"
directories correspond to the different modules (static libraries and set
of headers that we have). We have different kinds of such modules because
of how we combine various code together. The directory layout now reflects
this.
Diffstat (limited to 'libnm-core/nm-setting-wpan.h')
-rw-r--r-- | libnm-core/nm-setting-wpan.h | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/libnm-core/nm-setting-wpan.h b/libnm-core/nm-setting-wpan.h deleted file mode 100644 index 2a09d49bbd..0000000000 --- a/libnm-core/nm-setting-wpan.h +++ /dev/null @@ -1,57 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2018 Lubomir Rintel <lkundrak@v3.sk> - */ - -#ifndef __NM_SETTING_WPAN_H__ -#define __NM_SETTING_WPAN_H__ - -#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION) - #error "Only <NetworkManager.h> can be included directly." -#endif - -#include "nm-setting.h" - -G_BEGIN_DECLS - -#define NM_TYPE_SETTING_WPAN (nm_setting_wpan_get_type()) -#define NM_SETTING_WPAN(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_SETTING_WPAN, NMSettingWpan)) -#define NM_SETTING_WPAN_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_SETTING_WPANCONFIG, NMSettingWpanClass)) -#define NM_IS_SETTING_WPAN(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_SETTING_WPAN)) -#define NM_IS_SETTING_WPAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_SETTING_WPAN)) -#define NM_SETTING_WPAN_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_SETTING_WPAN, NMSettingWpanClass)) - -#define NM_SETTING_WPAN_SETTING_NAME "wpan" -#define NM_SETTING_WPAN_MAC_ADDRESS "mac-address" -#define NM_SETTING_WPAN_PAN_ID "pan-id" -#define NM_SETTING_WPAN_SHORT_ADDRESS "short-address" -#define NM_SETTING_WPAN_PAGE "page" -#define NM_SETTING_WPAN_CHANNEL "channel" - -#define NM_SETTING_WPAN_PAGE_DEFAULT -1 -#define NM_SETTING_WPAN_CHANNEL_DEFAULT -1 - -typedef struct _NMSettingWpanClass NMSettingWpanClass; - -NM_AVAILABLE_IN_1_14 -GType nm_setting_wpan_get_type(void); -NM_AVAILABLE_IN_1_14 -NMSetting *nm_setting_wpan_new(void); - -NM_AVAILABLE_IN_1_14 -const char *nm_setting_wpan_get_mac_address(NMSettingWpan *setting); -NM_AVAILABLE_IN_1_14 -guint16 nm_setting_wpan_get_pan_id(NMSettingWpan *setting); -NM_AVAILABLE_IN_1_14 -guint16 nm_setting_wpan_get_short_address(NMSettingWpan *setting); -NM_AVAILABLE_IN_1_16 -gint16 nm_setting_wpan_get_page(NMSettingWpan *setting); -NM_AVAILABLE_IN_1_16 -gint16 nm_setting_wpan_get_channel(NMSettingWpan *setting); - -G_END_DECLS - -#endif /* __NM_SETTING_WPAN_H__ */ |