sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4 from drebbe-intrepid/master 

Updated icsnVC40.h to latest v803 release.
pull/8/head
Paul Hollinsky 2019-03-28 20:52:17 -04:00 committed by GitHub
parent 8a77bfb0f4 9a83ec1822
commit ec30696110
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2277 additions and 945 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/icsneolegacy/icsneolegacy.cpp
View File

@ -14,6 +14,9 @@
#include <map> #include <map>
#include <algorithm> #include <algorithm>
#include <cstring>
#include <climits>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(disable : 4100) // unreferenced formal parameter #pragma warning(disable : 4100) // unreferenced formal parameter
#endif #endif
@ -65,7 +68,7 @@ int icsneoFindDevices(NeoDeviceEx* devs, int* devCount, unsigned int* devTypes,
if(devCount == nullptr) if(devCount == nullptr)
return 0; return 0;
unsigned int devTypesDefault[] = { NEODEVICE_ALL }; unsigned int devTypesDefault[] = { std::numeric_limits<unsigned int>::max() };
if(devTypes == nullptr || devTypeCount == 0) { if(devTypes == nullptr || devTypeCount == 0) {
devTypes = devTypesDefault; devTypes = devTypesDefault;
devTypeCount = 1; devTypeCount = 1;
@ -543,4 +546,4 @@ int icsneoEnableNetworkCom(void* hObject, int Enable) {
int icsneoFindAllCOMDevices(int lDriverType, int lGetSerialNumbers, int lStopAtFirst, int lUSBCommOnly, int* p_lDeviceTypes, int* p_lComPorts, int* p_lSerialNumbers, int*lNumDevices) { int icsneoFindAllCOMDevices(int lDriverType, int lGetSerialNumbers, int lStopAtFirst, int lUSBCommOnly, int* p_lDeviceTypes, int* p_lComPorts, int* p_lSerialNumbers, int*lNumDevices) {
// TODO Implement // TODO Implement
return false; return false;
} }

3215
include/icsneo/icsnVC40.h
View File

File diff suppressed because it is too large Load Diff