X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fgeekos%2Fserial.h;h=2389ed6342d6c6e193a19e438b42ea2206215347;hb=eb7dda8d4a92a2e8d0c8f867c65317d756ca6c11;hp=4ebe0b07509c246b9a7958b77d49c08b1278c96f;hpb=626595465a2c6987606a6bc697df65130ad8c2d3;p=palacios.git

diff --git a/palacios/include/geekos/serial.h b/palacios/include/geekos/serial.h
index 4ebe0b0..2389ed6 100644
--- a/palacios/include/geekos/serial.h
+++ b/palacios/include/geekos/serial.h
@@ -10,51 +10,15 @@
 #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 SerialPutChar(unsigned char c);
 
+void SerialPrint(const char * format, ...);
+void SerialPrintLevel(int level, const char * format, ...);
+void SerialPrintList(const char * format, va_list ap);
 
 void SerialPutLine(char * line); 
 void SerialPutLineN(char * line, int len);
@@ -63,7 +27,7 @@ void SerialPutLineN(char * line, int len);
 void SerialPrintHex(unsigned char x);
 void SerialMemDump(unsigned char *start, int n);
 
-void InitSerial();
+void Init_Serial();
 void InitSerialAddr(unsigned short io_addr);
 
 #endif