uipaq/ucom support; written by isis@www.cs.umd.edu

13 files changed, 427 insertions, 11 deletions

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 36fd426629c..0373cd8b4fc 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.150 2005/05/26 23:18:26 drahn Exp $
+#	$OpenBSD: GENERIC,v 1.151 2005/06/17 23:50:36 deraadt Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -83,6 +83,8 @@ uplcom* at uhub?			# I/O DATA USB-RSAQ2 serial adapter
 ucom*	at uplcom?
 umct*	at uhub?			# MCT USB-RS232 serial adapter
 ucom*	at umct?
+uipaq*	at uhub?			# iPAQ serial adapter
+ucom*	at uipaq?
 uaudio* at uhub?			# USB Audio
 audio*	at uaudio?
 umidi*	at uhub?			# USB MIDI
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 8d9be42b133..0d41f32467f 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.71 2005/06/02 20:09:39 tholo Exp $
+#	$OpenBSD: GENERIC,v 1.72 2005/06/17 23:50:37 deraadt Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -112,6 +112,8 @@ uplcom* at uhub?		# I/O DATA USB-RSAQ2 serial adapter
 ucom*	at uplcom?
 umct*	at uhub?		# MCT USB-RS232 serial adapter
 ucom*	at umct?
+uipaq*	at uhub?		# iPAQ serial adapter
+ucom*	at uipaq?
 uaudio* at uhub?		# USB Audio
 audio*	at uaudio?
 umidi*	at uhub?		# USB MIDI
diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC
index 151ecd6fe7f..69bb068da53 100644
--- a/sys/arch/cats/conf/GENERIC
+++ b/sys/arch/cats/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.26 2005/06/14 13:32:49 drahn Exp $
+#	$OpenBSD: GENERIC,v 1.27 2005/06/17 23:50:37 deraadt Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -174,6 +174,8 @@ uplcom* at uhub?		# I/O DATA USB-RSAQ2 serial adapter
 ucom*	at uplcom?
 umct*	at uhub?		# MCT USB-RS232 serial adapter
 ucom*	at umct?
+uipaq*	at uhub?		# iPAQ serial adapter
+ucom*	at uipaq?
 uaudio* at uhub?		# USB Audio
 audio*	at uaudio?
 umidi*	at uhub?		# USB MIDI
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 2d07204776a..7a875a9f514 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.74 2005/06/09 18:01:36 mickey Exp $
+#	$OpenBSD: GENERIC,v 1.75 2005/06/17 23:50:37 deraadt Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -108,6 +108,8 @@ pcmcia*		at cardslot?
 #ucom*	at uplcom?
 #umct*	at uhub?		# MCT USB-RS232 serial adapter
 #ucom*	at umct?
+#uipaq*	at uhub?		# iPAQ serial adapter
+#ucom*	at uipaq?
 #uaudio* at uhub?		# USB Audio
 #audio*	at uaudio?
 #umidi*	at uhub?		# USB MIDI
diff --git a/sys/arch/hppa64/conf/GENERIC b/sys/arch/hppa64/conf/GENERIC
index 602bdae9113..0ebd931f39a 100644
--- a/sys/arch/hppa64/conf/GENERIC
+++ b/sys/arch/hppa64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.6 2005/05/26 23:18:27 drahn Exp $
+#	$OpenBSD: GENERIC,v 1.7 2005/06/17 23:50:37 deraadt Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -78,6 +78,8 @@ pci*	at ppb?
 #ucom*	at uplcom?
 #umct*	at uhub?		# MCT USB-RS232 serial adapter
 #ucom*	at umct?
+#uipaq*	at uhub?		# iPAQ serial adapter
+#ucom*	at uipaq?
 #uaudio* at uhub?		# USB Audio
 #audio*	at uaudio?
 #umidi*	at uhub?		# USB MIDI
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 43c2cca9c6e..120a2edf496 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.417 2005/06/02 20:09:39 tholo Exp $
+#	$OpenBSD: GENERIC,v 1.418 2005/06/17 23:50:37 deraadt Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -155,6 +155,8 @@ uplcom* at uhub?		# I/O DATA USB-RSAQ2 serial adapter
 ucom*	at uplcom?
 umct*	at uhub?		# MCT USB-RS232 serial adapter
 ucom*	at umct?
