summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
Diffstat (limited to 'board')
-rw-r--r--board/big/battery.c12
-rw-r--r--board/firefly/usb_pd_policy.c2
-rw-r--r--board/fruitpie/usb_pd_policy.c2
-rw-r--r--board/nyan/battery.c12
-rw-r--r--board/samus/power_sequence.c12
-rw-r--r--board/samus_pd/usb_pd_policy.c2
6 files changed, 21 insertions, 21 deletions
diff --git a/board/big/battery.c b/board/big/battery.c
index aa6191f2c0..4979085e96 100644
--- a/board/big/battery.c
+++ b/board/big/battery.c
@@ -13,7 +13,7 @@
#include "console.h"
/* Console output macros */
-#define CPRINTF(format, args...) cprintf(CC_CHARGER, format, ## args)
+#define CPRINTS(format, args...) cprints(CC_CHARGER, format, ## args)
/* These 2 defines are for cut_off command for 3S battery */
#define SB_SHIP_MODE_ADDR 0x3a
@@ -274,16 +274,16 @@ const struct battery_info *battery_get_info(void)
int design_mv;
if (battery_manufacturer_name(manuf, sizeof(manuf))) {
- CPRINTF("[%T Failed to get MANUF name]\n");
+ CPRINTS("Failed to get MANUF name");
return &info_precharge;
}
if (battery_device_name(device, sizeof(device))) {
- CPRINTF("[%T Failed to get DEVICE name]\n");
+ CPRINTS("Failed to get DEVICE name");
return &info_precharge;
}
if (battery_design_voltage((int *)&design_mv)) {
- CPRINTF("[%T Failed to get DESIGN_VOLTAGE]\n");
+ CPRINTS("Failed to get DESIGN_VOLTAGE");
return &info_precharge;
}
@@ -291,7 +291,7 @@ const struct battery_info *battery_get_info(void)
if ((strcasecmp(support_batteries[i].manuf, manuf) == 0) &&
(strcasecmp(support_batteries[i].device, device) == 0) &&
(support_batteries[i].design_mv == design_mv)) {
- CPRINTF("[%T battery Manuf:%s, Device=%s, design=%u]\n",
+ CPRINTS("battery Manuf:%s, Device=%s, design=%u",
manuf, device, design_mv);
support_cut_off = support_batteries[i].support_cut_off;
battery_info = support_batteries[i].battery_info;
@@ -299,7 +299,7 @@ const struct battery_info *battery_get_info(void)
}
}
- CPRINTF("[%T un-recognized battery Manuf:%s, Device:%s]\n",
+ CPRINTS("un-recognized battery Manuf:%s, Device:%s",
manuf, device);
return &info_precharge;
}
diff --git a/board/firefly/usb_pd_policy.c b/board/firefly/usb_pd_policy.c
index d00ac47916..0a57d34192 100644
--- a/board/firefly/usb_pd_policy.c
+++ b/board/firefly/usb_pd_policy.c
@@ -15,7 +15,7 @@
#include "util.h"
#include "usb_pd.h"
-#define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args)
+#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
/* Acceptable margin between requested VBUS and measured value */
#define MARGIN_MV 400 /* mV */
diff --git a/board/fruitpie/usb_pd_policy.c b/board/fruitpie/usb_pd_policy.c
index 001dafd28f..8f1cde1c6e 100644
--- a/board/fruitpie/usb_pd_policy.c
+++ b/board/fruitpie/usb_pd_policy.c
@@ -13,7 +13,7 @@
#include "util.h"
#include "usb_pd.h"
-#define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args)
+#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
const uint32_t pd_src_pdo[] = {
PDO_FIXED(5000, 500, PDO_FIXED_EXTERNAL),
diff --git a/board/nyan/battery.c b/board/nyan/battery.c
index 381ff09290..027062940e 100644
--- a/board/nyan/battery.c
+++ b/board/nyan/battery.c
@@ -13,7 +13,7 @@
#include "console.h"
/* Console output macros */
-#define CPRINTF(format, args...) cprintf(CC_CHARGER, format, ## args)
+#define CPRINTS(format, args...) cprints(CC_CHARGER, format, ## args)
/* These 2 defines are for cut_off command for 3S battery */
#define SB_SHIP_MODE_ADDR 0x3a
@@ -236,16 +236,16 @@ const struct battery_info *battery_get_info(void)
int design_mv;
if (battery_manufacturer_name(manuf, sizeof(manuf))) {
- CPRINTF("[%T Failed to get MANUF name]\n");
+ CPRINTS("Failed to get MANUF name");
return &info_precharge;
}
if (battery_device_name(device, sizeof(device))) {
- CPRINTF("[%T Failed to get DEVICE name]\n");
+ CPRINTS("Failed to get DEVICE name");
return &info_precharge;
}
if (battery_design_voltage((int *)&design_mv)) {
- CPRINTF("[%T Failed to get DESIGN_VOLTAGE]\n");
+ CPRINTS("Failed to get DESIGN_VOLTAGE");
return &info_precharge;
}
@@ -253,7 +253,7 @@ const struct battery_info *battery_get_info(void)
if ((strcasecmp(support_batteries[i].manuf, manuf) == 0) &&
(strcasecmp(support_batteries[i].device, device) == 0) &&
(support_batteries[i].design_mv == design_mv)) {
- CPRINTF("[%T battery Manuf:%s, Device=%s, design=%u]\n",
+ CPRINTS("battery Manuf:%s, Device=%s, design=%u",
manuf, device, design_mv);
support_cut_off = support_batteries[i].support_cut_off;
battery_info = support_batteries[i].battery_info;
@@ -261,7 +261,7 @@ const struct battery_info *battery_get_info(void)
}
}
- CPRINTF("[%T un-recognized battery Manuf:%s, Device=%s]\n",
+ CPRINTS("un-recognized battery Manuf:%s, Device=%s",
manuf, device);
return &info_precharge;
}
diff --git a/board/samus/power_sequence.c b/board/samus/power_sequence.c
index bc06ed6222..914bd5268c 100644
--- a/board/samus/power_sequence.c
+++ b/board/samus/power_sequence.c
@@ -22,7 +22,7 @@
/* Console output macros */
#define CPUTS(outstr) cputs(CC_CHIPSET, outstr)
-#define CPRINTF(format, args...) cprintf(CC_CHIPSET, format, ## args)
+#define CPRINTS(format, args...) cprints(CC_CHIPSET, format, ## args)
/* Input state flags */
#define IN_PGOOD_PP1050 POWER_SIGNAL_MASK(X86_PGOOD_PP1050)
@@ -63,7 +63,7 @@ static int pause_in_s5; /* Pause in S5 when shutting down? */
void chipset_force_shutdown(void)
{
- CPRINTF("[%T %s()]\n", __func__);
+ CPRINTS("%s()", __func__);
/*
* Force off. This condition will reset once the state machine
@@ -74,7 +74,7 @@ void chipset_force_shutdown(void)
void chipset_reset(int cold_reset)
{
- CPRINTF("[%T %s(%d)]\n", __func__, cold_reset);
+ CPRINTS("%s(%d)", __func__, cold_reset);
if (cold_reset) {
/*
* Drop and restore PWROK. This causes the PCH to reboot,
@@ -126,11 +126,11 @@ enum power_state power_chipset_init(void)
if ((power_get_signals() & IN_ALL_S0) == IN_ALL_S0) {
/* Disable idle task deep sleep when in S0. */
disable_sleep(SLEEP_MASK_AP_RUN);
- CPRINTF("[%T already in S0]\n");
+ CPRINTS("already in S0");
return POWER_S0;
} else {
/* Force all signals to their G3 states */
- CPRINTF("[%T forcing G3]\n");
+ CPRINTS("forcing G3");
gpio_set_level(GPIO_PCH_PWROK, 0);
gpio_set_level(GPIO_SYS_PWROK, 0);
gpio_set_level(GPIO_PP1050_EN, 0);
@@ -216,7 +216,7 @@ enum power_state power_handle_state(enum power_state state)
* indicate that PP5000 is stable */
while ((power_get_signals() & IN_PGOOD_PP5000) != 0) {
if (task_wait_event(SECOND) == TASK_EVENT_TIMER) {
- CPRINTF("[%T timeout waiting for PP5000\n");
+ CPRINTS("timeout waiting for PP5000");
gpio_set_level(GPIO_PP5000_EN, 0);
chipset_force_shutdown();
return POWER_G3;
diff --git a/board/samus_pd/usb_pd_policy.c b/board/samus_pd/usb_pd_policy.c
index c4c75fe63a..3d6b30250c 100644
--- a/board/samus_pd/usb_pd_policy.c
+++ b/board/samus_pd/usb_pd_policy.c
@@ -13,7 +13,7 @@
#include "util.h"
#include "usb_pd.h"
-#define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args)
+#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
/* TODO(crossbug.com/p/28869): update source and sink tables to spec. */
const uint32_t pd_src_pdo[] = {
View Lorry Controller Status