From 42692b4673c52a6e1f58463f0b98efbad73a3414 Mon Sep 17 00:00:00 2001 From: gregjhogan Date: Thu, 8 Feb 2018 23:49:41 -0600 Subject: [PATCH] TIS doesn't like ChannelID being zero --- drivers/windows/pandaJ2534DLL/pandaJ2534DLL.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/windows/pandaJ2534DLL/pandaJ2534DLL.cpp b/drivers/windows/pandaJ2534DLL/pandaJ2534DLL.cpp index 2e706f5..bf91f83 100644 --- a/drivers/windows/pandaJ2534DLL/pandaJ2534DLL.cpp +++ b/drivers/windows/pandaJ2534DLL/pandaJ2534DLL.cpp @@ -57,7 +57,7 @@ long ret_code(long code) { return code; } -#define EXTRACT_DID(CID) (CID & 0xFFFF) +#define EXTRACT_DID(CID) ((CID & 0xFFFF) - 1) #define EXTRACT_CID(CID) ((CID >> 16) & 0xFFFF) long check_valid_DeviceID(unsigned long DeviceID) { @@ -68,7 +68,7 @@ long check_valid_DeviceID(unsigned long DeviceID) { } long check_valid_ChannelID(unsigned long ChannelID) { - uint16_t dev_id = EXTRACT_DID(ChannelID);; + uint16_t dev_id = EXTRACT_DID(ChannelID); uint16_t con_id = EXTRACT_CID(ChannelID); if (pandas.size() <= dev_id || pandas[dev_id] == nullptr) @@ -117,7 +117,7 @@ PANDAJ2534DLL_API long PTAPI PassThruOpen(void *pName, unsigned long *pDevice panda_index = pandas.size()-1; } - *pDeviceID = panda_index; + *pDeviceID = panda_index + 1; // TIS doesn't like it when ID == 0 return ret_code(STATUS_NOERROR); } PANDAJ2534DLL_API long PTAPI PassThruClose(unsigned long DeviceID) {