Fixed some lose ends in the serial line debug dump code.

diff --git a/kernel/arch/i386/system.c b/kernel/arch/i386/system.c
index 2677333cb66f2192e230735f6de107565445775d..ebee1d7133319b09ca7883835df63589e3277105 100644 (file)
--- a/kernel/arch/i386/system.c
+++ b/kernel/arch/i386/system.c
@@ -8,8 +8,8 @@
 #include <minix/portio.h>
 
 #include "proto.h"
+#include "../../proc.h"
 
-FORWARD _PROTOTYPE( void do_ser_debug, (void));
 FORWARD _PROTOTYPE( void ser_debug, (int c));
 
 PUBLIC void arch_shutdown(int how)
@@ -47,16 +47,10 @@ PUBLIC void system_init(void)
 
 #define COM1_BASE       0x3F8
 #define COM1_THR        (COM1_BASE + 0)
-#define   LSR_THRE      0x20
+#define COM1_RBR (COM1_BASE + 0)
 #define COM1_LSR        (COM1_BASE + 5)
-
-#define REG_RBR        0
-#define REG_LSR        5
-#define                LSR_DR  0x1
-
-#define COM1_RBR (COM1_BASE + REG_RBR)
-#define COM1_LSR (COM1_BASE + REG_LSR)
-
+#define                LSR_DR          0x01
+#define                LSR_THRE        0x20
 
 PUBLIC void ser_putc(char c)
 {
@@ -76,7 +70,7 @@ PUBLIC void ser_putc(char c)
 /*===========================================================================*
  *                             do_ser_debug                                 * 
  *===========================================================================*/
-PRIVATE void do_ser_debug()
+PUBLIC void do_ser_debug()
 {
        u8_t c, lsr;
 

diff --git a/kernel/proto.h b/kernel/proto.h
index 5cba25df4cd78f9a66bb62dd59e346ed26c2f422..bab60aa33b623a54814fc35ad82f53b4c459fd54 100755 (executable)
--- a/kernel/proto.h
+++ b/kernel/proto.h
@@ -129,6 +129,6 @@ _PROTOTYPE( void read_tsc, (unsigned long *high, unsigned long *low)    );
 _PROTOTYPE( int arch_init_profile_clock, (u32_t freq)                  );
 _PROTOTYPE( void arch_stop_profile_clock, (void)                       );
 _PROTOTYPE( void arch_ack_profile_clock, (void)                                );
-
+_PROTOTYPE( void do_ser_debug, (void)                                  );
 
 #endif /* PROTO_H */