CVS commit: [jmcneill-usbmp] src/sys/dev/usb

[matthew green]

Module Name:    src
Committed By:   mrg
Date:           Sat Feb 25 13:17:16 UTC 2012

Modified Files:
        src/sys/dev/usb [jmcneill-usbmp]: uaudio.c

Log Message:
remove remaining splusb() calls, update some comments.


To generate a diff of this commit:
cvs rdiff -u -r1.124.2.2 -r1.124.2.3 src/sys/dev/usb/uaudio.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/usb/uaudio.c
diff -u src/sys/dev/usb/uaudio.c:1.124.2.2 src/sys/dev/usb/uaudio.c:1.124.2.3
--- src/sys/dev/usb/uaudio.c:1.124.2.2	Fri Feb 24 09:11:42 2012
+++ src/sys/dev/usb/uaudio.c	Sat Feb 25 13:17:16 2012
@@ -1,12 +1,12 @@
-/*	$NetBSD: uaudio.c,v 1.124.2.2 2012/02/24 09:11:42 mrg Exp $	*/
+/*	$NetBSD: uaudio.c,v 1.124.2.3 2012/02/25 13:17:16 mrg Exp $	*/
 
 /*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
+ * Copyright (c) 1999, 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lenn...@augustsson.net) at
- * Carlstedt Research & Technology.
+ * Carlstedt Research & Technology, and Matthew R. Green (m...@eterna.com.au).
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.124.2.2 2012/02/24 09:11:42 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.124.2.3 2012/02/25 13:17:16 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -2570,7 +2570,7 @@ uaudio_trigger_input(void *addr, void *s
 	struct uaudio_softc *sc;
 	struct chan *ch;
 	usbd_status err;
-	int i, s;
+	int i;
 
 	sc = addr;
 	if (sc->sc_dying)
@@ -2602,10 +2602,8 @@ uaudio_trigger_input(void *addr, void *s
 	ch->arg = arg;
 
 	mutex_spin_exit(&sc->sc_intr_lock);
-	s = splusb();
 	for (i = 0; i < UAUDIO_NCHANBUFS-1; i++) /* XXX -1 shouldn't be needed */
 		uaudio_chan_rtransfer(ch);
-	splx(s);
 	mutex_spin_enter(&sc->sc_intr_lock);
 
 	return 0;
@@ -2619,7 +2617,7 @@ uaudio_trigger_output(void *addr, void *
 	struct uaudio_softc *sc;
 	struct chan *ch;
 	usbd_status err;
-	int i, s;
+	int i;
 
 	sc = addr;
 	if (sc->sc_dying)
@@ -2651,10 +2649,8 @@ uaudio_trigger_output(void *addr, void *
 	ch->arg = arg;
 
 	mutex_spin_exit(&sc->sc_intr_lock);
-	s = splusb();
 	for (i = 0; i < UAUDIO_NCHANBUFS-1; i++) /* XXX */
 		uaudio_chan_ptransfer(ch);
-	splx(s);
 	mutex_spin_enter(&sc->sc_intr_lock);
 
 	return 0;
@@ -2765,7 +2761,7 @@ uaudio_chan_free_buffers(struct uaudio_s
 		usbd_free_xfer(ch->chanbufs[i].xfer);
 }
 
-/* Called at splusb() */
+/* Called with USB lock held. */
 Static void
 uaudio_chan_ptransfer(struct chan *ch)
 {
@@ -2868,7 +2864,7 @@ uaudio_chan_pintr(usbd_xfer_handle xfer,
 	uaudio_chan_ptransfer(ch);
 }
 
-/* Called at splusb() */
+/* Called with USB lock held. */
 Static void
 uaudio_chan_rtransfer(struct chan *ch)
 {