diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2016-04-18 16:04:35 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-04-19 13:56:45 -0700 |
| commit | cfca3ff970d92cf73631694383927d7ff7014004 (patch) | |
| tree | 1c7d9c08a821b05b7d9520f8143d290cdc4610f7 | |
| parent | 9360bff011d7bf9816defbed5088a5b7a6d5f150 (diff) | |
| download | chrome-ec-cfca3ff970d92cf73631694383927d7ff7014004.tar.gz | |
npcx: shi: Remove excessively verbose prints
Remove verbose prints (most of which are printed in ISRs) by default to
eliminate SHI console spam.
BUG=chrome-os-partner:52372
BRANCH=None
TEST=Verify console isn't spammy while SHI is in use on kevin.
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Change-Id: I0dbd43e01f37980bc0e9d14fa6349a7ecb8c6f47
Reviewed-on: https://chromium-review.googlesource.com/339493
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-by: Mulin Chao <mlchao@nuvoton.com>
| -rw-r--r-- | chip/npcx/registers.h | 2 | ||||
| -rw-r--r-- | chip/npcx/shi.c | 30 |
2 files changed, 18 insertions, 14 deletions
diff --git a/chip/npcx/registers.h b/chip/npcx/registers.h index 011977d24e..247c99cbb8 100644 --- a/chip/npcx/registers.h +++ b/chip/npcx/registers.h @@ -60,7 +60,7 @@ #define DEBUG_SPI 0 #define DEBUG_FLH 0 #define DEBUG_PECI 0 -#define DEBUG_SHI 1 +#define DEBUG_SHI 0 #define DEBUG_CLK 0 #define DEBUG_LPC 0 diff --git a/chip/npcx/shi.c b/chip/npcx/shi.c index 55a40150fc..a907d88173 100644 --- a/chip/npcx/shi.c +++ b/chip/npcx/shi.c @@ -23,14 +23,18 @@ #include "timer.h" #include "util.h" -#if !(DEBUG_SHI) -#define CPUTS(...) -#define CPRINTS(...) -#define CPRINTF(...) -#else #define CPUTS(outstr) cputs(CC_SPI, outstr) #define CPRINTS(format, args...) cprints(CC_SPI, format, ## args) #define CPRINTF(format, args...) cprintf(CC_SPI, format, ## args) + +#if !(DEBUG_SHI) +#define DEBUG_CPUTS(...) +#define DEBUG_CPRINTS(...) +#define DEBUG_CPRINTF(...) +#else +#define DEBUG_CPUTS(outstr) cputs(CC_SPI, outstr) +#define DEBUG_CPRINTS(format, args...) cprints(CC_SPI, format, ## args) +#define DEBUG_CPRINTF(format, args...) cprintf(CC_SPI, format, ## args) #endif /* SHI Bus definition */ @@ -182,7 +186,7 @@ static void shi_send_response_packet(struct host_packet *pkt) task_disable_irq(NPCX_IRQ_SHI); /* Transmit the reply */ state = SHI_STATE_SENDING; - CPRINTF("SND-"); + DEBUG_CPRINTF("SND-"); /* Start to fill output buffer with msg buffer */ shi_write_outbuf_wait(shi_params.sz_response); /* Enable SHI interrupt */ @@ -195,7 +199,7 @@ static void shi_send_response_packet(struct host_packet *pkt) else { /* Reset SHI and prepare to next transaction again */ shi_reset_prepare(); - CPRINTF("END\n"); + DEBUG_CPRINTF("END\n"); return; } } @@ -212,7 +216,7 @@ void shi_handle_host_package(void) - shi_params.sz_received; /* Move to processing state immediately */ state = SHI_STATE_PROCESSING; - CPRINTF("PRC-"); + DEBUG_CPRINTF("PRC-"); /* Read remaining bytes from input buffer directly */ if (!shi_read_inbuf_wait(remain_bytes)) return shi_error(1); @@ -433,7 +437,7 @@ void shi_int_handler(void) * transaction immediately */ NPCX_OBUF(0) = EC_SPI_NOT_READY; - CPRINTF("CSH-"); + DEBUG_CPRINTF("CSH-"); /* * If the buffer is still used by the host command. * Change tx buffer to NOT_READY @@ -444,12 +448,12 @@ void shi_int_handler(void) * response function */ state = SHI_STATE_NOT_READY; - CPRINTF("WAIT-"); + DEBUG_CPRINTF("WAIT-"); return; } /* reset SHI and prepare to next transaction again */ shi_reset_prepare(); - CPRINTF("END\n"); + DEBUG_CPRINTF("END\n"); return; } @@ -550,7 +554,7 @@ void shi_cs_event(enum gpio_signal signal) /* We're now inside a transaction */ state = SHI_STATE_RECEIVING; - CPRINTF("CSL-RV-"); + DEBUG_CPRINTF("CSL-RV-"); /* Setup deadline time for receiving */ shi_params.rx_deadline = get_time(); @@ -595,7 +599,7 @@ static void shi_reset_prepare(void) /* Ready to receive */ state = SHI_STATE_READY_TO_RECV; - CPRINTF("RDY-"); + DEBUG_CPRINTF("RDY-"); } static void shi_enable(void) |