Module Name: src
Committed By: riz
Date: Sun Oct 13 06:55:35 UTC 2013
Modified Files:
src/sys/arch/arm/xscale: pxa2x0_pcic.c
src/sys/arch/dreamcast/dev/maple: maple.c
src/sys/arch/emips/ebus: ace_ebus.c flash_ebus.c
src/sys/arch/epoc32/dev: etna.c
src/sys/arch/hpcsh/dev/hd64461: hd64461pcmcia.c
src/sys/arch/i386/pnpbios: pnpbios.c
src/sys/arch/xen/xen: xbd_xenbus.c xpci_xenbus.c
src/sys/arch/xen/xenbus: xenbus_probe.c
src/sys/dev/ic: i82365.c
Log Message:
Catch up to recent changes in config_pending_{incr,decr}().
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/xscale/pxa2x0_pcic.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/dreamcast/dev/maple/maple.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/emips/ebus/ace_ebus.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/emips/ebus/flash_ebus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/epoc32/dev/etna.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/i386/pnpbios/pnpbios.c
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/xen/xen/xbd_xenbus.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/xen/xen/xpci_xenbus.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/xen/xenbus/xenbus_probe.c
cvs rdiff -u -r1.115 -r1.116 src/sys/dev/ic/i82365.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/arm/xscale/pxa2x0_pcic.c
diff -u src/sys/arch/arm/xscale/pxa2x0_pcic.c:1.11 src/sys/arch/arm/xscale/pxa2x0_pcic.c:1.12
--- src/sys/arch/arm/xscale/pxa2x0_pcic.c:1.11 Sat Oct 27 17:17:42 2012
+++ src/sys/arch/arm/xscale/pxa2x0_pcic.c Sun Oct 13 06:55:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_pcic.c,v 1.11 2012/10/27 17:17:42 chs Exp $ */
+/* $NetBSD: pxa2x0_pcic.c,v 1.12 2013/10/13 06:55:34 riz Exp $ */
/* $OpenBSD: pxa2x0_pcic.c,v 1.17 2005/12/14 15:08:51 uwe Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_pcic.c,v 1.11 2012/10/27 17:17:42 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_pcic.c,v 1.12 2013/10/13 06:55:34 riz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -417,7 +417,7 @@ pxapcic_doattach(device_t self)
for (i = 0; i < sc->sc_nslots; i++) {
sock = &sc->sc_socket[s[i]];
- config_pending_incr();
+ config_pending_incr(self);
/* If there's a card there, attach it. */
cs = (*sock->pcictag->read)(sock, PXAPCIC_CARD_STATUS);
@@ -455,7 +455,7 @@ pxapcic_event_thread(void *arg)
u_int cs;
int present;
- config_pending_decr();
+ config_pending_decr(sock->sc->sc_dev);
while (sock->sc->sc_shutdown == 0) {
(void) tsleep(sock, PWAIT, "pxapcicev", 0);
Index: src/sys/arch/dreamcast/dev/maple/maple.c
diff -u src/sys/arch/dreamcast/dev/maple/maple.c:1.45 src/sys/arch/dreamcast/dev/maple/maple.c:1.46
--- src/sys/arch/dreamcast/dev/maple/maple.c:1.45 Sat Oct 27 17:17:44 2012
+++ src/sys/arch/dreamcast/dev/maple/maple.c Sun Oct 13 06:55:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: maple.c,v 1.45 2012/10/27 17:17:44 chs Exp $ */
+/* $NetBSD: maple.c,v 1.46 2013/10/13 06:55:34 riz Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: maple.c,v 1.45 2012/10/27 17:17:44 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: maple.c,v 1.46 2013/10/13 06:55:34 riz Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -242,7 +242,7 @@ mapleattach(device_t parent, device_t se
sc->sc_intrhand = sysasic_intr_establish(SYSASIC_EVENT_MAPLE_DMADONE,
IPL_MAPLE, IRL_MAPLE, maple_intr, sc);
- config_pending_incr(); /* create thread before mounting root */
+ config_pending_incr(self); /* create thread before mounting root */
if (kthread_create(PRI_NONE, 0, NULL, maple_event_thread, sc,
&sc->event_thread, "%s", device_xname(self)) == 0)
@@ -1428,7 +1428,7 @@ maple_event_thread(void *arg)
/* OK, continue booting system */
maple_polling = 0;
- config_pending_decr();
+ config_pending_decr(sc->sc_dev);
for (;;) {
/*
Index: src/sys/arch/emips/ebus/ace_ebus.c
diff -u src/sys/arch/emips/ebus/ace_ebus.c:1.7 src/sys/arch/emips/ebus/ace_ebus.c:1.8
--- src/sys/arch/emips/ebus/ace_ebus.c:1.7 Mon Jun 3 20:26:31 2013
+++ src/sys/arch/emips/ebus/ace_ebus.c Sun Oct 13 06:55:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ace_ebus.c,v 1.7 2013/06/03 20:26:31 christos Exp $ */
+/* $NetBSD: ace_ebus.c,v 1.8 2013/10/13 06:55:34 riz Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.7 2013/06/03 20:26:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.8 2013/10/13 06:55:34 riz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -242,7 +242,7 @@ ace_ebus_attach(device_t parent, device_
ebus_intr_establish(parent, (void*)ia->ia_cookie, IPL_BIO,
ace_ebus_intr, ace);
- config_pending_incr();
+ config_pending_incr(self);
error = kthread_create(PRI_NONE, 0, NULL, sysace_thread,
ace, NULL, "%s", device_xname(ace->sc_dev));
@@ -348,7 +348,7 @@ sysace_wedges(void *arg)
dkwedge_autodiscover = 1;
dkwedge_discover(&sc->sc_dk);
- config_pending_decr();
+ config_pending_decr(sc->sc_dev);
DBGME(DEBUG_STATUS, printf("Sysace::thread done for %p\n", sc));
kthread_exit(0);
@@ -1462,7 +1462,7 @@ sysace_send_config(struct ace_softc *sc,
* Rest of code lifted with mods from the dev\ata\wd.c driver
*/
-/* $NetBSD: ace_ebus.c,v 1.7 2013/06/03 20:26:31 christos Exp $ */
+/* $NetBSD: ace_ebus.c,v 1.8 2013/10/13 06:55:34 riz Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
Index: src/sys/arch/emips/ebus/flash_ebus.c
diff -u src/sys/arch/emips/ebus/flash_ebus.c:1.6 src/sys/arch/emips/ebus/flash_ebus.c:1.7
--- src/sys/arch/emips/ebus/flash_ebus.c:1.6 Wed May 29 00:47:48 2013
+++ src/sys/arch/emips/ebus/flash_ebus.c Sun Oct 13 06:55:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: flash_ebus.c,v 1.6 2013/05/29 00:47:48 christos Exp $ */
+/* $NetBSD: flash_ebus.c,v 1.7 2013/10/13 06:55:34 riz Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.6 2013/05/29 00:47:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash_ebus.c,v 1.7 2013/10/13 06:55:34 riz Exp $");
/* Driver for the Intel 28F320/640/128 (J3A150) StrataFlash memory device
* Extended to include the Intel JS28F256P30T95.
@@ -295,7 +295,7 @@ eflash_ebus_attach(device_t parent, devi
sc->sc_type.ft_manuf_code, sc->sc_type.ft_device_code);
}
- config_pending_incr();
+ config_pending_incr(self);
error = kthread_create(PRI_NONE, 0, NULL,
eflash_thread, sc, NULL, "%s", device_xname(sc->sc_dev));
@@ -1302,7 +1302,7 @@ static int eflash_write_at (struct eflas
/* Rest of code lifted with mods from the dev\ata\wd.c driver
*/
-/* $NetBSD: flash_ebus.c,v 1.6 2013/05/29 00:47:48 christos Exp $ */
+/* $NetBSD: flash_ebus.c,v 1.7 2013/10/13 06:55:34 riz Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -1537,7 +1537,7 @@ eflash_wedges(void *arg)
dkwedge_autodiscover = 1;
dkwedge_discover(&sc->sc_dk);
- config_pending_decr();
+ config_pending_decr(sc->sc_dev);
DBGME(DEBUG_STATUS,printf("%s: wedges thread done for %p\n", device_xname(sc->sc_dev), sc));
kthread_exit(0);
Index: src/sys/arch/epoc32/dev/etna.c
diff -u src/sys/arch/epoc32/dev/etna.c:1.2 src/sys/arch/epoc32/dev/etna.c:1.3
--- src/sys/arch/epoc32/dev/etna.c:1.2 Sat Jun 22 13:36:16 2013
+++ src/sys/arch/epoc32/dev/etna.c Sun Oct 13 06:55:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: etna.c,v 1.2 2013/06/22 13:36:16 kiyohara Exp $ */
+/* $NetBSD: etna.c,v 1.3 2013/10/13 06:55:34 riz Exp $ */
/*
* Copyright (c) 2012 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: etna.c,v 1.2 2013/06/22 13:36:16 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: etna.c,v 1.3 2013/10/13 06:55:34 riz Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -226,7 +226,7 @@ etna_doattach(device_t self)
struct etna_softc *sc = device_private(self);
int status;
- config_pending_incr();
+ config_pending_incr(self);
status = bus_space_read_1(sc->sc_iot, sc->sc_ioh, ETNA_SKT_STATUS);
if ((status & SKT_CARD_OUT) != SKT_CARD_OUT)
@@ -242,7 +242,7 @@ etna_event_thread(void *arg)
{
struct etna_softc *sc = arg;
- config_pending_decr();
+ config_pending_decr(sc->sc_dev);
// while (1) {
// }
Index: src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c
diff -u src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.49 src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.50
--- src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.49 Tue Jul 26 22:52:48 2011
+++ src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c Sun Oct 13 06:55:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64461pcmcia.c,v 1.49 2011/07/26 22:52:48 dyoung Exp $ */
+/* $NetBSD: hd64461pcmcia.c,v 1.50 2013/10/13 06:55:34 riz Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64461pcmcia.c,v 1.49 2011/07/26 22:52:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64461pcmcia.c,v 1.50 2013/10/13 06:55:34 riz Exp $");
#include "opt_hd64461pcmcia.h"
@@ -273,7 +273,7 @@ hd64461pcmcia_attach(device_t parent, de
"%s", device_xname(self));
KASSERT(error == 0);
- config_pending_incr();
+ config_pending_incr(self);
/* XXX: TODO */
if (!pmf_device_register(self, NULL, NULL))
@@ -294,7 +294,7 @@ hd64461pcmcia_event_thread(void *arg)
hd64461pcmcia_attach_channel(sc, CHANNEL_1);
hd64461pcmcia_attach_channel(sc, CHANNEL_0);
#endif
- config_pending_decr();
+ config_pending_decr(sc->sc_dev);
while (!sc->sc_shutdown) {
tsleep(sc, PWAIT, "CSC wait", 0);
Index: src/sys/arch/i386/pnpbios/pnpbios.c
diff -u src/sys/arch/i386/pnpbios/pnpbios.c:1.71 src/sys/arch/i386/pnpbios/pnpbios.c:1.72
--- src/sys/arch/i386/pnpbios/pnpbios.c:1.71 Thu Jun 30 20:09:31 2011
+++ src/sys/arch/i386/pnpbios/pnpbios.c Sun Oct 13 06:55:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pnpbios.c,v 1.71 2011/06/30 20:09:31 wiz Exp $ */
+/* $NetBSD: pnpbios.c,v 1.72 2013/10/13 06:55:34 riz Exp $ */
/*
* Copyright (c) 2000 Jason R. Thorpe. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pnpbios.c,v 1.71 2011/06/30 20:09:31 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pnpbios.c,v 1.72 2013/10/13 06:55:34 riz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -369,7 +369,7 @@ pnpbios_attach(device_t parent, device_t
if (evtype != PNP_IC_CONTROL_EVENT_NONE) {
if (evtype != PNP_IC_CONTROL_EVENT_POLL || sc->sc_evaddr) {
sc->sc_threadrun = 1;
- config_pending_incr();
+ config_pending_incr(sc->sc_dev);
if (kthread_create(PRI_NONE, 0, NULL,
pnpbios_event_thread, sc, &sc->sc_evthread,
"%s", device_xname(self)))
@@ -1412,7 +1412,7 @@ pnpbios_event_thread(void *arg)
EDPRINTF(("pnpbios: os active returns 0x%02x\n", rv));
}
- config_pending_decr();
+ config_pending_decr(sc->sc_dev);
goto start;
while (sc->sc_threadrun) {
Index: src/sys/arch/xen/xen/xbd_xenbus.c
diff -u src/sys/arch/xen/xen/xbd_xenbus.c:1.59 src/sys/arch/xen/xen/xbd_xenbus.c:1.60
--- src/sys/arch/xen/xen/xbd_xenbus.c:1.59 Wed May 29 23:11:56 2013
+++ src/sys/arch/xen/xen/xbd_xenbus.c Sun Oct 13 06:55:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: xbd_xenbus.c,v 1.59 2013/05/29 23:11:56 christos Exp $ */
+/* $NetBSD: xbd_xenbus.c,v 1.60 2013/10/13 06:55:34 riz Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.59 2013/05/29 23:11:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.60 2013/10/13 06:55:34 riz Exp $");
#include "opt_xen.h"
@@ -246,7 +246,7 @@ xbd_xenbus_attach(device_t parent, devic
int err;
#endif
- config_pending_incr();
+ config_pending_incr(self);
aprint_normal(": Xen Virtual Block Device Interface\n");
dk_sc_init(&sc->sc_dksc, device_xname(self));
@@ -581,7 +581,7 @@ static void xbd_backend_changed(void *ar
disk_set_info(sc->sc_dksc.sc_dev, &sc->sc_dksc.sc_dkdev, NULL);
/* the disk should be working now */
- config_pending_decr();
+ config_pending_decr(sc->sc_dksc.sc_dev);
break;
default:
panic("bad backend state %d", new_state);
Index: src/sys/arch/xen/xen/xpci_xenbus.c
diff -u src/sys/arch/xen/xen/xpci_xenbus.c:1.12 src/sys/arch/xen/xen/xpci_xenbus.c:1.13
--- src/sys/arch/xen/xen/xpci_xenbus.c:1.12 Wed Dec 5 01:46:22 2012
+++ src/sys/arch/xen/xen/xpci_xenbus.c Sun Oct 13 06:55:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: xpci_xenbus.c,v 1.12 2012/12/05 01:46:22 jakllsch Exp $ */
+/* $NetBSD: xpci_xenbus.c,v 1.13 2013/10/13 06:55:34 riz Exp $ */
/*
* Copyright (c) 2009 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.c,v 1.12 2012/12/05 01:46:22 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xpci_xenbus.c,v 1.13 2013/10/13 06:55:34 riz Exp $");
#include "opt_xen.h"
@@ -148,7 +148,7 @@ xpci_xenbus_attach(device_t parent, devi
xpci_sc = sc;
DPRINTF(("xpci_sc %p\n", xpci_sc));
- config_pending_incr();
+ config_pending_incr(self);
aprint_normal(": Xen PCI passthrough Interface\n");
sc->sc_dev = self;
@@ -284,7 +284,7 @@ xpci_backend_changed(void *arg, XenbusSt
sc->sc_backend_status = XPCI_STATE_CONNECTED;
/* the devices should be working now */
- config_pending_decr();
+ config_pending_decr(sc->sc_dksc.sc_dev);
break;
default:
panic("bad backend state %d", new_state);
Index: src/sys/arch/xen/xenbus/xenbus_probe.c
diff -u src/sys/arch/xen/xenbus/xenbus_probe.c:1.37 src/sys/arch/xen/xenbus/xenbus_probe.c:1.38
--- src/sys/arch/xen/xenbus/xenbus_probe.c:1.37 Thu Jun 7 14:05:13 2012
+++ src/sys/arch/xen/xenbus/xenbus_probe.c Sun Oct 13 06:55:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: xenbus_probe.c,v 1.37 2012/06/07 14:05:13 sborrill Exp $ */
+/* $NetBSD: xenbus_probe.c,v 1.38 2013/10/13 06:55:34 riz Exp $ */
/******************************************************************************
* Talks to Xen Store to figure out what devices we have.
*
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenbus_probe.c,v 1.37 2012/06/07 14:05:13 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenbus_probe.c,v 1.38 2013/10/13 06:55:34 riz Exp $");
#if 0
#define DPRINTK(fmt, args...) \
@@ -107,7 +107,7 @@ xenbus_attach(device_t parent, device_t
aprint_normal(": Xen Virtual Bus Interface\n");
xenbus_dev = self;
- config_pending_incr();
+ config_pending_incr(self);
err = kthread_create(PRI_NONE, 0, NULL, xenbus_probe_init, NULL,
NULL, "xenbus_probe");
@@ -711,7 +711,7 @@ xenbus_probe_init(void *unused)
}
DPRINTK("done");
- config_pending_decr();
+ config_pending_decr(xenbus_dev);
#ifdef DOM0OPS
if (dom0) {
int s;
Index: src/sys/dev/ic/i82365.c
diff -u src/sys/dev/ic/i82365.c:1.115 src/sys/dev/ic/i82365.c:1.116
--- src/sys/dev/ic/i82365.c:1.115 Sat Oct 27 17:18:20 2012
+++ src/sys/dev/ic/i82365.c Sun Oct 13 06:55:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365.c,v 1.115 2012/10/27 17:18:20 chs Exp $ */
+/* $NetBSD: i82365.c,v 1.116 2013/10/13 06:55:34 riz Exp $ */
/*
* Copyright (c) 2004 Charles M. Hannum. All rights reserved.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.115 2012/10/27 17:18:20 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.116 2013/10/13 06:55:34 riz Exp $");
#define PCICDEBUG
@@ -506,7 +506,7 @@ pcic_attach_socket_finish(struct pcic_ha
if (h->event_thread != NULL)
panic("pcic_attach_socket: event thread");
#endif
- config_pending_incr();
+ config_pending_incr(sc->dev);
snprintf(cs, sizeof(cs), "%d,%d", h->chip, h->socket);
if (kthread_create(PRI_NONE, 0, NULL, pcic_event_thread, h,
@@ -537,7 +537,7 @@ pcic_event_thread(void *arg)
splx(s);
if (first) {
first = 0;
- config_pending_decr();
+ config_pending_decr(sc->dev);
}
/*
* No events to process; release the PCIC lock.
