 @@ -1,14 +1,14 @@
-/*	$NetBSD: ixp425_npe.c,v 1.6 2009/10/26 19:16:55 cegger Exp $	*/
+/*	$NetBSD: ixp425_npe.c,v 1.7 2011/05/13 22:28:40 rmind Exp $	*/
 /*-
  * Copyright (c) 2006 Sam Leffler, Errno Consulting
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer,
  *    without modification.
  * 2. Redistributions in binary form must reproduce at minimum a disclaimer
  *    similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
 @@ -52,27 +52,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
 */
 #include <sys/cdefs.h>
 #if 0
 __FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
 #endif
-__KERNEL_RCSID(0, "$NetBSD: ixp425_npe.c,v 1.6 2009/10/26 19:16:55 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_npe.c,v 1.7 2011/05/13 22:28:40 rmind Exp $");
 /*
  * Intel XScale Network Processing Engine (NPE) support.
+ *
  * Each NPE has an ixpnpeX device associated with it that is
  * attached at boot.  Depending on the microcode loaded into
  * an NPE there may be an Ethernet interface (npeX) or some
  * other network interface (e.g. for ATM).  This file has support
  * for loading microcode images and the associated NPE CPU
  * manipulations (start, stop, reset).
+ *
  * The code here basically replaces the npeDl and npeMh classes
  * in the Intel Access Library (IAL).
 @@ -1374,35 +1374,28 @@ ixpnpe_sendmsg_locked(struct ixpnpe_soft
 	error = EIO;
     if (error)
 	printf("%s: input FIFO timeout, msg [0x%x,0x%x]\n",
 	    sc->sc_dev.dv_xname, msg[0], msg[1]);
     return error;
+}
 static int
 ixpnpe_recvmsg_locked(struct ixpnpe_softc *sc, uint32_t msg[2])
+{
 	if (!sc->sc_msgwaiting) {
-#if 0
+		/* XXX interrupt context - cannot sleep */
 		/*
 		 * This ltsleep() is dangerous because this function may be
 		 * called under interrupt context.
 		 */
 		ltsleep(sc, 0, "npemh", 0, &sc->sc_lock);
 #else
 		delay(1000);	/* wait 1ms (is it ok?)*/
 #endif
+	}
 	memcpy(msg, sc->sc_msg, sizeof(sc->sc_msg));
 	/* NB: sc_msgwaiting != 1 means the ack fetch failed */
 	return sc->sc_msgwaiting != 1 ? EIO : 0;
+}
 /*
  * Send a msg to the NPE and wait for a reply.  We use the
  * private mutex and sleep until an interrupt is received
  * signalling the availability of data in the output FIFO
  * so the caller cannot be holding a mutex.  May be better
  * piggyback on the caller's mutex instead but that would
  * make other locking confusing.

 @@ -1,14 +1,14 @@
-/* $NetBSD: ppbus_conf.c,v 1.18 2009/11/11 15:34:37 he Exp $ */
+/* $NetBSD: ppbus_conf.c,v 1.19 2011/05/13 22:28:40 rmind Exp $ */
 /*-
  * Copyright (c) 1997, 1998, 1999 Nicolas Souchu
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -20,27 +20,27 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * FreeBSD: src/sys/dev/ppbus/ppbconf.c,v 1.17.2.1 2000/05/24 00:20:57 n_hibma Exp
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppbus_conf.c,v 1.18 2009/11/11 15:34:37 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppbus_conf.c,v 1.19 2011/05/13 22:28:40 rmind Exp $");
 #include "opt_ppbus.h"
 #include "opt_ppbus_1284.h"
 #include "gpio.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <dev/ppbus/ppbus_1284.h>
 @@ -145,27 +145,27 @@ ppbus_attach(device_t parent, device_t s
 	ppbus->sc_1284_error = PPBUS_NO_ERROR;
 	/* Record device's sucessful attachment */
 	ppbus->sc_dev_ok = PPBUS_OK;
 #ifndef DONTPROBE_1284
 	/* detect IEEE1284 compliant devices */
 	if (ppbus_scan_bus(self)) {
 		printf("%s: No IEEE1284 device found.\n", device_xname(self));
 	} else {
 		printf("%s: IEEE1284 device found.\n", device_xname(self));
 		/*
 		 * Detect device ID (interrupts must be disabled because we
-		 * cannot do a ltsleep() to wait for it - no context)
+		 * cannot do a block to wait for it - no context)
 		 */
 		if (args.capabilities & PPBUS_HAS_INTR) {
 			int val = 0;
 			if(ppbus_write_ivar(self, PPBUS_IVAR_INTR, &val) != 0) {
 				printf(" <problem initializing interrupt "
 					"usage>");
+			}
+		}
 		ppbus_pnp_detect(self);
+	}
 #endif /* !DONTPROBE_1284 */
 	/* Configure child devices */