support for ucycom:

- teach ucom that not all i/o is done via bulk pipes
- teach uhidev that i/o interrupt pipes are distinct

1 files changed, 10 insertions, 3 deletions

diff --git a/sys/dev/usb/uhidev.h b/sys/dev/usb/uhidev.h
index dd9190c1f62..ce37bd8a26c 100644
--- a/sys/dev/usb/uhidev.h
+++ b/sys/dev/usb/uhidev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhidev.h,v 1.5 2006/03/07 04:41:19 krw Exp $	*/
+/*	$OpenBSD: uhidev.h,v 1.6 2006/08/18 02:54:11 jason Exp $	*/
 /*	$NetBSD: uhidev.h,v 1.3 2002/10/08 09:56:17 dan Exp $	*/
 
 /*
@@ -51,12 +51,18 @@ struct uhidev_softc {
 	USBBASEDEVICE sc_dev;		/* base device */
 	usbd_device_handle sc_udev;
 	usbd_interface_handle sc_iface;	/* interface */
-	usbd_pipe_handle sc_intrpipe;	/* interrupt pipe */
-	int sc_ep_addr;
+	usbd_pipe_handle sc_ipipe;	/* input interrupt pipe */
+	usbd_xfer_handle sc_ixfer;	/* read request */
+	int sc_iep_addr;
 
 	u_char *sc_ibuf;
 	u_int sc_isize;
 
+	usbd_pipe_handle sc_opipe;	/* output interrupt pipe */
+	usbd_xfer_handle sc_oxfer;	/* write request */
+	usbd_xfer_handle sc_owxfer;	/* internal write request */
+	int sc_oep_addr;
+
 	void *sc_repdesc;
 	int sc_repdesc_size;
 
@@ -91,3 +97,4 @@ void uhidev_close(struct uhidev *);
 usbd_status uhidev_set_report(struct uhidev *scd, int type, void *data,int len);
 void uhidev_set_report_async(struct uhidev *scd, int type, void *data, int len);
 usbd_status uhidev_get_report(struct uhidev *scd, int type, void *data,int len);
+usbd_status uhidev_write(struct uhidev_softc *, void *, int);