add smart com probe approach

limit to 9600 for now (will be better soon)

1 files changed, 105 insertions, 175 deletions

diff --git a/sys/arch/i386/stand/libsa/bioscom.S b/sys/arch/i386/stand/libsa/bioscom.S
index 386d0574274..df9ea2fef5f 100644
--- a/sys/arch/i386/stand/libsa/bioscom.S
+++ b/sys/arch/i386/stand/libsa/bioscom.S
@@ -1,214 +1,144 @@
-/*	$OpenBSD: bioscom.S,v 1.4 1997/04/09 08:39:12 mickey Exp $	*/
+/*	$OpenBSD: bioscom.S,v 1.5 1997/07/17 22:48:42 mickey Exp $	*/
 
 /*
- * Mach Operating System
- * Copyright (c) 1992, 1991 Carnegie Mellon University
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
+ * Copyright (c) 1997 Michael Shalayeff
+ * All rights reserved.
  *
- *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- *	$Id: bioscom.S,v 1.4 1997/04/09 08:39:12 mickey Exp $
- */
-
-/*
-  Copyright 1988, 1989, 1990, 1991, 1992 
-   by Intel Corporation, Santa Clara, California.
-
-                All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appears in all
-copies and that both the copyright notice and this permission notice
-appear in supporting documentation, and that the name of Intel
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-
-INTEL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
-IN NO EVENT SHALL INTEL BE LIABLE FOR ANY SPECIAL, INDIRECT, OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT,
-NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-/*
- * Serial bootblock interface routines
- * Copyright (c) 1994, J"org Wunsch
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Michael Shalayeff.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
  *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR 
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  *
- * THE AUTHOR ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  THE AUTHOR DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- */ 
+ */
 
-	.file	"serial.s"
+	.file	"bioscom.S"
 
 #include <machine/asm.h>
 #define	_LOCORE
-#include "biosdev.h"
+#include <machine/biosvar.h>
 #undef	_LOCORE
 
-	.data
-port:
-	.long	0x2f8
-
+#define COM_ENT(i,op)		\
+ENTRY(com/**/i/**/_/**/op)	; \
+	xorl	%edx, %edx	; \
+	movb	$i, %dl		; \
+	jmp	1f
+	
 	.text
-
-/*
- * The serial port interface routines implement a simple polled i/o
- * interface to a standard serial port.  Due to the space restrictions
- * for the boot blocks, no BIOS support is used (since BIOS requires
- * expensive real/protected mode switches), instead the rudimentary
- * BIOS support is duplicated here.
- *
- * The base address for the i/o port is stored in 'port' variable upon
- * probing for device.  Console parameters are currently
- * hard-coded to 9600 Bd, 8 bit.  This can be changed in the
- * init_serial() function.
- */
-
 /*
- * int com_probe();
- *	probe com[0-3] ports and store first found in 'port' variable
+ * int com<N>_probe();
+ *	probe com<N> port
  */
-ENTRY(com_probe)
-	pushl	%ebp
-	movl	%esp, %ebp
-	pushl	%edx
-
-	/*
-	 * void init_serial(void)
-	 * 	initialize the serial console port to 9600 Bd, 8 bpc
-	 */
-	movl	$port, %edx	# line control reg
-	addb	5, %dl
-	movl	$0x80, %eax
-	outb	%al, %dx	# enable DLAB
-
-	subb	$3, %dl		# divisor latch, low byte
-	movb	$12, %al	# divisor 12: 9600 Bd
-	outb	%al, %dx
-	incl	%edx		# divisor latch, high byte
-	movb	%ah, %al
-	outb	%al, %dx
-
-	addb	$2, %dl		# line control reg
-	movb	$0x13, %al
-	outb	%al, %dx	# 8 bit, no parity, 1 stop bit
-
-	incl	%edx		# modem control reg
-	movb	$3, %al
-	outb	%al, %dx	# enable DTR/RTS
-
-	/* now finally, flush the input buffer */
-	incl	%edx		# line status reg
+COM_ENT(0,probe)
+COM_ENT(1,probe)
+COM_ENT(2,probe)
+COM_ENT(3,probe)
+
+1:	pushl	%ebx
+
+	DOINT(0x11)		# get equipment (9-11 # of coms)
+	shrl	$9, %eax
+	andb	$7, %al
+	cmpb	%al, %dl
+	jl	1f
+	xorl	%eax, %eax
+	jmp	2f
 1:
