CVS commit: src/sys/dev/gpio

[Masao Uebayashi]

Module Name:    src
Committed By:   uebayasi
Date:           Thu Aug 20 12:09:22 UTC 2015

Modified Files:
        src/sys/dev/gpio: files.gpio gpiosim.c

Log Message:
Use needs-count for # of pseudo instances; suggested by cube@.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/gpio/files.gpio
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/gpio/gpiosim.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/gpio/files.gpio
diff -u src/sys/dev/gpio/files.gpio:1.12 src/sys/dev/gpio/files.gpio:1.13
--- src/sys/dev/gpio/files.gpio:1.12	Sat May 30 15:35:51 2015
+++ src/sys/dev/gpio/files.gpio	Thu Aug 20 12:09:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.gpio,v 1.12 2015/05/30 15:35:51 jmcneill Exp $
+# $NetBSD: files.gpio,v 1.13 2015/08/20 12:09:22 uebayasi Exp $
 
 define	gpio {[offset = -1], [mask = 0], [flag = 0]}
 
@@ -8,7 +8,7 @@ file	dev/gpio/gpio.c				gpio	needs-flag
 
 # GPIO simulator
 defpseudodev	gpiosim: gpiobus
-file	dev/gpio/gpiosim.c			gpiosim
+file	dev/gpio/gpiosim.c			gpiosim	needs-count
 
 # I2C bus bit-banging
 device	gpioiic: i2cbus, i2c_bitbang

Index: src/sys/dev/gpio/gpiosim.c
diff -u src/sys/dev/gpio/gpiosim.c:1.16 src/sys/dev/gpio/gpiosim.c:1.17
--- src/sys/dev/gpio/gpiosim.c:1.16	Tue Feb 25 18:30:09 2014
+++ src/sys/dev/gpio/gpiosim.c	Thu Aug 20 12:09:22 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: gpiosim.c,v 1.16 2014/02/25 18:30:09 pooka Exp $ */
+/* $NetBSD: gpiosim.c,v 1.17 2015/08/20 12:09:22 uebayasi Exp $ */
 /*      $OpenBSD: gpiosim.c,v 1.1 2008/11/23 18:46:49 mbalmer Exp $	*/
 
 /*
@@ -30,6 +30,8 @@
 #include <sys/ioccom.h>
 #include <dev/gpio/gpiovar.h>
 
+#include "gpiosim.h"
+
 #define	GPIOSIM_NPINS	64
 
 struct gpiosim_softc {
@@ -64,7 +66,7 @@ gpiosim_match(device_t parent, cfdata_t 
 }
 
 void
-gpiosimattach(int num)
+gpiosimattach(int num __unused)
 {
 	cfdata_t cf;
 	int n, err;
@@ -73,7 +75,7 @@ gpiosimattach(int num)
 	if (err)
 		printf("%s: unable to register cfattach\n", gpiosim_cd.cd_name);
 
-	for (n = 0; n < num; n++) {
+	for (n = 0; n < NGPIOSIM; n++) {
 		cf = malloc(sizeof(*cf), M_DEVBUF, M_WAITOK);
 		cf->cf_name = "gpiosim";
 		cf->cf_atname = "gpiosim";