[OSCBS-41] Update to Zephyr v3.2.0 (#382)
Updating to integrate with Zephyr v3.2.0 required: - Update `west.yml` to import Zephyr v3.2.0 manifest - Prefix include pathname of ztest.h with `zephyr/` - Prefix every Zephyr header included pathname with `zephyr/` - Change all Zephyr tests/samples to use `find_package` - For unit_testing, use a distinct prj.conf which only references Kconfigs defined in the Zephyr repo. (Zephyr constraint.) - Move ztest headers into a zephyr-prefixed pathname Co-authored-by: Gregory Shue <gregory.shue@legrand.com>
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
#ifndef BITS_H
|
||||
#define BITS_H
|
||||
|
||||
#include <sys/util.h> /* defines BIT(n) */
|
||||
#include <zephyr/sys/util.h> /* defines BIT(n) */
|
||||
|
||||
/********************************************************************
|
||||
* Bit Masks
|
||||
|
||||
@@ -26,9 +26,9 @@
|
||||
#ifndef NET_H
|
||||
#define NET_H
|
||||
|
||||
#include <net/net_ip.h>
|
||||
#include <net/socket.h>
|
||||
#include <zephyr.h>
|
||||
#include <zephyr/net/net_ip.h>
|
||||
#include <zephyr/net/socket.h>
|
||||
#include <zephyr/kernel.h>
|
||||
#include <bacnet/basic/object/device.h>
|
||||
|
||||
static inline char *inet_ntoa(struct in_addr in) {
|
||||
|
||||
@@ -34,13 +34,13 @@
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
#include <device.h>
|
||||
#include <init.h>
|
||||
#include <kernel.h>
|
||||
#include <sys/printk.h>
|
||||
#include <net/net_ip.h>
|
||||
#include <net/socket.h>
|
||||
#include <net/socket_select.h>
|
||||
#include <zephyr/device.h>
|
||||
#include <zephyr/init.h>
|
||||
#include <zephyr/kernel.h>
|
||||
#include <zephyr/sys/printk.h>
|
||||
#include <zephyr/net/net_ip.h>
|
||||
#include <zephyr/net/socket.h>
|
||||
#include <zephyr/net/socket_select.h>
|
||||
#include "bacnet/bacdcode.h"
|
||||
#include "bacnet/bacint.h"
|
||||
#include "bacnet/datalink/bip.h"
|
||||
@@ -48,8 +48,8 @@
|
||||
#include "bacnet/basic/bbmd/h_bbmd.h"
|
||||
|
||||
/* Logging module registration is already done in ports/zephyr/main.c */
|
||||
#include <logging/log.h>
|
||||
#include <logging/log_ctrl.h>
|
||||
#include <zephyr/logging/log.h>
|
||||
#include <zephyr/logging/log_ctrl.h>
|
||||
|
||||
LOG_MODULE_DECLARE(bacnet, CONFIG_BACNETSTACK_LOG_LEVEL);
|
||||
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
#include <stdlib.h>
|
||||
#if CONFIG_NATIVE_APPLICATION
|
||||
#include <sys/time.h>
|
||||
#elif defined(__ZEPHYR__)
|
||||
#include <zephyr/posix/sys/time.h>
|
||||
#else
|
||||
#include <posix/sys/time.h>
|
||||
#endif
|
||||
|
||||
+6
-6
@@ -8,14 +8,14 @@
|
||||
#include <stdint.h>
|
||||
|
||||
/* Zephyr includes */
|
||||
#include <init.h>
|
||||
#include <kernel.h>
|
||||
#include <sys/printk.h>
|
||||
#include <sys/util.h>
|
||||
#include <zephyr.h>
|
||||
#include <zephyr/init.h>
|
||||
#include <zephyr/kernel.h>
|
||||
#include <zephyr/sys/printk.h>
|
||||
#include <zephyr/sys/util.h>
|
||||
#include <zephyr/kernel.h>
|
||||
|
||||
#define LOG_LEVEL CONFIG_BACNETSTACK_LOG_LEVEL
|
||||
#include <logging/log.h>
|
||||
#include <zephyr/logging/log.h>
|
||||
LOG_MODULE_REGISTER(bacnet);
|
||||
|
||||
/* To do: init()
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
*********************************************************************/
|
||||
#include <kernel.h>
|
||||
#include <zephyr/kernel.h>
|
||||
#include "bacnet/basic/sys/mstimer.h"
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user