Module Name: src
Committed By: msaitoh
Date: Fri Dec 7 09:36:26 UTC 2018
Modified Files:
src/sys/dev/pci: files.pci ppb.c
Log Message:
- defflag PPB_USEINTR
- Print "interrupting at "
To generate a diff of this commit:
cvs rdiff -u -r1.410 -r1.411 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/pci/ppb.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/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.410 src/sys/dev/pci/files.pci:1.411
--- src/sys/dev/pci/files.pci:1.410 Sat Nov 24 18:23:29 2018
+++ src/sys/dev/pci/files.pci Fri Dec 7 09:36:26 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.410 2018/11/24 18:23:29 bouyer Exp $
+# $NetBSD: files.pci,v 1.411 2018/12/07 09:36:26 msaitoh Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -378,6 +378,7 @@ file dev/pci/toshide.c toshide
device ppb: pcibus
attach ppb at pci
file dev/pci/ppb.c ppb
+defflag opt_ppb.h PPB_USEINTR
# Cyclades Cyclom-8/16/32
attach cy at pci with cy_pci
Index: src/sys/dev/pci/ppb.c
diff -u src/sys/dev/pci/ppb.c:1.63 src/sys/dev/pci/ppb.c:1.64
--- src/sys/dev/pci/ppb.c:1.63 Wed May 10 03:24:31 2017
+++ src/sys/dev/pci/ppb.c Fri Dec 7 09:36:26 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ppb.c,v 1.63 2017/05/10 03:24:31 msaitoh Exp $ */
+/* $NetBSD: ppb.c,v 1.64 2018/12/07 09:36:26 msaitoh Exp $ */
/*
* Copyright (c) 1996, 1998 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.63 2017/05/10 03:24:31 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.64 2018/12/07 09:36:26 msaitoh Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_ppb.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
@@ -276,7 +280,7 @@ ppbattach(device_t parent, device_t self
intrstr = pci_intr_string(pc, sc->sc_pihp[0], intrbuf,
sizeof(intrbuf));
- aprint_normal_dev(self, "%s\n", intrstr);
+ aprint_normal_dev(self, "interrupting at %s\n", intrstr);
/* Clear any pending events */
slcsr = pci_conf_read(pc, pa->pa_tag,
