updated test_vm

[palacios.git] / misc / test_vm / include / geekos / serial.h

diff --git a/misc/test_vm/include/geekos/serial.h b/misc/test_vm/include/geekos/serial.h
index 4ebe0b0..9b7b133 100644 (file)
--- a/misc/test_vm/include/geekos/serial.h
+++ b/misc/test_vm/include/geekos/serial.h
@@ -10,51 +10,9 @@
 #define DEFAULT_SERIAL_ADDR 0x3F8
 
 
-#ifndef SERIAL_PRINT
-#define SERIAL_PRINT              1
-#endif
-#ifndef SERIAL_PRINT_DEBUG
-#define SERIAL_PRINT_DEBUG        1 
-#endif
-#ifndef SERIAL_PRINT_DEBUG_LEVEL
-#define SERIAL_PRINT_DEBUG_LEVEL  10
-#endif
-
-#define SERIAL_PRINT_MAXBUF       256
- 
-
-#if SERIAL_PRINT                                                
-#define SerialPrint(format, args...)                             \
-do {                                                             \
-  char buf[SERIAL_PRINT_MAXBUF];                                                 \
-  snprintf( buf, SERIAL_PRINT_MAXBUF, format, ## args ) ;                       \
-  SerialPutLineN(buf, SERIAL_PRINT_MAXBUF);                                     \
-} while (0)  
-#else
-#define SerialPrint(format, args...) do {} while (0)
-#endif
-
-
-#define PrintBoth(format, args...) \
-do {  \
-  Print(format, ## args); \
-  SerialPrint(format, ##args); \
- } while (0)
-
-
-#if SERIAL_PRINT_DEBUG
-#define SerialPrintLevel(level, format, args...)                \
-do {                                                             \
-  char buf[SERIAL_PRINT_MAXBUF];                                                 \
-  if (level >= SERIAL_PRINT_DEBUG_LEVEL  ) {                                     \
-    snprintf( buf, SERIAL_PRINT_MAXBUF, format, ## args ) ;            \
-    SerialPutLineN(buf, SERIAL_PRINT_MAXBUF);                          \
-  }                                                                     \
-} while (0)  
-#else
-#define SerialPrintLevel(level, format, args...) do {} while (0)
-#endif
 
+void SerialPrint(const char * format, ...);
+void SerialPrintList(const char * format, va_list ap);
 
 void SerialPutLine(char * line); 
 void SerialPutLineN(char * line, int len);