From cab8f526de4a584ce35d62abfd06aa788d23f1bf Mon Sep 17 00:00:00 2001 From: Philip Homburg Date: Mon, 23 Apr 2007 15:59:16 +0000 Subject: [PATCH] Fixed some lose ends in the serial line debug dump code. --- kernel/arch/i386/system.c | 16 +++++----------- kernel/proto.h | 2 +- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/kernel/arch/i386/system.c b/kernel/arch/i386/system.c index 2677333cb..ebee1d713 100644 --- a/kernel/arch/i386/system.c +++ b/kernel/arch/i386/system.c @@ -8,8 +8,8 @@ #include #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 5cba25df4..bab60aa33 100755 --- 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 */ -- 2.44.0