diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-21 14:56:21 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-21 14:56:21 +0000 |
| commit | fcfd6c4d7ca3cc8d2751652a79a08d64eb8ec5a3 (patch) | |
| tree | a06bbe9986c21dae6763e584c9ab79394cb3b99b /apps/modbus/ascii | |
| parent | 1dc0e8b8c5b6e03fcfcdcbc89efd512f934eaca5 (diff) | |
| download | nuttx-fcfd6c4d7ca3cc8d2751652a79a08d64eb8ec5a3.tar.gz nuttx-fcfd6c4d7ca3cc8d2751652a79a08d64eb8ec5a3.tar.bz2 nuttx-fcfd6c4d7ca3cc8d2751652a79a08d64eb8ec5a3.zip | |
FreeModBus is now integrated with the Nuttx configuration system
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4961 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/modbus/ascii')
| -rw-r--r-- | apps/modbus/ascii/mbascii.c | 10 | ||||
| -rw-r--r-- | apps/modbus/ascii/mbascii.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/apps/modbus/ascii/mbascii.c b/apps/modbus/ascii/mbascii.c index c513457ea..c334d6a9a 100644 --- a/apps/modbus/ascii/mbascii.c +++ b/apps/modbus/ascii/mbascii.c @@ -29,22 +29,22 @@ */ /* ----------------------- System includes ----------------------------------*/ -#include "stdlib.h" -#include "string.h" +#include <nuttx/config.h> +#include <stdlib.h> +#include <string.h> /* ----------------------- Platform includes --------------------------------*/ #include "port.h" /* ----------------------- Modbus includes ----------------------------------*/ #include "mb.h" -#include "mbconfig.h" #include "mbascii.h" #include "mbframe.h" #include "mbcrc.h" #include "mbport.h" -#if MB_ASCII_ENABLED > 0 +#ifdef CONFIG_MB_ASCII_ENABLED /* ----------------------- Defines ------------------------------------------*/ #define MB_ASCII_DEFAULT_CR '\r' /*!< Default CR character for Modbus ASCII. */ @@ -117,7 +117,7 @@ eMBASCIIInit( UCHAR ucSlaveAddress, UCHAR ucPort, ULONG ulBaudRate, eMBParity eP { eStatus = MB_EPORTERR; } - else if( xMBPortTimersInit( MB_ASCII_TIMEOUT_SEC * 20000UL ) != TRUE ) + else if( xMBPortTimersInit( CONFIG_MB_ASCII_TIMEOUT_SEC * 20000UL ) != TRUE ) { eStatus = MB_EPORTERR; } diff --git a/apps/modbus/ascii/mbascii.h b/apps/modbus/ascii/mbascii.h index 47846ddec..1191a1166 100644 --- a/apps/modbus/ascii/mbascii.h +++ b/apps/modbus/ascii/mbascii.h @@ -35,7 +35,7 @@ PR_BEGIN_EXTERN_C #endif -#if MB_ASCII_ENABLED > 0 +#ifdef CONFIG_MB_ASCII_ENABLED eMBErrorCode eMBASCIIInit( UCHAR slaveAddress, UCHAR ucPort, ULONG ulBaudRate, eMBParity eParity ); void eMBASCIIStart( void ); |