Also pass a type argument to comcnattach() and com_kgdb_attach().
comspeed() (and thus cominit()) may need this information.
This commit is contained in:
thorpej
parent
fee392c197
commit
0eff671820
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: com_pioc.c,v 1.7 2002/10/02 03:31:58 thorpej Exp $ */
|
||||
/* $NetBSD: com_pioc.c,v 1.8 2003/06/14 17:01:07 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: com_pioc.c,v 1.7 2002/10/02 03:31:58 thorpej Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: com_pioc.c,v 1.8 2003/06/14 17:01:07 thorpej Exp $");
|
||||
|
||||
#include <sys/systm.h>
|
||||
#include <sys/tty.h>
|
||||
|
|
@ -264,7 +264,8 @@ comcninit(cp)
|
|||
#define CONADDR 0x3f8
|
||||
#endif
|
||||
|
||||
result = comcnattach(comconstag, (IO_CONF_BASE + CONADDR), CONSPEED, COM_FREQ, CONMODE);
|
||||
result = comcnattach(comconstag, (IO_CONF_BASE + CONADDR), CONSPEED,
|
||||
COM_FREQ, COM_TYPE_NORMAL, CONMODE);
|
||||
if (result) {
|
||||
printf("initialising serial; got errornr %d\n", result);
|
||||
panic("can't init serial console @%x", CONADDR);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.19 2003/04/26 11:05:06 ragge Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.20 2003/06/14 17:01:07 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2001 The NetBSD Foundation, Inc.
|
||||
|
|
@ -250,7 +250,7 @@ mach_init(int argc, char *argv[], char *envp[])
|
|||
led_display('c', 'o', 'n', 's');
|
||||
DELAY(160000000 / comcnrate);
|
||||
if (comcnattach(&acp->ac_lociot, P4032_COM1, comcnrate,
|
||||
COM_FREQ,
|
||||
COM_FREQ, COM_TYPE_NORMAL,
|
||||
(TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8) != 0)
|
||||
panic("p4032: unable to initialize serial console");
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: api_up1000.c,v 1.13 2002/09/27 15:35:33 provos Exp $ */
|
||||
/* $NetBSD: api_up1000.c,v 1.14 2003/06/14 17:01:07 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: api_up1000.c,v 1.13 2002/09/27 15:35:33 provos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: api_up1000.c,v 1.14 2003/06/14 17:01:07 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -131,7 +131,7 @@ api_up1000_cons_init()
|
|||
DELAY(160000000 / comcnrate);
|
||||
|
||||
if(comcnattach(&icp->ic_iot, 0x3f8, comcnrate,
|
||||
COM_FREQ,
|
||||
COM_FREQ, COM_TYPE_NORMAL,
|
||||
(TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
|
||||
panic("can't init serial console");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_1000a.c,v 1.18 2002/09/27 15:35:33 provos Exp $ */
|
||||
/* $NetBSD: dec_1000a.c,v 1.19 2003/06/14 17:01:07 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
|
@ -72,7 +72,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.18 2002/09/27 15:35:33 provos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.19 2003/06/14 17:01:07 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -203,7 +203,7 @@ dec_1000a_cons_init()
|
|||
DELAY(160000000 / comcnrate);
|
||||
|
||||
if(comcnattach(iot, 0x3f8, comcnrate,
|
||||
COM_FREQ,
|
||||
COM_FREQ, COM_TYPE_NORMAL,
|
||||
(TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
|
||||
panic("can't init serial console");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_2000_300.c,v 1.8 2002/09/27 15:35:34 provos Exp $ */
|
||||
/* $NetBSD: dec_2000_300.c,v 1.9 2003/06/14 17:01:07 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2000 The NetBSD Foundation, Inc.
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_2000_300.c,v 1.8 2002/09/27 15:35:34 provos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_2000_300.c,v 1.9 2003/06/14 17:01:07 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -163,7 +163,7 @@ dec_2000_300_cons_init(void)
|
|||
DELAY(160000000 / ctb->ctb_baud);
|
||||
|
||||
if (comcnattach(&jcp->jc_internal_iot, 0x3f8,
|
||||
ctb->ctb_baud, COM_FREQ,
|
||||
ctb->ctb_baud, COM_FREQ, COM_TYPE_NORMAL,
|
||||
(TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
|
||||
panic("can't init serial console");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_2100_a50.c,v 1.54 2002/09/27 15:35:34 provos Exp $ */
|
||||
/* $NetBSD: dec_2100_a50.c,v 1.55 2003/06/14 17:01:07 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.54 2002/09/27 15:35:34 provos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.55 2003/06/14 17:01:07 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -154,7 +154,7 @@ dec_2100_a50_cons_init()
|
|||
DELAY(160000000 / comcnrate);
|
||||
|
||||
if(comcnattach(&acp->ac_iot, 0x3f8, comcnrate,
|
||||
COM_FREQ,
|
||||
COM_FREQ, COM_TYPE_NORMAL,
|
||||
(TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
|
||||
panic("can't init serial console");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_2100_a500.c,v 1.9 2002/09/27 15:35:34 provos Exp $ */
|
||||
/* $NetBSD: dec_2100_a500.c,v 1.10 2003/06/14 17:01:07 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999 The NetBSD Foundation, Inc.
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_2100_a500.c,v 1.9 2002/09/27 15:35:34 provos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_2100_a500.c,v 1.10 2003/06/14 17:01:07 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -178,7 +178,7 @@ dec_2100_a500_cons_init(void)
|
|||
DELAY(160000000 / comcnrate);
|
||||
|
||||
if(comcnattach(&tcp->tc_iot, 0x3f8, comcnrate,
|
||||
COM_FREQ,
|
||||
COM_FREQ, COM_TYPE_NORMAL,
|
||||
(TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
|
||||
panic("can't init serial console");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_550.c,v 1.20 2002/09/27 15:35:34 provos Exp $ */
|
||||
/* $NetBSD: dec_550.c,v 1.21 2003/06/14 17:01:07 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.20 2002/09/27 15:35:34 provos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.21 2003/06/14 17:01:07 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -142,7 +142,7 @@ dec_550_cons_init()
|
|||
DELAY(160000000 / comcnrate);
|
||||
|
||||
if(comcnattach(&ccp->cc_iot, 0x3f8, comcnrate,
|
||||
COM_FREQ,
|
||||
COM_FREQ, COM_TYPE_NORMAL,
|
||||
(TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
|
||||
panic("can't init serial console");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_6600.c,v 1.17 2002/09/27 15:35:35 provos Exp $ */
|
||||
/* $NetBSD: dec_6600.c,v 1.18 2003/06/14 17:01:08 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.17 2002/09/27 15:35:35 provos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.18 2003/06/14 17:01:08 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -134,7 +134,7 @@ dec_6600_cons_init()
|
|||
DELAY(160000000 / comcnrate);
|
||||
|
||||
if(comcnattach(&tsp->pc_iot, 0x3f8, comcnrate,
|
||||
COM_FREQ,
|
||||
COM_FREQ, COM_TYPE_NORMAL,
|
||||
(TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
|
||||
panic("can't init serial console");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_alphabook1.c,v 1.14 2002/09/27 15:35:35 provos Exp $ */
|
||||
/* $NetBSD: dec_alphabook1.c,v 1.15 2003/06/14 17:01:08 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.14 2002/09/27 15:35:35 provos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.15 2003/06/14 17:01:08 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -134,7 +134,7 @@ dec_alphabook1_cons_init()
|
|||
DELAY(160000000 / comcnrate);
|
||||
|
||||
if(comcnattach(&lcp->lc_iot, 0x3f8, comcnrate,
|
||||
COM_FREQ,
|
||||
COM_FREQ, COM_TYPE_NORMAL,
|
||||
(TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
|
||||
panic("can't init serial console");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_axppci_33.c,v 1.54 2002/09/27 15:35:35 provos Exp $ */
|
||||
/* $NetBSD: dec_axppci_33.c,v 1.55 2003/06/14 17:01:08 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_axppci_33.c,v 1.54 2002/09/27 15:35:35 provos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_axppci_33.c,v 1.55 2003/06/14 17:01:08 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -188,7 +188,7 @@ dec_axppci_33_cons_init()
|
|||
DELAY(160000000 / comcnrate);
|
||||
|
||||
if(comcnattach(&lcp->lc_iot, 0x3f8, comcnrate,
|
||||
COM_FREQ,
|
||||
COM_FREQ, COM_TYPE_NORMAL,
|
||||
(TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
|
||||
panic("can't init serial console");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_eb164.c,v 1.46 2002/09/27 15:35:35 provos Exp $ */
|
||||
/* $NetBSD: dec_eb164.c,v 1.47 2003/06/14 17:01:08 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.46 2002/09/27 15:35:35 provos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.47 2003/06/14 17:01:08 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -137,7 +137,7 @@ dec_eb164_cons_init()
|
|||
DELAY(160000000 / comcnrate);
|
||||
|
||||
if(comcnattach(&ccp->cc_iot, 0x3f8, comcnrate,
|
||||
COM_FREQ,
|
||||
COM_FREQ, COM_TYPE_NORMAL,
|
||||
(TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
|
||||
panic("can't init serial console");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_eb64plus.c,v 1.29 2002/09/27 15:35:35 provos Exp $ */
|
||||
/* $NetBSD: dec_eb64plus.c,v 1.30 2003/06/14 17:01:08 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_eb64plus.c,v 1.29 2002/09/27 15:35:35 provos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_eb64plus.c,v 1.30 2003/06/14 17:01:08 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -144,7 +144,7 @@ dec_eb64plus_cons_init()
|
|||
DELAY(160000000 / comcnrate);
|
||||
|
||||
if(comcnattach(&acp->ac_iot, 0x3f8, comcnrate,
|
||||
COM_FREQ,
|
||||
COM_FREQ, COM_TYPE_NORMAL,
|
||||
(TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
|
||||
panic("can't init serial console");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_eb66.c,v 1.15 2002/09/27 15:35:35 provos Exp $ */
|
||||
/* $NetBSD: dec_eb66.c,v 1.16 2003/06/14 17:01:08 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v 1.15 2002/09/27 15:35:35 provos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v 1.16 2003/06/14 17:01:08 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -141,7 +141,7 @@ dec_eb66_cons_init()
|
|||
DELAY(160000000 / comcnrate);
|
||||
|
||||
if(comcnattach(&lcp->lc_iot, 0x3f8, comcnrate,
|
||||
COM_FREQ,
|
||||
COM_FREQ, COM_TYPE_NORMAL,
|
||||
(TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
|
||||
panic("can't init serial console");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_kn20aa.c,v 1.52 2002/09/27 15:35:35 provos Exp $ */
|
||||
/* $NetBSD: dec_kn20aa.c,v 1.53 2003/06/14 17:01:08 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c,v 1.52 2002/09/27 15:35:35 provos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c,v 1.53 2003/06/14 17:01:08 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -143,7 +143,7 @@ dec_kn20aa_cons_init()
|
|||
DELAY(160000000 / comcnrate);
|
||||
|
||||
if(comcnattach(&ccp->cc_iot, 0x3f8, comcnrate,
|
||||
COM_FREQ,
|
||||
COM_FREQ, COM_TYPE_NORMAL,
|
||||
(TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
|
||||
panic("can't init serial console");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: dec_kn300.c,v 1.27 2002/09/27 15:35:35 provos Exp $ */
|
||||
/* $NetBSD: dec_kn300.c,v 1.28 2003/06/14 17:01:08 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998 by Matthew Jacob
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.27 2002/09/27 15:35:35 provos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.28 2003/06/14 17:01:08 thorpej Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -177,7 +177,8 @@ dec_kn300_cons_init()
|
|||
*/
|
||||
DELAY(160000000 / comcnrate);
|
||||
if (comcnattach(&ccp->cc_iot, 0x3f8, comcnrate,
|
||||
COM_FREQ, (TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8)) {
|
||||
COM_FREQ, COM_TYPE_NORMAL,
|
||||
(TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8)) {
|
||||
panic("can't init serial console");
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: kgdb_machdep.c,v 1.2 2001/11/20 08:43:19 lukem Exp $ */
|
||||
/* $NetBSD: kgdb_machdep.c,v 1.3 2003/06/14 17:01:08 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2001 The NetBSD Foundation, Inc.
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.2 2001/11/20 08:43:19 lukem Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.3 2003/06/14 17:01:08 thorpej Exp $");
|
||||
|
||||
#include "com.h"
|
||||
|
||||
|
|
@ -107,7 +107,7 @@ alpha_kgdb_init(const char **valid_devs, struct alpha_bus_space *bst)
|
|||
#if NCOM > 0
|
||||
if (strcmp(kgdb_devname, "com") == 0) {
|
||||
com_kgdb_attach(bst, kgdb_devaddr, kgdb_devrate, COM_FREQ,
|
||||
kgdb_devmode);
|
||||
COM_TYPE_NORMAL, kgdb_devmode);
|
||||
return;
|
||||
}
|
||||
#endif /* NCOM > 0 */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: c_isa.c,v 1.3 2003/01/19 10:06:12 tsutsui Exp $ */
|
||||
/* $NetBSD: c_isa.c,v 1.4 2003/06/14 17:01:08 thorpej Exp $ */
|
||||
/* $OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $ */
|
||||
|
||||
/*-
|
||||
|
|
@ -206,6 +206,6 @@ c_isa_cons_init()
|
|||
if (com_console_address == 0)
|
||||
com_console_address = IO_COM1;
|
||||
comcnattach(&arc_bus_io, com_console_address,
|
||||
com_console_speed, com_freq, com_console_mode);
|
||||
com_console_speed, com_freq, COM_TYPE_NORMAL, com_console_mode);
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: c_jazz_eisa.c,v 1.5 2003/05/04 10:37:48 tsutsui Exp $ */
|
||||
/* $NetBSD: c_jazz_eisa.c,v 1.6 2003/06/14 17:01:09 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998
|
||||
|
|
@ -193,6 +193,6 @@ c_jazz_eisa_cons_init()
|
|||
com_console_address = jazzio_bus.bs_start + 0x6000;
|
||||
}
|
||||
comcnattach(&jazzio_bus, com_console_address,
|
||||
com_console_speed, com_freq, com_console_mode);
|
||||
com_console_speed, com_freq, COM_TYPE_NORMAL, com_console_mode);
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: c_nec_pci.c,v 1.5 2003/05/25 14:00:12 tsutsui Exp $ */
|
||||
/* $NetBSD: c_nec_pci.c,v 1.6 2003/06/14 17:01:09 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (C) 2000 Shuichiro URATA. All rights reserved.
|
||||
|
|
@ -316,6 +316,6 @@ c_nec_pci_cons_init()
|
|||
if (com_console_address == 0)
|
||||
com_console_address = RD94_SYS_COM1;
|
||||
comcnattach(&jazzio_bus, com_console_address,
|
||||
com_console_speed, com_freq, com_console_mode);
|
||||
com_console_speed, com_freq, COM_TYPE_NORMAL, com_console_mode);
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: p_sni_rm200pci.c,v 1.2 2003/05/25 14:00:12 tsutsui Exp $ */
|
||||
/* $NetBSD: p_sni_rm200pci.c,v 1.3 2003/06/14 17:01:09 thorpej Exp $ */
|
||||
/* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -181,5 +181,5 @@ p_sni_rm200pci_cons_init()
|
|||
#endif
|
||||
}
|
||||
comcnattach(&arc_bus_io /* XXX? */, com_console_address,
|
||||
com_console_speed, com_freq, com_console_mode);
|
||||
com_console_speed, com_freq, COM_TYPE_NORMAL, com_console_mode);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.80 2003/04/26 11:05:08 ragge Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.81 2003/06/14 17:01:09 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
|
||||
|
|
@ -346,7 +346,8 @@ dokbd:
|
|||
if (!strcmp(consinfo->devname, "com")) {
|
||||
bus_space_tag_t tag = &bebox_isa_io_bs_tag;
|
||||
|
||||
if(comcnattach(tag, consinfo->addr, consinfo->speed, COM_FREQ,
|
||||
if(comcnattach(tag, consinfo->addr, consinfo->speed,
|
||||
COM_FREQ, COM_TYPE_NORMAL,
|
||||
((TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8)))
|
||||
panic("can't init serial console");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: cats_machdep.c,v 1.47 2003/05/22 05:47:06 thorpej Exp $ */
|
||||
/* $NetBSD: cats_machdep.c,v 1.48 2003/06/14 17:01:09 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1997,1998 Mark Brinicombe.
|
||||
|
|
@ -925,7 +925,7 @@ consinit(void)
|
|||
#if (NCOM > 0)
|
||||
else if (strncmp(console, "com", 3) == 0) {
|
||||
if (comcnattach(&isa_io_bs_tag, CONCOMADDR, comcnspeed,
|
||||
COM_FREQ, comcnmode))
|
||||
COM_FREQ, COM_TYPE_NORMAL, comcnmode))
|
||||
panic("can't init serial console @%x", CONCOMADDR);
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: console.c,v 1.2 2002/09/06 13:18:43 gehenna Exp $ */
|
||||
/* $NetBSD: console.c,v 1.3 2003/06/14 17:01:09 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
|
||||
|
|
@ -51,7 +51,8 @@ consinit()
|
|||
{
|
||||
/* XXX Check NVRAM to see if we should enable the console at all. */
|
||||
|
||||
comcnattach(0, 0x1c800000, 115200, COM_FREQ * 10, CONMODE);
|
||||
comcnattach(0, 0x1c800000, 115200, COM_FREQ * 10, COM_TYPE_NORMAL,
|
||||
CONMODE);
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: brh_machdep.c,v 1.14 2003/05/22 05:47:07 thorpej Exp $ */
|
||||
/* $NetBSD: brh_machdep.c,v 1.15 2003/06/14 17:01:09 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
|
||||
|
|
@ -872,7 +872,7 @@ consinit(void)
|
|||
|
||||
#if NCOM > 0
|
||||
if (comcnattach(&obio_bs_tag, comcnaddrs[comcnunit], comcnspeed,
|
||||
BECC_PERIPH_CLOCK, comcnmode))
|
||||
BECC_PERIPH_CLOCK, COM_TYPE_NORMAL, comcnmode))
|
||||
panic("can't init serial console @%lx", comcnaddrs[comcnunit]);
|
||||
#else
|
||||
panic("serial console @%lx not configured", comcnaddrs[comcnunit]);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: integrator_machdep.c,v 1.40 2003/05/22 05:47:08 thorpej Exp $ */
|
||||
/* $NetBSD: integrator_machdep.c,v 1.41 2003/06/14 17:01:10 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2001,2002 ARM Ltd
|
||||
|
|
@ -876,7 +876,7 @@ consinit(void)
|
|||
#endif
|
||||
#if (NCOM > 0)
|
||||
if (comcnattach(&isa_io_bs_tag, CONCOMADDR, comcnspeed,
|
||||
COM_FREQ, comcnmode))
|
||||
COM_FREQ, COM_TYPE_NORMAL, comcnmode))
|
||||
panic("can't init serial console @%x", CONCOMADDR);
|
||||
return;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: iq80310_machdep.c,v 1.57 2003/05/22 05:47:08 thorpej Exp $ */
|
||||
/* $NetBSD: iq80310_machdep.c,v 1.58 2003/06/14 17:01:10 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
|
||||
|
|
@ -846,7 +846,7 @@ consinit(void)
|
|||
|
||||
#if NCOM > 0
|
||||
if (comcnattach(&obio_bs_tag, comcnaddrs[comcnunit], comcnspeed,
|
||||
COM_FREQ, comcnmode))
|
||||
COM_FREQ, COM_TYPE_NORMAL, comcnmode))
|
||||
panic("can't init serial console @%lx", comcnaddrs[comcnunit]);
|
||||
#else
|
||||
panic("serial console @%lx not configured", comcnaddrs[comcnunit]);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: iq80321_machdep.c,v 1.26 2003/05/22 05:47:09 thorpej Exp $ */
|
||||
/* $NetBSD: iq80321_machdep.c,v 1.27 2003/06/14 17:01:10 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
|
||||
|
|
@ -857,7 +857,7 @@ consinit(void)
|
|||
|
||||
#if NCOM > 0
|
||||
if (comcnattach(&obio_bs_tag, comcnaddrs[comcnunit], comcnspeed,
|
||||
COM_FREQ, comcnmode))
|
||||
COM_FREQ, COM_TYPE_NORMAL, comcnmode))
|
||||
panic("can't init serial console @%lx", comcnaddrs[comcnunit]);
|
||||
#else
|
||||
panic("serial console @%lx not configured", comcnaddrs[comcnunit]);
|
||||
|
|
@ -866,7 +866,7 @@ consinit(void)
|
|||
#if NCOM > 0
|
||||
if (strcmp(kgdb_devname, "com") == 0) {
|
||||
com_kgdb_attach(&obio_bs_tag, kgdb_devaddr, kgdb_devrate,
|
||||
COM_FREQ, kgdb_devmode);
|
||||
COM_FREQ, COM_TYPE_NORMAL, kgdb_devmode);
|
||||
}
|
||||
#endif /* NCOM > 0 */
|
||||
#endif /* KGDB */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: smdk2800_machdep.c,v 1.12 2003/05/22 05:47:10 thorpej Exp $ */
|
||||
/* $NetBSD: smdk2800_machdep.c,v 1.13 2003/06/14 17:01:11 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2002 Fujitsu Component Limited
|
||||
|
|
@ -942,7 +942,7 @@ consinit(void)
|
|||
#endif /* NSSCOM */
|
||||
#if NCOM>0 && defined(CONCOMADDR)
|
||||
if (comcnattach(&isa_io_bs_tag, CONCOMADDR, comcnspeed,
|
||||
COM_FREQ, comcnmode))
|
||||
COM_FREQ, COM_TYPE_NORMAL, comcnmode))
|
||||
panic("can't init serial console @%x", CONCOMADDR);
|
||||
return;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.10 2003/04/26 11:05:11 ragge Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.11 2003/06/14 17:01:11 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 2001, 2002 Wasabi Systems, Inc.
|
||||
|
|
@ -222,7 +222,8 @@ mach_init(int argc, char **argv, yamon_env_var *envp, u_long memsize)
|
|||
* character time = (1000000 / (defaultrate / 10))
|
||||
*/
|
||||
delay(160000000 / comcnrate);
|
||||
if (comcnattach(&mcp->mc_iot, MALTA_UART0ADR, comcnrate, COM_FREQ,
|
||||
if (comcnattach(&mcp->mc_iot, MALTA_UART0ADR, comcnrate,
|
||||
COM_FREQ, COM_TYPE_NORMAL,
|
||||
(TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8) != 0)
|
||||
panic("malta: unable to initialize serial console");
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.11 2003/04/26 11:05:11 ragge Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.12 2003/06/14 17:01:11 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
|
||||
|
|
@ -353,7 +353,8 @@ consinit(void)
|
|||
(TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8);
|
||||
#else
|
||||
/* PPCBOOT using COM1 @ 57600 */
|
||||
comcnattach(>_obio2_bs_tag, 0, 57600, COM_FREQ*2,
|
||||
comcnattach(>_obio2_bs_tag, 0, 57600,
|
||||
COM_FREQ*2, COM_TYPE_NORMAL,
|
||||
(TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8);
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: consinit.c,v 1.1 2003/03/11 10:57:55 hannken Exp $ */
|
||||
/* $NetBSD: consinit.c,v 1.2 2003/06/14 17:01:11 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2003 The NetBSD Foundation, Inc.
|
||||
|
|
@ -79,7 +79,8 @@ consinit(void)
|
|||
|
||||
#ifdef COM_IS_CONSOLE
|
||||
tag = MAKE_BUS_TAG(BASE_COM);
|
||||
comcnattach(tag, BASE_COM, COM_CONSOLE_SPEED, COM_FREQ,
|
||||
comcnattach(tag, BASE_COM, COM_CONSOLE_SPEED,
|
||||
COM_FREQ, COM_TYPE_NORMAL,
|
||||
(TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8);
|
||||
#else
|
||||
/* Clear VRam */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: consinit.c,v 1.1 2002/12/09 12:16:21 scw Exp $ */
|
||||
/* $NetBSD: consinit.c,v 1.2 2003/06/14 17:01:11 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998
|
||||
|
|
@ -110,7 +110,7 @@ consinit(void)
|
|||
tag = ibm4xx_make_bus_space_tag(0, 0);
|
||||
|
||||
if (comcnattach(tag, CONADDR, CONSPEED, COM_FREQ*6,
|
||||
comcnmode))
|
||||
COM_TYPE_NORMAL, comcnmode))
|
||||
panic("can't init serial console @%x", CONADDR);
|
||||
else
|
||||
return;
|
||||
|
|
@ -127,7 +127,7 @@ kgdb_port_init(void)
|
|||
if(!strcmp(kgdb_devname, "com")) {
|
||||
bus_space_tag_t tag = ibm4xx_make_bus_space_tag(0, 2);
|
||||
com_kgdb_attach(tag, comkgdbaddr, comkgdbrate, COM_FREQ * 6,
|
||||
comkgdbmode);
|
||||
COM_TYPE_NORMAL, comkgdbmode);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: cons_machdep.c,v 1.6 2003/04/26 11:05:12 ragge Exp $ */
|
||||
/* $NetBSD: cons_machdep.c,v 1.7 2003/06/14 17:01:12 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 2002 Wasabi Systems, Inc.
|
||||
|
|
@ -160,7 +160,8 @@ void
|
|||
comcninit(struct consdev *cn)
|
||||
{
|
||||
|
||||
comcnattach(comtag, comaddr, COM_SPEED, COM_FREQ, TTYDEF_CFLAG);
|
||||
comcnattach(comtag, comaddr, COM_SPEED, COM_FREQ, COM_TYPE_NORMAL,
|
||||
TTYDEF_CFLAG);
|
||||
}
|
||||
#endif /* NCOM > 0 */
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: com_gsc.c,v 1.5 2002/10/02 05:17:49 thorpej Exp $ */
|
||||
/* $NetBSD: com_gsc.c,v 1.6 2003/06/14 17:01:12 thorpej Exp $ */
|
||||
|
||||
/* $OpenBSD: com_gsc.c,v 1.8 2000/03/13 14:39:59 mickey Exp $ */
|
||||
|
||||
|
|
@ -170,6 +170,7 @@ com_gsc_kgdb_attach(void)
|
|||
error = com_kgdb_attach(&hppa_bustag,
|
||||
KGDBADDR + COMGSC_OFFSET,
|
||||
KGDBRATE, COMGSC_FREQUENCY,
|
||||
COM_TYPE_NORMAL,
|
||||
/* 8N1 */
|
||||
((TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8));
|
||||
if (error) {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: com_hpcio.c,v 1.5 2002/10/02 05:26:45 thorpej Exp $ */
|
||||
/* $NetBSD: com_hpcio.c,v 1.6 2003/06/14 17:01:12 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2002 TAKEMRUA Shin. All rights reserved.
|
||||
|
|
@ -220,11 +220,11 @@ com_hpcio_cndb_attach(bus_space_tag_t iot, int iobase, int rate,
|
|||
#ifdef KGDB
|
||||
if (kgdb)
|
||||
return (com_kgdb_attach(com_hpcio_cniot, iobase, rate,
|
||||
frequency, cflag));
|
||||
frequency, COM_TYPE_NORMAL, cflag));
|
||||
else
|
||||
#endif
|
||||
return (comcnattach(com_hpcio_cniot, iobase, rate,
|
||||
frequency, cflag));
|
||||
frequency, COM_TYPE_NORMAL, cflag));
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: com_vrip.c,v 1.14 2002/10/02 05:26:53 thorpej Exp $ */
|
||||
/* $NetBSD: com_vrip.c,v 1.15 2003/06/14 17:01:12 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999 SASAKI Takesi. All rights reserved.
|
||||
|
|
@ -100,10 +100,12 @@ com_vrip_cndb_attach(bus_space_tag_t iot, int iobase, int rate, int frequency,
|
|||
return (EIO); /* I can't find appropriate error number. */
|
||||
#ifdef KGDB
|
||||
if (kgdb)
|
||||
return (com_kgdb_attach(iot, iobase, rate, frequency, cflag));
|
||||
return (com_kgdb_attach(iot, iobase, rate, frequency,
|
||||
COM_TYPE_NORMAL, cflag));
|
||||
else
|
||||
#endif
|
||||
return (comcnattach(iot, iobase, rate, frequency, cflag));
|
||||
return (comcnattach(iot, iobase, rate, frequency,
|
||||
COM_TYPE_NORMAL, cflag));
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: hd64461uart.c,v 1.14 2002/10/02 15:45:20 thorpej Exp $ */
|
||||
/* $NetBSD: hd64461uart.c,v 1.15 2003/06/14 17:01:13 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
|
||||
|
|
@ -115,7 +115,7 @@ hd64461uartcninit(struct consdev *cp)
|
|||
hd64461uart_init();
|
||||
|
||||
comcnattach(hd64461uart_chip.io_tag, 0x0, COMCN_SPEED, COM_FREQ,
|
||||
CONMODE);
|
||||
COM_TYPE_NORMAL, CONMODE);
|
||||
|
||||
hd64461uart_chip.console = 1;
|
||||
}
|
||||
|
|
@ -134,7 +134,7 @@ hd64461uart_kgdb_init()
|
|||
hd64461uart_init();
|
||||
|
||||
if (com_kgdb_attach(hd64461uart_chip.io_tag, 0x0, kgdb_rate,
|
||||
COM_FREQ, CONMODE) != 0) {
|
||||
COM_FREQ, COM_TYPE_NORMAL, CONMODE) != 0) {
|
||||
printf("%s: KGDB console open failed.\n", __FUNCTION__);
|
||||
return (1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: hd64465uart.c,v 1.8 2002/10/02 15:45:21 thorpej Exp $ */
|
||||
/* $NetBSD: hd64465uart.c,v 1.9 2003/06/14 17:01:13 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
|
||||
|
|
@ -114,7 +114,7 @@ hd64465uartcninit(struct consdev *cp)
|
|||
hd64465uart_init();
|
||||
|
||||
comcnattach(hd64465uart_chip.io_tag, 0x0, COMCN_SPEED, COM_FREQ,
|
||||
CONMODE);
|
||||
COM_TYPE_NORMAL, CONMODE);
|
||||
|
||||
hd64465uart_chip.console = 1;
|
||||
}
|
||||
|
|
@ -133,7 +133,7 @@ hd64465uart_kgdb_init()
|
|||
hd64465uart_init();
|
||||
|
||||
if (com_kgdb_attach(hd64465uart_chip.io_tag, 0x0, kgdb_rate,
|
||||
COM_FREQ, CONMODE) != 0) {
|
||||
COM_FREQ, COM_TYPE_NORMAL, CONMODE) != 0) {
|
||||
printf("%s: KGDB console open failed.\n", __FUNCTION__);
|
||||
return (1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: com_mainbus.c,v 1.3 2002/10/02 05:39:04 thorpej Exp $ */
|
||||
/* $NetBSD: com_mainbus.c,v 1.4 2003/06/14 17:01:13 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2002 The NetBSD Foundation, Inc.
|
||||
|
|
@ -122,5 +122,6 @@ comcninit(cp)
|
|||
struct consdev *cp;
|
||||
{
|
||||
|
||||
comcnattach(0, CONADDR, COMCN_SPEED, COM_FREQ, CONMODE);
|
||||
comcnattach(0, CONADDR, COMCN_SPEED, COM_FREQ, COM_TYPE_NORMAL,
|
||||
CONMODE);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.12 2003/04/26 11:05:16 ragge Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.13 2003/06/14 17:01:13 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
|
||||
|
|
@ -313,7 +313,7 @@ dokbd:
|
|||
static const bus_addr_t caddr[2] = {0x3f8, 0x2f8};
|
||||
int rv;
|
||||
rv = comcnattach(tag, caddr[bootinfo.bi_consolechan],
|
||||
bootinfo.bi_consolespeed, COM_FREQ,
|
||||
bootinfo.bi_consolespeed, COM_FREQ, COM_TYPE_NORMAL,
|
||||
bootinfo.bi_consolecflag);
|
||||
if (rv)
|
||||
panic("can't init serial console");
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: netwinder_machdep.c,v 1.53 2003/06/13 12:30:04 uwe Exp $ */
|
||||
/* $NetBSD: netwinder_machdep.c,v 1.54 2003/06/14 17:01:13 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1997,1998 Mark Brinicombe.
|
||||
|
|
@ -915,7 +915,7 @@ consinit(void)
|
|||
} else {
|
||||
#if (NCOM > 0)
|
||||
if (comcnattach(&isa_io_bs_tag, CONCOMADDR, comcnspeed,
|
||||
COM_FREQ, comcnmode))
|
||||
COM_FREQ, COM_TYPE_NORMAL, comcnmode))
|
||||
panic("can't init serial console @%x", CONCOMADDR);
|
||||
#else
|
||||
panic("serial console @%x not configured", CONCOMADDR);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.14 2003/04/26 11:05:19 ragge Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.15 2003/06/14 17:01:14 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2002 The NetBSD Foundation, Inc.
|
||||
|
|
@ -298,6 +298,7 @@ consinit(void)
|
|||
tag = &pmppc_mem_tag;
|
||||
|
||||
if(comcnattach(tag, CPC_COM0, 9600, CPC_COM_SPEED(a_config.a_bus_freq),
|
||||
COM_TYPE_NORMAL,
|
||||
((TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8)))
|
||||
panic("can't init serial console");
|
||||
else
|
||||
|
|
@ -317,7 +318,7 @@ kgdb_port_init(void)
|
|||
bus_space_tag_t tag = &pmppc_mem_tag;
|
||||
com_kgdb_attach(tag, comkgdbaddr, comkgdbrate,
|
||||
CPC_COM_SPEED(a_config.a_bus_freq),
|
||||
comkgdbmode);
|
||||
COM_TYPE_NORMAL, comkgdbmode);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: consinit.c,v 1.1 2002/04/25 20:36:50 nonaka Exp $ */
|
||||
/* $NetBSD: consinit.c,v 1.2 2003/06/14 17:01:14 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
|
||||
|
|
@ -133,6 +133,7 @@ dokbd:
|
|||
bus_space_tag_t tag = &prep_isa_io_space_tag;
|
||||
|
||||
if(comcnattach(tag, consinfo->addr, consinfo->speed, COM_FREQ,
|
||||
COM_TYPE_NORMAL,
|
||||
((TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8)))
|
||||
panic("can't init serial console");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.26 2003/04/26 11:05:19 ragge Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.27 2003/06/14 17:01:14 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
|
||||
|
|
@ -287,7 +287,7 @@ consinit(void)
|
|||
#if (NCOM > 0)
|
||||
tag = &sandpoint_isa_io_bs_tag;
|
||||
|
||||
if(comcnattach(tag, 0x3F8, 38400, COM_FREQ,
|
||||
if(comcnattach(tag, 0x3F8, 38400, COM_FREQ, COM_TYPE_NORMAL,
|
||||
((TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8)))
|
||||
panic("can't init serial console");
|
||||
else
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: console.c,v 1.8 2003/01/03 09:09:22 rafal Exp $ */
|
||||
/* $NetBSD: console.c,v 1.9 2003/06/14 17:01:14 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
|
||||
|
|
@ -98,7 +98,8 @@ consinit()
|
|||
if (comcnattach(3, ((consdev[7] == '0') ?
|
||||
MIPS_PHYS_TO_KSEG1(MACE_ISA_SER1_BASE) :
|
||||
MIPS_PHYS_TO_KSEG1(MACE_ISA_SER2_BASE)),
|
||||
speed, COM_FREQ, comcnmode) == 0)
|
||||
speed, COM_FREQ, COM_TYPE_NORMAL,
|
||||
comcnmode) == 0)
|
||||
return;
|
||||
|
||||
printf("can't init serial hardware console!\n");
|
||||
|
|
@ -117,7 +118,8 @@ kgdb_port_init()
|
|||
# if defined(IP32) && (NCOM > 0)
|
||||
# define KGDB_DEVMODE ((TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8)
|
||||
if (mach_type == MACH_SGI_IP32)
|
||||
com_kgdb_attach(3, 0xbf398000, 9600, COM_FREQ, KGDB_DEVMODE);
|
||||
com_kgdb_attach(3, 0xbf398000, 9600, COM_FREQ, COM_TYPE_NORMAL,
|
||||
KGDB_DEVMODE);
|
||||
# endif /* IP32 && (NCOM > 0) */
|
||||
|
||||
# if (defined(IP20) || defined(IP22)) && (NZSC > 0)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: com_ofisa_consolehack.c,v 1.2 2002/10/05 17:01:50 chs Exp $ */
|
||||
/* $NetBSD: com_ofisa_consolehack.c,v 1.3 2003/06/14 17:01:15 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997
|
||||
|
|
@ -78,6 +78,7 @@ comcninit(cp)
|
|||
#define CONMODE ((TTYDEF_CFLAG & ~(CSIZE | CSTOPB | PARENB)) | CS8) /* 8N1 */
|
||||
#endif
|
||||
|
||||
if (comcnattach(&isa_io_bs_tag, 0x3f8, 9600, COM_FREQ, CONMODE))
|
||||
if (comcnattach(&isa_io_bs_tag, 0x3f8, 9600, COM_FREQ, COM_TYPE_NORMAL,
|
||||
CONMODE))
|
||||
panic("can't init serial console @%x", 0x3f8);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: com_ebus.c,v 1.9 2002/12/10 13:44:49 pk Exp $ */
|
||||
/* $NetBSD: com_ebus.c,v 1.10 2003/06/14 17:01:15 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
|
@ -108,7 +108,8 @@ com_ebus_attach(parent, self, aux)
|
|||
*/
|
||||
if (prom_instance_to_package(prom_stdin()) == ea->ea_node)
|
||||
comcnattach(sc->sc_iot, sc->sc_iobase,
|
||||
B9600, sc->sc_frequency, (CLOCAL | CREAD | CS8));
|
||||
B9600, sc->sc_frequency, COM_TYPE_NORMAL,
|
||||
(CLOCAL | CREAD | CS8));
|
||||
|
||||
if (!com_is_console(sc->sc_iot, sc->sc_iobase, &sc->sc_ioh)
|
||||
&& bus_space_map(sc->sc_iot, sc->sc_iobase, ea->ea_reg[0].size,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: com_obio.c,v 1.13 2002/12/10 13:44:49 pk Exp $ */
|
||||
/* $NetBSD: com_obio.c,v 1.14 2003/06/14 17:01:15 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
|
@ -196,7 +196,8 @@ com_obio_attach(parent, self, aux)
|
|||
*/
|
||||
if (prom_instance_to_package(prom_stdin()) == sa->sa_node)
|
||||
comcnattach(sc->sc_iot, sc->sc_iobase,
|
||||
B9600, sc->sc_frequency, (CLOCAL | CREAD | CS8));
|
||||
B9600, sc->sc_frequency, COM_TYPE_NORMAL,
|
||||
(CLOCAL | CREAD | CS8));
|
||||
|
||||
if (!com_is_console(sc->sc_iot, sc->sc_iobase, &sc->sc_ioh) &&
|
||||
sbus_bus_map(sc->sc_iot,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: com_ebus.c,v 1.18 2002/12/10 13:44:51 pk Exp $ */
|
||||
/* $NetBSD: com_ebus.c,v 1.19 2003/06/14 17:01:15 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1999, 2000 Matthew R. Green
|
||||
|
|
@ -158,7 +158,7 @@ com_ebus_attach(parent, self, aux)
|
|||
/* Attach com as the console. */
|
||||
cn_orig = cn_tab;
|
||||
if (comcnattach(sc->sc_iot, sc->sc_iobase, kma.kmta_baud,
|
||||
sc->sc_frequency, kma.kmta_cflag)) {
|
||||
sc->sc_frequency, COM_TYPE_NORMAL, kma.kmta_cflag)) {
|
||||
printf("Error: comcnattach failed\n");
|
||||
}
|
||||
cn_tab = cn_orig;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: consinit.c,v 1.2 2003/03/02 18:27:14 fvdl Exp $ */
|
||||
/* $NetBSD: consinit.c,v 1.3 2003/06/14 17:01:15 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.2 2003/03/02 18:27:14 fvdl Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.3 2003/06/14 17:01:15 thorpej Exp $");
|
||||
|
||||
#include "opt_kgdb.h"
|
||||
|
||||
|
|
@ -189,7 +189,7 @@ dokbd:
|
|||
bus_space_tag_t tag = X86_BUS_SPACE_IO;
|
||||
|
||||
if (comcnattach(tag, consinfo->addr, consinfo->speed,
|
||||
COM_FREQ, comcnmode))
|
||||
COM_FREQ, COM_TYPE_NORMAL, comcnmode))
|
||||
panic("can't init serial console @%x", consinfo->addr);
|
||||
|
||||
return;
|
||||
|
|
@ -225,7 +225,7 @@ kgdb_port_init()
|
|||
bus_space_tag_t tag = X86_BUS_SPACE_IO;
|
||||
|
||||
com_kgdb_attach(tag, comkgdbaddr, comkgdbrate, COM_FREQ,
|
||||
comkgdbmode);
|
||||
COM_TYPE_NORMAL, comkgdbmode);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: com.c,v 1.209 2003/06/14 16:25:52 thorpej Exp $ */
|
||||
/* $NetBSD: com.c,v 1.210 2003/06/14 17:01:06 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
|
||||
|
|
@ -77,7 +77,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.209 2003/06/14 16:25:52 thorpej Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.210 2003/06/14 17:01:06 thorpej Exp $");
|
||||
|
||||
#include "opt_com.h"
|
||||
#include "opt_ddb.h"
|
||||
|
|
@ -138,7 +138,7 @@ static void com_enable_debugport(struct com_softc *);
|
|||
|
||||
void com_config(struct com_softc *);
|
||||
void com_shutdown(struct com_softc *);
|
||||
int comspeed(long, long);
|
||||
int comspeed(long, long, int);
|
||||
static u_char cflag2lcr(tcflag_t);
|
||||
int comparam(struct tty *, struct termios *);
|
||||
void comstart(struct tty *);
|
||||
|
|
@ -155,7 +155,7 @@ void com_iflush(struct com_softc *);
|
|||
int com_common_getc(dev_t, bus_space_tag_t, bus_space_handle_t);
|
||||
void com_common_putc(dev_t, bus_space_tag_t, bus_space_handle_t, int);
|
||||
|
||||
int cominit(bus_space_tag_t, bus_addr_t, int, int, tcflag_t,
|
||||
int cominit(bus_space_tag_t, bus_addr_t, int, int, int, tcflag_t,
|
||||
bus_space_handle_t *);
|
||||
|
||||
int comcngetc(dev_t);
|
||||
|
|
@ -265,8 +265,9 @@ void com_kgdb_putc(void *, int);
|
|||
|
||||
#endif
|
||||
|
||||
/*ARGSUSED*/
|
||||
int
|
||||
comspeed(long speed, long frequency)
|
||||
comspeed(long speed, long frequency, int type)
|
||||
{
|
||||
#define divrnd(n, q) (((n)*2/(q)+1)/2) /* divide and round off */
|
||||
|
||||
|
|
@ -1391,7 +1392,8 @@ comparam(struct tty *tp, struct termios *t)
|
|||
*/
|
||||
for (prescaler = 0, speed = t->c_ospeed; prescaler < 4;
|
||||
prescaler++, speed /= 2)
|
||||
if ((ospeed = comspeed(speed, sc->sc_frequency)) > 0)
|
||||
if ((ospeed = comspeed(speed, sc->sc_frequency,
|
||||
sc->sc_type)) > 0)
|
||||
break;
|
||||
|
||||
if (prescaler == 4)
|
||||
|
|
@ -1399,7 +1401,7 @@ comparam(struct tty *tp, struct termios *t)
|
|||
sc->sc_prescaler = prescaler;
|
||||
} else
|
||||
#endif
|
||||
ospeed = comspeed(t->c_ospeed, sc->sc_frequency);
|
||||
ospeed = comspeed(t->c_ospeed, sc->sc_frequency, sc->sc_type);
|
||||
|
||||
/* Check requested parameters. */
|
||||
if (ospeed < 0)
|
||||
|
|
@ -2366,7 +2368,7 @@ com_common_putc(dev_t dev, bus_space_tag_t iot, bus_space_handle_t ioh, int c)
|
|||
*/
|
||||
int
|
||||
cominit(bus_space_tag_t iot, bus_addr_t iobase, int rate, int frequency,
|
||||
tcflag_t cflag, bus_space_handle_t *iohp)
|
||||
int type, tcflag_t cflag, bus_space_handle_t *iohp)
|
||||
{
|
||||
bus_space_handle_t ioh;
|
||||
|
||||
|
|
@ -2376,7 +2378,7 @@ cominit(bus_space_tag_t iot, bus_addr_t iobase, int rate, int frequency,
|
|||
bus_space_write_1(iot, ioh, com_lcr, LCR_EERS);
|
||||
bus_space_write_1(iot, ioh, com_efr, 0);
|
||||
bus_space_write_1(iot, ioh, com_lcr, LCR_DLAB);
|
||||
rate = comspeed(rate, frequency);
|
||||
rate = comspeed(rate, frequency, type);
|
||||
bus_space_write_1(iot, ioh, com_dlbl, rate);
|
||||
bus_space_write_1(iot, ioh, com_dlbh, rate >> 8);
|
||||
bus_space_write_1(iot, ioh, com_lcr, cflag2lcr(cflag));
|
||||
|
|
@ -2400,11 +2402,11 @@ struct consdev comcons = {
|
|||
|
||||
int
|
||||
comcnattach(bus_space_tag_t iot, bus_addr_t iobase, int rate, int frequency,
|
||||
tcflag_t cflag)
|
||||
int type, tcflag_t cflag)
|
||||
{
|
||||
int res;
|
||||
|
||||
res = cominit(iot, iobase, rate, frequency, cflag, &comconsioh);
|
||||
res = cominit(iot, iobase, rate, frequency, type, cflag, &comconsioh);
|
||||
if (res)
|
||||
return (res);
|
||||
|
||||
|
|
@ -2446,7 +2448,7 @@ comcnpollc(dev_t dev, int on)
|
|||
#ifdef KGDB
|
||||
int
|
||||
com_kgdb_attach(bus_space_tag_t iot, bus_addr_t iobase, int rate,
|
||||
int frequency, tcflag_t cflag)
|
||||
int frequency, int type, tcflag_t cflag)
|
||||
{
|
||||
int res;
|
||||
|
||||
|
|
@ -2458,7 +2460,7 @@ com_kgdb_attach(bus_space_tag_t iot, bus_addr_t iobase, int rate,
|
|||
#endif
|
||||
} else {
|
||||
|
||||
res = cominit(iot, iobase, rate, frequency, cflag,
|
||||
res = cominit(iot, iobase, rate, frequency, type, cflag,
|
||||
&com_kgdb_ioh);
|
||||
if (res)
|
||||
return (res);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: comvar.h,v 1.45 2003/06/14 16:25:53 thorpej Exp $ */
|
||||
/* $NetBSD: comvar.h,v 1.46 2003/06/14 17:01:06 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
|
||||
|
|
@ -46,10 +46,10 @@
|
|||
#include <sys/lock.h>
|
||||
#endif
|
||||
|
||||
int comcnattach __P((bus_space_tag_t, bus_addr_t, int, int, tcflag_t));
|
||||
int comcnattach __P((bus_space_tag_t, bus_addr_t, int, int, int, tcflag_t));
|
||||
|
||||
#ifdef KGDB
|
||||
int com_kgdb_attach __P((bus_space_tag_t, bus_addr_t, int, int, tcflag_t));
|
||||
int com_kgdb_attach __P((bus_space_tag_t, bus_addr_t, int, int, int, tcflag_t));
|
||||
#endif
|
||||
|
||||
int com_is_console __P((bus_space_tag_t, bus_addr_t, bus_space_handle_t *));
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: puccn.c,v 1.5 2003/03/29 20:15:31 matt Exp $ */
|
||||
/* $NetBSD: puccn.c,v 1.6 2003/06/14 17:01:06 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Derived from pci.c
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: puccn.c,v 1.5 2003/03/29 20:15:31 matt Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: puccn.c,v 1.6 2003/06/14 17:01:06 thorpej Exp $");
|
||||
|
||||
#include "opt_kgdb.h"
|
||||
|
||||
|
|
@ -201,7 +201,8 @@ comgdbinit(struct consdev *cn)
|
|||
if (pucgdbbase == 0) {
|
||||
return;
|
||||
}
|
||||
com_kgdb_attach(puctag, pucgdbbase, CONSPEED, COM_FREQ, CONMODE);
|
||||
com_kgdb_attach(puctag, pucgdbbase, CONSPEED, COM_FREQ,
|
||||
COM_TYPE_NORMAL, CONMODE);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -217,7 +218,8 @@ comcninit(struct consdev *cn)
|
|||
if (puccnbase == 0) {
|
||||
return;
|
||||
}
|
||||
comcnattach(puctag, puccnbase, CONSPEED, COM_FREQ, CONMODE);
|
||||
comcnattach(puctag, puccnbase, CONSPEED, COM_FREQ, COM_TYPE_NORMAL,
|
||||
CONMODE);
|
||||
}
|
||||
|
||||
/* comcngetc, comcnputc, comcnpollc provided by dev/ic/com.c */
|
||||
|
|
|
|||
Loading…
Reference in New Issue