Refer to the PE thread from the struct pdb_config

lib/include/policy_engine.h

@@ -34,9 +34,6 @@
 #define PDB_EVT_PE_GET_SOURCE_CAP EVENT_MASK(6)
 #define PDB_EVT_PE_NEW_POWER EVENT_MASK(7)
 
-/* The Policy Engine thread object */
-extern thread_t *pdb_pe_thread;
-
 /*
  * Start the Policy Engine thread
  */

lib/src/hard_reset.c

@@ -72,9 +72,8 @@ static enum hardrst_state hardrst_reset_layer(struct pdb_config *cfg)
 
 static enum hardrst_state hardrst_indicate_hard_reset(struct pdb_config *cfg)
 {
-    (void) cfg;
     /* Tell the PE that we're doing a hard reset */
-    chEvtSignal(pdb_pe_thread, PDB_EVT_PE_RESET);
+    chEvtSignal(cfg->pe.thread, PDB_EVT_PE_RESET);
 
     return PRLHRWaitPE;
 }
@@ -100,9 +99,8 @@ static enum hardrst_state hardrst_wait_phy(struct pdb_config *cfg)
 
 static enum hardrst_state hardrst_hard_reset_requested(struct pdb_config *cfg)
 {
-    (void) cfg;
     /* Tell the PE that the hard reset was sent */
-    chEvtSignal(pdb_pe_thread, PDB_EVT_PE_HARD_SENT);
+    chEvtSignal(cfg->pe.thread, PDB_EVT_PE_HARD_SENT);
 
     return PRLHRWaitPE;
 }

lib/src/int_n.c

@@ -76,7 +76,7 @@ static THD_FUNCTION(IntNPoll, vcfg) {
              * Engine thread */
             if (status.interrupta & FUSB_INTERRUPTA_I_OCP_TEMP
                     && status.status1 & FUSB_STATUS1_OVRTEMP) {
-                chEvtSignal(pdb_pe_thread, PDB_EVT_PE_I_OVRTEMP);
+                chEvtSignal(cfg->pe.thread, PDB_EVT_PE_I_OVRTEMP);
             }
 
         }

lib/src/policy_engine.c

@@ -28,8 +28,6 @@
 #include "pd.h"
 
 
