Consolidate emergency debug output

This removes the duplicate uart_emergency_printf() vs. panic_printf()
/ uart_emergency_puts() vs. panic_puts() implementation and saves
~0.5kb of code size.

The other significant change is that uart_flush_output() is now smart
enough to determine if it's in an interrupt; if so, it will spin-flush
the output buffer instead of waiting on the uart interrupt.  This
removes the need for a separate panic_flush().

BUG=chrome-os-partner:15579
BRANCH=none
TEST=crash unaligned; should print well-formatted crash dump

Change-Id: Ifae756203dd1881806be563308077c1d68302e1f
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/36695

2 files changed, 0 insertions, 39 deletions

diff --git a/include/panic.h b/include/panic.h
index bb3e853bd2..b003f188c8 100644
--- a/include/panic.h
+++ b/include/panic.h
@@ -48,16 +48,6 @@ struct panic_data {
 #define PANIC_DATA_FLAG_OLD_HOSTCMD (1 << 2)
 
 /**
- * Write a character to the panic reporting device
- *
- * This function will not return until the character has left the UART
- * data register. Any previously queued UART traffic is displayed first.
- *
- * @param ch	Character to write
- */
-void panic_putc(int ch);
-
-/**
  * Write a string to the panic reporting device
  *
  * This function will not return until the string has left the UART
@@ -68,23 +58,6 @@ void panic_putc(int ch);
 void panic_puts(const char *s);
 
 /**
- * Very basic vprintf() for use in panic situations
- *
- * We only support %s and %nx where n is the number of hex digits to display.
- * Currently we don't even support %d, and it is aimed at small code size.
- *
- * TODO(sjg@chromium.org): Really what we need is a vsnprintf() that is
- * shared between the console UART and panic (and is also available as an
- * snprintf()). The only downside is that we would then require a large
- * printf() implementation to be always present, whereas presumably now we
- * can turn it off.
- *
- * @param format	printf-style format string
- * @param args		List of arguments to process
- */
-void panic_vprintf(const char *format, va_list args);
-
-/**
  * Very basic printf() for use in panic situations
  *
  * See panic_vprintf() for full details
diff --git a/include/uart.h b/include/uart.h
index ce940457bd..115896f54a 100644
--- a/include/uart.h
+++ b/include/uart.h
@@ -42,18 +42,6 @@ int uart_vprintf(const char *format, va_list args);
 /* Flushes output.  Blocks until UART has transmitted all output. */
 void uart_flush_output(void);
 
-/* Flushes output.
- *
- * Blocks until UART has transmitted all output, even in a high priority
- * interrupt context. */
-void uart_emergency_flush(void);
-
-/* Like uart_printf(), but bypasses the transmit buffer.
- *
- * Blocks until UART has transmitted the formatted output, even in a high
- * priority interrupt context. */
-int uart_emergency_printf(const char *format, ...);
-
 /*****************************************************************************/
 /* Input functions
  *