diff options
| author | Tero Kontkanen <tero.kontkanen@granitedevices.fi> | 2017-01-27 14:10:28 +0200 |
|---|---|---|
| committer | Tero Kontkanen <tero.kontkanen@granitedevices.fi> | 2017-01-27 14:10:28 +0200 |
| commit | 787e6aa5f47c2bfa3e8f7d1d3ffb4f3c4926575a (patch) | |
| tree | 832d67329b562c1407cddebad756da53efea0cc1 /busdevice.c | |
| parent | 1f976e7371a1da4d2b7d3e33587f6c03c33c9eed (diff) | |
| parent | b70a617475efe9af38e6d3debc26ff1555714435 (diff) | |
| download | SimpleMotionV2-787e6aa5f47c2bfa3e8f7d1d3ffb4f3c4926575a.tar.gz SimpleMotionV2-787e6aa5f47c2bfa3e8f7d1d3ffb4f3c4926575a.zip | |
Merge branch 'feature/replace_rs232_lib' into develop
Diffstat (limited to 'busdevice.c')
| -rw-r--r-- | busdevice.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/busdevice.c b/busdevice.c index c82e27b..c4f89a1 100644 --- a/busdevice.c +++ b/busdevice.c @@ -1,6 +1,6 @@ #include "busdevice.h" -#include "rs232.h" +#include "pcserialport.h" #include <string.h> #define BD_NONE 0 @@ -67,7 +67,7 @@ smbusdevicehandle smBDOpen( const char *devicename ) if(strncmp(devicename,"COM",3) == 0 || strncmp(devicename,"/dev/tty",8) == 0) //use rs232 lib { - BusDevice[handle].comPort=OpenComport( devicename, SMBusBaudrate ); + BusDevice[handle].comPort=serialPortOpen( devicename, SMBusBaudrate ); if( BusDevice[handle].comPort == -1 ) { return -1; //failed to open @@ -101,7 +101,7 @@ smbool smBDClose( const smbusdevicehandle handle ) if( BusDevice[handle].bdType==BD_RS ) { - CloseComport( BusDevice[handle].comPort ); + serialPortClose( BusDevice[handle].comPort ); BusDevice[handle].opened=smfalse; return smtrue; } @@ -142,7 +142,7 @@ smbool smBDTransmit(const smbusdevicehandle handle) if( BusDevice[handle].bdType==BD_RS ) { - if(SendBuf(BusDevice[handle].comPort,BusDevice[handle].txBuffer, BusDevice[handle].txBufferUsed)==BusDevice[handle].txBufferUsed) + if(serialPortWriteBuffer(BusDevice[handle].comPort,BusDevice[handle].txBuffer, BusDevice[handle].txBufferUsed)==BusDevice[handle].txBufferUsed) { BusDevice[handle].txBufferUsed=0; return smtrue; @@ -166,7 +166,7 @@ smbool smBDRead( const smbusdevicehandle handle, smuint8 *byte ) if( BusDevice[handle].bdType==BD_RS ) { int n; - n=PollComport(BusDevice[handle].comPort, byte, 1); + n=serialPortRead(BusDevice[handle].comPort, byte, 1); if( n!=1 ) return smfalse; else return smtrue; } |