diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-21 21:23:18 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-21 21:23:18 +0000 |
| commit | d9714b556703561a0abcbe71970b1cd6922168a6 (patch) | |
| tree | 70b7893243b8ee2e6b8b5fd95106c4ab962699c5 /apps/modbus/tcp | |
| parent | ebf70f8a79eb8ef23bc1d99938768ef06c466119 (diff) | |
| download | nuttx-d9714b556703561a0abcbe71970b1cd6922168a6.tar.gz nuttx-d9714b556703561a0abcbe71970b1cd6922168a6.tar.bz2 nuttx-d9714b556703561a0abcbe71970b1cd6922168a6.zip | |
Use NuttX types in FreeModBus port; Add FreeModBus demo at apps/examples/modbus; Add new termios APIs
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4964 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/modbus/tcp')
| -rw-r--r-- | apps/modbus/tcp/mbtcp.c | 22 | ||||
| -rw-r--r-- | apps/modbus/tcp/mbtcp.h | 10 |
2 files changed, 16 insertions, 16 deletions
diff --git a/apps/modbus/tcp/mbtcp.c b/apps/modbus/tcp/mbtcp.c index 195a88fe9..b841f078a 100644 --- a/apps/modbus/tcp/mbtcp.c +++ b/apps/modbus/tcp/mbtcp.c @@ -79,11 +79,11 @@ /* ----------------------- Start implementation -----------------------------*/ eMBErrorCode -eMBTCPDoInit( USHORT ucTCPPort ) +eMBTCPDoInit( uint16_t ucTCPPort ) { eMBErrorCode eStatus = MB_ENOERR; - if( xMBTCPPortInit( ucTCPPort ) == FALSE ) + if( xMBTCPPortInit( ucTCPPort ) == false ) { eStatus = MB_EPORTERR; } @@ -103,14 +103,14 @@ eMBTCPStop( void ) } eMBErrorCode -eMBTCPReceive( UCHAR * pucRcvAddress, UCHAR ** ppucFrame, USHORT * pusLength ) +eMBTCPReceive( uint8_t * pucRcvAddress, uint8_t ** ppucFrame, uint16_t * pusLength ) { eMBErrorCode eStatus = MB_EIO; - UCHAR *pucMBTCPFrame; - USHORT usLength; - USHORT usPID; + uint8_t *pucMBTCPFrame; + uint16_t usLength; + uint16_t usPID; - if( xMBTCPPortGetRequest( &pucMBTCPFrame, &usLength ) != FALSE ) + if( xMBTCPPortGetRequest( &pucMBTCPFrame, &usLength ) != false ) { usPID = pucMBTCPFrame[MB_TCP_PID] << 8U; usPID |= pucMBTCPFrame[MB_TCP_PID + 1]; @@ -135,11 +135,11 @@ eMBTCPReceive( UCHAR * pucRcvAddress, UCHAR ** ppucFrame, USHORT * pusLength ) } eMBErrorCode -eMBTCPSend( UCHAR _unused, const UCHAR * pucFrame, USHORT usLength ) +eMBTCPSend( uint8_t _unused, const uint8_t * pucFrame, uint16_t usLength ) { eMBErrorCode eStatus = MB_ENOERR; - UCHAR *pucMBTCPFrame = ( UCHAR * ) pucFrame - MB_TCP_FUNC; - USHORT usTCPLength = usLength + MB_TCP_FUNC; + uint8_t *pucMBTCPFrame = ( uint8_t * ) pucFrame - MB_TCP_FUNC; + uint16_t usTCPLength = usLength + MB_TCP_FUNC; /* The MBAP header is already initialized because the caller calls this * function with the buffer returned by the previous call. Therefore we @@ -149,7 +149,7 @@ eMBTCPSend( UCHAR _unused, const UCHAR * pucFrame, USHORT usLength ) */ pucMBTCPFrame[MB_TCP_LEN] = ( usLength + 1 ) >> 8U; pucMBTCPFrame[MB_TCP_LEN + 1] = ( usLength + 1 ) & 0xFF; - if( xMBTCPPortSendResponse( pucMBTCPFrame, usTCPLength ) == FALSE ) + if( xMBTCPPortSendResponse( pucMBTCPFrame, usTCPLength ) == false ) { eStatus = MB_EIO; } diff --git a/apps/modbus/tcp/mbtcp.h b/apps/modbus/tcp/mbtcp.h index 905d113c5..1ded9c5d4 100644 --- a/apps/modbus/tcp/mbtcp.h +++ b/apps/modbus/tcp/mbtcp.h @@ -39,13 +39,13 @@ PR_BEGIN_EXTERN_C #define MB_TCP_PSEUDO_ADDRESS 255 /* ----------------------- Function prototypes ------------------------------*/ - eMBErrorCode eMBTCPDoInit( USHORT ucTCPPort ); + eMBErrorCode eMBTCPDoInit( uint16_t ucTCPPort ); void eMBTCPStart( void ); void eMBTCPStop( void ); -eMBErrorCode eMBTCPReceive( UCHAR * pucRcvAddress, UCHAR ** pucFrame, - USHORT * pusLength ); -eMBErrorCode eMBTCPSend( UCHAR _unused, const UCHAR * pucFrame, - USHORT usLength ); +eMBErrorCode eMBTCPReceive( uint8_t * pucRcvAddress, uint8_t ** pucFrame, + uint16_t * pusLength ); +eMBErrorCode eMBTCPSend( uint8_t _unused, const uint8_t * pucFrame, + uint16_t usLength ); #ifdef __cplusplus PR_END_EXTERN_C |