-	inb	%dx, %al
-	testb	$0x01, %al
-	jz	2f		# no more characters buffered
-	subb	$5, %dl		# rx buffer reg
-	inb	%dx, %al	# throw away
-	addb	$5, %dl
-	jmp	1b
-2:
-	popl	%edx
-	popl	%ebp
-	xorl	%eax, %eax	# is present (:
+	xorl	%eax, %eax
+	movb	$0xe2, %al
+	DOINT(0x14)
+	xorl	%eax, %eax
 	incl	%eax
+2:
+	popl	%ebx
 	ret
 
 /*
- * void com_putc(ch) char ch;
+ * void com<N>_putc(char ch)
  *	send ch to serial port
  *
  */
 
-ENTRY(com_putc)
-	pushl	%ebp
-	movl	%esp, %ebp
-	pushl	%ebx
-
-	movl	$port, %edx	# line status reg
-	add	5, %edx
-1:	inb	%dx, %al
-	test	$0x20, %al
-	jz	1b		# TX buffer not empty
-
-	movb	8(%ebp), %al
-
-	sub	$5, %edx	# TX output reg
-	outb	%al, %dx	# send this one
-
-	popl	%edx
-	popl	%ebp
+COM_ENT(0,putc)
+COM_ENT(1,putc)
+COM_ENT(2,putc)
+COM_ENT(3,putc)
+
+1:	pushl	%ebx
+	movl	8(%esp), %eax
+	movb	$1, %ah
+	DOINT(0x14)
+	xorl	%al, %al
+	testb	$0x80, %ah
+	jz	1f
+	movb	%ah, %al
+	andb	$0x7f, %al
+1:	movzbl	%al, %eax
+	popl	%ebx
 	ret
 
 /*
- * int com_getc(void)
+ * int com<N>_getc(void)
  *	read a character from serial port
  */
 
-ENTRY(com_getc)
-	pushl	%edx
-
-	movl	$port, %edx	# line status reg
-	addl	5, %edx
-1:
-	inb	%dx, %al
-	testb	$0x01, %al
-	jz	1b		# no RX char available
+COM_ENT(0,getc)
+COM_ENT(1,getc)
+COM_ENT(2,getc)
+COM_ENT(3,getc)
 
+1:	pushl	%ebx
 	xorl	%eax, %eax
-	subl	$5, %edx	# RX buffer reg
-	inb	%dx, %al	# fetch (first) character
-
-	andb	$0x7F, %eax	# remove any parity bits we get
-	cmpb	$0x7F, %eax	# make DEL...
-	jne	2f
-	movb	$0x08, %eax	# look like BS
-2:
-	popl	%edx
+	movb	$2, %ah
+	DOINT(0x14)
+	testb	$0x80, %ah
+	jz	1f
+	movl	$-1, %eax
+	jmp	2f
+1:	movzbl	%al, %eax
+2:	popl	%ebx
 	ret
 
 /*
- * int com_ischar(void)
- *       if there is a character pending, return true; otherwise return 0
+ * int com<N>_ischar(void)
+ *       check for char available
  */
-ENTRY(com_ischar)
-	pushl	%edx
 
-	xorl	%eax, %eax
-	movl	$port, %edx	# line status reg
-	addl	5, %edx
-	inb	%dx, %al
-	andb	$0x01, %al		# RX char available?
+COM_ENT(0,ischar)
+COM_ENT(1,ischar)
+COM_ENT(2,ischar)
+COM_ENT(3,ischar)
 
-	pop	%edx
+1:	pushl	%ebx
+	xorl	%eax, %eax
+	movb	$3, %al
+	DOINT(0x14)
+	movb	$0, %al
+	testb	$1, %ah
+	jz	1f
+	incl	%eax
+1:	movzbl	%al, %eax
+	popl	%ebx
 	ret