X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/0c530ab8987f0ae6a1a3d9284f40182b88852816..c18c124eaa464aaaa5549e99e5a70fc9cbb50944:/pexpert/i386/pe_serial.c diff --git a/pexpert/i386/pe_serial.c b/pexpert/i386/pe_serial.c index 2bce2811c..f056487a0 100644 --- a/pexpert/i386/pe_serial.c +++ b/pexpert/i386/pe_serial.c @@ -1,23 +1,29 @@ /* - * Copyright (c) 2000 Apple Computer, Inc. All rights reserved. + * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved. * - * @APPLE_LICENSE_HEADER_START@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * - * The contents of this file constitute Original Code as defined in and - * are subject to the Apple Public Source License Version 1.1 (the - * "License"). You may not use this file except in compliance with the - * License. Please obtain a copy of the License at - * http://www.apple.com/publicsource and read it before using this file. + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. The rights granted to you under the License + * may not be used to create, or enable the creation or redistribution of, + * unlawful or unlicensed copies of an Apple operating system, or to + * circumvent, violate, or enable the circumvention or violation of, any + * terms of an Apple operating system software license agreement. * - * This Original Code and all software distributed under the License are - * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER + * Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this file. + * + * The Original Code and all software distributed under the License are + * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License. + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_END@ */ /* @@ -28,10 +34,6 @@ #include #include -void serial_putc(char); -int serial_getc(void); -int serial_init(void); - /* standard port addresses */ enum { COM1_PORT_ADDR = 0x3f8, @@ -50,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 { @@ -88,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; } @@ -158,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 */ @@ -175,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)) { @@ -200,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 )