summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/ic/com.c10
-rw-r--r--sys/dev/ic/comvar.h6
2 files changed, 5 insertions, 11 deletions
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index 51d74e3fcc4..ad18a259ca3 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com.c,v 1.73 2001/09/30 15:07:52 art Exp $ */
+/* $OpenBSD: com.c,v 1.74 2001/09/30 15:20:59 art Exp $ */
/* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */
/*
@@ -108,6 +108,7 @@ static u_char tiocm_xxx2mcr __P((int));
void compwroff __P((struct com_softc *));
void com_raisedtr __P((void *));
+void com_enable_debugport __P((struct com_softc *));
struct cfdriver com_cd = {
NULL, "com", DV_TTY
@@ -128,7 +129,6 @@ int commajor;
static int com_kgdb_addr;
static bus_space_tag_t com_kgdb_iot;
static bus_space_handle_t com_kgdb_ioh;
-static int com_kgdb_attached;
int com_kgdb_getc __P((void *));
void com_kgdb_putc __P((void *, int));
@@ -337,8 +337,6 @@ com_attach_subr(sc)
!ISSET(sc->sc_hwflags, COM_HW_CONSOLE)) {
printf("%s: kgdb\n", sc->sc_dev.dv_xname);
SET(sc->sc_hwflags, COM_HW_KGDB);
- com_enable_debugport(sc);
- com_kgdb_attached = 1;
}
#endif /* KGDB */
@@ -373,9 +371,10 @@ com_attach_subr(sc)
if (!sc->enable)
sc->enabled = 1;
+ if (ISSET(sc->sc_hwflags, COM_HW_CONSOLE|COM_HW_KGDB))
+ com_enable_debugport(sc);
}
-#ifdef KGDB
void
com_enable_debugport(sc)
struct com_softc *sc;
@@ -391,7 +390,6 @@ com_enable_debugport(sc)
splx(s);
}
-#endif /* KGDB */
int
com_detach(self, flags)
diff --git a/sys/dev/ic/comvar.h b/sys/dev/ic/comvar.h
index dd96c6c9d2f..5dd663e614d 100644
--- a/sys/dev/ic/comvar.h
+++ b/sys/dev/ic/comvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: comvar.h,v 1.28 2001/09/30 01:19:58 art Exp $ */
+/* $OpenBSD: comvar.h,v 1.29 2001/09/30 15:20:59 art Exp $ */
/* $NetBSD: comvar.h,v 1.5 1996/05/05 19:50:47 christos Exp $ */
/*
@@ -162,10 +162,6 @@ void comcnpollc __P((dev_t, int));
int com_common_getc __P((bus_space_tag_t, bus_space_handle_t));
void com_common_putc __P((bus_space_tag_t, bus_space_handle_t, int));
-#if defined(DDB) || defined(KGDB)
-void com_enable_debugport __P((struct com_softc *));
-#endif
-
#ifdef KGDB
int com_kgdb_attach __P((bus_space_tag_t, int, int, int, tcflag_t));
int kgdbintr __P((void *));