diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-24 15:10:21 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-24 15:10:21 +0000 |
| commit | 6d2bcd43a9a90e4be63c1bc29f14882a8db536df (patch) | |
| tree | d9193962a4631ab2b77486d8192377c05862ee8f /apps/include | |
| parent | bbae2a800dec1c8f22c3a2bf1d95affb68112746 (diff) | |
| download | nuttx-6d2bcd43a9a90e4be63c1bc29f14882a8db536df.tar.gz nuttx-6d2bcd43a9a90e4be63c1bc29f14882a8db536df.tar.bz2 nuttx-6d2bcd43a9a90e4be63c1bc29f14882a8db536df.zip | |
Remove BOTHER
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4972 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/include')
| -rw-r--r-- | apps/include/modbus/mb.h | 5 | ||||
| -rw-r--r-- | apps/include/modbus/mbport.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/apps/include/modbus/mb.h b/apps/include/modbus/mb.h index ed247d163..be7c0df90 100644 --- a/apps/include/modbus/mb.h +++ b/apps/include/modbus/mb.h @@ -33,6 +33,7 @@ #include <stdint.h> #include <stdbool.h> +#include <termios.h> #ifdef __cplusplus PR_BEGIN_EXTERN_C @@ -136,7 +137,7 @@ typedef enum * address or to the broadcast address are processed. * \param ucPort The port to use. E.g. 1 for COM1 on windows. This value * is platform dependent and some ports simply choose to ignore it. - * \param ulBaudRate The baudrate. E.g. 19200. Supported baudrates depend + * \param ulBaudRate The baudrate. E.g. B19200. Supported baudrates depend * on the porting layer. * \param eParity Parity used for serial transmission. * @@ -149,7 +150,7 @@ typedef enum * - eMBErrorCode::MB_EPORTERR IF the porting layer returned an error. */ eMBErrorCode eMBInit( eMBMode eMode, uint8_t ucSlaveAddress, - uint8_t ucPort, uint32_t ulBaudRate, eMBParity eParity ); + uint8_t ucPort, speed_t ulBaudRate, eMBParity eParity ); /*! \ingroup modbus * \brief Initialize the Modbus protocol stack for Modbus TCP. diff --git a/apps/include/modbus/mbport.h b/apps/include/modbus/mbport.h index e011c15bd..9301d8c90 100644 --- a/apps/include/modbus/mbport.h +++ b/apps/include/modbus/mbport.h @@ -71,7 +71,7 @@ bool xMBPortEventGet( /*@out@ */ eMBEventType * eEvent ); /* ----------------------- Serial port functions ----------------------------*/ -bool xMBPortSerialInit( uint8_t ucPort, uint32_t ulBaudRate, +bool xMBPortSerialInit( uint8_t ucPort, speed_t ulBaudRate, uint8_t ucDataBits, eMBParity eParity ); void vMBPortClose( void ); |