CVS commit: src/sys/arch/x68k/dev

[Tetsuya Isaki]

Module Name:    src
Committed By:   isaki
Date:           Sat Jan  9 09:16:33 UTC 2010

Modified Files:
        src/sys/arch/x68k/dev: grf.c par.c

Log Message:
Make compile with DEBUG.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/x68k/dev/grf.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/x68k/dev/par.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/x68k/dev/grf.c
diff -u src/sys/arch/x68k/dev/grf.c:1.38 src/sys/arch/x68k/dev/grf.c:1.39
--- src/sys/arch/x68k/dev/grf.c:1.38	Sun Jan 18 02:40:05 2009
+++ src/sys/arch/x68k/dev/grf.c	Sat Jan  9 09:16:32 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf.c,v 1.38 2009/01/18 02:40:05 isaki Exp $	*/
+/*	$NetBSD: grf.c,v 1.39 2010/01/09 09:16:32 isaki Exp $	*/
 
 /*
  * Copyright (c) 1990, 1993
@@ -83,7 +83,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.38 2009/01/18 02:40:05 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.39 2010/01/09 09:16:32 isaki Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -329,8 +329,10 @@
 	vsize_t size;
 
 #ifdef DEBUG
-	if (grfdebug & GDB_MMAP)
-		printf("grfunmap(%d): dev %x addr %p\n", p->p_pid, dev, addr);
+	if (grfdebug & GDB_MMAP) {
+		printf("grfunmap(%d): dev %x addr %p\n",
+			p->p_pid, GRFUNIT(dev), addr);
+	}
 #endif
 	if (addr == 0)
 		return EINVAL;		/* XXX: how do we deal with this? */

Index: src/sys/arch/x68k/dev/par.c
diff -u src/sys/arch/x68k/dev/par.c:1.37 src/sys/arch/x68k/dev/par.c:1.38
--- src/sys/arch/x68k/dev/par.c:1.37	Wed Jun 25 08:14:59 2008
+++ src/sys/arch/x68k/dev/par.c	Sat Jan  9 09:16:32 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: par.c,v 1.37 2008/06/25 08:14:59 isaki Exp $	*/
+/*	$NetBSD: par.c,v 1.38 2010/01/09 09:16:32 isaki Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: par.c,v 1.37 2008/06/25 08:14:59 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: par.c,v 1.38 2010/01/09 09:16:32 isaki Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
@@ -266,7 +266,7 @@
 	
 #ifdef DEBUG
 	if (pardebug & PDB_FOLLOW)
-		printf("parwrite(%x, %p)\n", dev, uio);
+		printf("parwrite(%x, %p)\n", UNIT(dev), uio);
 #endif
 	return (parrw(dev, uio));
 }