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

changed delays to yields.

Browse Source
This commit is contained in:
skarg
2006-08-29 10:32:32 +00:00
parent 23a8636b90
commit 0f851d57f0
1 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/ports/rtos32/rs485.c
+29 -34
View File
@@ -73,19 +73,17 @@ static void RS485_Standard_Port_Settings(long port, long *pIRQ,
} }
} }
static int TestCOMPort( static int TestCOMPort(int Base)
int Base)/* base address of UART */ { /* base address of UART */
{ int i;
int i;
for (i=0; i<256; i++) for (i = 0; i < 256; i++) {
{ RTOut(Base + 7, (BYTE) i); // write scratch register
RTOut(Base+7, (BYTE)i); // write scratch register RTOut(Base + 1, RTIn(Base + 1)); // read/write IER
RTOut(Base+1, RTIn(Base+1)); // read/write IER if (RTIn(Base + 7) != i) // check scratch register
if (RTIn(Base+7) != i) // check scratch register return FALSE;
return FALSE; }
} return TRUE;
return TRUE;
} }
static RS485_Open_Port(int port, /* COM port number - COM1 = 0 */ static RS485_Open_Port(int port, /* COM port number - COM1 = 0 */
@@ -112,9 +110,9 @@ static RS485_Open_Port(int port, /* COM port number - COM1 = 0 */
/* enable the 485 via the DTR pin */ /* enable the 485 via the DTR pin */
RS485_IO_ENABLE(port); RS485_IO_ENABLE(port);
RS485_RECEIVE_ENABLE(port); RS485_RECEIVE_ENABLE(port);
#if PRINT_ENABLED_RS485 #if PRINT_ENABLED_RS485
fprintf(stderr,"RS485: COM%d Enabled\r\n",port+1); fprintf(stderr, "RS485: COM%d Enabled\r\n", port + 1);
#endif #endif
return; return;
} }
@@ -140,21 +138,19 @@ void RS485_Send_Frame(volatile struct mstp_port_struct_t *mstp_port, /* port
RTKScheduler(); RTKScheduler();
RS485_RECEIVE_ENABLE(RS485_Port); RS485_RECEIVE_ENABLE(RS485_Port);
mstp_port->SilenceTimer = 0; mstp_port->SilenceTimer = 0;
#if PRINT_ENABLED_RS485 #if PRINT_ENABLED_RS485
{ {
int i = 0; int i = 0;
fprintf(stderr,"RS485 Tx:"); fprintf(stderr, "RS485 Tx:");
for (i = 0; i < nbytes; i++) for (i = 0; i < nbytes; i++) {
{ fprintf(stderr, " %02X", buffer[i]);
fprintf(stderr," %02X",buffer[i]); if ((!(i % 20)) && (i != 0)) {
if ((!(i%20)) && (i != 0)) fprintf(stderr, "\r\n ");
{
fprintf(stderr,"\r\n ");
} }
} }
fprintf(stderr,"\r\n"); fprintf(stderr, "\r\n");
} }
#endif #endif
return; return;
} }
@@ -165,18 +161,18 @@ void RS485_Check_UART_Data(volatile struct mstp_port_struct_t *mstp_port)
unsigned timeout = 1; /* milliseconds to wait for a character */ unsigned timeout = 1; /* milliseconds to wait for a character */
static Duration ticks = 0; /* duration to wait for data */ static Duration ticks = 0; /* duration to wait for data */
if (!ticks)
{
ticks = MilliSecsToTicks(timeout);
if (!ticks)
ticks = 1;
}
if (mstp_port->ReceiveError) { if (mstp_port->ReceiveError) {
/* wait for state machine to clear this */ /* wait for state machine to clear this */
RTKDelay(ticks); RTKScheduler();
} }
/* wait for state machine to read from the DataRegister */ /* wait for state machine to read from the DataRegister */
else if (!mstp_port->DataAvailable) { else if (!mstp_port->DataAvailable) {
if (!ticks)
{
ticks = MilliSecsToTicks(timeout);
if (!ticks)
ticks = 1;
}
/* check for data */ /* check for data */
if (RTKGetTimed(ReceiveBuffer[RS485_Port], &com_data, ticks)) { if (RTKGetTimed(ReceiveBuffer[RS485_Port], &com_data, ticks)) {
/* if error, */ /* if error, */
@@ -191,6 +187,5 @@ void RS485_Check_UART_Data(volatile struct mstp_port_struct_t *mstp_port)
} }
} }
else else
RTKDelay(ticks); RTKScheduler();
} }