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

Deprecated Ringbuf_Alloc, and replaced with Ringbuf_Data_Peek() and Ringbuf_Data_Put() functions. Ringbuf_Alloc() was not interrupt or thread safe.

Browse Source
This commit is contained in:
skarg
2015-09-09 14:54:02 +00:00
parent a36ac1ec45
commit 07bf4eba3b
11 changed files with 75 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ports/stm32f10x/dlmstp.c
+7 -4
View File
@@ -444,10 +444,10 @@ static void MSTP_Send_Frame(
{ /* number of bytes of data (up to 501) */
uint8_t crc8 = 0xFF; /* used to calculate the crc value */
uint16_t crc16 = 0xFFFF; /* used to calculate the crc value */
static struct mstp_tx_packet *pkt;
struct mstp_tx_packet *pkt;
uint16_t i = 0; /* used to calculate CRC for data */
pkt = (struct mstp_tx_packet *) Ringbuf_Alloc(&Transmit_Queue);
pkt = (struct mstp_tx_packet *) Ringbuf_Data_Peek(&Transmit_Queue);
if (pkt) {
/* create the MS/TP header */
pkt->buffer[0] = 0x55;
@@ -476,6 +476,7 @@ static void MSTP_Send_Frame(
pkt->length += data_len;
pkt->length += 2;
}
Ringbuf_Data_Put(&Transmit_Queue, (uint8_t *)pkt);
} else {
pkt = NULL;
}
@@ -1274,7 +1275,7 @@ int dlmstp_send_pdu(
struct mstp_pdu_packet *pkt;
uint16_t i = 0;
pkt = (struct mstp_pdu_packet *) Ringbuf_Alloc(&PDU_Queue);
pkt = (struct mstp_pdu_packet *) Ringbuf_Data_Peek(&PDU_Queue);
if (pkt) {
pkt->data_expecting_reply = npdu_data->data_expecting_reply;
for (i = 0; i < pdu_len; i++) {
@@ -1286,7 +1287,9 @@ int dlmstp_send_pdu(
} else {
pkt->destination_mac = MSTP_BROADCAST_ADDRESS;
}
bytes_sent = pdu_len;
if (Ringbuf_Data_Put(&PDU_Queue, (uint8_t *)pkt)) {
bytes_sent = pdu_len;
}
}
return bytes_sent;
bacnet-stack/ports/stm32f10x/stm32f10x_conf.h
+1 -1
View File
@@ -46,7 +46,7 @@
#include "stm32f10x_tim.h"
#include "stm32f10x_usart.h"
#include "stm32f10x_wwdg.h"
#include "misc.h" /* High level functions for NVIC and SysTick (add-on to CMSIS functions) */
#include "stm32f10x_misc.h" /* High level functions for NVIC and SysTick (add-on to CMSIS functions) */
/* Exported types ------------------------------------------------------------*/
/* Exported constants --------------------------------------------------------*/