Check if 5 V is in the range for Type-C Current

Previously, we didn't make use of the voltage range when checking a
Type-C Current advertisement.  That was bad, since if e.g. we want 6 V,
with the range 5-7 V, we could get the power we want from Type-C
Current.

This commit makes the firmware test if the configured voltage range
contains 5 V, and if it does, allows use of Type-C Current.

lib/include/pd.h

@@ -19,6 +19,8 @@
 #ifndef PDB_PD_H
 #define PDB_PD_H
 
+#include <stdint.h>
+
 #include <ch.h>
 
 
@@ -193,7 +195,7 @@
 #define PD_APDO_PPS_MIN_VOLTAGE_SET(v) (((v) << PD_APDO_PPS_MIN_VOLTAGE_SHIFT) & PD_APDO_PPS_MIN_VOLTAGE)
 
 /* PD Programmable Power Supply APDO current */
-#define PD_APDO_PPS_CURRENT_GET(pdo) (((pdo) & PD_APDO_PPS_CURRENT) >> PD_APDO_PPS_CURRENT_SHIFT)
+#define PD_APDO_PPS_CURRENT_GET(pdo) ((uint8_t) (((pdo) & PD_APDO_PPS_CURRENT) >> PD_APDO_PPS_CURRENT_SHIFT))
 
 #define PD_APDO_PPS_CURRENT_SET(i) (((i) << PD_APDO_PPS_CURRENT_SHIFT) & PD_APDO_PPS_CURRENT)
 

src/device_policy_manager.c

@@ -340,14 +340,14 @@ bool pdbs_dpm_evaluate_typec_current(struct pdb_config *cfg,
 
     /* If we have no configuration or don't want 5 V, Type-C Current can't
      * possibly satisfy our needs */
-    /* TODO Check if 5 V is inside the voltage range */
-    if (scfg == NULL || PD_MV2PDV(scfg->v) != PD_MV2PDV(5000)) {
+    if (scfg == NULL || (scfg->v != 5000 && (scfg->vmin > 5000
+            || scfg->vmax < 5000))) {
         dpm_data->_capability_match = false;
         return false;
     }
 
     /* Get the current we want */
-    uint16_t current = dpm_get_current(scfg, scfg->v);
+    uint16_t current = dpm_get_current(scfg, 5000);
 
     /* If 1.5 A is available and we want no more than that, great. */
     if (tcc == fusb_tcc_1_5 && current <= 150) {