+uipaq*	at uhub?		# iPAQ serial adapter
+ucom*	at uipaq?
 uaudio* at uhub?		# USB Audio
 audio*	at uaudio?
 umidi*	at uhub?		# USB MIDI
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index b28540fbafd..ed11117c2b0 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.87 2005/06/02 23:21:03 drahn Exp $g
+#	$OpenBSD: GENERIC,v 1.88 2005/06/17 23:50:38 deraadt Exp $g
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -198,6 +198,8 @@ uplcom* at uhub?		# I/O DATA USB-RSAQ2 serial adapter
 ucom*	at uplcom?
 umct*	at uhub?		# MCT USB-RS232 serial adapter
 ucom*	at umct?
+uipaq*	at uhub?		# iPAQ serial adapter
+ucom*	at uipaq?
 uaudio* at uhub?		# USB Audio
 audio*	at uaudio?
 umidi*	at uhub?		# USB MIDI
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 257a82d79ba..51ee3769450 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.128 2005/05/26 23:18:27 drahn Exp $
+#	$OpenBSD: GENERIC,v 1.129 2005/06/17 23:50:38 deraadt Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -122,6 +122,8 @@ uplcom* at uhub?		# I/O DATA USB-RSAQ2 serial adapter
 ucom*	at uplcom?
 umct*	at uhub?		# MCT USB-RS232 serial adapter
 ucom*	at umct?
+uipaq*	at uhub?		# iPAQ serial adapter
+ucom*	at uipaq?
 uaudio* at uhub?		# USB Audio
 audio*	at uaudio?
 umidi*	at uhub?		# USB MIDI
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index 87d0228a7a3..81842ff0169 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.42 2005/06/16 21:58:27 uwe Exp $
+#	$OpenBSD: GENERIC,v 1.43 2005/06/17 23:50:38 deraadt Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -88,6 +88,8 @@ uplcom*		at uhub?		# I/O DATA USB-RSAQ2 serial adapter
 ucom*		at uplcom?
 umct*		at uhub?		# MCT USB-RS232 serial adapter
 ucom*		at umct?
+uipaq*		at uhub?		# iPAQ serial adapter
+ucom*		at uipaq?
 uaudio*		at uhub?		# USB Audio
 audio*		at uaudio?
 umidi*		at uhub?		# USB MIDI
diff --git a/sys/dev/usb/FILES b/sys/dev/usb/FILES
index 850124edc20..a11f4968212 100644
--- a/sys/dev/usb/FILES
+++ b/sys/dev/usb/FILES
@@ -39,6 +39,7 @@ uhid.c			USB generic HID driver
 uhidev.c		USB HID class driver
 uhidev.h		  and definitions for it
 uhub.c			USB hub driver
+uipaq.c			HP ipaq22xx driver
 ukbd.c			USB keyboard driver
 ukbdmap.c		wscons key mapping for ukbd
 ukbdvar.h		API for ukbd.c
diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb
index 1b6328eadb1..a2af70c4aa0 100644
--- a/sys/dev/usb/files.usb
+++ b/sys/dev/usb/files.usb
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.usb,v 1.47 2005/04/16 14:55:10 damien Exp $
+#	$OpenBSD: files.usb,v 1.48 2005/06/17 23:50:32 deraadt Exp $
 #	$NetBSD: files.usb,v 1.16 2000/02/14 20:29:54 augustss Exp $
 #
 # Config file and device description for machine-independent USB code.
@@ -192,6 +192,11 @@ device	ubsa: ucombus
 attach	ubsa at uhub
 file	dev/usb/ubsa.c			ubsa
 
+# iPAQ PDAs
+# Generic ipaq support
+device	uipaq: ucombus
+attach	uipaq at uhub
+file	dev/usb/uipaq.c			uipaq
 
 # Scanners
 # Generic scanner support
