Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring back the "comconsattached" flag. It is necessary for starred

Browse Source 
com devices (on non "__BROKEN_INDIRECT_CONFIG" ISA).
This commit is contained in:
drochner 1997-08-16 08:33:08 +00:00
parent 23d0cae1eb
commit 570688abef
7 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/ic/com.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com.c,v 1.104 1997/08/14 16:15:15 drochner Exp $ */ /* $NetBSD: com.c,v 1.105 1997/08/16 08:33:10 drochner Exp $ */
/*- /*-
* Copyright (c) 1993, 1994, 1995, 1996, 1997 * Copyright (c) 1993, 1994, 1995, 1996, 1997
@ -164,6 +164,7 @@ int comconsaddr;
bus_space_tag_t comconstag; bus_space_tag_t comconstag;
bus_space_handle_t comconsioh; bus_space_handle_t comconsioh;
tcflag_t comconscflag = TTYDEF_CFLAG; tcflag_t comconscflag = TTYDEF_CFLAG;
int comconsattached;
int commajor; int commajor;
@ -377,6 +378,8 @@ com_attach_subr(sc)
#endif #endif
if (iobase == comconsaddr) { if (iobase == comconsaddr) {
comconsattached = 1;
/* Make sure the console is always "hardwired". */ /* Make sure the console is always "hardwired". */
delay(1000); /* wait for output to finish */ delay(1000); /* wait for output to finish */
SET(sc->sc_hwflags, COM_HW_CONSOLE); SET(sc->sc_hwflags, COM_HW_CONSOLE);