-thread_t *pdb_pe_thread;
-
 enum policy_engine_state {
     PESinkStartup,
     PESinkDiscovery,
@@ -709,6 +707,6 @@ static THD_FUNCTION(PolicyEngine, vcfg) {
 
 void pdb_pe_run(struct pdb_config *cfg)
 {
-    pdb_pe_thread = chThdCreateStatic(cfg->pe._wa, sizeof(cfg->pe._wa),
+    cfg->pe.thread = chThdCreateStatic(cfg->pe._wa, sizeof(cfg->pe._wa),
             PDB_PRIO_PE, PolicyEngine, cfg);
 }

lib/src/protocol_rx.c

@@ -139,7 +139,7 @@ static enum protocol_rx_state protocol_rx_store_messageid(struct pdb_config *cfg
 
     /* Pass the message to the policy engine. */
     chMBPost(&cfg->pe.mailbox, (msg_t) cfg->prl._rx_message, TIME_IMMEDIATE);
-    chEvtSignal(pdb_pe_thread, PDB_EVT_PE_MSG_RX);
+    chEvtSignal(cfg->pe.thread, PDB_EVT_PE_MSG_RX);
 
     /* Don't check if we got a RESET because we'd do nothing different. */
 

lib/src/protocol_tx.c

@@ -58,7 +58,7 @@ static enum protocol_tx_state protocol_tx_phy_reset(struct pdb_config *cfg)
      * we failed to send it */
     if (cfg->prl._tx_message != NULL) {
         /* Tell the policy engine that we failed */
-        chEvtSignal(pdb_pe_thread, PDB_EVT_PE_TX_ERR);
+        chEvtSignal(cfg->pe.thread, PDB_EVT_PE_TX_ERR);
         /* Finish failing to send the message */
         cfg->prl._tx_message = NULL;
     }
@@ -195,7 +195,7 @@ static enum protocol_tx_state protocol_tx_transmission_error(struct pdb_config *
     cfg->prl._tx_messageidcounter = (cfg->prl._tx_messageidcounter + 1) % 8;
 
     /* Tell the policy engine that we failed */
-    chEvtSignal(pdb_pe_thread, PDB_EVT_PE_TX_ERR);
+    chEvtSignal(cfg->pe.thread, PDB_EVT_PE_TX_ERR);
 
     cfg->prl._tx_message = NULL;
     return PRLTxWaitMessage;
@@ -207,7 +207,7 @@ static enum protocol_tx_state protocol_tx_message_sent(struct pdb_config *cfg)
     cfg->prl._tx_messageidcounter = (cfg->prl._tx_messageidcounter + 1) % 8;
 
     /* Tell the policy engine that we succeeded */
-    chEvtSignal(pdb_pe_thread, PDB_EVT_PE_TX_DONE);
+    chEvtSignal(cfg->pe.thread, PDB_EVT_PE_TX_DONE);
 
     cfg->prl._tx_message = NULL;
     return PRLTxWaitMessage;

src/main.c

@@ -104,7 +104,7 @@ static void setup(void)
     usbConnectBus(serusbcfg.usbp);
 
     /* Start the shell */
-    pdbs_shell();
+    pdbs_shell(&pdb_config);
 }
 
 /*

src/shell.c

@@ -52,6 +52,9 @@ static struct pdbs_config tmpcfg = {
     .status = PDBS_CONFIG_STATUS_VALID
 };
 
+/* Pointer to the PD Buddy firmware library configuration */
+static struct pdb_config *pdb_config;
+
 /*
  * Helper functions for printing PDOs
  */
@@ -175,7 +178,7 @@ static void cmd_write(BaseSequentialStream *chp, int argc, char *argv[])
 
     pdbs_config_flash_update(&tmpcfg);
 
-    chEvtSignal(pdb_pe_thread, PDB_EVT_PE_NEW_POWER);
+    chEvtSignal(pdb_config->pe.thread, PDB_EVT_PE_NEW_POWER);
 }
 
 static void cmd_load(BaseSequentialStream *chp, int argc, char *argv[])
@@ -329,10 +332,10 @@ static void cmd_output(BaseSequentialStream *chp, int argc, char *argv[])
         /* Set the output status and re-negotiate power */
         if (strcmp(argv[0], "enable") == 0) {
             pdb_dpm_output_enabled = true;
-            chEvtSignal(pdb_pe_thread, PDB_EVT_PE_NEW_POWER);
+            chEvtSignal(pdb_config->pe.thread, PDB_EVT_PE_NEW_POWER);
         } else if (strcmp(argv[0], "disable") == 0) {
             pdb_dpm_output_enabled = false;
-            chEvtSignal(pdb_pe_thread, PDB_EVT_PE_NEW_POWER);
+            chEvtSignal(pdb_config->pe.thread, PDB_EVT_PE_NEW_POWER);
         } else {
             /* Or, if the argument was invalid, print a usage message */
             chprintf(chp, "Usage: output [enable|disable]\r\n");
@@ -454,7 +457,7 @@ static bool cmdexec(const struct pdbs_shell_cmd *scp, BaseSequentialStream *chp,
 /*
  * PD Buddy Sink configuration shell
  */
-void pdbs_shell(void)
+void pdbs_shell(struct pdb_config *cfg)
 {
     int n;
     BaseSequentialStream *chp = shell_cfg.io;
@@ -462,6 +465,8 @@ void pdbs_shell(void)
     char *lp, *cmd, *tokp, line[PDB_SHELL_MAX_LINE_LENGTH];
     char *args[PDB_SHELL_MAX_ARGUMENTS + 1];
 
+    pdb_config = cfg;
+
     while (true) {
         /* Print the prompt */
         chprintf(chp, "PDBS) ");

src/shell.h

@@ -37,6 +37,8 @@
 
 #include <ch.h>
 
+#include <pdb.h>
+
 #define PDB_SHELL_MAX_LINE_LENGTH 64
 #define PDB_SHELL_MAX_ARGUMENTS 2
 
@@ -55,7 +57,7 @@ struct pdbs_shell_cfg {
 };
 
 
-void pdbs_shell(void);
+void pdbs_shell(struct pdb_config *cfg);
 
 bool shellGetLine(BaseSequentialStream *chp, char *line, unsigned size);