Mac support (#8)

Support for OSX

Author: raghavan97

.github/workflows/build.yml

@@ -0,0 +1,34 @@
+name: Build
+
+on: [push, pull_request]
+
+
+jobs:
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-18.04, macos-latest]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-python@v2
+        name: Install Python
+        with:
+          python-version: '3.7'
+
+      - name: Install cibuildwheel
+        run: |
+          python -m pip install cibuildwheel==1.7.2
+
+      - name: Build wheels
+        run: |
+          python -m cibuildwheel --output-dir wheelhouse
+        env:
+          CIBW_SKIP: "cp35-* cp37-* cp38-* cp39-* pp*-*"
+
+      - uses: actions/upload-artifact@v2
+        with:
+          path: ./wheelhouse/*.whl

misty/bacnet-stack-0.8.4/Makefile

@@ -40,10 +40,16 @@ DEFINES += $(MAKE_DEFINE)
 # BACnet Ports Directory
 BACNET_PORT ?= linux
 
+ADDL_WARN_FLAGS =
+UNAME := $(shell uname)
+ifeq ($(UNAME), Darwin)
+ADDL_WARN_FLAGS = -Wno-self-assign
+endif
+
 # Default compiler settings
 OPTIMIZATION = -Os
 DEBUGGING =
-WARNINGS = -Wall -Wmissing-prototypes
+WARNINGS = -Wall $(ADDL_WARN_FLAGS)
 ifeq (${BUILD},debug)
 OPTIMIZATION = -O0
 DEBUGGING = -g -DDEBUG_ENABLED=1

misty/bacnet-stack-0.8.4/demo/Makefile

@@ -22,10 +22,17 @@ INCLUDE1 = -I$(BACNET_PORT_DIR) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER)
 INCLUDE2 = -I$(BACNET_INCLUDE)
 INCLUDES = $(INCLUDE1) $(INCLUDE2)
 BACNET_LIB=-L$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
+
+ADDL_WARN_FLAGS =
+UNAME := $(shell uname)
+ifeq ($(UNAME), Darwin)
+ADDL_WARN_FLAGS = -Wno-self-assign
+endif
+
 ifeq (${BACNET_PORT},linux)
 PFLAGS = -pthread
 TARGET_EXT =
-SYSTEM_LIB=-lc,-lgcc,-lrt,-lm
+SYSTEM_LIB=-lc,-lm
 endif
 ifeq (${BACNET_PORT},bsd)
 PFLAGS = -pthread
@@ -45,7 +52,7 @@ OPTIMIZATION = -O0
 DEBUGGING = -g -DDEBUG_ENABLED=1
 endif
 # put all the flags together
-CFLAGS := -Wall $(DEBUGGING) $(OPTIMIZATION) $(INCLUDES) $(DEFINES)
+CFLAGS := -Wall $(ADDL_WARN_FLAGS) $(DEBUGGING) $(OPTIMIZATION) $(INCLUDES) $(DEFINES)
 LFLAGS := -Wl,$(BACNET_LIB),$(SYSTEM_LIB)
 
 .EXPORT_ALL_VARIABLES:

misty/bacnet-stack-0.8.4/demo/mstpcap/main.c

@@ -1228,8 +1228,8 @@ int main(
         }
         if (!Wireshark_Capture) {
             if (!(packet_count % 100)) {
-                fprintf(stdout, "\r%hu packets, %hu invalid frames", packet_count,
-                    Invalid_Frame_Count);
+                fprintf(stdout, "\r%hu packets, %hu invalid frames", (unsigned short)packet_count,
+                    (unsigned short)Invalid_Frame_Count);
             }
             if (packet_count >= 65535) {
                 packet_statistics_print();

misty/bacnet-stack-0.8.4/demo/whois/main.c

@@ -288,7 +288,7 @@ static void print_address_cache(
         } else {
             print_macaddr(&local_sadr, 1);
         }
-        printf(" %-4hu ", addr->max_apdu);
+        printf(" %-4hu ", (unsigned short)addr->max_apdu);
         printf("\n");
 
         addr = addr->next;

misty/bacnet-stack-0.8.4/include/debug.h

@@ -54,4 +54,7 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
+void enable_debug_flag(char *fname);
+void status_debug_flag(void);
+void disable_debug_flag(void);
 #endif

misty/bacnet-stack-0.8.4/ports/linux/dlmstp.c

@@ -671,7 +671,7 @@ void dlmstp_get_broadcast_address(
 bool dlmstp_init(
     char *ifname)
 {
-    unsigned long hThread = 0;
+    pthread_t hThread = 0;
     int rv = 0;
 
     /* initialize PDU queue */

