svn commit: r212585 - in user/weongyo/usb/sys/dev/usb: . controller template

Weongyo Jeong weongyo at FreeBSD.org
Mon Sep 13 22:40:10 UTC 2010 

Author: weongyo
Date: Mon Sep 13 22:40:10 2010
New Revision: 212585
URL: http://svn.freebsd.org/changeset/base/212585

Log:
  Removes usb_process.[ch] not used anymore at USB stack.  All are
  replaced with taskqueue(9).  While I'm here, usbd_do_request_proc() API
  is also removed.

Deleted:
  user/weongyo/usb/sys/dev/usb/usb_process.c
  user/weongyo/usb/sys/dev/usb/usb_process.h
Modified:
  user/weongyo/usb/sys/dev/usb/controller/at91dci.c
  user/weongyo/usb/sys/dev/usb/controller/at91dci_atmelarm.c
  user/weongyo/usb/sys/dev/usb/controller/atmegadci.c
  user/weongyo/usb/sys/dev/usb/controller/atmegadci_atmelarm.c
  user/weongyo/usb/sys/dev/usb/controller/avr32dci.c
  user/weongyo/usb/sys/dev/usb/controller/ehci.c
  user/weongyo/usb/sys/dev/usb/controller/ehci_ixp4xx.c
  user/weongyo/usb/sys/dev/usb/controller/ehci_mv.c
  user/weongyo/usb/sys/dev/usb/controller/ehci_pci.c
  user/weongyo/usb/sys/dev/usb/controller/musb_otg.c
  user/weongyo/usb/sys/dev/usb/controller/musb_otg_atmelarm.c
  user/weongyo/usb/sys/dev/usb/controller/ohci.c
  user/weongyo/usb/sys/dev/usb/controller/ohci_atmelarm.c
  user/weongyo/usb/sys/dev/usb/controller/ohci_pci.c
  user/weongyo/usb/sys/dev/usb/controller/ohci_s3c24x0.c
  user/weongyo/usb/sys/dev/usb/controller/uhci.c
  user/weongyo/usb/sys/dev/usb/controller/uhci_pci.c
  user/weongyo/usb/sys/dev/usb/controller/usb_controller.c
  user/weongyo/usb/sys/dev/usb/controller/uss820dci.c
  user/weongyo/usb/sys/dev/usb/controller/uss820dci_atmelarm.c
  user/weongyo/usb/sys/dev/usb/template/usb_template.c
  user/weongyo/usb/sys/dev/usb/usb_bus.h
  user/weongyo/usb/sys/dev/usb/usb_busdma.c
  user/weongyo/usb/sys/dev/usb/usb_compat_linux.c
  user/weongyo/usb/sys/dev/usb/usb_debug.c
  user/weongyo/usb/sys/dev/usb/usb_dev.c
  user/weongyo/usb/sys/dev/usb/usb_device.c
  user/weongyo/usb/sys/dev/usb/usb_dynamic.c
  user/weongyo/usb/sys/dev/usb/usb_generic.c
  user/weongyo/usb/sys/dev/usb/usb_handle_request.c
  user/weongyo/usb/sys/dev/usb/usb_hid.c
  user/weongyo/usb/sys/dev/usb/usb_hub.c
  user/weongyo/usb/sys/dev/usb/usb_msctest.c
  user/weongyo/usb/sys/dev/usb/usb_request.c
  user/weongyo/usb/sys/dev/usb/usb_transfer.c
  user/weongyo/usb/sys/dev/usb/usb_util.c
  user/weongyo/usb/sys/dev/usb/usbdi.h
  user/weongyo/usb/sys/dev/usb/usbdi_util.h

Modified: user/weongyo/usb/sys/dev/usb/controller/at91dci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/at91dci.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/controller/at91dci.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -72,7 +72,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_debug.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_transfer.h>
 #include <dev/usb/usb_device.h>
 #include <dev/usb/usb_hub.h>

Modified: user/weongyo/usb/sys/dev/usb/controller/at91dci_atmelarm.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/at91dci_atmelarm.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/controller/at91dci_atmelarm.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_util.h>
 
 #include <dev/usb/usb_controller.h>

Modified: user/weongyo/usb/sys/dev/usb/controller/atmegadci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/atmegadci.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/controller/atmegadci.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_debug.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_transfer.h>
 #include <dev/usb/usb_device.h>
 #include <dev/usb/usb_hub.h>

