sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't use strerror in apps/modbus; Add CONFIG_MB_TERMIOS to enable/suppress use of termios.h interfaces

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4968 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-07-22 17:41:19 +00:00
parent 1a2e8d6f5b
commit 6071b29253
5 changed files with 260 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog.txt
View File

@ -255,5 +255,7 @@
has been added to the NuttX apps/ source tree. has been added to the NuttX apps/ source tree.
* apps/examples/modbus: A port of the freemodbus-v1.5.0 "demo" * apps/examples/modbus: A port of the freemodbus-v1.5.0 "demo"
program that will be used to verify the FreeModBus port program that will be used to verify the FreeModBus port
* apps/modbus: Don't use strerror(). It is just too big.
* apps/modbus: Add CONFIG_MB_TERMIOS. If the driver doesn't support
termios ioctls, then don't bother trying to configure the baud, parity
etc.

9
modbus/Kconfig
View File

@ -24,6 +24,15 @@ config MB_TCP_ENABLED
depends on MODBUS depends on MODBUS
default y default y
config MB_TERMIOS
bool "Driver TERMIOS supported"
depends on MB_ASCII_ENABLED || MB_RTU_ENABLED
default n
---help---
Serial driver supports termios.h interfaces (tcsetattr, tcflush, etc.).
If this is not defined, then the terminal settings (baud, parity, etc).
are not configurable at runtime; serial streams will not be flushed when closed.
config MB_ASCII_TIMEOUT_SEC config MB_ASCII_TIMEOUT_SEC
int "Character timeout" int "Character timeout"
depends on MB_ASCII_ENABLED depends on MB_ASCII_ENABLED

4
modbus/README.txt
View File

@ -60,6 +60,10 @@ The NuttX-named configuration options that are available include:
CONFIG_MB_ASCII_ENABLED - Modbus ASCII support CONFIG_MB_ASCII_ENABLED - Modbus ASCII support
CONFIG_MB_RTU_ENABLED - Modbus RTU support CONFIG_MB_RTU_ENABLED - Modbus RTU support
CONFIG_MB_TCP_ENABLED - Modbus TCP support CONFIG_MB_TCP_ENABLED - Modbus TCP support
CONFIG_MB_TERMIOS - Serial driver supports termios.h interfaces (tcsetattr,
tcflush, etc.). If this is not defined, then the terminal settings (baud,
parity, etc.) are not configurable at runtime; serial streams will not be
flushed when closed.
CONFIG_MB_ASCII_TIMEOUT_SEC - Character timeout value for Modbus ASCII. The CONFIG_MB_ASCII_TIMEOUT_SEC - Character timeout value for Modbus ASCII. The
character timeout value is not fixed for Modbus ASCII and is therefore character timeout value is not fixed for Modbus ASCII and is therefore
a configuration option. It should be set to the maximum expected delay a configuration option. It should be set to the maximum expected delay

30
modbus/nuttx/portother.c
View File

@ -22,6 +22,7 @@
*/ */
/* ----------------------- Standard includes --------------------------------*/ /* ----------------------- Standard includes --------------------------------*/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -33,32 +34,33 @@
#include "port.h" #include "port.h"
/* ----------------------- Modbus includes ----------------------------------*/ /* ----------------------- Modbus includes ----------------------------------*/
#include <apps/modbus/mb.h> #include <apps/modbus/mb.h>
#include <apps/modbus/mbport.h> #include <apps/modbus/mbport.h>
/* ----------------------- Defines ------------------------------------------*/ /* ----------------------- Defines ------------------------------------------*/
#define NELEMS(x) (sizeof((x))/sizeof((x)[0])) #define NELEMS(x) (sizeof((x))/sizeof((x)[0]))
/* ----------------------- Static variables ---------------------------------*/ /* ----------------------- Static variables ---------------------------------*/
static FILE *fLogFile = NULL; static FILE *fLogFile = NULL;
static eMBPortLogLevel eLevelMax = MB_LOG_DEBUG; static eMBPortLogLevel eLevelMax = MB_LOG_DEBUG;
static pthread_mutex_t xLock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t xLock = PTHREAD_MUTEX_INITIALIZER;
/* ----------------------- Start implementation -----------------------------*/ /* ----------------------- Start implementation -----------------------------*/
void
vMBPortLogLevel( eMBPortLogLevel eNewLevelMax ) void vMBPortLogLevel(eMBPortLogLevel eNewLevelMax)
{ {
eLevelMax = eNewLevelMax; eLevelMax = eNewLevelMax;
} }
void void vMBPortLogFile(FILE * fNewLogFile)
vMBPortLogFile( FILE * fNewLogFile )
{ {
fLogFile = fNewLogFile; fLogFile = fNewLogFile;
} }
void void vMBPortLog(eMBPortLogLevel eLevel, const char * szModule, const char * szFmt, ...)
vMBPortLog( eMBPortLogLevel eLevel, const char * szModule, const char * szFmt, ... )
{ {
char szBuf[512]; char szBuf[512];
int i; int i;
@ -85,20 +87,20 @@ vMBPortLog( eMBPortLogLevel eLevel, const char * szModule, const char * szFmt, .
} }
} }
void void vMBPortEnterCritical(void)
vMBPortEnterCritical( void )
{ {
if( pthread_mutex_lock( &xLock ) != 0 ) int ret = pthread_mutex_lock(&xLock);
if (ret != 0)
{ {
vMBPortLog( MB_LOG_ERROR, "OTHER", "Locking primitive failed: %s\n", strerror( errno ) ); vMBPortLog(MB_LOG_ERROR, "OTHER", "Locking primitive failed: %d\n", ret);
} }
} }
void void vMBPortExitCritical(void)
vMBPortExitCritical( void )
{ {
if( pthread_mutex_unlock( &xLock ) != 0 ) int ret = pthread_mutex_unlock(&xLock);
if (ret != 0)
{ {
vMBPortLog( MB_LOG_ERROR, "OTHER", "Locking primitive failed: %s\n", strerror( errno ) ); vMBPortLog(MB_LOG_ERROR, "OTHER", "Locking primitive failed: %d\n", ret);
} }
} }

