dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Zephyr 3.7.0 integration fixes: (#723) (#724)"

Browse Source 
This reverts commit 2d7a2961a2.
This commit is contained in:
Steve Karg
2024-08-16 09:02:24 -05:00
parent e9bcaa746c
commit e1002c433f
6 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ports/zephyr/bip-init.c
+1 -4
View File
@@ -11,7 +11,6 @@
#include <zephyr/init.h>
#include <zephyr/kernel.h>
#include <zephyr/sys/printk.h>
#include <zephyr/net/net_if.h>
#include <zephyr/net/net_ip.h>
#include <zephyr/net/socket.h>
#include <zephyr/net/socket_select.h>
@@ -322,7 +321,7 @@ uint16_t bip_receive(
/* see if there is a packet for us */
if (zsock_select(max + 1, &read_fds, NULL, NULL, &select_timeout) > 0) {
socket =
ZSOCK_FD_ISSET(BIP_Socket, &read_fds) ? BIP_Socket : BIP_Broadcast_Socket;
FD_ISSET(BIP_Socket, &read_fds) ? BIP_Socket : BIP_Broadcast_Socket;
received_bytes = zsock_recvfrom(socket, (char *)&npdu[0], max_npdu, 0,
(struct sockaddr *)&sin, &sin_len);
} else {
@@ -407,7 +406,6 @@ int bip_send_pdu(BACNET_ADDRESS *dest,
*/
void bip_set_interface(char *ifname)
{
#if 0 //{TODO: Fix build errors for native_posix
struct net_if *iface = 0;
int index = -1;
uint8_t x = 0;
@@ -492,7 +490,6 @@ void bip_set_interface(char *ifname)
} else {
LOG_ERR("%s:%d - Failed to set iface", THIS_FILE, __LINE__);
}
#endif //}TODO:
}
static int createSocket(struct sockaddr_in *sin)
ports/zephyr/bip6-init.c
-1
View File
@@ -11,7 +11,6 @@
#include <zephyr/init.h>
#include <zephyr/kernel.h>
#include <zephyr/sys/printk.h>
#include <zephyr/net/net_if.h>
#include <zephyr/net/net_ip.h>
#include <zephyr/net/socket.h>
#include <zephyr/net/socket_select.h>