From 1ad2da7895e87dbc6737a1438afc50ed50d87065 Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Fri, 28 Nov 2008 22:05:46 +0000
Subject: [PATCH] Corrected compile errors in PIC port for MS/TP.  Untested.

---
 .../ports/pic18f6720/BACnet-Server.mcp        |  48 ++++++++++--------
 .../ports/pic18f6720/BACnet-Server.mcw        | Bin 58368 -> 57856 bytes
 bacnet-stack/ports/pic18f6720/rs485.c         |  36 ++++++-------
 bacnet-stack/src/fifo.c                       |   3 +-
 4 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/bacnet-stack/ports/pic18f6720/BACnet-Server.mcp b/bacnet-stack/ports/pic18f6720/BACnet-Server.mcp
index 444b2bd7..b4932d36 100644
--- a/bacnet-stack/ports/pic18f6720/BACnet-Server.mcp
+++ b/bacnet-stack/ports/pic18f6720/BACnet-Server.mcp
@@ -83,6 +83,7 @@ file_056=.
 file_057=.
 file_058=.
 file_059=.
+file_060=.
 [GENERATED_FILES]
 file_000=no
 file_001=no
@@ -144,6 +145,7 @@ file_056=no
 file_057=no
 file_058=no
 file_059=no
+file_060=no
 [OTHER_FILES]
 file_000=no
 file_001=no
@@ -205,6 +207,7 @@ file_056=no
 file_057=no
 file_058=no
 file_059=no
+file_060=no
 [FILE_INFO]
 file_000=C:\code\bacnet-stack\src\abort.c
 file_001=C:\code\bacnet-stack\src\bacapp.c
@@ -244,28 +247,29 @@ file_034=C:\code\bacnet-stack\src\npdu.c
 file_035=C:\code\bacnet-stack\src\version.c
 file_036=apdu.c
 file_037=C:\code\bacnet-stack\demo\handler\noserv.c
-file_038=stdbool.h
-file_039=stdint.h
-file_040=rs485.h
-file_041=mstp.h
-file_042=C:\mcc18\h\p18f6720.h
-file_043=C:\code\bacnet-stack\include\bits.h
-file_044=C:\code\bacnet-stack\include\abort.h
-file_045=C:\code\bacnet-stack\include\ai.h
-file_046=C:\code\bacnet-stack\include\apdu.h
-file_047=C:\code\bacnet-stack\include\bacaddr.h
-file_048=C:\code\bacnet-stack\include\bacapp.h
-file_049=C:\code\bacnet-stack\include\bacdcode.h
-file_050=C:\code\bacnet-stack\include\bacdef.h
-file_051=C:\code\bacnet-stack\include\bacenum.h
-file_052=C:\code\bacnet-stack\include\bacerror.h
-file_053=C:\code\bacnet-stack\include\bacint.h
-file_054=C:\code\bacnet-stack\include\bacprop.h
-file_055=C:\code\bacnet-stack\include\bacreal.h
-file_056=C:\code\bacnet-stack\include\bacstr.h
-file_057=C:\code\bacnet-stack\include\bigend.h
-file_058=C:\code\bacnet-stack\include\config.h
-file_059=18F6720.lkr
+file_038=C:\code\bacnet-stack\src\fifo.c
+file_039=stdbool.h
+file_040=stdint.h
+file_041=rs485.h
+file_042=mstp.h
+file_043=C:\mcc18\h\p18f6720.h
+file_044=C:\code\bacnet-stack\include\bits.h
+file_045=C:\code\bacnet-stack\include\abort.h
+file_046=C:\code\bacnet-stack\include\ai.h
+file_047=C:\code\bacnet-stack\include\apdu.h
+file_048=C:\code\bacnet-stack\include\bacaddr.h
+file_049=C:\code\bacnet-stack\include\bacapp.h
+file_050=C:\code\bacnet-stack\include\bacdcode.h
+file_051=C:\code\bacnet-stack\include\bacdef.h
+file_052=C:\code\bacnet-stack\include\bacenum.h
+file_053=C:\code\bacnet-stack\include\bacerror.h
+file_054=C:\code\bacnet-stack\include\bacint.h
+file_055=C:\code\bacnet-stack\include\bacprop.h
+file_056=C:\code\bacnet-stack\include\bacreal.h
+file_057=C:\code\bacnet-stack\include\bacstr.h
+file_058=C:\code\bacnet-stack\include\bigend.h
+file_059=C:\code\bacnet-stack\include\config.h
+file_060=18F6720.lkr
 [SUITE_INFO]
 suite_guid={5B7D72DD-9861-47BD-9F60-2BE967BF8416}
 suite_state=
