PERFORCE change 119943 for review

[Warner Losh]

http://perforce.freebsd.org/chv.cgi?CH=119943

Change 119943 by imp at imp_lighthouse on 2007/05/16 23:16:53

	Revert.  The last commit was a lame experiment that I had in my tree.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/ugen.c#16 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/ugen.c#16 (text+ko) ====

@@ -55,8 +55,8 @@
 #include <sys/filio.h>
 #include <sys/tty.h>
 #include <sys/file.h>
+#include <sys/vnode.h>
 #include <sys/poll.h>
-#include <sys/uio.h>
 
 #include <dev/usb/usb_port.h>
 #include <dev/usb/usb.h>
@@ -1008,7 +1008,6 @@
 			        /* let application process data */
 			        break;
 			    }
-#if 0
 			    if(flag & IO_NDELAY)
 			    {
 			        if(n)
@@ -1017,7 +1016,7 @@
 				}
 				break;
 			    }
-#endif
+
 			    /* wait for data */
 
 			    sce->state |= (UGEN_RD_SLP|UGEN_RD_WUP);
@@ -1234,7 +1233,7 @@
 				 */
 				usbd_transfer_start(sce->xfer_out[0]);
 				usbd_transfer_start(sce->xfer_out[1]);
-#if 0
+
 				if(flag & IO_NDELAY)
 				{
 					if(n)
@@ -1243,7 +1242,7 @@
 					}
 					break;
 				}
-#endif
+
 				sce->state |= (UGEN_WR_SLP|UGEN_WR_WUP);
 
 				error = mtx_sleep(sce, &sc->sc_mtx, (PZERO|PCATCH),