Skip to content

Commit 3efa486

Browse files
authored
Fixed warning from using FD_ISSET instead of ZSOCK_FD_ISSET. (#37)
2 parents 097dfb8 + ff03a30 commit 3efa486

File tree

4 files changed

+3
-18
lines changed

4 files changed

+3
-18
lines changed

.github/workflows/zephyr-samples.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,3 @@ jobs:
3939
run: |
4040
pwd
4141
./samples.sh
42-
43-
- name: Archive Test Results
44-
uses: actions/upload-artifact@v4
45-
with:
46-
name: samples
47-
path: bacnet/twister-out.samples

.github/workflows/zephyr.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,3 @@ jobs:
3434
run: |
3535
pwd
3636
./unittest.sh
37-
38-
- name: Archive Test Results
39-
uses: actions/upload-artifact@v4
40-
with:
41-
name: unit_testing
42-
path: bacnet/twister-out.unit_testing

zephyr/subsys/bacnet_datalink/bip-init.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
#include <zephyr/kernel.h>
1313
#include <zephyr/sys/printk.h>
1414
#include <zephyr/net/net_if.h>
15-
#include <zephyr/net/net_ip.h>
1615
#include <zephyr/net/socket.h>
17-
#include <zephyr/net/socket_select.h>
1816
/* BACnet Stack defines - first */
1917
#include "bacnet/bacdef.h"
2018
/* BACnet Stack API */
@@ -324,8 +322,8 @@ uint16_t bip_receive(
324322

325323
/* see if there is a packet for us */
326324
if (zsock_select(max + 1, &read_fds, NULL, NULL, &select_timeout) > 0) {
327-
socket =
328-
FD_ISSET(BIP_Socket, &read_fds) ? BIP_Socket : BIP_Broadcast_Socket;
325+
socket = ZSOCK_FD_ISSET(BIP_Socket, &read_fds) ? BIP_Socket
326+
: BIP_Broadcast_Socket;
329327
received_bytes = zsock_recvfrom(
330328
socket, (char *)&npdu[0], max_npdu, 0, (struct sockaddr *)&sin,
331329
&sin_len);

zephyr/subsys/bacnet_datalink/bip6-init.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111
#include <zephyr/init.h>
1212
#include <zephyr/kernel.h>
1313
#include <zephyr/sys/printk.h>
14-
#include <zephyr/net/net_ip.h>
14+
#include <zephyr/net/net_if.h>
1515
#include <zephyr/net/socket.h>
16-
#include <zephyr/net/socket_select.h>
1716
/* BACnet Stack defines - first */
1817
#include "bacnet/bacdef.h"
1918
/* BACnet Stack API */

0 commit comments

Comments
 (0)