Sat Mar 3 02:28:53 2012 UTC ()

revert a stray splx(s) that somehow got back in here..


(mrg)

diff -r1.181.6.14 -r1.181.6.15 src/sys/dev/usb/ehci.c

--- src/sys/dev/usb/ehci.c 2012/02/26 05:05:44	1.181.6.14
+++ src/sys/dev/usb/ehci.c 2012/03/03 02:28:52	1.181.6.15

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ehci.c,v 1.181.6.14 2012/02/26 05:05:44 mrg Exp $ */
+/*	$NetBSD: ehci.c,v 1.181.6.15 2012/03/03 02:28:52 mrg Exp $ */
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net), Charles M. Hannum,
  * Jeremy Morse (jeremy.morse@gmail.com), Jared D. McNeill
  * (jmcneill@invisible.ca) and Matthew R. Green (mrg@eterna.com.au).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -43,27 +43,27 @@
 /*
  * TODO:
  * 1) hold off explorations by companion controllers until ehci has started.
+ *
  * 2) The hub driver needs to handle and schedule the transaction translator,
  *    to assign place in frame where different devices get to go. See chapter
  *    on hubs in USB 2.0 for details.
+ *
  * 3) Command failures are not recovered correctly.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.181.6.14 2012/02/26 05:05:44 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.181.6.15 2012/03/03 02:28:52 mrg Exp $");
 #include "ohci.h"
 #include "uhci.h"
 #include "opt_usb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/device.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 @@ -2869,27 +2869,27 @@ ehci_free_sqtd_chain(ehci_softc_t *sc, e
 		     sqtd, sqtdend));
 	for (i = 0; sqtd != sqtdend; sqtd = p, i++) {
 		p = sqtd->nextqtd;
 		ehci_free_sqtd(sc, sqtd);
+	}
+}
 Static ehci_soft_itd_t *
 ehci_alloc_itd(ehci_softc_t *sc)
+{
 	struct ehci_soft_itd *itd, *freeitd;
 	usbd_status err;
-	int i, s, offs, frindex, previndex;
+	int i, offs, frindex, previndex;
 	usb_dma_t dma;
 	KASSERT(mutex_owned(&sc->sc_lock));
 	/* Find an itd that wasn't freed this frame or last frame. This can
 	 * discard itds that were freed before frindex wrapped around
 	 * XXX - can this lead to thrashing? Could fix by enabling wrap-around
 	 *       interrupt and fiddling with list when that happens */
 	frindex = (EOREAD4(sc, EHCI_FRINDEX) + 1) >> 3;
 	previndex = (frindex != 0) ? frindex - 1 : sc->sc_flsize;
 	freeitd = NULL;
 	LIST_FOREACH(itd, &sc->sc_freeitds, u.free_list) {
 @@ -2923,27 +2923,26 @@ ehci_alloc_itd(ehci_softc_t *sc)
+	}
 	itd = freeitd;
 	LIST_REMOVE(itd, u.free_list);
 	memset(&itd->itd, 0, sizeof(ehci_itd_t));
 	usb_syncmem(&itd->dma, itd->offs + offsetof(ehci_itd_t, itd_next),
                     sizeof(itd->itd.itd_next), BUS_DMASYNC_PREWRITE |
                     BUS_DMASYNC_PREREAD);
 	itd->u.frame_list.next = NULL;
 	itd->u.frame_list.prev = NULL;
 	itd->xfer_next = NULL;
 	itd->slot = 0;
 	splx(s);
 	return itd;
+}
 Static void
 ehci_free_itd(ehci_softc_t *sc, ehci_soft_itd_t *itd)
+{
 	KASSERT(mutex_owned(&sc->sc_lock));
 	LIST_INSERT_HEAD(&sc->sc_freeitds, itd, u.free_list);
+}