treewide: align headers c++ guards fixes

* Make sure all C++ C includes have an end.
* Correct order of ifdefs and doxygen so that they are in the correct
  order. The order is not aligned from file to file, though it is
  corrected per file.
* Added space after license in some headers and source files.

Signed-off-by: Eivind Jølsgard <eivind.jolsgard@nordicsemi.no>

Author: eivindj-nordic

applications/asset_tracker_v2/src/cloud/cloud_codec/cloud_codec.h

@@ -535,10 +535,10 @@ void cloud_codec_populate_modem_dynamic_buffer(
 				int *head_modem_buf,
 				size_t buffer_count);
 
-/**
- * @}
- */
 #ifdef __cplusplus
 }
 #endif
+/**
+ * @}
+ */
 #endif

applications/asset_tracker_v2/src/cloud/cloud_codec/json_common.h

@@ -11,8 +11,7 @@
 #ifndef JSON_COMMON_H__
 #define JSON_COMMON_H__
 
-/**@file
- *
+/**
  * @defgroup JSON common json_common
  * @brief    Module containing common JSON encoding functions.
  * @{

applications/asset_tracker_v2/src/ext_sensors/ext_sensors.h

@@ -11,8 +11,7 @@
 #ifndef EXT_SENSORS_H__
 #define EXT_SENSORS_H__
 
-/**@file
- *
+/**
  * @defgroup External sensors ext_sensors
  * @brief    Module that manages external sensors.
  * @{

applications/asset_tracker_v2/src/modules/modules_common.h

@@ -137,6 +137,10 @@ int module_start(struct module_data *module);
  */
 uint32_t module_active_count_get(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 /**
  *@}
  */

applications/nrf_desktop/configuration/common/motion_sensor.h

@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
+
 #ifndef _MOTION_SENSOR_H_
 #define _MOTION_SENSOR_H_
 

applications/nrf_desktop/src/util/chmap_filter/include/chmap_filter.h

@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
+
 #ifndef _CHMAP_FILTER_H_
 #define _CHMAP_FILTER_H_
 

applications/serial_lte_modem/src/ftp_c/slm_at_ftp.h

@@ -12,6 +12,7 @@
  * @brief Vendor-specific AT command for FTP and TFTP services.
  * @{
  */
+
 /**
  * @brief Initialize FTP AT command parser.
  *

applications/serial_lte_modem/src/http_c/slm_at_httpc.h

@@ -12,6 +12,7 @@
  * @brief Vendor-specific AT command for HTTP service.
  * @{
  */
+
 /**
  * @brief HTTPC raw data send.
  *

applications/serial_lte_modem/src/mqtt_c/slm_at_mqtt.h

@@ -12,6 +12,7 @@
  * @brief Vendor-specific AT command for MQTT service.
  * @{
  */
+
 /**
  * @brief Initialize MQTT AT command parser.
  *

applications/serial_lte_modem/src/slm_at_cmng.h

@@ -12,6 +12,7 @@
  * @brief Vendor-specific AT command for CMNG service.
  * @{
  */
+
 /**
  * @brief Initialize CMNG AT command parser.
  *

applications/serial_lte_modem/src/slm_at_icmp.h

@@ -12,6 +12,7 @@
  * @brief Vendor-specific AT command for ICMP service.
  * @{
  */
+
 /**
  * @brief Initialize ICMP AT command parser.
  *

applications/serial_lte_modem/src/slm_at_sms.h

@@ -12,6 +12,7 @@
  * @brief Vendor-specific AT command for SMS service.
  * @{
  */
+
 /**
  * @brief Initialize SMS AT command parser.
  *

applications/serial_lte_modem/src/slm_at_tcp_proxy.h

@@ -12,6 +12,7 @@
  * @brief Vendor-specific AT command for TCP proxy service.
  * @{
  */
+
 /**
  * @brief Initialize TCP proxy AT command parser.
  *

applications/serial_lte_modem/src/slm_at_udp_proxy.h

@@ -12,6 +12,7 @@
  * @brief Vendor-specific AT command for UDP proxy service.
  * @{
  */
+
 /**
  * @brief Initialize UDP proxy AT command parser.
  *

applications/serial_lte_modem/src/slm_settings.h

@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
+
 #ifndef SLM_SETTINGS_
 #define SLM_SETTINGS_
 

ext/iperf3/iperf_api.h

@@ -453,7 +453,7 @@ enum {
     /* Stream errors */
     IECREATESTREAM = 200,   // Unable to create a new stream (check herror/perror)
     IEINITSTREAM = 201,     // Unable to initialize stream (check herror/perror)
-    IESTREAMLISTEN = 202,   // Unable to start stream listener (check perror) 
+    IESTREAMLISTEN = 202,   // Unable to start stream listener (check perror)
     IESTREAMCONNECT = 203,  // Unable to connect stream (check herror/perror)
     IESTREAMACCEPT = 204,   // Unable to accepte stream connection (check perror)
     IESTREAMWRITE = 205,    // Unable to write to stream socket (check perror)

include/bluetooth/conn_ctx.h

@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
+#ifndef BT_CONN_CTX_H_
+#define BT_CONN_CTX_H_
+
 /**
  * @file
  * @defgroup bt_conn_ctx Bluetooth connection context library API
  * @{
  * @brief API for the Bluetooth connection context library.
  */
 
-#ifndef BT_CONN_CTX_H_
-#define BT_CONN_CTX_H_
-
 #include <zephyr/kernel.h>
 #include <zephyr/sys/__assert.h>
 #include <zephyr/bluetooth/conn.h>

include/bluetooth/enocean.h

@@ -3,16 +3,17 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
+
+#ifndef BT_ENOCEAN_H__
+#define BT_ENOCEAN_H__
+
 /**
  * @file
  * @defgroup bt_enocean Bluetooth EnOcean library API
  * @{
  * @brief API for interacting with EnOcean Bluetooth wall switches and sensors
  */
 
-#ifndef BT_ENOCEAN_H__
-#define BT_ENOCEAN_H__
-
 #include <zephyr/bluetooth/bluetooth.h>
 
 #ifdef __cplusplus

include/bluetooth/mesh/dk_prov.h

@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
+
 /**
  * @file
  * @brief Bluetooth mesh provisioning handler for Nordic DKs.

include/bluetooth/mesh/gen_lvl_cli.h

@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
+
 /**
  * @file
  * @defgroup bt_mesh_lvl_cli Generic Level Client model

include/bluetooth/mesh/gen_plvl.h

@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
+
 /**
  * @file
  * @defgroup bt_mesh_plvl Generic Power Level Models

include/bluetooth/mesh/gen_ponoff.h

@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
+
 /**
  * @file
  * @defgroup bt_mesh_ponoff Generic Power OnOff Models

include/bluetooth/mesh/gen_ponoff_srv.h

@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
+
 /**
  * @file
  * @defgroup bt_mesh_ponoff_srv Generic Power OnOff Server model

include/bluetooth/mesh/gen_prop_cli.h

@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
+
 /**
  * @file
  * @defgroup bt_mesh_prop_cli Generic Property Client model

include/bluetooth/mesh/light_ctl.h

@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
+
 /**
  * @file
  * @defgroup bt_mesh_light_ctl Light CTL models

include/bluetooth/mesh/light_hsl.h

@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
+
 /**
  * @file
  * @defgroup bt_mesh_light_hsl Light HSL models

include/bluetooth/mesh/light_xyl.h

@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
+
 /**
  * @file
  * @defgroup bt_mesh_light_xyl Light xyL models

include/bluetooth/mesh/model_types.h

@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
+
 /**
  * @file
  * @defgroup bt_mesh_model_types Common model types

include/bluetooth/mesh/properties.h

@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
+
 /**
  * @file
  * @defgroup bt_mesh_properties Bluetooth mesh properties

include/bluetooth/mesh/sensor.h

@@ -586,6 +586,6 @@ const char *bt_mesh_sensor_ch_str(const struct sensor_value *ch);
 }
 #endif
 
-/** @} */
-
 #endif /* BT_MESH_SENSOR_H__ */
+
+/** @} */

include/bluetooth/mesh/sensor_cli.h

@@ -670,6 +670,6 @@ extern const struct bt_mesh_model_cb _bt_mesh_sensor_cli_cb;
 }
 #endif
 
-/** @} */
-
 #endif /* BT_MESH_SENSOR_CLI_H__ */
+
+/** @} */

include/bluetooth/mesh/sensor_srv.h

@@ -151,6 +151,6 @@ extern const struct bt_mesh_model_op _bt_mesh_sensor_setup_srv_op[];
 }
 #endif
 