misty/bacnet-stack-0.8.4/ports/linux/dlmstp_linux.c

@@ -40,6 +40,9 @@
 /* OS Specific include */
 #include "net.h"
 #include "ringbuf.h"
+#ifdef __APPLE__
+#include <dispatch/dispatch.h>
+#endif
 
 /** @file linux/dlmstp.c  Provides Linux-specific DataLink functions for MS/TP. */
 
@@ -123,7 +126,12 @@ void dlmstp_cleanup(
     close(poSharedData->RS485_Handle);
 
     pthread_cond_destroy(&poSharedData->Received_Frame_Flag);
+#ifdef __APPLE__
+    dispatch_release(poSharedData->Receive_Packet_Flag);
+#endif
+#ifdef __linux__ 
     sem_destroy(&poSharedData->Receive_Packet_Flag);
+#endif
     pthread_cond_destroy(&poSharedData->Master_Done_Flag);
     pthread_mutex_destroy(&poSharedData->Received_Frame_Mutex);
     pthread_mutex_destroy(&poSharedData->Master_Done_Mutex);
@@ -175,7 +183,12 @@ uint16_t dlmstp_receive(
     unsigned timeout)
 {       /* milliseconds to wait for a packet */
     uint16_t pdu_len = 0;
+#ifdef __APPLE__
+    dispatch_time_t dis_time;
+#endif
+#ifdef __linux__ 
     struct timespec abstime;
+#endif
     int rv = 0;
     SHARED_MSTP_DATA *poSharedData;
     struct mstp_port_struct_t *mstp_port =
@@ -190,8 +203,14 @@ uint16_t dlmstp_receive(
     (void) max_pdu;
     /* see if there is a packet available, and a place
        to put the reply (if necessary) and process it */
+#ifdef __APPLE__
+    dis_time = dispatch_time(DISPATCH_TIME_NOW, timeout*1000000);
+    rv = dispatch_semaphore_wait(poSharedData->Receive_Packet_Flag, dis_time);
+#endif
+#ifdef __linux__ 
     get_abstime(&abstime, timeout);
     rv = sem_timedwait(&poSharedData->Receive_Packet_Flag, &abstime);
+#endif
     if (rv == 0) {
         if (poSharedData->Receive_Packet.ready) {
             if (poSharedData->Receive_Packet.pdu_len) {
@@ -356,7 +375,12 @@ uint16_t MSTP_Put_Receive(
             mstp_port->SourceAddress);
         poSharedData->Receive_Packet.pdu_len = mstp_port->DataLength;
         poSharedData->Receive_Packet.ready = true;
+#ifdef __APPLE__
+        dispatch_semaphore_signal(poSharedData->Receive_Packet_Flag);
+#endif
+#ifdef __linux__ 
         sem_post(&poSharedData->Receive_Packet_Flag);
+#endif
     }
 
     return pdu_len;
@@ -870,7 +894,7 @@ bool dlmstp_init(
     void *poPort,
     char *ifname)
 {
-    unsigned long hThread = 0;
+    pthread_t hThread;
     int rv = 0;
     SHARED_MSTP_DATA *poSharedData;
     struct mstp_port_struct_t *mstp_port =
@@ -894,15 +918,19 @@ bool dlmstp_init(
     /* initialize packet queue */
     poSharedData->Receive_Packet.ready = false;
     poSharedData->Receive_Packet.pdu_len = 0;
+#ifdef __APPLE__
+    poSharedData->Receive_Packet_Flag  = dispatch_semaphore_create(0);
+#endif
+#ifdef __linux__ 
     rv = sem_init(&poSharedData->Receive_Packet_Flag, 0, 0);
+#endif
     if (rv != 0) {
         fprintf(stderr,
             "MS/TP Interface: %s\n cannot allocate PThread Condition.\n",
             ifname);
         exit(1);
     }
 
-    struct termios newtio;
     printf("RS485: Initializing %s", poSharedData->RS485_Port_Name);
     /*
        Open device for reading and writing.
@@ -922,6 +950,36 @@ bool dlmstp_init(
     /* efficient blocking for the read */
     fcntl(poSharedData->RS485_Handle, F_SETFL, 0);
 #endif
+
+#ifdef __APPLE__
+      struct termios options;
+
+      tcgetattr(poSharedData->RS485_Handle, &options);
+      cfsetispeed(&options,  poSharedData->RS485_Baud);
+      cfsetospeed(&options,  poSharedData->RS485_Baud);
+
+      //No parity 8N1
+      options.c_cflag &= ~PARENB;
+      options.c_cflag &= ~CSTOPB;
+      options.c_cflag &= ~CSIZE;
+      options.c_cflag |= CS8;
+
+      //No flow control
+      options.c_cflag &= ~CRTSCTS;
+
+      //Turn off s/w flow control
+      options.c_iflag &= ~(IXON | IXOFF | IXANY);
+
+      //Turn on read and ignore ctrl lines
+      options.c_cflag |= (CLOCAL | CREAD);
+
+      if( tcsetattr(poSharedData->RS485_Handle, TCSANOW, &options) < 0) {
+        perror(poSharedData->RS485_Port_Name);
+        exit(-1);
+      }
+#endif
+#ifdef __linux__ 
+    struct termios newtio;
     /* save current serial port settings */
     tcgetattr(poSharedData->RS485_Handle, &poSharedData->RS485_oldtio);
     /* clear struct for new port settings */
@@ -943,6 +1001,9 @@ bool dlmstp_init(
     newtio.c_lflag = 0;
     /* activate the settings for the port after flushing I/O */
     tcsetattr(poSharedData->RS485_Handle, TCSAFLUSH, &newtio);
+
+#endif
+
     /* flush any data waiting */
     usleep(200000);
     tcflush(poSharedData->RS485_Handle, TCIOFLUSH);

misty/bacnet-stack-0.8.4/ports/linux/dlmstp_linux.h

@@ -26,7 +26,9 @@
 
 #include "mstp.h"
 /*#include "dlmstp.h" */
+#ifdef __linux__ 
 #include "bits/pthreadtypes.h"
+#endif
 #include <semaphore.h>
 
 #include <stdbool.h>
@@ -37,6 +39,9 @@
 #include <termios.h>
 #include "fifo.h"
 #include "ringbuf.h"
+#ifdef __APPLE__
+#include <dispatch/dispatch.h>
+#endif
 /* defines specific to MS/TP */
 /* preamble+type+dest+src+len+crc8+crc16 */
 #define MAX_HEADER (2+1+1+1+2+1+2)
@@ -73,7 +78,12 @@ typedef struct shared_mstp_data {
     /*
        RT_SEM Receive_Packet_Flag;
      */
+#ifdef __APPLE__
+    dispatch_semaphore_t Receive_Packet_Flag;
+#endif
+#ifdef __linux__ 
     sem_t Receive_Packet_Flag;
+#endif
     /* mechanism to wait for a frame in state machine */
     /*
        RT_COND Received_Frame_Flag;

misty/bacnet-stack-0.8.4/ports/linux/net.h

@@ -78,6 +78,7 @@
 #include <net/route.h>
 #include <net/if.h>
 #include <net/if_arp.h>
+#ifdef __linux__ 
 #include <features.h>   /* for the glibc version number */
 #if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1
 #include <netpacket/packet.h>
@@ -93,6 +94,7 @@
 #include <sys/un.h>
 #include <sys/ioctl.h>
 #include <netdb.h>
+#endif
 
 /** @file linux/net.h  Includes Linux network headers. */