Modified: user/weongyo/usb/sys/dev/usb/controller/atmegadci_atmelarm.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/atmegadci_atmelarm.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/controller/atmegadci_atmelarm.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_util.h>
 
 #include <dev/usb/usb_controller.h>

Modified: user/weongyo/usb/sys/dev/usb/controller/avr32dci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/avr32dci.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/controller/avr32dci.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_debug.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_transfer.h>
 #include <dev/usb/usb_device.h>
 #include <dev/usb/usb_hub.h>

Modified: user/weongyo/usb/sys/dev/usb/controller/ehci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ehci.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/controller/ehci.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -74,7 +74,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_debug.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_transfer.h>
 #include <dev/usb/usb_device.h>
 #include <dev/usb/usb_hub.h>

Modified: user/weongyo/usb/sys/dev/usb/controller/ehci_ixp4xx.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ehci_ixp4xx.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/controller/ehci_ixp4xx.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_util.h>
 
 #include <dev/usb/usb_controller.h>

Modified: user/weongyo/usb/sys/dev/usb/controller/ehci_mv.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ehci_mv.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/controller/ehci_mv.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_util.h>
 
 #include <dev/usb/usb_controller.h>

Modified: user/weongyo/usb/sys/dev/usb/controller/ehci_pci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ehci_pci.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/controller/ehci_pci.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -70,7 +70,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_util.h>
 
 #include <dev/usb/usb_controller.h>

Modified: user/weongyo/usb/sys/dev/usb/controller/musb_otg.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/musb_otg.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/controller/musb_otg.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -64,7 +64,6 @@
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_debug.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_transfer.h>
 #include <dev/usb/usb_device.h>
 #include <dev/usb/usb_hub.h>

Modified: user/weongyo/usb/sys/dev/usb/controller/musb_otg_atmelarm.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/musb_otg_atmelarm.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/controller/musb_otg_atmelarm.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -49,7 +49,6 @@
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_util.h>
 
 #include <dev/usb/usb_controller.h>

Modified: user/weongyo/usb/sys/dev/usb/controller/ohci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ohci.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/controller/ohci.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_debug.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_transfer.h>
 #include <dev/usb/usb_device.h>
 #include <dev/usb/usb_hub.h>

Modified: user/weongyo/usb/sys/dev/usb/controller/ohci_atmelarm.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ohci_atmelarm.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/controller/ohci_atmelarm.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_util.h>
 
 #include <dev/usb/usb_controller.h>

Modified: user/weongyo/usb/sys/dev/usb/controller/ohci_pci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ohci_pci.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/controller/ohci_pci.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_util.h>
 
 #include <dev/usb/usb_controller.h>

Modified: user/weongyo/usb/sys/dev/usb/controller/ohci_s3c24x0.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/ohci_s3c24x0.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/controller/ohci_s3c24x0.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_util.h>
 
 #include <dev/usb/usb_controller.h>

Modified: user/weongyo/usb/sys/dev/usb/controller/uhci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/uhci.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/controller/uhci.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_debug.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_transfer.h>
 #include <dev/usb/usb_device.h>
 #include <dev/usb/usb_hub.h>

Modified: user/weongyo/usb/sys/dev/usb/controller/uhci_pci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/uhci_pci.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/controller/uhci_pci.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_util.h>
 #include <dev/usb/usb_debug.h>
 

Modified: user/weongyo/usb/sys/dev/usb/controller/usb_controller.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/usb_controller.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/controller/usb_controller.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -53,7 +53,6 @@
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_debug.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_busdma.h>
 #include <dev/usb/usb_dynamic.h>
 #include <dev/usb/usb_device.h>

Modified: user/weongyo/usb/sys/dev/usb/controller/uss820dci.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/uss820dci.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/controller/uss820dci.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -60,7 +60,6 @@
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_debug.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_transfer.h>
 #include <dev/usb/usb_device.h>
 #include <dev/usb/usb_hub.h>

Modified: user/weongyo/usb/sys/dev/usb/controller/uss820dci_atmelarm.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/controller/uss820dci_atmelarm.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/controller/uss820dci_atmelarm.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_util.h>
 
 #include <dev/usb/usb_controller.h>

Modified: user/weongyo/usb/sys/dev/usb/template/usb_template.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/template/usb_template.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/template/usb_template.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -58,7 +58,6 @@
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_dynamic.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_device.h>
 
 #define	USB_DEBUG_VAR usb_debug

