From 7c26a7028a1899b37c0d48400977a0058677ed2b Mon Sep 17 00:00:00 2001 From: gregjhogan Date: Fri, 9 Feb 2018 20:15:14 -0600 Subject: [PATCH] TIS needs unsupported protocols to return an error --- drivers/windows/pandaJ2534DLL/J2534Connection.cpp | 4 ++-- drivers/windows/pandaJ2534DLL/pandaJ2534DLL.cpp | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/windows/pandaJ2534DLL/J2534Connection.cpp b/drivers/windows/pandaJ2534DLL/J2534Connection.cpp index 5d841578c39b59..cb7845fbcd11f2 100644 --- a/drivers/windows/pandaJ2534DLL/J2534Connection.cpp +++ b/drivers/windows/pandaJ2534DLL/J2534Connection.cpp @@ -147,8 +147,8 @@ long J2534Connection::PassThruIoctl(unsigned long IoctlID, void *pInput, void *p return STATUS_NOERROR; } -long J2534Connection::init5b(SBYTE_ARRAY* pInput, SBYTE_ARRAY* pOutput) { return STATUS_NOERROR; } -long J2534Connection::initFast(PASSTHRU_MSG* pInput, PASSTHRU_MSG* pOutput) { return STATUS_NOERROR; } +long J2534Connection::init5b(SBYTE_ARRAY* pInput, SBYTE_ARRAY* pOutput) { return ERR_FAILED; } +long J2534Connection::initFast(PASSTHRU_MSG* pInput, PASSTHRU_MSG* pOutput) { return ERR_FAILED; } long J2534Connection::clearTXBuff() { if (auto panda_ps = this->panda_dev.lock()) { synchronized(staged_writes_lock) { diff --git a/drivers/windows/pandaJ2534DLL/pandaJ2534DLL.cpp b/drivers/windows/pandaJ2534DLL/pandaJ2534DLL.cpp index bf91f8364539a3..7a01cc730cdf4b 100644 --- a/drivers/windows/pandaJ2534DLL/pandaJ2534DLL.cpp +++ b/drivers/windows/pandaJ2534DLL/pandaJ2534DLL.cpp @@ -140,14 +140,12 @@ PANDAJ2534DLL_API long PTAPI PassThruConnect(unsigned long DeviceID, unsigned lo switch (ProtocolID) { //SW seems to refer to Single Wire. https://www.nxp.com/files-static/training_pdf/20451_BUS_COMM_WBT.pdf //SW_ protocols may be touched on here: https://www.iso.org/obp/ui/#iso:std:iso:22900:-2:ed-1:v1:en - case J1850VPW: //These protocols are outdated and will not be supported. HDS wants them to not fail to open. - case J1850PWM: - case J1850VPW_PS: - case J1850PWM_PS: + //case J1850VPW: // These protocols are outdated and will not be supported. HDS wants them to not fail to open. + //case J1850PWM: // ^-- it appears HDS no longer needs this, and TIS needs it disabled --^ + //case J1850VPW_PS: + //case J1850PWM_PS: case ISO9141: //This protocol could be implemented if 5 BAUD init support is added to the panda. case ISO9141_PS: - conn = std::make_shared(panda, ProtocolID, Flags, BaudRate); - break; case ISO14230: //Only supporting Fast init until panda adds support for 5 BAUD init. case ISO14230_PS: conn = std::make_shared(panda, ProtocolID, Flags, BaudRate);