84
modbus/nuttx/portserial.c
View File

@ -22,6 +22,7 @@
*/ */
/* ----------------------- Standard includes --------------------------------*/ /* ----------------------- Standard includes --------------------------------*/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -31,17 +32,22 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/select.h> #include <sys/select.h>
#include <fcntl.h> #include <fcntl.h>
#include <termios.h>
#include <unistd.h> #include <unistd.h>
#include <assert.h> #include <assert.h>
#ifdef CONFIG_MB_TERMIOS
# include <termios.h>
#endif
#include "port.h" #include "port.h"
/* ----------------------- Modbus includes ----------------------------------*/ /* ----------------------- Modbus includes ----------------------------------*/
#include <apps/modbus/mb.h> #include <apps/modbus/mb.h>
#include <apps/modbus/mbport.h> #include <apps/modbus/mbport.h>
/* ----------------------- Defines -----------------------------------------*/ /* ----------------------- Defines -----------------------------------------*/
#ifdef CONFIG_MB_ASCII_ENABLED #ifdef CONFIG_MB_ASCII_ENABLED
#define BUF_SIZE 513 /* must hold a complete ASCII frame. */ #define BUF_SIZE 513 /* must hold a complete ASCII frame. */
#else #else
@ -49,6 +55,7 @@
#endif #endif
/* ----------------------- Static variables ---------------------------------*/ /* ----------------------- Static variables ---------------------------------*/
static int iSerialFd = -1; static int iSerialFd = -1;
static bool bRxEnabled; static bool bRxEnabled;
static bool bTxEnabled; static bool bTxEnabled;
@ -58,22 +65,28 @@ static uint8_t ucBuffer[BUF_SIZE];
static int uiRxBufferPos; static int uiRxBufferPos;
static int uiTxBufferPos; static int uiTxBufferPos;
#ifdef CONFIG_MB_TERMIOS
static struct termios xOldTIO; static struct termios xOldTIO;
#endif
/* ----------------------- Function prototypes ------------------------------*/ /* ----------------------- Function prototypes ------------------------------*/
static bool prvbMBPortSerialRead(uint8_t *pucBuffer, uint16_t usNBytes, uint16_t *usNBytesRead); static bool prvbMBPortSerialRead(uint8_t *pucBuffer, uint16_t usNBytes, uint16_t *usNBytesRead);
static bool prvbMBPortSerialWrite(uint8_t *pucBuffer, uint16_t usNBytes); static bool prvbMBPortSerialWrite(uint8_t *pucBuffer, uint16_t usNBytes);
/* ----------------------- Begin implementation -----------------------------*/ /* ----------------------- Begin implementation -----------------------------*/
void
vMBPortSerialEnable( bool bEnableRx, bool bEnableTx ) void vMBPortSerialEnable(bool bEnableRx, bool bEnableTx)
{ {
/* it is not allowed that both receiver and transmitter are enabled. */ /* it is not allowed that both receiver and transmitter are enabled. */
ASSERT(!bEnableRx || !bEnableTx); ASSERT(!bEnableRx || !bEnableTx);
if (bEnableRx) if (bEnableRx)
{ {
#ifdef CONFIG_MB_TERMIOS
(void)tcflush(iSerialFd, TCIFLUSH); (void)tcflush(iSerialFd, TCIFLUSH);
#endif
uiRxBufferPos = 0; uiRxBufferPos = 0;
bRxEnabled = true; bRxEnabled = true;
} }
@ -81,6 +94,7 @@ vMBPortSerialEnable( bool bEnableRx, bool bEnableTx )
{ {
bRxEnabled = false; bRxEnabled = false;
} }
if (bEnableTx) if (bEnableTx)
{ {
bTxEnabled = true; bTxEnabled = true;
@ -92,26 +106,30 @@ vMBPortSerialEnable( bool bEnableRx, bool bEnableTx )
} }
} }
bool bool xMBPortSerialInit(uint8_t ucPort, uint32_t ulBaudRate,
xMBPortSerialInit( uint8_t ucPort, uint32_t ulBaudRate, uint8_t ucDataBits, eMBParity eParity ) uint8_t ucDataBits, eMBParity eParity)
{ {
char szDevice[16]; char szDevice[16];
bool bStatus = true; bool bStatus = true;
#ifdef CONFIG_MB_TERMIOS
struct termios xNewTIO; struct termios xNewTIO;
speed_t xNewSpeed; speed_t xNewSpeed;
#endif
snprintf(szDevice, 16, "/dev/ttyS%d", ucPort); snprintf(szDevice, 16, "/dev/ttyS%d", ucPort);
if ((iSerialFd = open(szDevice, O_RDWR | O_NOCTTY)) < 0) if ((iSerialFd = open(szDevice, O_RDWR | O_NOCTTY)) < 0)
{ {
vMBPortLog( MB_LOG_ERROR, "SER-INIT", "Can't open serial port %s: %s\n", szDevice, vMBPortLog(MB_LOG_ERROR, "SER-INIT", "Can't open serial port %s: %d\n",
strerror( errno ) ); szDevice, errno);
} }
#ifdef CONFIG_MB_TERMIOS
else if (tcgetattr(iSerialFd, &xOldTIO) != 0) else if (tcgetattr(iSerialFd, &xOldTIO) != 0)
{ {
vMBPortLog( MB_LOG_ERROR, "SER-INIT", "Can't get settings from port %s: %s\n", szDevice, vMBPortLog(MB_LOG_ERROR, "SER-INIT", "Can't get settings from port %s: %d\n",
strerror( errno ) ); szDevice, errno);
} }
else else
{ {
@ -132,6 +150,7 @@ xMBPortSerialInit( uint8_t ucPort, uint32_t ulBaudRate, uint8_t ucDataBits, eMBP
default: default:
bStatus = false; bStatus = false;
} }
switch (ucDataBits) switch (ucDataBits)
{ {
case 8: case 8:
@ -143,6 +162,7 @@ xMBPortSerialInit( uint8_t ucPort, uint32_t ulBaudRate, uint8_t ucDataBits, eMBP
default: default:
bStatus = false; bStatus = false;
} }
switch (ulBaudRate) switch (ulBaudRate)
{ {
case 9600: case 9600:
@ -163,22 +183,23 @@ xMBPortSerialInit( uint8_t ucPort, uint32_t ulBaudRate, uint8_t ucDataBits, eMBP
default: default:
bStatus = false; bStatus = false;
} }
if (bStatus) if (bStatus)
{ {
if (cfsetispeed(&xNewTIO, xNewSpeed) != 0) if (cfsetispeed(&xNewTIO, xNewSpeed) != 0)
{ {
vMBPortLog( MB_LOG_ERROR, "SER-INIT", "Can't set baud rate %ld for port %s: %s\n", vMBPortLog(MB_LOG_ERROR, "SER-INIT", "Can't set baud rate %ld for port %s: %d\n",
ulBaudRate, strerror( errno ) ); ulBaudRate, errno);
} }
else if (cfsetospeed(&xNewTIO, xNewSpeed) != 0) else if (cfsetospeed(&xNewTIO, xNewSpeed) != 0)
{ {
vMBPortLog( MB_LOG_ERROR, "SER-INIT", "Can't set baud rate %ld for port %s: %s\n", vMBPortLog(MB_LOG_ERROR, "SER-INIT", "Can't set baud rate %ld for port %s: %d\n",
ulBaudRate, szDevice, strerror( errno ) ); ulBaudRate, szDevice, errno);
} }
else if (tcsetattr(iSerialFd, TCSANOW, &xNewTIO) != 0) else if (tcsetattr(iSerialFd, TCSANOW, &xNewTIO) != 0)
{ {
vMBPortLog( MB_LOG_ERROR, "SER-INIT", "Can't set settings for port %s: %s\n", vMBPortLog(MB_LOG_ERROR, "SER-INIT", "Can't set settings for port %s: %d\n",
szDevice, strerror( errno ) ); szDevice, errno);
} }
else else
{ {
@ -187,11 +208,12 @@ xMBPortSerialInit( uint8_t ucPort, uint32_t ulBaudRate, uint8_t ucDataBits, eMBP
} }
} }
} }
#endif
return bStatus; return bStatus;
} }
bool bool xMBPortSerialSetTimeout(uint32_t ulNewTimeoutMs)
xMBPortSerialSetTimeout( uint32_t ulNewTimeoutMs )
{ {
if (ulNewTimeoutMs > 0) if (ulNewTimeoutMs > 0)
{ {
@ -201,22 +223,23 @@ xMBPortSerialSetTimeout( uint32_t ulNewTimeoutMs )
{ {
ulTimeoutMs = 1; ulTimeoutMs = 1;
} }
return true; return true;
} }
void void vMBPortClose(void)
vMBPortClose( void )
{ {
if (iSerialFd != -1) if (iSerialFd != -1)
{ {
#ifdef CONFIG_MB_TERMIOS
(void)tcsetattr(iSerialFd, TCSANOW, &xOldTIO); (void)tcsetattr(iSerialFd, TCSANOW, &xOldTIO);
#endif
(void)close(iSerialFd); (void)close(iSerialFd);
iSerialFd = -1; iSerialFd = -1;
} }
} }
bool bool prvbMBPortSerialRead(uint8_t *pucBuffer, uint16_t usNBytes, uint16_t *usNBytesRead)
prvbMBPortSerialRead( uint8_t * pucBuffer, uint16_t usNBytes, uint16_t * usNBytesRead )
{ {
bool bResult = true; bool bResult = true;
ssize_t res; ssize_t res;
@ -229,7 +252,9 @@ prvbMBPortSerialRead( uint8_t * pucBuffer, uint16_t usNBytes, uint16_t * usNByte
FD_SET(iSerialFd, &rfds); FD_SET(iSerialFd, &rfds);
/* Wait until character received or timeout. Recover in case of an /* Wait until character received or timeout. Recover in case of an
* interrupted read system call. */ * interrupted read system call.
*/
do do
{ {
if (select(iSerialFd + 1, &rfds, NULL, NULL, &tv) == -1) if (select(iSerialFd + 1, &rfds, NULL, NULL, &tv) == -1)
@ -257,12 +282,12 @@ prvbMBPortSerialRead( uint8_t * pucBuffer, uint16_t usNBytes, uint16_t * usNByte
break; break;
} }
} }
while(bResult == true); while(bResult == true);
return bResult; return bResult;
} }
bool bool prvbMBPortSerialWrite(uint8_t *pucBuffer, uint16_t usNBytes)
prvbMBPortSerialWrite( uint8_t * pucBuffer, uint16_t usNBytes )
{ {
ssize_t res; ssize_t res;
size_t left = (size_t) usNBytes; size_t left = (size_t) usNBytes;
@ -276,12 +301,15 @@ prvbMBPortSerialWrite( uint8_t * pucBuffer, uint16_t usNBytes )
{ {
break; break;
} }
/* call write again because of interrupted system call. */ /* call write again because of interrupted system call. */
continue; continue;
} }
done += res; done += res;
left -= res; left -= res;
} }
return left == 0 ? true : false; return left == 0 ? true : false;
} }
@ -313,8 +341,8 @@ xMBPortSerialPoll( )
} }
else else
{ {
vMBPortLog( MB_LOG_ERROR, "SER-POLL", "read failed on serial device: %s\n", vMBPortLog(MB_LOG_ERROR, "SER-POLL", "read failed on serial device: %d\n",
strerror( errno ) ); errno);
bStatus = false; bStatus = false;
} }
} }
@ -327,8 +355,8 @@ xMBPortSerialPoll( )
} }
if (!prvbMBPortSerialWrite(&ucBuffer[0], uiTxBufferPos)) if (!prvbMBPortSerialWrite(&ucBuffer[0], uiTxBufferPos))
{ {
vMBPortLog( MB_LOG_ERROR, "SER-POLL", "write failed on serial device: %s\n", vMBPortLog(MB_LOG_ERROR, "SER-POLL", "write failed on serial device: %d\n",
strerror( errno ) ); errno);
bStatus = false; bStatus = false;
} }
} }