diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..a6ec1ac --- /dev/null +++ b/.gitattributes @@ -0,0 +1,40 @@ +* text=auto + +*.S text +*.asm text +*.c text +*.cc text +*.cpp text +*.cxx text +*.h text +*.htm text +*.html text +*.in text +*.ld text +*.m4 text +*.mak text +*.mk text +*.py text +*.rb text +*.s text +*.sct text +*.sh text +*.txt text +*.xml text +Makefile text +AUTHORS text +COPYING text + +*.LZO -text +*.Opt -text +*.Uv2 -text +*.ewp -text +*.eww -text +*.vcproj -text +*.bat -text +*.dos -text +*.icf -text +*.inf -text +*.ini -text +*.sct -text +*.xsd -text diff --git a/FreeModbus 主机分析图.vsd b/FreeModbus 主机分析图.vsd index 7291f61..4c59adb 100644 Binary files a/FreeModbus 主机分析图.vsd and b/FreeModbus 主机分析图.vsd differ diff --git a/FreeModbus/modbus/include/mb.h b/FreeModbus/modbus/include/mb.h index a29aa55..db1a4fb 100644 --- a/FreeModbus/modbus/include/mb.h +++ b/FreeModbus/modbus/include/mb.h @@ -322,9 +322,6 @@ eMBErrorCode eMBRegisterCB( UCHAR ucFunctionCode, */ eMBErrorCode eMBRegInputCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNRegs ); -/* This callback function will be use in Modbus Master mode.*/ -eMBErrorCode eMBRegMasterInputCB( UCHAR * pucRegBuffer, USHORT usAddress, - USHORT usNRegs ); /*! \ingroup modbus_registers * \brief Callback function used if a Holding Register value is @@ -360,9 +357,6 @@ eMBErrorCode eMBRegMasterInputCB( UCHAR * pucRegBuffer, USHORT usAddress, */ eMBErrorCode eMBRegHoldingCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNRegs, eMBRegisterMode eMode ); -/* This callback function will be use in Modbus Master mode.*/ -eMBErrorCode eMBMasterRegHoldingCB( UCHAR * pucRegBuffer, USHORT usAddress, - USHORT usNRegs, eMBRegisterMode eMode ); /*! \ingroup modbus_registers * \brief Callback function used if a Coil Register value is @@ -398,9 +392,6 @@ eMBErrorCode eMBMasterRegHoldingCB( UCHAR * pucRegBuffer, USHORT usAddress, */ eMBErrorCode eMBRegCoilsCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNCoils, eMBRegisterMode eMode ); -/* This callback function will be use in Modbus Master mode.*/ -eMBErrorCode eMBMasterRegCoilsCB( UCHAR * pucRegBuffer, USHORT usAddress, - USHORT usNCoils, eMBRegisterMode eMode ); /*! \ingroup modbus_registers * \brief Callback function used if a Input Discrete Register value is @@ -430,9 +421,6 @@ eMBErrorCode eMBMasterRegCoilsCB( UCHAR * pucRegBuffer, USHORT usAddress, */ eMBErrorCode eMBRegDiscreteCB( UCHAR * pucRegBuffer, USHORT usAddress, USHORT usNDiscrete ); -/* This callback function will be use in Modbus Master mode.*/ -eMBErrorCode eMBMasterRegDiscreteCB( UCHAR * pucRegBuffer, USHORT usAddress, - USHORT usNDiscrete ); #ifdef __cplusplus PR_END_EXTERN_C