diff --git a/bacnet-stack/ports/pic18f6720/BACnet-Server.mcw b/bacnet-stack/ports/pic18f6720/BACnet-Server.mcw
index 31711b56591b4bc7ca58ea7c2e8f2f28aa514121..679e31fbaa0bffa439fb6569fc15820053d127d6 100644
GIT binary patch
literal 57856
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
VW2QkHH-+X0*A+<m|C;~)e*l9<EIR-I

delta 4770
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

diff --git a/bacnet-stack/ports/pic18f6720/rs485.c b/bacnet-stack/ports/pic18f6720/rs485.c
index 646833d1..b34ea97a 100644
--- a/bacnet-stack/ports/pic18f6720/rs485.c
+++ b/bacnet-stack/ports/pic18f6720/rs485.c
@@ -41,14 +41,15 @@ extern volatile struct mstp_port_struct_t MSTP_Port;
 /* the baud rate is adjustable */
 uint32_t RS485_Baud_Rate = 38400;
 
-/*#pragma udata MSTPPortData
- */
+/* the FIFO structures for sending and receiving */
+FIFO_BUFFER FIFO_Rx;
+FIFO_BUFFER FIFO_Tx;
+#pragma udata MSTPPortData
 /* the buffer for receiving data (size must be a power of 2) */
 volatile uint8_t RS485_Rx_Buffer[128];
-FIFO_BUFFER FIFO_Rx;
 /* the buffer for sending data (size must be a power of 2) */
 volatile uint8_t RS485_Tx_Buffer[128];
-FIFO_BUFFER FIFO_Tx;
+#pragma udata
 
 /****************************************************************************
 * DESCRIPTION: Transmits a frame using the UART
@@ -67,7 +68,7 @@ void RS485_Send_Frame(
     if (!buffer)
         return;
 
-    while (!Empty(&FIFO_Tx)) {
+    while (!FIFO_Empty(&FIFO_Tx)) {
         /* buffer is not empty.  Wait for ISR to transmit. */
     };
 
@@ -83,18 +84,19 @@ void RS485_Send_Frame(
         /* The line has not been silent long enough, so wait. */
     };
 
-    FIFO_Add(&FIFO_Tx, buffer, nbytes);
-    /* disable the receiver */
-    PIE3bits.RC2IE = 0;
-    RCSTA2bits.CREN = 0;
-    /* enable the transceiver */
-    RS485_TX_ENABLE = 1;
-    RS485_RX_DISABLE = 1;
-    /* enable the transmitter */
-    TXSTA2bits.TXEN = 1;
-    PIE3bits.TX2IE = 1;
-    /* reset the silence timer per MSTP spec, sort of */
-    mstp_port->SilenceTimer = 0;
+    if (FIFO_Add(&FIFO_Tx, buffer, nbytes)) {
+        /* disable the receiver */
+        PIE3bits.RC2IE = 0;
+        RCSTA2bits.CREN = 0;
+        /* enable the transceiver */
+        RS485_TX_ENABLE = 1;
+        RS485_RX_DISABLE = 1;
+        /* enable the transmitter */
+        TXSTA2bits.TXEN = 1;
+        PIE3bits.TX2IE = 1;
+        /* reset the silence timer per MSTP spec, sort of */
+        mstp_port->SilenceTimer = 0;
+    }
 
     return;
 }
diff --git a/bacnet-stack/src/fifo.c b/bacnet-stack/src/fifo.c
index 3e3e216b..df6170ae 100755
--- a/bacnet-stack/src/fifo.c
+++ b/bacnet-stack/src/fifo.c
@@ -164,8 +164,9 @@ bool FIFO_Add(
     /* limit the ring to prevent overwriting */
     if (FIFO_Available (b, count)) {
         while (count) {
-            b->buffer[b->head % b->buffer_len] = data_byte;
+            b->buffer[b->head % b->buffer_len] = *data_bytes;
             b->head++;
+            data_bytes++;
             count--;
         }
         status = true;