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

Converted C++ comments to C comments

Browse Source
This commit is contained in:
skarg
2006-10-07 14:12:16 +00:00
parent 8d9c621e89
commit 19c5a20205
7 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ports/pic18/dlmstp.c
+3 -3
View File
@@ -36,7 +36,7 @@
#include "npdu.h"
#include "eeprom.h"
// Number of MS/TP Packets Rx/Tx
/* Number of MS/TP Packets Rx/Tx
*/
uint16_t MSTP_Packets = 0;
@@ -50,7 +50,7 @@ volatile struct mstp_port_struct_t MSTP_Port;
#pragma udata
#define INCREMENT_AND_LIMIT_UINT16(x) {if (x < 0xFFFF) x++;}
// This defines the number of edit fields for this module
/* This defines the number of edit fields for this module
*/
#define MAX_EDIT_FIELD 1
@@ -204,7 +204,7 @@ void dlmstp_task(void)
} while (bytes_remaining);
}
/* only do master state machine while rx is idle */
//MSTP_Master_Node_FSM(&MSTP_Port);
if (MSTP_Port.receive_state == MSTP_RECEIVE_STATE_IDLE) {
while (MSTP_Master_Node_FSM(&MSTP_Port)) {};
/*MSTP_Master_Node_FSM(&MSTP_Port);
*/
bacnet-stack/ports/pic18/mstp.c
+3 -3
View File
@@ -766,7 +766,7 @@ bool MSTP_Master_Node_FSM(volatile struct mstp_port_struct_t *mstp_port)
mstp_port->DataLength);
break;
case FRAME_TYPE_BACNET_DATA_EXPECTING_REPLY:
//mstp_port->ReplyPostponedTimer = 0;
/*mstp_port->ReplyPostponedTimer = 0; */
/* indicate successful reception to the higher layers */
dlmstp_put_receive(mstp_port->SourceAddress,
(uint8_t *) & mstp_port->InputBuffer[0],
@@ -1213,12 +1213,12 @@ void MSTP_Init(volatile struct mstp_port_struct_t *mstp_port)
mstp_port->ReceivedValidFrame = false;
mstp_port->RetryCount = 0;
mstp_port->SilenceTimer = 0;
// mstp_port->ReplyPostponedTimer = 0;
/* mstp_port->ReplyPostponedTimer = 0; */
mstp_port->SoleMaster = false;
mstp_port->SourceAddress = 0;
mstp_port->TokenCount = 0;
#if 0
// these are adjustable, so should already be set
/* these are adjustable, so should already be set */
mstp_port->Nmax_info_frames = DEFAULT_MAX_INFO_FRAMES;
mstp_port->Nmax_master = DEFAULT_MAX_MASTER;
#endif
bacnet-stack/ports/pic18/mstp.h
+1 -1
View File
@@ -162,7 +162,7 @@ struct mstp_port_struct_t {
/* Machine when a Data Expecting Reply Answer activity is completed. */
/* note: we always send a reply postponed since a message other than
the reply may be in the transmit queue */
// uint16_t ReplyPostponedTimer;
/* uint16_t ReplyPostponedTimer; */
/* Used to store the Source Address of a received frame. */
uint8_t SourceAddress;
bacnet-stack/ports/pic18/rs485.c
+7 -7
View File
@@ -44,7 +44,7 @@ uint32_t RS485_Baud_Rate = 9600;
/* the ISR and other use this for status and control */
COMSTAT RS485_Comstat;
//#pragma udata MSTPPortData
/*#pragma udata MSTPPortData */
/* the buffer for receiving characters */
volatile uint8_t RS485_Rx_Buffer[MAX_MPDU];
@@ -87,11 +87,11 @@ void RS485_Send_Frame(volatile struct mstp_port_struct_t *mstp_port, /* port
RS485_Comstat.TxHead = 0;
memcpy((void *)&RS485_Tx_Buffer[0], (void *)buffer, nbytes);
//for (i = 0; i < nbytes; i++) {
// /* put the data into the buffer */
// RS485_Tx_Buffer[i] = *buffer;
// buffer++;
//}
/*for (i = 0; i < nbytes; i++) { */
/* /* put the data into the buffer */ */
/* RS485_Tx_Buffer[i] = *buffer; */
/* buffer++; */
/*} */
RS485_Comstat.Tx_Bytes = nbytes;
/* disable the receiver */
PIE3bits.RC2IE = 0;
@@ -205,7 +205,7 @@ void RS485_Interrupt_Tx(void)
/* enable the receiver */
RS485_TX_ENABLE = 0;
RS485_RX_DISABLE = 0;
// FIXME: might not be necessary
/* FIXME: might not be necessary */
PIE3bits.RC2IE = 1;
RCSTA2bits.CREN = 1;
}