From c888e4930dee7fbc83753b17626505238852523d Mon Sep 17 00:00:00 2001
From: abby wolf <Abigail.Wolf@analog.com>
Date: Mon, 30 Sep 2024 15:35:42 -0500
Subject: [PATCH] Update VS HCI opcodes

---
 .../controller/sources/ble/lhci/lhci_cmd_vs.c | 36 -------------------
 .../controller/sources/ble/lhci/lhci_int.h    | 19 +++++-----
 2 files changed, 10 insertions(+), 45 deletions(-)

diff --git a/Libraries/Cordio/controller/sources/ble/lhci/lhci_cmd_vs.c b/Libraries/Cordio/controller/sources/ble/lhci/lhci_cmd_vs.c
index 071bc02cbf..eb0ffb3b9b 100644
--- a/Libraries/Cordio/controller/sources/ble/lhci/lhci_cmd_vs.c
+++ b/Libraries/Cordio/controller/sources/ble/lhci/lhci_cmd_vs.c
@@ -230,33 +230,6 @@ bool_t lhciCommonVsStdDecodeCmdPkt(LhciHdr_t *pHdr, uint8_t *pBuf)
         evtParamLen += sizeof(BbBlePduFiltStats_t);
         break;
 
-    case LHCI_OPCODE_VS_REG_WRITE: {
-        uint8_t len;
-        uint32_t addr;
-        uint32_t *addrP;
-
-        BSTREAM_TO_UINT8(len, pBuf);
-        BSTREAM_TO_UINT32(addr, pBuf);
-        addrP = (uint32_t *)addr;
-
-        LL_TRACE_INFO2("### LlVsRegWrite ### 0x%08X %d bytes", addr, len);
-
-        memcpy(addrP, pBuf, len);
-        break;
-    }
-
-    case LHCI_OPCODE_VS_REG_READ: {
-        uint8_t len;
-
-        BSTREAM_TO_UINT8(len, pBuf);
-        BSTREAM_TO_UINT32(regReadAddr, pBuf);
-
-        LL_TRACE_INFO2("### LlVsRegRead ### 0x%08X %d bytes", regReadAddr, len);
-
-        evtParamLen += len;
-        break;
-    }
-
     case LHCI_OPCODE_VS_TX_TEST: {
         uint16_t numPackets = pBuf[4] | (pBuf[5] << 8);
 
@@ -314,7 +287,6 @@ bool_t lhciCommonVsStdDecodeCmdPkt(LhciHdr_t *pHdr, uint8_t *pBuf)
         case LHCI_OPCODE_VS_GET_RAND_ADDR:
         case LHCI_OPCODE_VS_SET_TX_TEST_ERR_PATT:
         case LHCI_OPCODE_VS_SET_SNIFFER_ENABLE:
-        case LHCI_OPCODE_VS_REG_WRITE:
         case LHCI_OPCODE_VS_RX_TEST:
         case LHCI_OPCODE_VS_TX_TEST:
         case LHCI_OPCODE_VS_RESET_ADV_STATS:
@@ -440,14 +412,6 @@ bool_t lhciCommonVsStdDecodeCmdPkt(LhciHdr_t *pHdr, uint8_t *pBuf)
             break;
         }
 
-        case LHCI_OPCODE_VS_REG_READ: {
-            if (regReadAddr != 0) {
-                uint32_t *regReadP = (uint32_t *)regReadAddr;
-                memcpy(pBuf, regReadP, (evtParamLen - 1));
-            }
-            break;
-        }
-
             /* --- default --- */
 
         default:
diff --git a/Libraries/Cordio/controller/sources/ble/lhci/lhci_int.h b/Libraries/Cordio/controller/sources/ble/lhci/lhci_int.h
index ad00651f47..2a74a59e9d 100644
--- a/Libraries/Cordio/controller/sources/ble/lhci/lhci_int.h
+++ b/Libraries/Cordio/controller/sources/ble/lhci/lhci_int.h
@@ -360,27 +360,28 @@ extern "C" {
 #define LHCI_OPCODE_VS_SET_CONN_PHY_TX_PWR \
     HCI_OPCODE(HCI_OGF_VENDOR_SPEC, 0x3DD) /*!< Set Connection Phy Tx Power opcode. */
 
-#define LHCI_OPCODE_VS_REG_WRITE HCI_OPCODE(HCI_OGF_VENDOR_SPEC, 0x300) /*!< Write data to MCU register or memory space. */
-#define LHCI_OPCODE_VS_REG_READ HCI_OPCODE(HCI_OGF_VENDOR_SPEC, 0x301) /*!< Read data from MCU  register or memory space. */
 #define LHCI_OPCODE_VS_RESET_CONN_STATS \
-    HCI_OPCODE(HCI_OGF_VENDOR_SPEC, 0x302) /*!< Reset connection stats. */
+    HCI_OPCODE(HCI_OGF_VENDOR_SPEC, 0x300) /*!< Reset connection stats. */
 #define LHCI_OPCODE_VS_TX_TEST \
-    HCI_OPCODE(HCI_OGF_VENDOR_SPEC, 0x303) /*!< Vendor specific TX test that takes numPkt param. */
+    HCI_OPCODE(HCI_OGF_VENDOR_SPEC, 0x301) /*!< Vendor specific TX test that takes numPkt param. */
 #define LHCI_OPCODE_VS_RESET_TEST_STATS     \
     HCI_OPCODE(HCI_OGF_VENDOR_SPEC, \
-               0x304) /*!<Vendor specific End Test Returning More than RX Packets*/
+               0x302) /*!<Vendor specific End Test Returning More than RX Packets*/
 #define LHCI_OPCODE_VS_RX_TEST     \
     HCI_OPCODE(HCI_OGF_VENDOR_SPEC, \
-               0x305) /*!<Vendor specific RX Test*/
+               0x303) /*!<Vendor specific RX Test*/
 #define LHCI_OPCODE_VS_GET_RSSI     \
     HCI_OPCODE(HCI_OGF_VENDOR_SPEC, \
-               0x306) /*!<Vendor specific Get RSSI*/
+               0x304) /*!<Vendor specific Get RSSI*/
 #define LHCI_OPCODE_VS_RESET_ADV_STATS     \
     HCI_OPCODE(HCI_OGF_VENDOR_SPEC, \
-               0x307) /*!<Vendor specific Get RSSI*/
+               0x305) /*!<Vendor specific Reset Advertising Stats */
 #define LHCI_OPCODE_VS_RESET_SCAN_STATS     \
     HCI_OPCODE(HCI_OGF_VENDOR_SPEC, \
-               0x308) /*!<Vendor specific Get RSSI*/
+               0x306) /*!<Vendor specific Reset Scan Stats */
+#define LHCI_OPCODE_VS_FGEN     \
+    HCI_OPCODE(HCI_OGF_VENDOR_SPEC, \
+               0x307) /*!<Vendor specific Function Generation */
 /* Vendor specific event masks. */
 #define LHCI_VS_EVT_MASK_SCAN_REPORT_EVT 0x01 /*!< (Byte 0) VS event bit, scan report. */
 #define LHCI_VS_EVT_MASK_DIAG_TRACE_EVT 0x02 /*!< (Byte 0) VS event bit, diagnostic tracing. */