6
sys/dev/isa/ast.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ast.c,v 1.34 1997/08/13 21:26:52 jtk Exp $ */ /* $NetBSD: ast.c,v 1.35 1997/08/16 08:33:08 drochner Exp $ */
/* /*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -93,7 +93,7 @@ astprobe(parent, self, aux)
*/ */
/* if the first port is in use as console, then it. */ /* if the first port is in use as console, then it. */
if (iobase == comconsaddr if ((iobase == comconsaddr && !comconsattached)
#ifdef KGDB #ifdef KGDB
|| iobase == com_kgdb_addr || iobase == com_kgdb_addr
#endif #endif
@ -113,7 +113,7 @@ checkmappings:
for (i = 1; i < NSLAVES; i++) { for (i = 1; i < NSLAVES; i++) {
iobase += COM_NPORTS; iobase += COM_NPORTS;
if (iobase == comconsaddr if ((iobase == comconsaddr && !comconsattached)
#ifdef KGDB #ifdef KGDB
|| iobase == com_kgdb_addr || iobase == com_kgdb_addr
#endif #endif

6
sys/dev/isa/boca.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: boca.c,v 1.21 1997/08/13 21:26:53 jtk Exp $ */ /* $NetBSD: boca.c,v 1.22 1997/08/16 08:33:09 drochner Exp $ */
/* /*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -93,7 +93,7 @@ bocaprobe(parent, self, aux)
*/ */
/* if the first port is in use as console, then it. */ /* if the first port is in use as console, then it. */
if (iobase == comconsaddr if ((iobase == comconsaddr && !comconsattached)
#ifdef KGDB #ifdef KGDB
|| iobase == com_kgdb_addr || iobase == com_kgdb_addr
#endif #endif
@ -113,7 +113,7 @@ checkmappings:
for (i = 1; i < NSLAVES; i++) { for (i = 1; i < NSLAVES; i++) {
iobase += COM_NPORTS; iobase += COM_NPORTS;
if (iobase == comconsaddr if ((iobase == comconsaddr && !comconsattached)
#ifdef KGDB #ifdef KGDB
|| iobase == com_kgdb_addr || iobase == com_kgdb_addr
#endif #endif

5
sys/dev/isa/com.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com.c,v 1.104 1997/08/14 16:15:15 drochner Exp $ */ /* $NetBSD: com.c,v 1.105 1997/08/16 08:33:10 drochner Exp $ */
/*- /*-
* Copyright (c) 1993, 1994, 1995, 1996, 1997 * Copyright (c) 1993, 1994, 1995, 1996, 1997
@ -164,6 +164,7 @@ int comconsaddr;
bus_space_tag_t comconstag; bus_space_tag_t comconstag;
bus_space_handle_t comconsioh; bus_space_handle_t comconsioh;
tcflag_t comconscflag = TTYDEF_CFLAG; tcflag_t comconscflag = TTYDEF_CFLAG;
int comconsattached;
int commajor; int commajor;
@ -377,6 +378,8 @@ com_attach_subr(sc)
#endif #endif
if (iobase == comconsaddr) { if (iobase == comconsaddr) {
comconsattached = 1;
/* Make sure the console is always "hardwired". */ /* Make sure the console is always "hardwired". */
delay(1000); /* wait for output to finish */ delay(1000); /* wait for output to finish */
SET(sc->sc_hwflags, COM_HW_CONSOLE); SET(sc->sc_hwflags, COM_HW_CONSOLE);

4
sys/dev/isa/com_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com_isa.c,v 1.3 1997/08/12 17:25:44 drochner Exp $ */ /* $NetBSD: com_isa.c,v 1.4 1997/08/16 08:33:11 drochner Exp $ */
/*- /*-
* Copyright (c) 1993, 1994, 1995, 1996 * Copyright (c) 1993, 1994, 1995, 1996
@ -91,7 +91,7 @@ com_isa_probe(parent, match, aux)
iobase = ia->ia_iobase; iobase = ia->ia_iobase;
/* if it's in use as console, it's there. */ /* if it's in use as console, it's there. */
if (iobase != comconsaddr if ((iobase != comconsaddr || comconsattached)
#ifdef KGDB #ifdef KGDB
&& iobase != com_kgdb_addr && iobase != com_kgdb_addr
#endif #endif

4
sys/dev/isa/com_multi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com_multi.c,v 1.3 1997/08/13 21:26:54 jtk Exp $ */ /* $NetBSD: com_multi.c,v 1.4 1997/08/16 08:33:12 drochner Exp $ */
/*- /*-
* Copyright (c) 1993, 1994, 1995, 1996 * Copyright (c) 1993, 1994, 1995, 1996
@ -86,7 +86,7 @@ com_multi_probe(parent, match, aux)
iobase = ca->ca_iobase; iobase = ca->ca_iobase;
/* if it's in use as console, it's there. */ /* if it's in use as console, it's there. */
if (iobase == comconsaddr if ((iobase == comconsaddr && !comconsattached)
#ifdef KGDB #ifdef KGDB
|| iobase == com_kgdb_addr || iobase == com_kgdb_addr
#endif #endif

6
sys/dev/isa/rtfps.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rtfps.c,v 1.29 1997/08/13 21:26:54 jtk Exp $ */ /* $NetBSD: rtfps.c,v 1.30 1997/08/16 08:33:13 drochner Exp $ */
/* /*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -95,7 +95,7 @@ rtfpsprobe(parent, self, aux)
*/ */
/* if the first port is in use as console, then it. */ /* if the first port is in use as console, then it. */
if (iobase == comconsaddr if ((iobase == comconsaddr && !comconsattached)
#ifdef KGDB #ifdef KGDB
|| iobase == com_kgdb_addr || iobase == com_kgdb_addr
#endif #endif
@ -115,7 +115,7 @@ checkmappings:
for (i = 1; i < NSLAVES; i++) { for (i = 1; i < NSLAVES; i++) {
iobase += COM_NPORTS; iobase += COM_NPORTS;
if (iobase == comconsaddr if ((iobase == comconsaddr && !comconsattached)
#ifdef KGDB #ifdef KGDB
|| iobase == com_kgdb_addr || iobase == com_kgdb_addr
#endif #endif