CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Wed Mar  5 05:56:04 UTC 2014

Modified Files:
        src/sys/dev/pci: puccn.c puccn.h

Log Message:
No functional change:
 - Rename function for consistency.
 - Add prototypes.
 - KNF.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/puccn.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/puccn.h

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/puccn.c
diff -u src/sys/dev/pci/puccn.c:1.13 src/sys/dev/pci/puccn.c:1.14
--- src/sys/dev/pci/puccn.c:1.13	Sun Jan 26 10:54:24 2014
+++ src/sys/dev/pci/puccn.c	Wed Mar  5 05:56:04 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: puccn.c,v 1.13 2014/01/26 10:54:24 msaitoh Exp $ */
+/*	$NetBSD: puccn.c,v 1.14 2014/03/05 05:56:04 msaitoh Exp $ */
 
 /*
  * Derived from  pci.c
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puccn.c,v 1.13 2014/01/26 10:54:24 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puccn.c,v 1.14 2014/03/05 05:56:04 msaitoh Exp $");
 
 #include "opt_kgdb.h"
 
@@ -122,11 +122,13 @@ pucprobe_doit(struct consdev *cn)
 resume_scan:
 		for (; func < nfunctions; func++)  {
 			pa.pa_tag = pci_make_tag(pa.pa_pc, bus, dev, func);
-			reg = pci_conf_read(pa.pa_pc, pa.pa_tag, PCI_CLASS_REG);
+			reg = pci_conf_read(pa.pa_pc, pa.pa_tag,
+			    PCI_CLASS_REG);
 			if (PCI_CLASS(reg)  == PCI_CLASS_COMMUNICATIONS
 			    && PCI_SUBCLASS(reg)
 			       == PCI_SUBCLASS_COMMUNICATIONS_SERIAL) {
-				pa.pa_id = pci_conf_read(pa.pa_pc, pa.pa_tag, PCI_ID_REG);
+				pa.pa_id = pci_conf_read(pa.pa_pc, pa.pa_tag,
+				    PCI_ID_REG);
 				subsys = pci_conf_read(pa.pa_pc, pa.pa_tag,
 				    PCI_SUBSYS_ID_REG);
 				foundport = 1;
@@ -164,8 +166,7 @@ resume_scan:
 	 * We found a device and it's on the puc table. Set the tag and
 	 * the base address.
 	 */
-	for (i = 0; PUC_PORT_VALID(desc, i); i++)
-	{
+	for (i = 0; PUC_PORT_VALID(desc, i); i++) {
 		if (desc->ports[i].type != PUC_PORT_TYPE_COM)
 			continue;
 		puccnflags = desc->ports[i].flags;
@@ -204,18 +205,15 @@ resume_scan:
 }
 
 #ifdef KGDB
-void comgdbprobe(struct consdev *);
-void comgdbinit(struct consdev *);
-
 void
-comgdbprobe(struct consdev *cn)
+puc_gdbprobe(struct consdev *cn)
 {
 
 	pucgdbbase = pucprobe_doit(cn);
 }
 
 void
-comgdbinit(struct consdev *cn)
+puc_gdbinit(struct consdev *cn)
 {
 
 	if (pucgdbbase == 0)

Index: src/sys/dev/pci/puccn.h
diff -u src/sys/dev/pci/puccn.h:1.6 src/sys/dev/pci/puccn.h:1.7
--- src/sys/dev/pci/puccn.h:1.6	Sun Jan 26 10:54:24 2014
+++ src/sys/dev/pci/puccn.h	Wed Mar  5 05:56:04 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: puccn.h,v 1.6 2014/01/26 10:54:24 msaitoh Exp $ */
+/*	$NetBSD: puccn.h,v 1.7 2014/03/05 05:56:04 msaitoh Exp $ */
 
 /*
  * Derived from  pci.c
@@ -48,3 +48,5 @@
 void puc_cnprobe(struct consdev *);
 int puc_cninit(struct consdev *);
 int cpu_puc_cnprobe(struct consdev *, struct pci_attach_args *);
+void puc_gdbprobe(struct consdev *);
+void puc_gdbinit(struct consdev *);