Reference the PRLTX thread by the new struct

lib/src/hard_reset.c

@@ -57,7 +57,7 @@ static enum hardrst_state hardrst_reset_layer(struct pdb_config *cfg)
     chThdYield();
 
     /* Reset the Protocol TX machine */
-    chEvtSignal(pdb_prltx_thread, PDB_EVT_PRLTX_RESET);
+    chEvtSignal(cfg->prl.tx_thread, PDB_EVT_PRLTX_RESET);
     chThdYield();
 
     /* Continue the process based on what event started the reset. */

lib/src/int_n.c

@@ -59,7 +59,7 @@ static THD_FUNCTION(IntNPoll, vcfg) {
             if (status.interrupta & FUSB_INTERRUPTA_I_TXSENT) {
                 events |= PDB_EVT_PRLTX_I_TXSENT;
             }
-            chEvtSignal(pdb_prltx_thread, events);
+            chEvtSignal(cfg->prl.tx_thread, events);
 
             /* If the I_HARDRST or I_HARDSENT flag is set, tell the Hard Reset
              * thread */

lib/src/policy_engine.c

@@ -154,7 +154,7 @@ static enum policy_engine_state pe_sink_select_cap(struct pdb_config *cfg)
 {
     /* Transmit the request */
     chMBPost(&pdb_prltx_mailbox, (msg_t) last_dpm_request, TIME_IMMEDIATE);
-    chEvtSignal(pdb_prltx_thread, PDB_EVT_PRLTX_MSG_TX);
+    chEvtSignal(cfg->prl.tx_thread, PDB_EVT_PRLTX_MSG_TX);
     eventmask_t evt = chEvtWaitAny(PDB_EVT_PE_TX_DONE | PDB_EVT_PE_TX_ERR
             | PDB_EVT_PE_RESET);
     /* Don't free the request; we might need it again */
@@ -428,7 +428,7 @@ static enum policy_engine_state pe_sink_get_source_cap(struct pdb_config *cfg)
         | PD_SPECREV_2_0 | PD_POWERROLE_SINK | PD_NUMOBJ(0);
     /* Transmit the Get_Source_Cap */
     chMBPost(&pdb_prltx_mailbox, (msg_t) get_source_cap, TIME_IMMEDIATE);
-    chEvtSignal(pdb_prltx_thread, PDB_EVT_PRLTX_MSG_TX);
+    chEvtSignal(cfg->prl.tx_thread, PDB_EVT_PRLTX_MSG_TX);
     eventmask_t evt = chEvtWaitAny(PDB_EVT_PE_TX_DONE | PDB_EVT_PE_TX_ERR
             | PDB_EVT_PE_RESET);
     /* Free the sent message */
@@ -455,7 +455,7 @@ static enum policy_engine_state pe_sink_give_sink_cap(struct pdb_config *cfg)
 
     /* Transmit our capabilities */
     chMBPost(&pdb_prltx_mailbox, (msg_t) snk_cap, TIME_IMMEDIATE);
-    chEvtSignal(pdb_prltx_thread, PDB_EVT_PRLTX_MSG_TX);
+    chEvtSignal(cfg->prl.tx_thread, PDB_EVT_PRLTX_MSG_TX);
     eventmask_t evt = chEvtWaitAny(PDB_EVT_PE_TX_DONE | PDB_EVT_PE_TX_ERR
             | PDB_EVT_PE_RESET);
 
@@ -522,7 +522,7 @@ static enum policy_engine_state pe_sink_soft_reset(struct pdb_config *cfg)
         | PD_POWERROLE_SINK | PD_NUMOBJ(0);
     /* Transmit the Accept */
     chMBPost(&pdb_prltx_mailbox, (msg_t) accept, TIME_IMMEDIATE);
-    chEvtSignal(pdb_prltx_thread, PDB_EVT_PRLTX_MSG_TX);
+    chEvtSignal(cfg->prl.tx_thread, PDB_EVT_PRLTX_MSG_TX);
     eventmask_t evt = chEvtWaitAny(PDB_EVT_PE_TX_DONE | PDB_EVT_PE_TX_ERR
             | PDB_EVT_PE_RESET);
     /* Free the sent message */
@@ -552,7 +552,7 @@ static enum policy_engine_state pe_sink_send_soft_reset(struct pdb_config *cfg)
         | PD_POWERROLE_SINK | PD_NUMOBJ(0);
     /* Transmit the soft reset */
     chMBPost(&pdb_prltx_mailbox, (msg_t) softrst, TIME_IMMEDIATE);
-    chEvtSignal(pdb_prltx_thread, PDB_EVT_PRLTX_MSG_TX);
+    chEvtSignal(cfg->prl.tx_thread, PDB_EVT_PRLTX_MSG_TX);
     eventmask_t evt = chEvtWaitAny(PDB_EVT_PE_TX_DONE | PDB_EVT_PE_TX_ERR
             | PDB_EVT_PE_RESET);
     /* Free the sent message */
@@ -613,7 +613,7 @@ static enum policy_engine_state pe_sink_send_reject(struct pdb_config *cfg)
 
     /* Transmit the message */
     chMBPost(&pdb_prltx_mailbox, (msg_t) reject, TIME_IMMEDIATE);
-    chEvtSignal(pdb_prltx_thread, PDB_EVT_PRLTX_MSG_TX);
+    chEvtSignal(cfg->prl.tx_thread, PDB_EVT_PRLTX_MSG_TX);
     eventmask_t evt = chEvtWaitAny(PDB_EVT_PE_TX_DONE | PDB_EVT_PE_TX_ERR
             | PDB_EVT_PE_RESET);
 

lib/src/protocol_rx.c

@@ -49,8 +49,9 @@ int8_t pdb_prlrx_messageid = -1;
 /*
  * PRL_Rx_Wait_for_PHY_Message state
  */
-static enum protocol_rx_state protocol_rx_wait_phy(void)
+static enum protocol_rx_state protocol_rx_wait_phy(struct pdb_config *cfg)
 {
+    (void) cfg;
     /* Wait for an event */
     eventmask_t evt = chEvtWaitAny(ALL_EVENTS);
 
@@ -82,7 +83,7 @@ static enum protocol_rx_state protocol_rx_wait_phy(void)
 /*
  * PRL_Rx_Layer_Reset_for_Receive state
  */
-static enum protocol_rx_state protocol_rx_reset(void)
+static enum protocol_rx_state protocol_rx_reset(struct pdb_config *cfg)
 {
     /* Reset MessageIDCounter */
     pdb_prltx_messageidcounter = 0;
@@ -91,7 +92,7 @@ static enum protocol_rx_state protocol_rx_reset(void)
     pdb_prlrx_messageid = -1;
 
     /* TX transitions to its reset state */
-    chEvtSignal(pdb_prltx_thread, PDB_EVT_PRLTX_RESET);
+    chEvtSignal(cfg->prl.tx_thread, PDB_EVT_PRLTX_RESET);
     chThdYield();
 
     /* If we got a RESET signal, reset the machine */
@@ -108,8 +109,9 @@ static enum protocol_rx_state protocol_rx_reset(void)
 /*
  * PRL_Rx_Check_MessageID state
  */
-static enum protocol_rx_state protocol_rx_check_messageid(void)
+static enum protocol_rx_state protocol_rx_check_messageid(struct pdb_config *cfg)
 {
+    (void) cfg;
     /* If we got a RESET signal, reset the machine */
     if (chEvtGetAndClearEvents(PDB_EVT_PRLRX_RESET) != 0) {
         chPoolFree(&pdb_msg_pool, protocol_rx_message);
@@ -133,10 +135,10 @@ static enum protocol_rx_state protocol_rx_check_messageid(void)
 /*
  * PRL_Rx_Store_MessageID state
  */
-static enum protocol_rx_state protocol_rx_store_messageid(void)
+static enum protocol_rx_state protocol_rx_store_messageid(struct pdb_config *cfg)
 {
     /* Tell ProtocolTX to discard the message being transmitted */
-    chEvtSignal(pdb_prltx_thread, PDB_EVT_PRLTX_DISCARD);
+    chEvtSignal(cfg->prl.tx_thread, PDB_EVT_PRLTX_DISCARD);
     chThdYield();
 
     /* Update the stored MessageID */
@@ -155,22 +157,21 @@ static enum protocol_rx_state protocol_rx_store_messageid(void)
  * Protocol layer RX state machine thread
  */
 static THD_FUNCTION(ProtocolRX, cfg) {
-    (void) cfg;
     enum protocol_rx_state state = PRLRxWaitPHY;
 
     while (true) {
         switch (state) {
             case PRLRxWaitPHY:
-                state = protocol_rx_wait_phy();
+                state = protocol_rx_wait_phy(cfg);
                 break;
             case PRLRxReset:
-                state = protocol_rx_reset();
+                state = protocol_rx_reset(cfg);
                 break;
             case PRLRxCheckMessageID:
-                state = protocol_rx_check_messageid();
+                state = protocol_rx_check_messageid(cfg);
                 break;
             case PRLRxStoreMessageID:
-                state = protocol_rx_store_messageid();
+                state = protocol_rx_store_messageid(cfg);
                 break;
             default:
                 /* This is an error.  It really shouldn't happen.  We might

lib/src/protocol_tx.c

@@ -26,8 +26,6 @@
 #include "pd.h"
 
 
-thread_t *pdb_prltx_thread;
-
 /* Protocol layer TX thread mailbox */
 static msg_t pdb_prltx_mailbox_queue[PDB_MSG_POOL_SIZE];
 mailbox_t pdb_prltx_mailbox;
@@ -290,6 +288,6 @@ static THD_FUNCTION(ProtocolTX, cfg) {
 
 void pdb_prltx_run(struct pdb_config *cfg)
 {
-    pdb_prltx_thread = chThdCreateStatic(cfg->prl._tx_wa,
+    cfg->prl.tx_thread = chThdCreateStatic(cfg->prl._tx_wa,
             sizeof(cfg->prl._tx_wa), PDB_PRIO_PRL, ProtocolTX, cfg);
 }

lib/src/protocol_tx.h

@@ -33,9 +33,6 @@
 #define PDB_EVT_PRLTX_DISCARD EVENT_MASK(3)
 #define PDB_EVT_PRLTX_MSG_TX EVENT_MASK(4)
 
-/* The Protocol TX thread object */
-extern thread_t *pdb_prltx_thread;
-
 /* Protocol layer TX thread mailbox */
 extern mailbox_t pdb_prltx_mailbox;