diff --git a/sys/dev/usb/uipaq.c b/sys/dev/usb/uipaq.c
new file mode 100644
index 00000000000..ed97f8c1be1
--- /dev/null
+++ b/sys/dev/usb/uipaq.c
@@ -0,0 +1,390 @@
+/*	$OpenBSD: uipaq.c,v 1.1 2005/06/17 23:50:33 deraadt Exp $	*/
+
+/*
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Lennart Augustsson (lennart@augustsson.net) at
+ * Carlstedt Research & Technology.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * iPAQ driver
+ * 
+ * 19 July 2003:	Incorporated changes suggested by Sam Lawrance from
+ * 			the uppc module
+ *
+ *
+ * Contact isis@cs.umd.edu if you have any questions/comments about this driver
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/device.h>
+#include <sys/conf.h>
+#include <sys/tty.h>
+
+#include <dev/usb/usb.h>
+#include <dev/usb/usbhid.h>
+
+#include <dev/usb/usbcdc.h>	/*UCDC_* stuff */
+
+#include <dev/usb/usbdi.h>
+#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdevs.h>
+
+#include <dev/usb/ucomvar.h>
+
+#ifdef UIPAQ_DEBUG
+#define DPRINTF(x)	if (uipaqdebug) printf x
+#define DPRINTFN(n,x)	if (uipaqdebug>(n)) printf x
+int uipaqdebug = 0;
+#else
+#define DPRINTF(x)
+#define DPRINTFN(n,x)
+#endif
+
+#define UIPAQ_CONFIG_NO		1
+#define UIPAQ_IFACE_INDEX	0
+
+#define UIPAQIBUFSIZE 1024
+#define UIPAQOBUFSIZE 1024
+
+struct uipaq_softc {
+	USBBASEDEVICE		sc_dev;		/* base device */
+	usbd_device_handle	sc_udev;	/* device */
+	usbd_interface_handle	sc_iface;	/* interface */
+
+	device_ptr_t		sc_subdev;	/* ucom uses that */
+	u_int16_t		sc_lcr;		/* state for DTR/RTS */
+
+	u_int16_t		sc_flags;
+
+	u_char			sc_dying;
+};
+
+/* Callback routines */
+Static void	uipaq_set(void *, int, int, int);
+
+
+/* Support routines. */
+/* based on uppc module by Sam Lawrance */
+Static void	uipaq_dtr(struct uipaq_softc *sc, int onoff);
+Static void	uipaq_rts(struct uipaq_softc *sc, int onoff);
+Static void	uipaq_break(struct uipaq_softc* sc, int onoff);
+
+
+struct ucom_methods uipaq_methods = {
+	NULL,
+	uipaq_set,
+	NULL,
+	NULL,
+	NULL,	/*open*/
+	NULL,	/*close*/
+	NULL,
+	NULL
+};
+
+struct uipaq_type {
+	struct usb_devno	uv_dev;
+	u_int16_t		uv_flags;
+};
+
+static const struct uipaq_type uipaq_devs[] = {
+	{{ USB_VENDOR_HP, USB_PRODUCT_HP_2215 }, 0 },
+	{{ USB_VENDOR_HP, USB_PRODUCT_HP_568J }, 0},
+	{{ USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQPOCKETPC} , 0},
+	{{ USB_VENDOR_CASIO, USB_PRODUCT_CASIO_BE300} , 0}
+};
+
+#define uipaq_lookup(v, p) ((struct uipaq_type *)usb_lookup(uipaq_devs, v, p))
+
+USB_DECLARE_DRIVER(uipaq);
+
+USB_MATCH(uipaq)
+{
+	USB_MATCH_START(uipaq, uaa);
+
+	if (uaa->iface != NULL)
+		return (UMATCH_NONE);
+
+	DPRINTFN(20,("uipaq: vendor=0x%x, product=0x%x\n",
+	    uaa->vendor, uaa->product));
+
+	return (uipaq_lookup(uaa->vendor, uaa->product) != NULL ?
+	    UMATCH_VENDOR_PRODUCT : UMATCH_NONE);
+}
+
+USB_ATTACH(uipaq)
+{
+	USB_ATTACH_START(uipaq, sc, uaa);
+	usbd_device_handle dev = uaa->device;
+	usbd_interface_handle iface;
+	usb_interface_descriptor_t *id;
+	usb_endpoint_descriptor_t *ed;
+	char devinfo[1024];
+	char *devname = USBDEVNAME(sc->sc_dev);
+	int i;
+	usbd_status err;
+	struct ucom_attach_args uca;
+
+	DPRINTFN(10,("\nuipaq_attach: sc=%p\n", sc));
+
+	/* Move the device into the configured state. */
+	err = usbd_set_config_no(dev, UIPAQ_CONFIG_NO, 1);
+	if (err) {
+		printf("\n%s: failed to set configuration, err=%s\n",
+		    devname, usbd_errstr(err));
+		goto bad;
+	}
+
+	err = usbd_device2interface_handle(dev, UIPAQ_IFACE_INDEX, &iface);
+	if (err) {
+		printf("\n%s: failed to get interface, err=%s\n",
+		    devname, usbd_errstr(err));
+		goto bad;
+	}
+
+	usbd_devinfo(dev, 0, devinfo, sizeof devinfo);
+	USB_ATTACH_SETUP;
+	printf("%s: %s\n", devname, devinfo);
+
+	sc->sc_flags = uipaq_lookup(uaa->vendor, uaa->product)->uv_flags;
+
+	id = usbd_get_interface_descriptor(iface);
+
+	sc->sc_udev = dev;
+	sc->sc_iface = iface;
+
+	uca.ibufsize = UIPAQIBUFSIZE;
+	uca.obufsize = UIPAQOBUFSIZE;
+	uca.ibufsizepad = UIPAQIBUFSIZE;
+	uca.opkthdrlen = 0;
+	uca.device = dev;
+	uca.iface = iface;
+	uca.methods = &uipaq_methods;
+	uca.arg = sc;
+	uca.portno = UCOM_UNK_PORTNO;
+	uca.info = "Generic";
+
+/*	err = uipaq_init(sc);
+	if (err) {
+		printf("%s: init failed, %s\n", USBDEVNAME(sc->sc_dev),
+		    usbd_errstr(err));
+		goto bad;
+	}*/
+
+	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev,
+	    USBDEV(sc->sc_dev));
+
+	uca.bulkin = uca.bulkout = -1;
+	for (i=0; i<id->bNumEndpoints; i++) {
+		ed = usbd_interface2endpoint_descriptor(iface, i);
+		if (ed == NULL) {
+			printf("%s: no endpoint descriptor for %d\n",
+					devname,i);
+			goto bad;
+		}
+		if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
+		    (ed->bmAttributes & UE_XFERTYPE) == UE_BULK) {
+			uca.bulkin = ed->bEndpointAddress;
+		} else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT &&
+		    (ed->bmAttributes & UE_XFERTYPE) == UE_BULK) {
+			uca.bulkout = ed->bEndpointAddress;
+		}
+	}
+	if (uca.bulkin != -1 && uca.bulkout != -1)
+		sc->sc_subdev = config_found_sm(self, &uca,
+		    ucomprint, ucomsubmatch);
+	else
+		printf("%s: no proper endpoints found (%d,%d) \n",
+		    devname, uca.bulkin, uca.bulkout);
+
+	USB_ATTACH_SUCCESS_RETURN;
+
+bad:
+	DPRINTF(("uipaq_attach: ATTACH ERROR\n"));
+	sc->sc_dying = 1;
+	USB_ATTACH_ERROR_RETURN;
+}
+
+
+void
+uipaq_dtr(struct uipaq_softc* sc, int onoff)
+{
+	usb_device_request_t req;
+	usbd_status err;
+	int retries = 3;
+
+	DPRINTF(("%s: uipaq_dtr: onoff=%x\n", USBDEVNAME(sc->sc_dev), onoff));
+
+	/* Avoid sending unnecessary requests */
+	if (onoff && (sc->sc_lcr & UCDC_LINE_DTR))
+		return;
+	if (!onoff && !(sc->sc_lcr & UCDC_LINE_DTR))
+		return;
+
+	/* Other parameters depend on reg */
+	req.bmRequestType = UT_WRITE_CLASS_INTERFACE;
+	req.bRequest = UCDC_SET_CONTROL_LINE_STATE;
+	sc->sc_lcr = onoff ? sc->sc_lcr | UCDC_LINE_DTR : sc->sc_lcr & ~UCDC_LINE_DTR;
+	USETW(req.wValue, sc->sc_lcr);
+	USETW(req.wIndex, 0x0);
+	USETW(req.wLength, 0);
+
+	/* Fire off the request a few times if necessary */
+	while (retries) {
+		err = usbd_do_request(sc->sc_udev, &req, NULL);
+		if (!err)
+			break;
+		retries--;
+	}
+}
+
+
+void
+uipaq_rts(struct uipaq_softc* sc, int onoff)
+{
+	usb_device_request_t req;
+	usbd_status err;
+	int retries = 3;
+
+	DPRINTF(("%s: uipaq_rts: onoff=%x\n", USBDEVNAME(sc->sc_dev), onoff));
+
+	/* Avoid sending unnecessary requests */
+	if (onoff && (sc->sc_lcr & UCDC_LINE_RTS)) return;
+	if (!onoff && !(sc->sc_lcr & UCDC_LINE_RTS)) return;
+
+	req.bmRequestType = UT_WRITE_CLASS_INTERFACE;
+	req.bRequest = UCDC_SET_CONTROL_LINE_STATE;
+	sc->sc_lcr = onoff ? sc->sc_lcr | UCDC_LINE_RTS : sc->sc_lcr & ~UCDC_LINE_RTS;
+	USETW(req.wValue, sc->sc_lcr);
+	USETW(req.wIndex, 0x0);
+	USETW(req.wLength, 0);
+
+	while (retries) {
+		err = usbd_do_request(sc->sc_udev, &req, NULL);
+		if (!err)
+			break;
+		retries--;
+	}
+}
+
+
+void
+uipaq_break(struct uipaq_softc* sc, int onoff)
+{
+	usb_device_request_t req;
+	usbd_status err;
+	int retries = 3;
+
+	DPRINTF(("%s: uipaq_break: onoff=%x\n", USBDEVNAME(sc->sc_dev), onoff));
+
+	req.bmRequestType = UT_WRITE_CLASS_INTERFACE;
+	req.bRequest = UCDC_SEND_BREAK;
+
+	USETW(req.wValue, onoff ? UCDC_BREAK_ON : UCDC_BREAK_OFF);
+	USETW(req.wIndex, 0x0);
+	USETW(req.wLength, 0);
+
+	while (retries) {
+		err = usbd_do_request(sc->sc_udev, &req, NULL);
+		if (!err)
+			break;
+		retries--;
+	}
+}
+
+
+void
+uipaq_set(void *addr, int portno, int reg, int onoff)
+{
+	struct uipaq_softc* sc = addr;
+
+	switch (reg) {
+	case UCOM_SET_DTR:
+		uipaq_dtr(addr, onoff);
+		break;
+	case UCOM_SET_RTS:
+		uipaq_rts(addr, onoff);
+		break;
+	case UCOM_SET_BREAK:
+		uipaq_break(addr, onoff);
+		break;
+	default:
+		printf("%s: unhandled set request: reg=%x onoff=%x\n",
+		    USBDEVNAME(sc->sc_dev), reg, onoff);
+		return;
+	}
+}
+
+
+int
+uipaq_activate(device_ptr_t self, enum devact act)
+{
+	struct uipaq_softc *sc = (struct uipaq_softc *)self;
+	int rv = 0;
+
+	switch (act) {
+	case DVACT_ACTIVATE:
+		return (EOPNOTSUPP);
+		break;
+
+	case DVACT_DEACTIVATE:
+		if (sc->sc_subdev != NULL)
+			rv = config_deactivate(sc->sc_subdev);
+		sc->sc_dying = 1;
+		break;
+	}
+	return (rv);
+}
+
+int
+uipaq_detach(device_ptr_t self, int flags)
+{
+	struct uipaq_softc *sc = (struct uipaq_softc *)self;
+	int rv = 0;
+
+	DPRINTF(("uipaq_detach: sc=%p flags=%d\n", sc, flags));
+	sc->sc_dying = 1;
+	if (sc->sc_subdev != NULL) {
+		rv |= config_detach(sc->sc_subdev, flags);
+		sc->sc_subdev = NULL;
+	}
+
+	usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev,
+	    USBDEV(sc->sc_dev));
+
+	return (rv);
+}
+
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index 0ba3ce92ba4..4323e550c9b 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb_port.h,v 1.57 2005/06/02 02:03:33 krw Exp $ */
+/*	$OpenBSD: usb_port.h,v 1.58 2005/06/17 23:50:33 deraadt Exp $ */
 /*	$NetBSD: usb_port.h,v 1.62 2003/02/15 18:33:30 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $	*/
 
@@ -98,6 +98,7 @@ MALLOC_DECLARE(M_USBHC);
 #define UDSBR_DEBUG 1
 #define UBT_DEBUG 1
 #define UAX_DEBUG 1
+#define UIPAQ_DEBUG 1
 #define Static
 #else
 #define Static static
@@ -234,6 +235,7 @@ int __CONCAT(dname,_detach)(struct device *self, int flags)
 #define USSCANNER_DEBUG 1
 #define UISDATA_DEBUG 1
 #define UDSBR_DEBUG 1
+#define UIPAQ_DEBUG 1
 #endif
 
 #define Static