diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/charge_manager.h | 6 | ||||
| -rw-r--r-- | include/config.h | 6 | ||||
| -rw-r--r-- | include/ec_commands.h | 2 | ||||
| -rw-r--r-- | include/usb_emsg.h | 2 | ||||
| -rw-r--r-- | include/usb_pd.h | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/include/charge_manager.h b/include/charge_manager.h index 4c29ea15a5..2a3ca27d74 100644 --- a/include/charge_manager.h +++ b/include/charge_manager.h @@ -113,8 +113,8 @@ enum ceil_requestor { CEIL_REQUESTOR_COUNT, }; -#define CHARGE_PORT_COUNT \ - (CONFIG_USB_PD_PORT_COUNT + CONFIG_DEDICATED_CHARGE_PORT_COUNT) +#define CHARGE_PORT_COUNT (CONFIG_USB_PD_PORT_MAX_COUNT + \ + CONFIG_DEDICATED_CHARGE_PORT_COUNT) #if (CONFIG_DEDICATED_CHARGE_PORT_COUNT > 0) /** @@ -133,7 +133,7 @@ enum ceil_requestor { */ #if !defined(DEDICATED_CHARGE_PORT) #error "DEDICATED_CHARGE_PORT must be defined" -#elif DEDICATED_CHARGE_PORT < CONFIG_USB_PD_PORT_COUNT +#elif DEDICATED_CHARGE_PORT < CONFIG_USB_PD_PORT_MAX_COUNT #error "DEDICATED_CHARGE_PORT must larger than pd port numbers" #endif /* !defined(DEDICATED_CHARGE_PORT) */ diff --git a/include/config.h b/include/config.h index 853f4c6f7a..a6f4af7630 100644 --- a/include/config.h +++ b/include/config.h @@ -3738,7 +3738,7 @@ #undef CONFIG_USB_PD_LOW_POWER_IDLE_WHEN_CONNECTED /* Number of USB PD ports */ -#undef CONFIG_USB_PD_PORT_COUNT +#undef CONFIG_USB_PD_PORT_MAX_COUNT /* Simple DFP, such as power adapter, will not send discovery VDM on connect */ #undef CONFIG_USB_PD_SIMPLE_DFP @@ -4973,12 +4973,12 @@ /* * If USB PD Discharge is enabled, verify that CONFIG_USB_PD_DISCHARGE_GPIO - * and CONFIG_USB_PD_PORT_COUNT, CONFIG_USB_PD_DISCHARGE_TCPC, or + * and CONFIG_USB_PD_PORT_MAX_COUNT, CONFIG_USB_PD_DISCHARGE_TCPC, or * CONFIG_USB_PD_DISCHARGE_PPC is defined. */ #ifdef CONFIG_USB_PD_DISCHARGE #ifdef CONFIG_USB_PD_DISCHARGE_GPIO -#if !defined(CONFIG_USB_PD_PORT_COUNT) +#if !defined(CONFIG_USB_PD_PORT_MAX_COUNT) #error "PD discharge port not defined" #endif #else diff --git a/include/ec_commands.h b/include/ec_commands.h index 6e5e3b6990..50b23f6ef3 100644 --- a/include/ec_commands.h +++ b/include/ec_commands.h @@ -5301,7 +5301,7 @@ struct ec_params_usb_pd_discovery_entry { enum usb_pd_override_ports { OVERRIDE_DONT_CHARGE = -2, OVERRIDE_OFF = -1, - /* [0, CONFIG_USB_PD_PORT_COUNT): Port# */ + /* [0, CONFIG_USB_PD_PORT_MAX_COUNT): Port# */ }; struct ec_params_charge_port_override { diff --git a/include/usb_emsg.h b/include/usb_emsg.h index ffbaa93a0e..7847cf6967 100644 --- a/include/usb_emsg.h +++ b/include/usb_emsg.h @@ -18,6 +18,6 @@ struct extended_msg { }; /* Defined in usb_prl_sm.c */ -extern struct extended_msg emsg[CONFIG_USB_PD_PORT_COUNT]; +extern struct extended_msg emsg[CONFIG_USB_PD_PORT_MAX_COUNT]; #endif /* __CROS_EC_USB_EBUF_H */ diff --git a/include/usb_pd.h b/include/usb_pd.h index 2593762a59..c5e778d35b 100644 --- a/include/usb_pd.h +++ b/include/usb_pd.h @@ -14,7 +14,7 @@ /* PD Host command timeout */ #define PD_HOST_COMMAND_TIMEOUT_US SECOND -#ifdef CONFIG_USB_PD_PORT_COUNT +#ifdef CONFIG_USB_PD_PORT_MAX_COUNT /* * Define PD_PORT_TO_TASK_ID() and TASK_ID_TO_PD_PORT() macros to * go between PD port number and task ID. Assume that TASK_ID_PD_C0 is the @@ -27,7 +27,7 @@ #define PD_PORT_TO_TASK_ID(port) -1 /* dummy task ID */ #define TASK_ID_TO_PD_PORT(id) 0 #endif /* CONFIG_COMMON_RUNTIME */ -#endif /* CONFIG_USB_PD_PORT_COUNT */ +#endif /* CONFIG_USB_PD_PORT_MAX_COUNT */ enum pd_rx_errors { PD_RX_ERR_INVAL = -1, /* Invalid packet */ |