diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2005-11-11 15:22:01 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2005-11-11 15:22:01 +0000 |
| commit | 3679e89c696b4eec001c44f0df43f10b2db944f7 (patch) | |
| tree | e6e9bbd0650b1b85714979d530ab94bab48b4ca7 | |
| parent | c48f07e8ed20b308d2d9379e81ed1bbefae7b619 (diff) | |
fix kgdb compilation; input and ok miod@.
| -rw-r--r-- | sys/arch/sparc/dev/z8530tty.c | 4 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/zs_kgdb.c | 7 | ||||
| -rw-r--r-- | sys/dev/ic/com.c | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/sys/arch/sparc/dev/z8530tty.c b/sys/arch/sparc/dev/z8530tty.c index d3ef26a3329..2403cba6830 100644 --- a/sys/arch/sparc/dev/z8530tty.c +++ b/sys/arch/sparc/dev/z8530tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: z8530tty.c,v 1.4 2003/10/03 16:44:50 miod Exp $ */ +/* $OpenBSD: z8530tty.c,v 1.5 2005/11/11 15:21:59 fgsch Exp $ */ /* $NetBSD: z8530tty.c,v 1.13 1996/10/16 20:42:14 gwr Exp $ */ /*- @@ -114,7 +114,7 @@ #include <dev/cons.h> #ifdef KGDB -extern int zs_check_kgdb(); +extern int zs_check_kgdb(struct zs_chanstate *, int); #endif /* diff --git a/sys/arch/sparc/dev/zs_kgdb.c b/sys/arch/sparc/dev/zs_kgdb.c index 337a2dea174..e520b9e22ab 100644 --- a/sys/arch/sparc/dev/zs_kgdb.c +++ b/sys/arch/sparc/dev/zs_kgdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zs_kgdb.c,v 1.1 2002/08/12 10:44:04 miod Exp $ */ +/* $OpenBSD: zs_kgdb.c,v 1.2 2005/11/11 15:21:59 fgsch Exp $ */ /* $NetBSD: zs_kgdb.c,v 1.1 1997/10/18 00:00:51 gwr Exp $ */ /*- @@ -219,7 +219,7 @@ zskgdb(cs) void zs_kgdb_rxint(struct zs_chanstate *); void zs_kgdb_txint(struct zs_chanstate *); -void zs_kgdb_stint(struct zs_chanstate *); +void zs_kgdb_stint(struct zs_chanstate *, int); void zs_kgdb_softint(struct zs_chanstate *); int kgdb_input_lost; @@ -260,8 +260,9 @@ zs_kgdb_txint(cs) } void -zs_kgdb_stint(cs) +zs_kgdb_stint(cs, force) register struct zs_chanstate *cs; + int force; { register int rr0; diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c index 36599ede3cf..2afb17b734a 100644 --- a/sys/dev/ic/com.c +++ b/sys/dev/ic/com.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com.c,v 1.106 2005/09/26 22:32:06 miod Exp $ */ +/* $OpenBSD: com.c,v 1.107 2005/11/11 15:22:00 fgsch Exp $ */ /* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */ /* @@ -1488,9 +1488,11 @@ com_kgdb_attach(iot, iobase, rate, frequency, cflag) int rate, frequency; tcflag_t cflag; { +#ifdef COM_CONSOLE if (iot == comconsiot && iobase == comconsaddr) { return (EBUSY); /* cannot share with console */ } +#endif com_kgdb_iot = iot; com_kgdb_addr = iobase; |