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

[matthew green]

Module Name:    src
Committed By:   mrg
Date:           Sun Feb 26 08:02:36 UTC 2012

Modified Files:
        src/sys/dev/usb [jmcneill-usbmp]: TODO.usbmp uhid.c umass.c
            usbdi_util.c usbdi_util.h

Log Message:
rename usb_detach_waitcv() to usb_detach_wait()


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/dev/usb/TODO.usbmp
cvs rdiff -u -r1.84.12.2 -r1.84.12.3 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.141.6.2 -r1.141.6.3 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.55.12.5 -r1.55.12.6 src/sys/dev/usb/usbdi_util.c
cvs rdiff -u -r1.41.16.2 -r1.41.16.3 src/sys/dev/usb/usbdi_util.h

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/TODO.usbmp
diff -u src/sys/dev/usb/TODO.usbmp:1.1.2.6 src/sys/dev/usb/TODO.usbmp:1.1.2.7
--- src/sys/dev/usb/TODO.usbmp:1.1.2.6	Sun Feb 26 07:12:49 2012
+++ src/sys/dev/usb/TODO.usbmp	Sun Feb 26 08:02:36 2012
@@ -1,4 +1,4 @@
-$NetBSD: TODO.usbmp,v 1.1.2.6 2012/02/26 07:12:49 mrg Exp $
+$NetBSD: TODO.usbmp,v 1.1.2.7 2012/02/26 08:02:36 mrg Exp $
 
 
 the majority of the USB MP device interface is documented in usbdivar.h.
@@ -26,8 +26,7 @@ ehci issues:
 
 
 wake/wakeup conversion:
-  - usb_detach_wait/wakeup() -> add a usb_detach_waitcv/broadcast() that
-    take a mutex (done)
+  - usb_detach_waitold/wakeupold() -> usb_detach_wait/broadcast()
   - drivers:
       if_aue.c
       if_axe.c
@@ -43,14 +42,10 @@ wake/wakeup conversion:
       ulpt.c
       umass.c		- done
       urio.c
-      usbdi_util.c
-      usbdi_util.h
       uscanner.c
       usscanner.c
       ustir.c
       utoppy.c
-  - maybe rename usb_detach_wait() to usb_detach_waitold(), so that the
-    new one can be usb_detach_wait()  [old names done]
 
 
 use usb_delay_ms_locked() in places

Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.84.12.2 src/sys/dev/usb/uhid.c:1.84.12.3
--- src/sys/dev/usb/uhid.c:1.84.12.2	Sat Feb 25 20:52:29 2012
+++ src/sys/dev/usb/uhid.c	Sun Feb 26 08:02:36 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhid.c,v 1.84.12.2 2012/02/25 20:52:29 mrg Exp $	*/
+/*	$NetBSD: uhid.c,v 1.84.12.3 2012/02/26 08:02:36 mrg Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.84.12.2 2012/02/25 20:52:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.84.12.3 2012/02/26 08:02:36 mrg Exp $");
 
 #include "opt_compat_netbsd.h"
 
@@ -214,7 +214,7 @@ uhid_detach(device_t self, int flags)
 			/* Wake everyone */
 			cv_broadcast(&sc->sc_cv);
 			/* Wait for processes to go away. */
-			usb_detach_waitcv(sc->sc_hdev.sc_dev,
+			usb_detach_wait(sc->sc_hdev.sc_dev,
 			    &sc->sc_detach_cv, &sc->sc_lock);
 		}
 	}

Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.141.6.2 src/sys/dev/usb/umass.c:1.141.6.3
--- src/sys/dev/usb/umass.c:1.141.6.2	Sat Feb 25 20:49:17 2012
+++ src/sys/dev/usb/umass.c	Sun Feb 26 08:02:36 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: umass.c,v 1.141.6.2 2012/02/25 20:49:17 mrg Exp $	*/
+/*	$NetBSD: umass.c,v 1.141.6.3 2012/02/26 08:02:36 mrg Exp $	*/
 
 /*
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.141.6.2 2012/02/25 20:49:17 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.141.6.3 2012/02/26 08:02:36 mrg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_umass.h"
@@ -680,7 +680,7 @@ umass_detach(device_t self, int flags)
 		aprint_normal_dev(self, "waiting for refcnt\n");
 #endif
 		/* Wait for processes to go away. */
-		usb_detach_waitcv(sc->sc_dev, &sc->sc_detach_cv, &sc->sc_lock);
+		usb_detach_wait(sc->sc_dev, &sc->sc_detach_cv, &sc->sc_lock);
 	}
 	mutex_exit(&sc->sc_lock);
 

Index: src/sys/dev/usb/usbdi_util.c
diff -u src/sys/dev/usb/usbdi_util.c:1.55.12.5 src/sys/dev/usb/usbdi_util.c:1.55.12.6
--- src/sys/dev/usb/usbdi_util.c:1.55.12.5	Sun Feb 26 07:12:50 2012
+++ src/sys/dev/usb/usbdi_util.c	Sun Feb 26 08:02:36 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi_util.c,v 1.55.12.5 2012/02/26 07:12:50 mrg Exp $	*/
+/*	$NetBSD: usbdi_util.c,v 1.55.12.6 2012/02/26 08:02:36 mrg Exp $	*/
 
 /*
  * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.55.12.5 2012/02/26 07:12:50 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.55.12.6 2012/02/26 08:02:36 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -514,13 +514,13 @@ usbd_intr_transfer(usbd_xfer_handle xfer
 }
 
 void
-usb_detach_waitcv(device_t dv, kcondvar_t *cv, kmutex_t *lock)
+usb_detach_wait(device_t dv, kcondvar_t *cv, kmutex_t *lock)
 {
-	DPRINTF(("usb_detach_waitcv: waiting for %s\n", device_xname(dv)));
+	DPRINTF(("usb_detach_wait: waiting for %s\n", device_xname(dv)));
 	if (cv_timedwait(cv, lock, hz * 60))	// dv, PZERO, "usbdet", hz * 60
-		printf("usb_detach_waitcv: %s didn't detach\n",
+		printf("usb_detach_wait: %s didn't detach\n",
 		        device_xname(dv));
-	DPRINTF(("usb_detach_waitcv: %s done\n", device_xname(dv)));
+	DPRINTF(("usb_detach_wait: %s done\n", device_xname(dv)));
 }
 
 void

Index: src/sys/dev/usb/usbdi_util.h
diff -u src/sys/dev/usb/usbdi_util.h:1.41.16.2 src/sys/dev/usb/usbdi_util.h:1.41.16.3
--- src/sys/dev/usb/usbdi_util.h:1.41.16.2	Sun Feb 26 07:12:50 2012
+++ src/sys/dev/usb/usbdi_util.h	Sun Feb 26 08:02:36 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi_util.h,v 1.41.16.2 2012/02/26 07:12:50 mrg Exp $	*/
+/*	$NetBSD: usbdi_util.h,v 1.41.16.3 2012/02/26 08:02:36 mrg Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@ void usb_detach_wakeupold(device_t);
 /*
  * MPSAFE versions - mutex must be at IPL_USB.
  */
-void usb_detach_waitcv(device_t dv, kcondvar_t *, kmutex_t *);
+void usb_detach_wait(device_t dv, kcondvar_t *, kmutex_t *);
 void usb_detach_broadcast(device_t, kcondvar_t *);