CVS commit: [thorpej-cfargs] src/sys/dev/pci
Module Name:src
Committed By: thorpej
Date: Sat Apr 3 01:52:16 UTC 2021
Modified Files:
src/sys/dev/pci [thorpej-cfargs]: ismt.c
Log Message:
ismt_config_interrupts(): remove a now-unused variable.
To generate a diff of this commit:
cvs rdiff -u -r1.7.10.1 -r1.7.10.2 src/sys/dev/pci/ismt.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/ismt.c
diff -u src/sys/dev/pci/ismt.c:1.7.10.1 src/sys/dev/pci/ismt.c:1.7.10.2
--- src/sys/dev/pci/ismt.c:1.7.10.1 Wed Mar 24 14:21:08 2021
+++ src/sys/dev/pci/ismt.c Sat Apr 3 01:52:16 2021
@@ -60,7 +60,7 @@
#if 0
__FBSDID("$FreeBSD: head/sys/dev/ismt/ismt.c 266474 2014-05-20 19:55:06Z jimharris $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: ismt.c,v 1.7.10.1 2021/03/24 14:21:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ismt.c,v 1.7.10.2 2021/04/03 01:52:16 thorpej Exp $");
#include
#include
@@ -810,7 +810,6 @@ ismt_rescan(device_t self, const char *i
static void
ismt_config_interrupts(device_t self)
{
- int flags = 0;
ismt_rescan(self, NULL, NULL);
}
CVS commit: [thorpej-cfargs] src/sys/dev/pci
Module Name:src Committed By: thorpej Date: Sat Apr 3 01:52:16 UTC 2021 Modified Files: src/sys/dev/pci [thorpej-cfargs]: ismt.c Log Message: ismt_config_interrupts(): remove a now-unused variable. To generate a diff of this commit: cvs rdiff -u -r1.7.10.1 -r1.7.10.2 src/sys/dev/pci/ismt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [thorpej-cfargs] src/sys/dev/pci
Module Name:src Committed By: thorpej Date: Wed Mar 31 01:44:59 UTC 2021 Modified Files: src/sys/dev/pci [thorpej-cfargs]: voodoofb.c Log Message: There are two interface attriubtues on this device, so we need to be explcit about it in BOTH config_found() calls. To generate a diff of this commit: cvs rdiff -u -r1.53.10.1 -r1.53.10.2 src/sys/dev/pci/voodoofb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [thorpej-cfargs] src/sys/dev/pci
Module Name:src Committed By: thorpej Date: Wed Mar 31 01:44:59 UTC 2021 Modified Files: src/sys/dev/pci [thorpej-cfargs]: voodoofb.c Log Message: There are two interface attriubtues on this device, so we need to be explcit about it in BOTH config_found() calls. To generate a diff of this commit: cvs rdiff -u -r1.53.10.1 -r1.53.10.2 src/sys/dev/pci/voodoofb.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/voodoofb.c diff -u src/sys/dev/pci/voodoofb.c:1.53.10.1 src/sys/dev/pci/voodoofb.c:1.53.10.2 --- src/sys/dev/pci/voodoofb.c:1.53.10.1 Sun Mar 21 21:09:14 2021 +++ src/sys/dev/pci/voodoofb.c Wed Mar 31 01:44:59 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: voodoofb.c,v 1.53.10.1 2021/03/21 21:09:14 thorpej Exp $ */ +/* $NetBSD: voodoofb.c,v 1.53.10.2 2021/03/31 01:44:59 thorpej Exp $ */ /* * Copyright (c) 2005, 2006, 2012 Michael Lorenz @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.53.10.1 2021/03/21 21:09:14 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.53.10.2 2021/03/31 01:44:59 thorpej Exp $"); #include #include @@ -546,8 +546,12 @@ voodoofb_attach(device_t parent, device_ aa.accessops = _accessops; aa.accesscookie = >vd; - config_found(self, , wsemuldisplaydevprint, CFARG_EOL); - config_found_ia(self, "drm", aux, voodoofb_drm_print); + config_found(self, , wsemuldisplaydevprint, + CFARG_IATTR, "wsemuldisplaydev", + CFARG_EOL); + config_found(self, aux, voodoofb_drm_print, + CFARG_IATTR, "drm", + CFARG_EOL); } static int
CVS commit: [thorpej-cfargs] src/sys/dev/pci
Module Name:src
Committed By: thorpej
Date: Sun Mar 28 20:41:04 UTC 2021
Modified Files:
src/sys/dev/pci [thorpej-cfargs]: mfii.c mpii.c
Log Message:
No need to pass interface attribute or locators to config_found().
To generate a diff of this commit:
cvs rdiff -u -r1.7.4.2 -r1.7.4.3 src/sys/dev/pci/mfii.c
cvs rdiff -u -r1.27.2.2 -r1.27.2.3 src/sys/dev/pci/mpii.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/mfii.c
diff -u src/sys/dev/pci/mfii.c:1.7.4.2 src/sys/dev/pci/mfii.c:1.7.4.3
--- src/sys/dev/pci/mfii.c:1.7.4.2 Mon Mar 22 16:23:45 2021
+++ src/sys/dev/pci/mfii.c Sun Mar 28 20:41:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mfii.c,v 1.7.4.2 2021/03/22 16:23:45 thorpej Exp $ */
+/* $NetBSD: mfii.c,v 1.7.4.3 2021/03/28 20:41:04 thorpej Exp $ */
/* $OpenBSD: mfii.c,v 1.58 2018/08/14 05:22:21 jmatthew Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.7.4.2 2021/03/22 16:23:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.7.4.3 2021/03/28 20:41:04 thorpej Exp $");
#include "bio.h"
@@ -988,13 +988,11 @@ static int
mfii_rescan(device_t self, const char *ifattr, const int *locators)
{
struct mfii_softc *sc = device_private(self);
+
if (sc->sc_child != NULL)
return 0;
- sc->sc_child = config_found(self, >sc_chan, scsiprint,
- CFARG_IATTR, ifattr,
- CFARG_LOCATORS, locators,
- CFARG_EOL);
+ sc->sc_child = config_found(self, >sc_chan, scsiprint, CFARG_EOL);
return 0;
}
Index: src/sys/dev/pci/mpii.c
diff -u src/sys/dev/pci/mpii.c:1.27.2.2 src/sys/dev/pci/mpii.c:1.27.2.3
--- src/sys/dev/pci/mpii.c:1.27.2.2 Mon Mar 22 16:23:45 2021
+++ src/sys/dev/pci/mpii.c Sun Mar 28 20:41:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mpii.c,v 1.27.2.2 2021/03/22 16:23:45 thorpej Exp $ */
+/* $NetBSD: mpii.c,v 1.27.2.3 2021/03/28 20:41:04 thorpej Exp $ */
/* $OpenBSD: mpii.c,v 1.115 2018/08/14 05:22:21 jmatthew Exp $ */
/*
* Copyright (c) 2010, 2012 Mike Belopuhov
@@ -20,7 +20,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.27.2.2 2021/03/22 16:23:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.27.2.3 2021/03/28 20:41:04 thorpej Exp $");
#include "bio.h"
@@ -726,10 +726,7 @@ mpii_rescan(device_t self, const char *i
if (sc->sc_child != NULL)
return 0;
- sc->sc_child = config_found(self, >sc_chan, scsiprint,
- CFARG_IATTR, ifattr,
- CFARG_LOCATORS, locators,
- CFARG_EOL);
+ sc->sc_child = config_found(self, >sc_chan, scsiprint, CFARG_EOL);
return 0;
}
CVS commit: [thorpej-cfargs] src/sys/dev/pci
Module Name:src Committed By: thorpej Date: Sun Mar 28 20:41:04 UTC 2021 Modified Files: src/sys/dev/pci [thorpej-cfargs]: mfii.c mpii.c Log Message: No need to pass interface attribute or locators to config_found(). To generate a diff of this commit: cvs rdiff -u -r1.7.4.2 -r1.7.4.3 src/sys/dev/pci/mfii.c cvs rdiff -u -r1.27.2.2 -r1.27.2.3 src/sys/dev/pci/mpii.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [thorpej-cfargs] src/sys/dev/pci
Module Name:src Committed By: thorpej Date: Sun Mar 28 20:38:04 UTC 2021 Modified Files: src/sys/dev/pci [thorpej-cfargs]: mlx_pci.c twe.c Log Message: Correct the names of the arguments passed to the rescan function. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.27.14.1 src/sys/dev/pci/mlx_pci.c cvs rdiff -u -r1.108.10.2 -r1.108.10.3 src/sys/dev/pci/twe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [thorpej-cfargs] src/sys/dev/pci
Module Name:src
Committed By: thorpej
Date: Sun Mar 28 20:38:04 UTC 2021
Modified Files:
src/sys/dev/pci [thorpej-cfargs]: mlx_pci.c twe.c
Log Message:
Correct the names of the arguments passed to the rescan function.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.14.1 src/sys/dev/pci/mlx_pci.c
cvs rdiff -u -r1.108.10.2 -r1.108.10.3 src/sys/dev/pci/twe.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/mlx_pci.c
diff -u src/sys/dev/pci/mlx_pci.c:1.27 src/sys/dev/pci/mlx_pci.c:1.27.14.1
--- src/sys/dev/pci/mlx_pci.c:1.27 Sun Dec 9 11:14:02 2018
+++ src/sys/dev/pci/mlx_pci.c Sun Mar 28 20:38:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mlx_pci.c,v 1.27 2018/12/09 11:14:02 jdolecek Exp $ */
+/* $NetBSD: mlx_pci.c,v 1.27.14.1 2021/03/28 20:38:04 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mlx_pci.c,v 1.27 2018/12/09 11:14:02 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx_pci.c,v 1.27.14.1 2021/03/28 20:38:04 thorpej Exp $");
#include
#include
@@ -145,7 +145,7 @@ static struct mlx_pci_ident {
};
static int
-mlx_pci_rescan(device_t self, const char *attr, const int *flag)
+mlx_pci_rescan(device_t self, const char *ifattr, const int *locs)
{
return mlx_configure(device_private(self), 1);
Index: src/sys/dev/pci/twe.c
diff -u src/sys/dev/pci/twe.c:1.108.10.2 src/sys/dev/pci/twe.c:1.108.10.3
--- src/sys/dev/pci/twe.c:1.108.10.2 Mon Mar 22 16:23:46 2021
+++ src/sys/dev/pci/twe.c Sun Mar 28 20:38:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: twe.c,v 1.108.10.2 2021/03/22 16:23:46 thorpej Exp $ */
+/* $NetBSD: twe.c,v 1.108.10.3 2021/03/28 20:38:04 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.108.10.2 2021/03/22 16:23:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.108.10.3 2021/03/28 20:38:04 thorpej Exp $");
#include
#include
@@ -451,7 +451,7 @@ twe_attach(device_t parent, device_t sel
twe_describe_controller(sc);
/* Find and attach RAID array units. */
- twe_rescan(self, "twe", 0);
+ twe_rescan(self, NULL, NULL);
/* ...and finally, enable interrupts. */
twe_outl(sc, TWE_REG_CTL, TWE_CTL_CLEAR_ATTN_INTR |
@@ -482,7 +482,7 @@ twe_attach(device_t parent, device_t sel
}
static int
-twe_rescan(device_t self, const char *attr, const int *flags)
+twe_rescan(device_t self, const char *ifattr, const int *locs)
{
struct twe_softc *sc;
int i;
CVS commit: [thorpej-cfargs] src/sys/dev/pci
Module Name:src
Committed By: thorpej
Date: Sun Mar 28 20:36:40 UTC 2021
Modified Files:
src/sys/dev/pci [thorpej-cfargs]: amr.c
Log Message:
Correct the names of the arguments passed to the rescan function.
To generate a diff of this commit:
cvs rdiff -u -r1.65.10.2 -r1.65.10.3 src/sys/dev/pci/amr.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/amr.c
diff -u src/sys/dev/pci/amr.c:1.65.10.2 src/sys/dev/pci/amr.c:1.65.10.3
--- src/sys/dev/pci/amr.c:1.65.10.2 Mon Mar 22 16:23:45 2021
+++ src/sys/dev/pci/amr.c Sun Mar 28 20:36:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amr.c,v 1.65.10.2 2021/03/22 16:23:45 thorpej Exp $ */
+/* $NetBSD: amr.c,v 1.65.10.3 2021/03/28 20:36:40 thorpej Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.65.10.2 2021/03/22 16:23:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.65.10.3 2021/03/28 20:36:40 thorpej Exp $");
#include
#include
@@ -511,7 +511,7 @@ amr_attach(device_t parent, device_t sel
}
static int
-amr_rescan(device_t self, const char *attr, const int *flags)
+amr_rescan(device_t self, const char *ifattr, const int *ulocs)
{
int j;
int locs[AMRCF_NLOCS];
@@ -531,7 +531,7 @@ amr_rescan(device_t self, const char *at
amr->amr_drive[j].al_dv =
config_found(amr->amr_dv, , amr_print,
CFARG_SUBMATCH, config_stdsubmatch,
- CFARG_IATTR, attr,
+ CFARG_IATTR, ifattr,
CFARG_LOCATORS, locs,
CFARG_EOL);
}
CVS commit: [thorpej-cfargs] src/sys/dev/pci
Module Name:src Committed By: thorpej Date: Sun Mar 28 20:36:40 UTC 2021 Modified Files: src/sys/dev/pci [thorpej-cfargs]: amr.c Log Message: Correct the names of the arguments passed to the rescan function. To generate a diff of this commit: cvs rdiff -u -r1.65.10.2 -r1.65.10.3 src/sys/dev/pci/amr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [thorpej-cfargs] src/sys/dev/pci
Module Name:src Committed By: thorpej Date: Sun Mar 28 20:36:16 UTC 2021 Modified Files: src/sys/dev/pci [thorpej-cfargs]: aac_pci.c Log Message: Correct the names of the arguments passed to the rescan function. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.40.14.1 src/sys/dev/pci/aac_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [thorpej-cfargs] src/sys/dev/pci
Module Name:src
Committed By: thorpej
Date: Sun Mar 28 20:36:16 UTC 2021
Modified Files:
src/sys/dev/pci [thorpej-cfargs]: aac_pci.c
Log Message:
Correct the names of the arguments passed to the rescan function.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.40.14.1 src/sys/dev/pci/aac_pci.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/aac_pci.c
diff -u src/sys/dev/pci/aac_pci.c:1.40 src/sys/dev/pci/aac_pci.c:1.40.14.1
--- src/sys/dev/pci/aac_pci.c:1.40 Sun Dec 9 11:14:01 2018
+++ src/sys/dev/pci/aac_pci.c Sun Mar 28 20:36:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: aac_pci.c,v 1.40 2018/12/09 11:14:01 jdolecek Exp $ */
+/* $NetBSD: aac_pci.c,v 1.40.14.1 2021/03/28 20:36:16 thorpej Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.40 2018/12/09 11:14:01 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.40.14.1 2021/03/28 20:36:16 thorpej Exp $");
#include
#include
@@ -617,7 +617,7 @@ aac_pci_attach(device_t parent, device_t
/* ARGSUSED */
static int
-aac_pci_rescan(device_t self, const char *attr, const int *flags)
+aac_pci_rescan(device_t self, const char *ifattr, const int *locs)
{
return aac_devscan(device_private(self));
CVS commit: [thorpej-cfargs] src/sys/dev/pci
Module Name:src Committed By: thorpej Date: Mon Mar 22 16:47:13 UTC 2021 Modified Files: src/sys/dev/pci [thorpej-cfargs]: twa.c Log Message: Fix missing comma. To generate a diff of this commit: cvs rdiff -u -r1.58.10.2 -r1.58.10.3 src/sys/dev/pci/twa.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/twa.c diff -u src/sys/dev/pci/twa.c:1.58.10.2 src/sys/dev/pci/twa.c:1.58.10.3 --- src/sys/dev/pci/twa.c:1.58.10.2 Mon Mar 22 16:23:45 2021 +++ src/sys/dev/pci/twa.c Mon Mar 22 16:47:13 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: twa.c,v 1.58.10.2 2021/03/22 16:23:45 thorpej Exp $ */ +/* $NetBSD: twa.c,v 1.58.10.3 2021/03/22 16:47:13 thorpej Exp $ */ /* $wasabi: twa.c,v 1.27 2006/07/28 18:17:21 wrstuden Exp $ */ /*- @@ -67,7 +67,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.58.10.2 2021/03/22 16:23:45 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.58.10.3 2021/03/22 16:47:13 thorpej Exp $"); //#define TWA_DEBUG @@ -1010,7 +1010,7 @@ twa_request_bus_scan(device_t self, cons sc->sc_units[unit].td_dev = config_found(sc->twa_dv, , twa_print, -CFARG_SUBMATCH, config_stdsubmatch +CFARG_SUBMATCH, config_stdsubmatch, CFARG_IATTR, attr, CFARG_LOCATORS, locs, CFARG_EOL);
CVS commit: [thorpej-cfargs] src/sys/dev/pci
Module Name:src Committed By: thorpej Date: Mon Mar 22 16:47:13 UTC 2021 Modified Files: src/sys/dev/pci [thorpej-cfargs]: twa.c Log Message: Fix missing comma. To generate a diff of this commit: cvs rdiff -u -r1.58.10.2 -r1.58.10.3 src/sys/dev/pci/twa.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
