summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authormckusick <mckusick@FreeBSD.org>1999-06-15 22:15:10 +0000
committermckusick <mckusick@FreeBSD.org>1999-06-15 22:15:10 +0000
commitac0e96a2d89dec8666e79dee4140dd78083fa4d5 (patch)
tree4da3629379695eed95647587c0b96bd8f59096a3 /sys
parent74090b93a67ba7cfe0ae2abf5caf0e129203a9d5 (diff)
downloadFreeBSD-src-ac0e96a2d89dec8666e79dee4140dd78083fa4d5.zip
FreeBSD-src-ac0e96a2d89dec8666e79dee4140dd78083fa4d5.tar.gz
COM_LLCONSOLE should over-ride COM_DEBUGGER request.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/sio/sio.c4
-rw-r--r--sys/isa/sio.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 3907a0b..4665d88 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: sio.c,v 1.245 1999/05/30 16:52:48 phk Exp $
+ * $Id: sio.c,v 1.246 1999/05/31 06:57:31 phk Exp $
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* from: i386/isa sio.c,v 1.234
*/
@@ -2858,7 +2858,7 @@ siocnprobe(cp)
siocniobase = iobase;
siocnunit = unit;
}
- if (COM_DEBUGGER(flags)) {
+ if (COM_DEBUGGER(flags) && !COM_LLCONSOLE(flags)) {
printf("sio%d: gdb debugging port\n", unit);
siogdbiobase = iobase;
siogdbunit = unit;
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index 3907a0b..4665d88 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: sio.c,v 1.245 1999/05/30 16:52:48 phk Exp $
+ * $Id: sio.c,v 1.246 1999/05/31 06:57:31 phk Exp $
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* from: i386/isa sio.c,v 1.234
*/
@@ -2858,7 +2858,7 @@ siocnprobe(cp)
siocniobase = iobase;
siocnunit = unit;
}
- if (COM_DEBUGGER(flags)) {
+ if (COM_DEBUGGER(flags) && !COM_LLCONSOLE(flags)) {
printf("sio%d: gdb debugging port\n", unit);
siogdbiobase = iobase;
siogdbunit = unit;
OpenPOWER on IntegriCloud