Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-2]: src/sys/dev/usb Pull up new file (revisions 1.1-1.3 via patch...
details: https://anonhg.NetBSD.org/src/rev/59099f004039
branches: netbsd-2
changeset: 563816:59099f004039
user: riz <riz%NetBSD.org@localhost>
date: Thu Jul 21 19:26:48 2005 +0000
description:
Pull up new file (revisions 1.1-1.3 via patch) (requested by itohy
in ticket #1430):
1.1:
Split common modem part of umodem.c to umodem_common.c and umodemvar.h,
to be shared with other umodem-like drivers.
1.2:
If CM descriptor is found, use the data interface in it;
if CM descriptor is NOT found but UNION descriotor is found,
use the data interface in it.
Do not require CM or ACM descriptors as long as
the data interface is found.
Should fix NetBSD PR #29754 by rivo nurges.
1.3:
Fix function name in debug messages.
White space police.
diffstat:
sys/dev/usb/umodem_common.c | 706 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 706 insertions(+), 0 deletions(-)
diffs (truncated from 710 to 300 lines):
diff -r ebe3bca15ae5 -r 59099f004039 sys/dev/usb/umodem_common.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/usb/umodem_common.c Thu Jul 21 19:26:48 2005 +0000
@@ -0,0 +1,706 @@
+/* $NetBSD: umodem_common.c,v 1.5.4.2 2005/07/21 19:26:48 riz Exp $ */
+
+/*
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Lennart Augustsson (lennart%augustsson.net@localhost) 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.
+ */
+
+/*
+ * Comm Class spec: http://www.usb.org/developers/devclass_docs/usbccs10.pdf
+ * http://www.usb.org/developers/devclass_docs/usbcdc11.pdf
+ */
+
+/*
+ * TODO:
+ * - Add error recovery in various places; the big problem is what
+ * to do in a callback if there is an error.
+ * - Implement a Call Device for modems without multiplexed commands.
+ *
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.5.4.2 2005/07/21 19:26:48 riz Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/ioctl.h>
+#include <sys/conf.h>
+#include <sys/tty.h>
+#include <sys/file.h>
+#include <sys/select.h>
+#include <sys/proc.h>
+#include <sys/vnode.h>
+#include <sys/device.h>
+#include <sys/poll.h>
+
+#include <dev/usb/usb.h>
+#include <dev/usb/usbcdc.h>
+
+#include <dev/usb/usbdi.h>
+#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdevs.h>
+#include <dev/usb/usb_quirks.h>
+
+#include <dev/usb/usbdevs.h>
+#include <dev/usb/ucomvar.h>
+#include <dev/usb/umodemvar.h>
+
+#ifdef UMODEM_DEBUG
+#define DPRINTFN(n, x) if (umodemdebug > (n)) logprintf x
+int umodemdebug = 0;
+#else
+#define DPRINTFN(n, x)
+#endif
+#define DPRINTF(x) DPRINTFN(0, x)
+
+/*
+ * These are the maximum number of bytes transferred per frame.
+ * If some really high speed devices should use this driver they
+ * may need to be increased, but this is good enough for normal modems.
+ */
+#define UMODEMIBUFSIZE 64
+#define UMODEMOBUFSIZE 256
+
+Static usbd_status umodem_set_comm_feature(struct umodem_softc *sc,
+ int feature, int state);
+Static usbd_status umodem_set_line_coding(struct umodem_softc *sc,
+ usb_cdc_line_state_t *state);
+
+Static void umodem_dtr(struct umodem_softc *, int);
+Static void umodem_rts(struct umodem_softc *, int);
+Static void umodem_break(struct umodem_softc *, int);
+Static void umodem_set_line_state(struct umodem_softc *);
+Static void umodem_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
+
+/* backport glue */
+Static usb_descriptor_t *usb_find_desc_if(usbd_device_handle, int, int,
+ usb_interface_descriptor_t *);
+/* end glue */
+
+int
+umodem_common_attach(device_ptr_t self, struct umodem_softc *sc,
+ struct usb_attach_arg *uaa, struct ucom_attach_args *uca)
+{
+ usbd_device_handle dev = uaa->device;
+ usb_interface_descriptor_t *id;
+ usb_endpoint_descriptor_t *ed;
+ char devinfo[1024];
+ usbd_status err;
+ int data_ifcno;
+ int i;
+
+ usbd_devinfo(uaa->device, 0, devinfo);
+ USB_ATTACH_SETUP;
+
+ sc->sc_udev = dev;
+ sc->sc_ctl_iface = uaa->iface;
+
+ id = usbd_get_interface_descriptor(sc->sc_ctl_iface);
+ printf("%s: %s, iclass %d/%d\n", USBDEVNAME(sc->sc_dev),
+ devinfo, id->bInterfaceClass, id->bInterfaceSubClass);
+ sc->sc_ctl_iface_no = id->bInterfaceNumber;
+
+ /* Get the data interface no. */
+ sc->sc_data_iface_no = data_ifcno =
+ umodem_get_caps(dev, &sc->sc_cm_cap, &sc->sc_acm_cap, id);
+
+ if (data_ifcno == -1) {
+ printf("%s: no pointer to data interface\n",
+ USBDEVNAME(sc->sc_dev));
+ goto bad;
+ }
+
+ printf("%s: data interface %d, has %sCM over data, has %sbreak\n",
+ USBDEVNAME(sc->sc_dev), data_ifcno,
+ sc->sc_cm_cap & USB_CDC_CM_OVER_DATA ? "" : "no ",
+ sc->sc_acm_cap & USB_CDC_ACM_HAS_BREAK ? "" : "no ");
+
+ /* Get the data interface too. */
+ for (i = 0; i < uaa->nifaces; i++) {
+ if (uaa->ifaces[i] != NULL) {
+ id = usbd_get_interface_descriptor(uaa->ifaces[i]);
+ if (id != NULL && id->bInterfaceNumber == data_ifcno) {
+ sc->sc_data_iface = uaa->ifaces[i];
+ uaa->ifaces[i] = NULL;
+ }
+ }
+ }
+ if (sc->sc_data_iface == NULL) {
+ printf("%s: no data interface\n", USBDEVNAME(sc->sc_dev));
+ goto bad;
+ }
+
+ /*
+ * Find the bulk endpoints.
+ * Iterate over all endpoints in the data interface and take note.
+ */
+ uca->bulkin = uca->bulkout = -1;
+
+ id = usbd_get_interface_descriptor(sc->sc_data_iface);
+ for (i = 0; i < id->bNumEndpoints; i++) {
+ ed = usbd_interface2endpoint_descriptor(sc->sc_data_iface, i);
+ if (ed == NULL) {
+ printf("%s: no endpoint descriptor for %d\n",
+ USBDEVNAME(sc->sc_dev), 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) {
+ printf("%s: Could not find data bulk in\n",
+ USBDEVNAME(sc->sc_dev));
+ goto bad;
+ }
+ if (uca->bulkout == -1) {
+ printf("%s: Could not find data bulk out\n",
+ USBDEVNAME(sc->sc_dev));
+ goto bad;
+ }
+
+ if (usbd_get_quirks(sc->sc_udev)->uq_flags & UQ_ASSUME_CM_OVER_DATA) {
+ sc->sc_cm_over_data = 1;
+ } else {
+ if (sc->sc_cm_cap & USB_CDC_CM_OVER_DATA) {
+ if (sc->sc_acm_cap & USB_CDC_ACM_HAS_FEATURE)
+ err = umodem_set_comm_feature(sc,
+ UCDC_ABSTRACT_STATE, UCDC_DATA_MULTIPLEXED);
+ else
+ err = 0;
+ if (err) {
+ printf("%s: could not set data multiplex mode\n",
+ USBDEVNAME(sc->sc_dev));
+ goto bad;
+ }
+ sc->sc_cm_over_data = 1;
+ }
+ }
+
+ /*
+ * The standard allows for notification messages (to indicate things
+ * like a modem hangup) to come in via an interrupt endpoint
+ * off of the control interface. Iterate over the endpoints on
+ * the control interface and see if there are any interrupt
+ * endpoints; if there are, then register it.
+ */
+
+ sc->sc_ctl_notify = -1;
+ sc->sc_notify_pipe = NULL;
+
+ for (i = 0; i < id->bNumEndpoints; i++) {
+ ed = usbd_interface2endpoint_descriptor(sc->sc_ctl_iface, i);
+ if (ed == NULL)
+ continue;
+
+ if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
+ (ed->bmAttributes & UE_XFERTYPE) == UE_INTERRUPT) {
+ printf("%s: status change notification available\n",
+ USBDEVNAME(sc->sc_dev));
+ sc->sc_ctl_notify = ed->bEndpointAddress;
+ }
+ }
+
+ sc->sc_dtr = -1;
+
+ /* bulkin, bulkout set above */
+ uca->ibufsize = UMODEMIBUFSIZE;
+ uca->obufsize = UMODEMOBUFSIZE;
+ uca->ibufsizepad = UMODEMIBUFSIZE;
+ uca->opkthdrlen = 0;
+ uca->device = sc->sc_udev;
+ uca->iface = sc->sc_data_iface;
+ uca->arg = sc;
+
+ usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev,
+ USBDEV(sc->sc_dev));
+
+ DPRINTF(("umodem_common_attach: sc=%p\n", sc));
+ sc->sc_subdev = config_found_sm(self, uca, ucomprint, ucomsubmatch);
+
+ return 0;
+
+ bad:
+ sc->sc_dying = 1;
+ return 1;
+}
+
+int
+umodem_open(void *addr, int portno)
+{
+ struct umodem_softc *sc = addr;
+ int err;
+
+ DPRINTF(("umodem_open: sc=%p\n", sc));
+
+ if (sc->sc_ctl_notify != -1 && sc->sc_notify_pipe == NULL) {
+ err = usbd_open_pipe_intr(sc->sc_ctl_iface, sc->sc_ctl_notify,
+ USBD_SHORT_XFER_OK, &sc->sc_notify_pipe, sc,
+ &sc->sc_notify_buf, sizeof(sc->sc_notify_buf),
+ umodem_intr, USBD_DEFAULT_INTERVAL);
+
+ if (err) {
+ DPRINTF(("Failed to establish notify pipe: %s\n",
+ usbd_errstr(err)));
+ return EIO;
+ }
+ }
+
+ return 0;
+}
+
+void
+umodem_close(void *addr, int portno)
+{
+ struct umodem_softc *sc = addr;
+ int err;
+
+ DPRINTF(("umodem_close: sc=%p\n", sc));
Home |
Main Index |
Thread Index |
Old Index