Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/usb split the mode switch part of the u3g driver int...
details: https://anonhg.NetBSD.org/src/rev/1b4e380ab0d7
branches: trunk
changeset: 824122:1b4e380ab0d7
user: christos <christos%NetBSD.org@localhost>
date: Wed May 24 20:23:58 2017 +0000
description:
split the mode switch part of the u3g driver into a separate file so that
others can use it.
diffstat:
sys/dev/usb/files.usb | 13 +-
sys/dev/usb/u3g.c | 419 +----------------------------------------
sys/dev/usb/umodeswitch.c | 467 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 479 insertions(+), 420 deletions(-)
diffs (truncated from 958 to 300 lines):
diff -r dd239ceb46b6 -r 1b4e380ab0d7 sys/dev/usb/files.usb
--- a/sys/dev/usb/files.usb Wed May 24 20:23:04 2017 +0000
+++ b/sys/dev/usb/files.usb Wed May 24 20:23:58 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.usb,v 1.144 2017/05/20 00:56:32 pgoyette Exp $
+# $NetBSD: files.usb,v 1.145 2017/05/24 20:23:58 christos Exp $
#
# Config file and device description for machine-independent USB code.
# Included by ports that need it. Ports that use it must provide
@@ -272,6 +272,11 @@
# Misc
#
+# Mode switch usb driver
+device umodeswitch
+attach umodeswitch at usbdevif
+file dev/usb/umodeswitch.c umodeswitch
+
# Diamond Multimedia Rio 500
device urio
attach urio at usbdevif
@@ -298,11 +303,9 @@
file dev/usb/ugensa.c ugensa
# 3G Modem
-device u3g: ucombus
+device u3g: ucombus, umodeswitch
attach u3g at usbifif
-device u3ginit
-attach u3ginit at usbdevif
-file dev/usb/u3g.c u3g | u3ginit
+file dev/usb/u3g.c u3g
# YAP phone firmware loader
device uyap: ezload
diff -r dd239ceb46b6 -r 1b4e380ab0d7 sys/dev/usb/u3g.c
--- a/sys/dev/usb/u3g.c Wed May 24 20:23:04 2017 +0000
+++ b/sys/dev/usb/u3g.c Wed May 24 20:23:58 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: u3g.c,v 1.33 2017/05/04 14:21:01 hauke Exp $ */
+/* $NetBSD: u3g.c,v 1.34 2017/05/24 20:23:58 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.33 2017/05/04 14:21:01 hauke Exp $");
+__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.34 2017/05/24 20:23:58 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -137,19 +137,13 @@
* interface attribute so that a match will claim the entire USB device
* for itself. This is used for when a device needs to be mode-switched
* and ensures any other interfaces present cannot be claimed by other
- * drivers while the mode-switch is in progress.
+ * drivers while the mode-switch is in progress. This is implemented by
+ * the umodeswitch driver.
*
* The second personality uses the 'usbifif' interface attribute so that
* it can claim the 3G modem interfaces for itself, leaving others (such
* as the mass storage interfaces on some devices) for other drivers.
*/
-static int u3ginit_match(device_t, cfdata_t, void *);
-static void u3ginit_attach(device_t, device_t, void *);
-static int u3ginit_detach(device_t, int);
-
-CFATTACH_DECL2_NEW(u3ginit, 0, u3ginit_match,
- u3ginit_attach, u3ginit_detach, NULL, NULL, NULL);
-
static int u3g_match(device_t, cfdata_t, void *);
static void u3g_attach(device_t, device_t, void *);
@@ -266,411 +260,6 @@
{ USB_VENDOR_4GSYSTEMS, USB_PRODUCT_4GSYSTEMS_XSSTICK_W14 },
};
-static int
-send_bulkmsg(struct usbd_device *dev, void *cmd, size_t cmdlen)
-{
- struct usbd_interface *iface;
- usb_interface_descriptor_t *id;
- usb_endpoint_descriptor_t *ed;
- struct usbd_pipe *pipe;
- struct usbd_xfer *xfer;
- int err, i;
-
- /* Move the device into the configured state. */
- err = usbd_set_config_index(dev, 0, 0);
- if (err) {
- aprint_error("u3ginit: failed to set config index\n");
- return UMATCH_NONE;
- }
-
- err = usbd_device2interface_handle(dev, 0, &iface);
- if (err != 0) {
- aprint_error("u3ginit: failed to get interface\n");
- return UMATCH_NONE;
- }
-
- id = usbd_get_interface_descriptor(iface);
- ed = NULL;
- for (i = 0 ; i < id->bNumEndpoints ; i++) {
- ed = usbd_interface2endpoint_descriptor(iface, i);
- if (ed == NULL)
- continue;
- if (UE_GET_DIR(ed->bEndpointAddress) != UE_DIR_OUT)
- continue;
- if ((ed->bmAttributes & UE_XFERTYPE) == UE_BULK)
- break;
- }
-
- if (i == id->bNumEndpoints)
- return UMATCH_NONE;
-
- err = usbd_open_pipe(iface, ed->bEndpointAddress,
- USBD_EXCLUSIVE_USE, &pipe);
- if (err != 0) {
- aprint_error("u3ginit: failed to open bulk transfer pipe %d\n",
- ed->bEndpointAddress);
- return UMATCH_NONE;
- }
-
- int error = usbd_create_xfer(pipe, cmdlen, 0, 0, &xfer);
- if (!error) {
-
- usbd_setup_xfer(xfer, NULL, cmd, cmdlen,
- USBD_SYNCHRONOUS, USBD_DEFAULT_TIMEOUT, NULL);
-
- err = usbd_transfer(xfer);
-
-#if 0 /* XXXpooka: at least my huawei "fails" this always, but still detaches */
- if (err)
- aprint_error("u3ginit: transfer failed\n");
-#else
- err = 0;
-#endif
- usbd_destroy_xfer(xfer);
- } else {
- aprint_error("u3ginit: failed to allocate xfer\n");
- err = USBD_NOMEM;
- }
-
- usbd_abort_pipe(pipe);
- usbd_close_pipe(pipe);
-
- return err == USBD_NORMAL_COMPLETION ? UMATCH_HIGHEST : UMATCH_NONE;
-}
-
-/* Byte 0..3: Command Block Wrapper (CBW) signature */
-static void
-set_cbw(unsigned char *cmd)
-{
- cmd[0] = 0x55;
- cmd[1] = 0x53;
- cmd[2] = 0x42;
- cmd[3] = 0x43;
-}
-
-static int
-u3g_bulk_scsi_eject(struct usbd_device *dev)
-{
- unsigned char cmd[31];
-
- memset(cmd, 0, sizeof(cmd));
- /* Byte 0..3: Command Block Wrapper (CBW) signature */
- set_cbw(cmd);
- /* 4..7: CBW Tag, has to unique, but only a single transfer used. */
- cmd[4] = 0x01;
- /* 8..11: CBW Transfer Length, no data here */
- /* 12: CBW Flag: output, so 0 */
- /* 13: CBW Lun: 0 */
- /* 14: CBW Length */
- cmd[14] = 0x06;
-
- /* Rest is the SCSI payload */
-
- /* 0: SCSI START/STOP opcode */
- cmd[15] = 0x1b;
- /* 1..3 unused */
- /* 4 Load/Eject command */
- cmd[19] = 0x02;
- /* 5: unused */
-
- return send_bulkmsg(dev, cmd, sizeof(cmd));
-}
-
-static int
-u3g_bulk_ata_eject(struct usbd_device *dev)
-{
- unsigned char cmd[31];
-
- memset(cmd, 0, sizeof(cmd));
- /* Byte 0..3: Command Block Wrapper (CBW) signature */
- set_cbw(cmd);
- /* 4..7: CBW Tag, has to unique, but only a single transfer used. */
- cmd[4] = 0x01;
- /* 8..11: CBW Transfer Length, no data here */
- /* 12: CBW Flag: output, so 0 */
- /* 13: CBW Lun: 0 */
- /* 14: CBW Length */
- cmd[14] = 0x06;
-
- /* Rest is the SCSI payload */
-
- /* 0: ATA pass-through */
- cmd[15] = 0x85;
- /* 1..3 unused */
- /* 4 XXX What is this command? */
- cmd[19] = 0x24;
- /* 5: unused */
-
- return send_bulkmsg(dev, cmd, sizeof(cmd));
-}
-
-static int
-u3g_huawei_reinit(struct usbd_device *dev)
-{
- /*
- * The Huawei device presents itself as a umass device with Windows
- * drivers on it. After installation of the driver, it reinits into a
- * 3G serial device.
- */
- usb_device_request_t req;
- usb_config_descriptor_t *cdesc;
-
- /* Get the config descriptor */
- cdesc = usbd_get_config_descriptor(dev);
- if (cdesc == NULL) {
- usb_device_descriptor_t dd;
-
- if (usbd_get_device_desc(dev, &dd) != 0)
- return UMATCH_NONE;
-
- if (dd.bNumConfigurations != 1)
- return UMATCH_NONE;
-
- if (usbd_set_config_index(dev, 0, 1) != 0)
- return UMATCH_NONE;
-
- cdesc = usbd_get_config_descriptor(dev);
-
- if (cdesc == NULL)
- return UMATCH_NONE;
- }
-
- /*
- * One iface means umass mode, more than 1 (4 usually) means 3G mode.
- *
- * XXX: We should check the first interface's device class just to be
- * sure. If it's a mass storage device, then we can be fairly certain
- * it needs a mode-switch.
- */
- if (cdesc->bNumInterface > 1)
- return UMATCH_NONE;
-
- req.bmRequestType = UT_WRITE_DEVICE;
- req.bRequest = UR_SET_FEATURE;
- USETW(req.wValue, UF_DEVICE_REMOTE_WAKEUP);
- USETW(req.wIndex, UHF_PORT_SUSPEND);
- USETW(req.wLength, 0);
-
- (void) usbd_do_request(dev, &req, 0);
-
- return UMATCH_HIGHEST; /* Prevent umass from attaching */
-}
-
-static int
-u3g_huawei_k3765_reinit(struct usbd_device *dev)
-{
- unsigned char cmd[31];
-
- /* magic string adapted from some webpage */
- memset(cmd, 0, sizeof(cmd));
- /* Byte 0..3: Command Block Wrapper (CBW) signature */
- set_cbw(cmd);
-
- cmd[15]= 0x11;
- cmd[16]= 0x06;
-
- return send_bulkmsg(dev, cmd, sizeof(cmd));
-}
-static int
-u3g_huawei_e171_reinit(struct usbd_device *dev)
-{
- unsigned char cmd[31];
-
- /* magic string adapted from some webpage */
- memset(cmd, 0, sizeof(cmd));
- /* Byte 0..3: Command Block Wrapper (CBW) signature */
- set_cbw(cmd);
-
- cmd[15]= 0x11;
- cmd[16]= 0x06;
- cmd[17]= 0x20;
- cmd[20]= 0x01;
-
- return send_bulkmsg(dev, cmd, sizeof(cmd));
Home |
Main Index |
Thread Index |
Old Index