Modified: user/weongyo/usb/sys/dev/usb/usb_bus.h
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_bus.h	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/usb_bus.h	Mon Sep 13 22:40:10 2010	(r212585)
@@ -29,15 +29,8 @@
 
 #include <sys/taskqueue.h>
 
-/*
- * The following structure defines the USB explore message sent to the USB
- * explore process.
- */
-
-struct usb_bus_msg {
-	struct usb_proc_msg hdr;
-	struct usb_bus *bus;
-};
+#define	USB_PRI_HIGH	PI_NET
+#define	USB_PRI_MED	PI_DISK
 
 /*
  * The following structure defines the USB statistics structure.

Modified: user/weongyo/usb/sys/dev/usb/usb_busdma.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_busdma.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/usb_busdma.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -52,7 +52,6 @@
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_transfer.h>
 #include <dev/usb/usb_device.h>
 #include <dev/usb/usb_util.h>

Modified: user/weongyo/usb/sys/dev/usb/usb_compat_linux.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_compat_linux.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/usb_compat_linux.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -54,7 +54,6 @@
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_compat_linux.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_device.h>
 #include <dev/usb/usb_util.h>
 #include <dev/usb/usb_busdma.h>

Modified: user/weongyo/usb/sys/dev/usb/usb_debug.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_debug.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/usb_debug.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -49,7 +49,6 @@
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_debug.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_device.h>
 #include <dev/usb/usb_busdma.h>
 #include <dev/usb/usb_transfer.h>

Modified: user/weongyo/usb/sys/dev/usb/usb_dev.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_dev.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/usb_dev.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -60,7 +60,6 @@
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_dev.h>
 #include <dev/usb/usb_mbuf.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_device.h>
 #include <dev/usb/usb_debug.h>
 #include <dev/usb/usb_busdma.h>

Modified: user/weongyo/usb/sys/dev/usb/usb_device.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_device.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/usb_device.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -57,7 +57,6 @@
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_debug.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_device.h>
 #include <dev/usb/usb_busdma.h>
 #include <dev/usb/usb_transfer.h>

Modified: user/weongyo/usb/sys/dev/usb/usb_dynamic.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_dynamic.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/usb_dynamic.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -48,7 +48,6 @@
 #include <dev/usb/usbdi.h>
 
 #include <dev/usb/usb_core.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_device.h>
 #include <dev/usb/usb_dynamic.h>
 

Modified: user/weongyo/usb/sys/dev/usb/usb_generic.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_generic.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/usb_generic.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -56,7 +56,6 @@
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_dev.h>
 #include <dev/usb/usb_mbuf.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_device.h>
 #include <dev/usb/usb_debug.h>
 #include <dev/usb/usb_request.h>

Modified: user/weongyo/usb/sys/dev/usb/usb_handle_request.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_handle_request.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/usb_handle_request.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -52,7 +52,6 @@
 #define	USB_DEBUG_VAR usb_debug
 
 #include <dev/usb/usb_core.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_busdma.h>
 #include <dev/usb/usb_transfer.h>
 #include <dev/usb/usb_device.h>

Modified: user/weongyo/usb/sys/dev/usb/usb_hid.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_hid.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/usb_hid.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_debug.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_device.h>
 #include <dev/usb/usb_request.h>
 

Modified: user/weongyo/usb/sys/dev/usb/usb_hub.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_hub.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/usb_hub.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -58,7 +58,6 @@
 #define	USB_DEBUG_VAR uhub_debug
 
 #include <dev/usb/usb_core.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_device.h>
 #include <dev/usb/usb_request.h>
 #include <dev/usb/usb_debug.h>

Modified: user/weongyo/usb/sys/dev/usb/usb_msctest.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_msctest.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/usb_msctest.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -59,7 +59,6 @@
 #define	USB_DEBUG_VAR usb_debug
 
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_transfer.h>
 #include <dev/usb/usb_msctest.h>
 #include <dev/usb/usb_debug.h>

Modified: user/weongyo/usb/sys/dev/usb/usb_request.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_request.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/usb_request.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -57,7 +57,6 @@
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_busdma.h>
 #include <dev/usb/usb_request.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_transfer.h>
 #include <dev/usb/usb_debug.h>
 #include <dev/usb/usb_device.h>
@@ -694,49 +693,6 @@ done:
 }
 
 /*------------------------------------------------------------------------*
- *	usbd_do_request_proc - factored out code
- *
- * This function is factored out code. It does basically the same like
- * usbd_do_request_flags, except it will check the status of the
- * passed process argument before doing the USB request. If the
- * process is draining the USB_ERR_IOERROR code will be returned. It
- * is assumed that the mutex associated with the process is locked
- * when calling this function.
- *------------------------------------------------------------------------*/
-usb_error_t
-usbd_do_request_proc(struct usb_device *udev, struct usb_process *pproc,
-    struct usb_device_request *req, void *data, uint16_t flags,
-    uint16_t *actlen, usb_timeout_t timeout)
-{
-	usb_error_t err;
-	uint16_t len;
-
-	/* get request data length */
-	len = UGETW(req->wLength);
-
-	/* check if the device is being detached */
-	if (usb_proc_is_gone(pproc)) {
-		err = USB_ERR_IOERROR;
-		goto done;
-	}
-
-	/* forward the USB request */
-	err = usbd_do_request_flags(udev, pproc->up_mtx,
-	    req, data, flags, actlen, timeout);
-
-done:
-	/* on failure we zero the data */
-	/* on short packet we zero the unused data */
-	if ((len != 0) && (req->bmRequestType & UE_DIR_IN)) {
-		if (err)
-			memset(data, 0, len);
-		else if (actlen && *actlen != len)
-			memset(((uint8_t *)data) + *actlen, 0, len - *actlen);
-	}
-	return (err);
-}
-
-/*------------------------------------------------------------------------*
  *	usbd_req_reset_port
  *
  * This function will instruct an USB HUB to perform a reset sequence

Modified: user/weongyo/usb/sys/dev/usb/usb_transfer.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_transfer.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/usb_transfer.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -52,7 +52,6 @@
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_transfer.h>
 #include <dev/usb/usb_device.h>
 #include <dev/usb/usb_debug.h>

Modified: user/weongyo/usb/sys/dev/usb/usb_util.c
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usb_util.c	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/usb_util.c	Mon Sep 13 22:40:10 2010	(r212585)
@@ -50,7 +50,6 @@
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_util.h>
-#include <dev/usb/usb_process.h>
 #include <dev/usb/usb_device.h>
 #include <dev/usb/usb_request.h>
 #include <dev/usb/usb_busdma.h>

Modified: user/weongyo/usb/sys/dev/usb/usbdi.h
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usbdi.h	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/usbdi.h	Mon Sep 13 22:40:10 2010	(r212585)
@@ -35,7 +35,6 @@ struct usb_endpoint;
 struct usb_page_cache;
 struct usb_page_search;
 struct usb_process;
-struct usb_proc_msg;
 struct usb_mbuf;
 struct mbuf;
 
@@ -89,7 +88,6 @@ typedef enum {	/* keep in sync with usb_
 /* typedefs */
 
 typedef void (usb_callback_t)(struct usb_xfer *, usb_error_t);
