X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/4452a7af2eac33dbad800bcc91f2399d62c18f53..c18c124eaa464aaaa5549e99e5a70fc9cbb50944:/pexpert/i386/pe_serial.c

diff --git a/pexpert/i386/pe_serial.c b/pexpert/i386/pe_serial.c
index f72de17ab..f056487a0 100644
--- a/pexpert/i386/pe_serial.c
+++ b/pexpert/i386/pe_serial.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -34,10 +34,6 @@
 #include <pexpert/protos.h>
 #include <pexpert/pexpert.h>
 
-void	serial_putc(char);
-int	serial_getc(void);
-int	serial_init(void);
-
 /* standard port addresses */
 enum {
     COM1_PORT_ADDR = 0x3f8,
@@ -56,7 +52,8 @@ enum {
     UART_LCR = 3,  /* line control register         */
     UART_MCR = 4,  /* modem control register        */
     UART_LSR = 5,  /* line status register          */
-    UART_MSR = 6   /* modem status register         */
+    UART_MSR = 6,  /* modem status register         */
+    UART_SCR = 7   /* scratch register              */
 };
 
 enum {
@@ -94,14 +91,12 @@ static int uart_initted = 0;   /* 1 if init'ed */
 static int
 uart_probe( void )
 {
-    /* Verify that the Divisor Register is accessible */
-
-    WRITE( LCR, UART_LCR_DLAB );
-    WRITE( DLL, 0x5a );
-    if (READ(DLL) != 0x5a) return 0;
-    WRITE( DLL, 0xa5 );
-    if (READ(DLL) != 0xa5) return 0;
-    WRITE( LCR, 0x00 );
+    /* Verify that the Scratch Register is accessible */
+
+    WRITE( SCR, 0x5a );
+    if (READ(SCR) != 0x5a) return 0;
+    WRITE( SCR, 0xa5 );
+    if (READ(SCR) != 0xa5) return 0;
     return 1;
 }
 
@@ -164,7 +159,7 @@ int serial_init( void )
 {
     unsigned serial_baud_rate = 0;
 	
-    if ( /*uart_initted ||*/ uart_probe() == 0 ) return 0;
+    if ( uart_probe() == 0 ) return 0;
 
     /* Disable hardware interrupts */
 
@@ -181,7 +176,7 @@ int serial_init( void )
 
     /* Set baud rate - use the supplied boot-arg if available */
 
-    if (PE_parse_boot_arg("serialbaud", &serial_baud_rate))
+    if (PE_parse_boot_argn("serialbaud", &serial_baud_rate, sizeof (serial_baud_rate)))
     {
 	    /* Valid divisor? */
 	    if (!((UART_CLOCK / 16) % serial_baud_rate)) {
@@ -206,7 +201,6 @@ int serial_init( void )
 void serial_putc( char c )
 {
     uart_putc(c);
-    if (c == '\n') uart_putc('\r');
 }
 
 int serial_getc( void )