xnu-2782.40.9.tar.gz

[apple/xnu.git] / pexpert / i386 / pe_serial.c

diff --git a/pexpert/i386/pe_serial.c b/pexpert/i386/pe_serial.c
index 2080b6024bc2d13791d9f630d06505740de8513a..f056487a044ce0a798318ad729fd744266a7c829 100644 (file)
--- a/pexpert/i386/pe_serial.c
+++ b/pexpert/i386/pe_serial.c
@@ -52,7 +52,8 @@ enum {
     UART_LCR = 3,  /* line control register         */
     UART_MCR = 4,  /* modem control register        */
     UART_LSR = 5,  /* line status register          */
     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 {
 };
 
 enum {


@@ -90,14 +91,12 @@ static int uart_initted = 0;   /* 1 if init'ed */
 static int
 uart_probe( void )
 {
 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;
 }
 
     return 1;
 }
 


@@ -160,7 +159,7 @@ int serial_init( void )
 {
     unsigned serial_baud_rate = 0;
        
 {
     unsigned serial_baud_rate = 0;
        

-    if ( /*uart_initted ||*/ uart_probe() == 0 ) return 0;
+    if ( uart_probe() == 0 ) return 0;

 
     /* Disable hardware interrupts */
 
 
     /* Disable hardware interrupts */
 


@@ -177,7 +176,7 @@ int serial_init( void )
 
     /* Set baud rate - use the supplied boot-arg if available */
 
 
     /* 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)) {
     {
            /* Valid divisor? */
            if (!((UART_CLOCK / 16) % serial_baud_rate)) {


@@ -202,7 +201,6 @@ int serial_init( void )
 void serial_putc( char c )
 {
     uart_putc(c);
 void serial_putc( char c )
 {
     uart_putc(c);

-    if (c == '\n') uart_putc('\r');

 }
 
 int serial_getc( void )
 }
 
 int serial_getc( void )