-/** @} */
-
 #endif /* BT_MESH_SENSOR_SRV_H__ */
+
+/** @} */

include/bluetooth/mesh/sensor_types.h

@@ -1340,10 +1340,10 @@ extern const struct bt_mesh_sensor_type
 
 /** @} */
 
-/** @} */
-
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* BT_MESH_SENSOR_TYPES_H__ */
+
+/** @} */

include/bluetooth/mesh/time.h

@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
+
 /**
  * @file
  * @defgroup bt_mesh_time Time Models

include/bluetooth/scan.h

@@ -4,7 +4,11 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-/**@file
+#ifndef BT_SCAN_H_
+#define BT_SCAN_H_
+
+/**
+ * @file
  * @defgroup nrf_bt_scan BT Scanning module
  * @{
  * @brief BT Scanning module
@@ -21,10 +25,6 @@
  *       multicentral link.
  */
 
-
-#ifndef BT_SCAN_H_
-#define BT_SCAN_H_
-
 #include <zephyr/types.h>
 #include <zephyr/sys/slist.h>
 #include <zephyr/bluetooth/bluetooth.h>
@@ -566,6 +566,6 @@ void bt_scan_blocklist_clear(void);
 }
 #endif
 
-#endif /* BT_SCAN_H_ */
-
 /** @} */
+
+#endif /* BT_SCAN_H_ */

include/bluetooth/services/bas_client.h

@@ -3,6 +3,7 @@
  *
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
+
 #ifndef __BAS_C_H
 #define __BAS_C_H
 

include/bluetooth/services/latency.h

@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
+#ifndef BT_LATENCY_H_
+#define BT_LATENCY_H_
+
 /**
  * @file
  * @defgroup bt_latency Bluetooth LE GATT Latency Service API
  * @{
  * @brief API for the Bluetooth LE GATT Latency Service.
  */
 
-#ifndef BT_LATENCY_H_
-#define BT_LATENCY_H_
-
 #include <zephyr/bluetooth/uuid.h>
 #include <zephyr/bluetooth/conn.h>
 #include <bluetooth/gatt_dm.h>

include/bluetooth/services/latency_client.h

@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
+#ifndef BT_LATENCY_CLIENT_H_
+#define BT_LATENCY_CLIENT_H_
+
 /**
  * @file
  * @defgroup bt_latency_c Bluetooth LE GATT Latency Client API
  * @{
  * @brief API for the Bluetooth LE GATT Latency Client.
  */
 
-#ifndef BT_LATENCY_CLIENT_H_
-#define BT_LATENCY_CLIENT_H_
-
 #include <zephyr/bluetooth/uuid.h>
 #include <zephyr/bluetooth/conn.h>
 #include <bluetooth/gatt_dm.h>