-typedef void (usb_proc_callback_t)(struct usb_proc_msg *);
 typedef usb_error_t (usb_handle_req_t)(struct usb_device *,
     struct usb_device_request *, const void **, uint16_t *);
 
@@ -382,15 +380,6 @@ struct usb_callout {
  */
 #define	USB_GET_STATE(xfer) (usbd_xfer_state(xfer))
 
-/*
- * The following structure defines the USB process message header.
- */
-struct usb_proc_msg {
-	TAILQ_ENTRY(usb_proc_msg) pm_qentry;
-	usb_proc_callback_t *pm_callback;
-	usb_size_t pm_num;
-};
-
 #define	USB_FIFO_TX 0
 #define	USB_FIFO_RX 1
 

Modified: user/weongyo/usb/sys/dev/usb/usbdi_util.h
==============================================================================
--- user/weongyo/usb/sys/dev/usb/usbdi_util.h	Mon Sep 13 22:27:52 2010	(r212584)
+++ user/weongyo/usb/sys/dev/usb/usbdi_util.h	Mon Sep 13 22:40:10 2010	(r212585)
@@ -39,10 +39,6 @@ struct usb_idesc_parse_state {
 
 /* prototypes */
 
-usb_error_t usbd_do_request_proc(struct usb_device *udev, struct usb_process *pproc,
-		    struct usb_device_request *req, void *data, uint16_t flags,
-		    uint16_t *actlen, usb_timeout_t timeout);
-
 struct usb_descriptor *usb_desc_foreach(struct usb_config_descriptor *cd,
 	    struct usb_descriptor *desc);
 struct usb_interface_descriptor *usb_idesc_foreach(

More information about the svn-src-user mailing list