From 16bb7e5f04c47939620cf228a5c23fad7224d954 Mon Sep 17 00:00:00 2001 From: paul-szczepanek-arm <33840200+paul-szczepanek-arm@users.noreply.github.com> Date: Fri, 10 May 2019 18:23:05 +0100 Subject: [PATCH] fix merge conflixt --- .../targets/TARGET_CORDIO/driver/CordioHCIDriver.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/driver/CordioHCIDriver.cpp b/features/FEATURE_BLE/targets/TARGET_CORDIO/driver/CordioHCIDriver.cpp index c5cece99bf..d166424efa 100644 --- a/features/FEATURE_BLE/targets/TARGET_CORDIO/driver/CordioHCIDriver.cpp +++ b/features/FEATURE_BLE/targets/TARGET_CORDIO/driver/CordioHCIDriver.cpp @@ -223,11 +223,6 @@ void CordioHCIDriver::handle_reset_sequence(uint8_t *pMsg) } break; case HCI_OPCODE_LE_WRITE_DEF_DATA_LEN: - /* send next command in sequence */ - HciReadLocalVerInfoCmd(); - break; - - case HCI_OPCODE_READ_LOCAL_VER_INFO: if (hciCoreCb.extResetSeq) { /* send first extended command */ HciReadLocalVerInfoCmd();