diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1997-04-16 11:56:40 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1997-04-16 11:56:40 +0000 |
| commit | ab08be91e5dc66cfc42b85763d4caf94e2fd3d09 (patch) | |
| tree | 89caace66e8787764cc54b781a8cbfd881b69458 /sys/arch/hp300/dev/dio.c | |
| parent | 75113d46e0ad67778c0741a5bfc96d9d686f7eec (diff) | |
Merge portions of NetBSD up to 970415.
This includes:
* All of the prototyping and KNF changes.
* The new interrupt system.
* Portions of the Domain Keyboard support from Mike Smith.
This does not include:
* m68k changes, namely generic dumps.
Various sundry changes and fixes by me.
Diffstat (limited to 'sys/arch/hp300/dev/dio.c')
| -rw-r--r-- | sys/arch/hp300/dev/dio.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/arch/hp300/dev/dio.c b/sys/arch/hp300/dev/dio.c index 4f6e3bcdc32..deb17145f54 100644 --- a/sys/arch/hp300/dev/dio.c +++ b/sys/arch/hp300/dev/dio.c @@ -1,5 +1,5 @@ -/* $OpenBSD: dio.c,v 1.3 1997/02/03 04:47:17 downsj Exp $ */ -/* $NetBSD: dio.c,v 1.3 1997/01/30 09:18:37 thorpej Exp $ */ +/* $OpenBSD: dio.c,v 1.4 1997/04/16 11:55:59 downsj Exp $ */ +/* $NetBSD: dio.c,v 1.5 1997/04/04 09:53:43 thorpej Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -123,7 +123,8 @@ dioattach(parent, self, aux) else { va = iomap(pa, NBPG); if (va == NULL) { - printf("%s: can't map scode %d\n", scode); + printf("%s: can't map scode %d\n", + self->dv_xname, scode); scode++; continue; } @@ -262,7 +263,9 @@ dio_devinfo(da, buf, buflen) char *buf; size_t buflen; { +#ifdef DIOVERBOSE int i; +#endif bzero(buf, buflen); |