From b1ef035d077696fd9655270c321329bbd4900ad3 Mon Sep 17 00:00:00 2001
From: "Ben V. Brown" <Ralim@Ralimtek.com>
Date: Mon, 5 Apr 2021 13:22:08 +1000
Subject: [PATCH] Cleanup RX

---
 source/Core/Drivers/FUSB302/protocol_rx.cpp | 31 +--------------------
 source/Core/Drivers/FUSB302/protocol_rx.h   |  2 --
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/source/Core/Drivers/FUSB302/protocol_rx.cpp b/source/Core/Drivers/FUSB302/protocol_rx.cpp
index b6618d76..73b9f095 100644
--- a/source/Core/Drivers/FUSB302/protocol_rx.cpp
+++ b/source/Core/Drivers/FUSB302/protocol_rx.cpp
@@ -29,14 +29,11 @@ StaticEventGroup_t  ProtocolReceive::xCreatedEventGroup;
 uint32_t            ProtocolReceive::TaskBuffer[ProtocolReceive::TaskStackSize];
 osStaticThreadDef_t ProtocolReceive::TaskControlBlock;
 union pd_msg        ProtocolReceive::tempMessage;
-uint8_t             ProtocolReceive::_rx_messageid;
-uint8_t             ProtocolReceive::_tx_messageidcounter;
 /*
  * PRL_Rx_Wait_for_PHY_Message state
  */
 ProtocolReceive::protocol_rx_state ProtocolReceive::protocol_rx_wait_phy() {
   /* Wait for an event */
-  _rx_messageid   = 0;
   eventmask_t evt = waitForEvent(PDB_EVT_PRLRX_RESET | PDB_EVT_PRLRX_I_GCRCSENT | PDB_EVT_PRLRX_I_RXPEND);
 
   /* If we got a reset event, reset */
@@ -74,11 +71,6 @@ ProtocolReceive::protocol_rx_state ProtocolReceive::protocol_rx_wait_phy() {
  * PRL_Rx_Layer_Reset_for_Receive state
  */
 ProtocolReceive::protocol_rx_state ProtocolReceive::protocol_rx_reset() {
-  /* Reset MessageIDCounter */
-  _tx_messageidcounter = 0;
-
-  /* Clear stored MessageID */
-  _rx_messageid = -1;
 
   /* TX transitions to its reset state */
   ProtocolTransmit::notify(ProtocolTransmit::Notifications::PDB_EVT_PRLTX_RESET);
@@ -92,28 +84,10 @@ ProtocolReceive::protocol_rx_state ProtocolReceive::protocol_rx_reset() {
   /* Go to the Check_MessageID state */
   return PRLRxCheckMessageID;
 }
-volatile uint32_t rxCounter = 0;
 /*
  * PRL_Rx_Check_MessageID state
  */
-ProtocolReceive::protocol_rx_state ProtocolReceive::protocol_rx_check_messageid() {
-  /* If we got a RESET signal, reset the machine */
-  //	if (waitForEvent(PDB_EVT_PRLRX_RESET, 0) == PDB_EVT_PRLRX_RESET) {
-  //		return PRLRxWaitPHY;
-  //	}
-  /* If the message has the stored ID, we've seen this message before.  Free
-   * it and don't pass it to the policy engine. */
-
-  /* Otherwise, there's either no stored ID or this message has an ID we
-   * haven't just seen.  Transition to the Store_MessageID state. */
-  //	if (PD_MESSAGEID_GET(&tempMessage) == _rx_messageid) {
-  //		return PRLRxWaitPHY;
-  //	} else
-  {
-    rxCounter++;
-    return PRLRxStoreMessageID;
-  }
-}
+ProtocolReceive::protocol_rx_state ProtocolReceive::protocol_rx_check_messageid() { return PRLRxStoreMessageID; }
 
 /*
  * PRL_Rx_Store_MessageID state
@@ -123,9 +97,6 @@ ProtocolReceive::protocol_rx_state ProtocolReceive::protocol_rx_store_messageid(
 
   ProtocolTransmit::notify(ProtocolTransmit::Notifications::PDB_EVT_PRLTX_DISCARD);
 
-  /* Update the stored MessageID */
-  _rx_messageid = PD_MESSAGEID_GET(&tempMessage);
-
   /* Pass the message to the policy engine. */
 
   PolicyEngine::handleMessage(&tempMessage);
diff --git a/source/Core/Drivers/FUSB302/protocol_rx.h b/source/Core/Drivers/FUSB302/protocol_rx.h
index 2521c30e..2693f33a 100644
--- a/source/Core/Drivers/FUSB302/protocol_rx.h
+++ b/source/Core/Drivers/FUSB302/protocol_rx.h
@@ -53,8 +53,6 @@ private:
   static protocol_rx_state protocol_rx_reset();
   static protocol_rx_state protocol_rx_wait_phy();
   static union pd_msg      tempMessage;
-  static uint8_t           _rx_messageid;
-  static uint8_t           _tx_messageidcounter;
   static uint32_t          waitForEvent(uint32_t mask, TickType_t ticksToWait = portMAX_DELAY);
 };