modeswitch: morph into tool that only switches Mobile Action cables

Remove option modeswitching code; use usb_modeswitch already, people.

12 files changed, 32 insertions, 243 deletions

diff --git a/Makefile.am b/Makefile.am
index 99a0133b3a..68a68d9166 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -448,24 +448,21 @@ extras_usb_db_pci_db_LDADD = libudev/libudev-private.la
 libexec_PROGRAMS += extras/usb-db/pci-db
 
 # ------------------------------------------------------------------------------
-# modem-modeswitch - magic config switch for 3G modems
-# ------------------------------------------------------------------------------
-extras_modem_modeswitch_modem_modeswitch_SOURCES =\
-	extras/modem-modeswitch/modem-modeswitch.c \
-	extras/modem-modeswitch/utils.c \
-	extras/modem-modeswitch/utils.h \
-	extras/modem-modeswitch/ma8280p_us.c \
-	extras/modem-modeswitch/ma8280p_us.h \
-	extras/modem-modeswitch/option.c \
-	extras/modem-modeswitch/option.h
-extras_modem_modeswitch_modem_modeswitch_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB_CFLAGS)
-extras_modem_modeswitch_modem_modeswitch_LDADD = libudev/libudev-private.la $(LIBUSB_LIBS)
+# mobile-action-modeswitch - switch Mobile Action cables into serial mode
+# ------------------------------------------------------------------------------
+extras_mobile_action_modeswitch_mobile_action_modeswitch_SOURCES =\
+	extras/mobile-action-modeswitch/mobile-action-modeswitch.c \
+	extras/mobile-action-modeswitch/utils.c \
+	extras/mobile-action-modeswitch/utils.h \
+	extras/mobile-action-modeswitch/ma8280p_us.c \
+	extras/mobile-action-modeswitch/ma8280p_us.h
+extras_mobile_action_modeswitch_mobile_action_modeswitch_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB_CFLAGS)
+extras_mobile_action_modeswitch_mobile_action_modeswitch_LDADD = libudev/libudev-private.la $(LIBUSB_LIBS)
 
 dist_udevrules_DATA += \
-	extras/modem-modeswitch/61-option-modem-modeswitch.rules \
-	extras/modem-modeswitch/61-mobile-action.rules
+	extras/mobile-action-modeswitch/61-mobile-action.rules
 
-libexec_PROGRAMS += extras/modem-modeswitch/modem-modeswitch
+libexec_PROGRAMS += extras/mobile-action-modeswitch/mobile-action-modeswitch
 
 # ------------------------------------------------------------------------------
 # keymap - map custom hardware's multimedia keys
diff --git a/extras/modem-modeswitch/.gitignore b/extras/mobile-action-modeswitch/.gitignore
index 0c1ff9f86c..0c1ff9f86c 100644
--- a/extras/modem-modeswitch/.gitignore
+++ b/extras/mobile-action-modeswitch/.gitignore
diff --git a/extras/mobile-action-modeswitch/61-mobile-action.rules b/extras/mobile-action-modeswitch/61-mobile-action.rules
new file mode 100644
index 0000000000..0af27a5cd4
--- /dev/null
+++ b/extras/mobile-action-modeswitch/61-mobile-action.rules
@@ -0,0 +1,15 @@
+ACTION!="add", GOTO="mobile_action_end"
+
+# ATTENTION: DO NOT USE THIS FILE FOR ANYTHING EXCEPT
+# MOBILE ACTION CABLES.  DO NOT USE IT FOR 3G DEVICES!
+
+SUBSYSTEM=="usb", ATTR{bDeviceClass}=="00|ff", ATTR{bDeviceSubClass}=="00|ff", ENV{DEVTYPE}=="usb_device", GOTO="mobile_action_switch"
+GOTO="mobile_action_end"
+
+LABEL="mobile_action_switch"
+
+# Mobile Action cables like the 8280p and 8230p
+ATTRS{idVendor}=="0df7", ATTRS{idProduct}=="0800", RUN+="mobile-action-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t mobile-action-8280p"
+
+LABEL="mobile_action_end"
+
diff --git a/extras/modem-modeswitch/ma8280p_us.c b/extras/mobile-action-modeswitch/ma8280p_us.c
index d7cf4f4b3f..d7cf4f4b3f 100644
--- a/extras/modem-modeswitch/ma8280p_us.c
+++ b/extras/mobile-action-modeswitch/ma8280p_us.c
diff --git a/extras/modem-modeswitch/ma8280p_us.h b/extras/mobile-action-modeswitch/ma8280p_us.h
index bf0e304401..bf0e304401 100644
--- a/extras/modem-modeswitch/ma8280p_us.h
+++ b/extras/mobile-action-modeswitch/ma8280p_us.h
diff --git a/extras/modem-modeswitch/modem-modeswitch.c b/extras/mobile-action-modeswitch/mobile-action-modeswitch.c
index a60ce7a41c..36d7d81a11 100644
--- a/extras/modem-modeswitch/modem-modeswitch.c
+++ b/extras/mobile-action-modeswitch/mobile-action-modeswitch.c
@@ -1,7 +1,7 @@
 /*
- * Modem mode switcher
+ * Mobile action cable mode switcher
  *
- * Copyright (C) 2008  Dan Williams <dcbw@redhat.com>
+ * Copyright (C) 2008 - 2010  Dan Williams <dcbw@redhat.com>
  * Copyright (C) 2008  Peter Henn <support@option.com>
  *
  * Heavily based on the 'ozerocdoff' tool by Peter Henn.
@@ -30,7 +30,6 @@
 #include "utils.h"
 
 #include "ma8280p_us.h"
-#include "option.h"
 
 struct usb_dev_handle *handle = NULL;
 
@@ -39,7 +38,6 @@ typedef int (*SwitchFunc) (struct usb_dev_handle *dh, struct usb_device *dev);
 
 typedef enum {
 	ST_UNKNOWN = 0,
-	ST_OPTION_ZEROCD,
 	ST_MA8280P
 } SwitchType;
 
@@ -51,7 +49,6 @@ typedef struct SwitchEntry {
 } SwitchEntry;
 
 static SwitchEntry switch_types[] = {
-	{ ST_OPTION_ZEROCD, "option-zerocd", option_zerocd_find, option_zerocd_switch },
 	{ ST_MA8280P, "mobile-action-8280p", NULL, ma8280p_switch },
 	{ ST_UNKNOWN, NULL, NULL }
 };
@@ -83,18 +80,17 @@ release_usb_device (int param)
 static void
 print_usage (void)
 {
-	printf ("Usage: modem-modeswitch [-hdq] [-l <file>] -v <vendor-id> -p <product-id> -t <type>\n"
+	printf ("Usage: mobile-action-modeswitch [-hdq] [-l <file>] -v <vendor-id> -p <product-id> -t <type>\n"
 	        " -h, --help               show this help message\n"
 	        " -v, --vendor <n>         target USB vendor ID\n"
 	        " -p, --product <n>        target USB product ID\n"
 	        " -t, --type <type>        type of switch to attempt, varies by device:\n"
-	        "                               option-zerocd         - For many newer Option N.V. devices\n"
 	        "                               mobile-action-8280p   - For Mobile Action 8xxxP USB cables\n"
 	        " -l, --log <file>         log output to a file\n"
 	        " -q, --quiet              don't print anything to stdout\n"
 	        " -d, --debug              display debugging messages\n\n"
 	        "Examples:\n"
-	        "   modem-modeswitch -v 0x0af0 -p 0xc031 -t option-zerocd\n");
+	        "   mobile-action-modeswitch -v 0x0df7 -p 0x8000 -t mobile-action-8280p\n");
 }
 
 static SwitchEntry *
@@ -249,7 +245,7 @@ int main(int argc, char **argv)
 
 	ret = (*sentry->switch_func) (handle, dev);
 	if (ret < 0) {
-		debug ("%s: failed to switch device to modem mode.", dev->filename);
+		debug ("%s: failed to switch device to serial mode.", dev->filename);
 		usb_release_interface (handle, 0);
 		usb_close (handle);
 		do_exit(9);
diff --git a/extras/modem-modeswitch/utils.c b/extras/mobile-action-modeswitch/utils.c
index 37d0df4d65..37d0df4d65 100644
--- a/extras/modem-modeswitch/utils.c
+++ b/extras/mobile-action-modeswitch/utils.c
diff --git a/extras/modem-modeswitch/utils.h b/extras/mobile-action-modeswitch/utils.h
index 1ef557a892..1ef557a892 100644
--- a/extras/modem-modeswitch/utils.h
+++ b/extras/mobile-action-modeswitch/utils.h
diff --git a/extras/modem-modeswitch/61-mobile-action.rules b/extras/modem-modeswitch/61-mobile-action.rules
deleted file mode 100644
index 29d460d53d..0000000000
--- a/extras/modem-modeswitch/61-mobile-action.rules
+++ /dev/null
@@ -1,15 +0,0 @@
-ACTION!="add", GOTO="mobile_action_end"
-
-SUBSYSTEM=="usb", ATTR{bDeviceClass}=="00|ff", ATTR{bDeviceSubClass}=="00|ff", ENV{DEVTYPE}=="usb_device", GOTO="mobile_action_switch"
-GOTO="mobile_action_end"
-
-LABEL="mobile_action_switch"
-ATTRS{idVendor}=="0df7", ATTRS{idProduct}=="0800", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t mobile-action-8280p"
-
-LABEL="mobile_action_end"
-
-# modem-modeswitch does not work with these devices, the fake CD-ROM needs to be ejected
-
-# ZTE MF6xx
-ACTION=="add", ENV{ID_CDROM}=="1", ENV{ID_VENDOR_ID}=="19d2", ENV{ID_MODEL_ID}=="2000", RUN+="/usr/bin/eject %k"
-
diff --git a/extras/modem-modeswitch/61-option-modem-modeswitch.rules b/extras/modem-modeswitch/61-option-modem-modeswitch.rules
deleted file mode 100644
index 053733efb3..0000000000
--- a/extras/modem-modeswitch/61-option-modem-modeswitch.rules
+++ /dev/null
@@ -1,44 +0,0 @@
-# NOTE: only for devices manufactured by Option NV
-# DO NOT add devices that are not manufactured by Option NV
-
-ACTION!="add", GOTO="option_zerocd_end"
-
-SUBSYSTEM=="usb", ATTR{bDeviceClass}!="ff", ENV{DEVTYPE}=="usb_device", GOTO="option_zerocd_disable"
-SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", GOTO="option_zerocd_disable"
-GOTO="option_zerocd_end"
-
-LABEL="option_zerocd_disable"
-ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="1000", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="6711", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="6711", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="6731", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="6751", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="6771", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="6791", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="6811", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="6911", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="6951", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="6971", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7011", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7031", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7051", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7071", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7111", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7211", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7251", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7271", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7311", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="c031", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="d031", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="d033", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7301", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7361", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7401", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7501", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7601", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-ATTRS{idVendor}=="0af0", ATTRS{idProduct}=="7901", RUN+="modem-modeswitch -v 0x%s{idVendor} -p 0x%s{idProduct} -t option-zerocd"
-
-# NOTE: only for devices manufactured by Option NV
-# DO NOT add devices that are not manufactured by Option NV
-
-LABEL="option_zerocd_end"
diff --git a/extras/modem-modeswitch/option.c b/extras/modem-modeswitch/option.c
deleted file mode 100644
index 5b299fd1bf..0000000000
--- a/extras/modem-modeswitch/option.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Modem mode switcher
- *
- * Copyright (C) 2008  Dan Williams <dcbw@redhat.com>
- * Copyright (C) 2008  Peter Henn <support@option.com>
- *
- * Heavily based on the 'ozerocdoff' tool by Peter Henn.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details:
- */
-
-#include <usb.h>
-
-#include "utils.h"
-#include "option.h"
-
-/* Borrowed from /usr/include/linux/usb/ch9.h */
-#define USB_ENDPOINT_XFERTYPE_MASK      0x03    /* in bmAttributes */
-#define USB_ENDPOINT_XFER_BULK          2
-#define USB_ENDPOINT_DIR_MASK           0x80
-#define USB_DIR_OUT                     0       /* to device */
-#define USB_DIR_IN                      0x80    /* to host */
-
-struct usb_device *
-option_zerocd_find (int vid, int pid)
-{
-	struct usb_bus *bus;
-	struct usb_device *dev;
-
-	for (bus = usb_get_busses(); bus; bus = bus->next) {
-		for (dev = bus->devices; dev; dev = dev->next) {
-			if (dev->descriptor.idVendor == vid && dev->descriptor.idProduct == pid) {
-				debug ("Found mass storage device:");
-				debug ("  Endpoints: %d", dev->config[0].interface[0].altsetting[0].bNumEndpoints);
-				debug ("  Class:     0x%X", dev->config[0].interface[0].altsetting[0].bInterfaceClass);
-				debug ("  SubClass:  0x%X", dev->config[0].interface[0].altsetting[0].bInterfaceSubClass);
-				debug ("  Protocol:  0x%X", dev->config[0].interface[0].altsetting[0].bInterfaceProtocol);
-
-				if (   (dev->config[0].interface[0].altsetting[0].bNumEndpoints == 2)
-				    && (dev->config[0].interface[0].altsetting[0].bInterfaceClass == 0x08)
-				    && (dev->config[0].interface[0].altsetting[0].bInterfaceSubClass == 0x06)
-				    && (dev->config[0].interface[0].altsetting[0].bInterfaceProtocol == 0x50) ) {
-					debug ("Found modem mass storage device '%s'", dev->filename);
-					return dev;
-				}
-			}
-		}
-	}
-	return NULL;
-}
-
-static int
-find_endpoints (struct usb_device *dev, int *in_ep, int *out_ep)
-{
-	int i;
-
-	for (i = 0; i < dev->config[0].interface[0].altsetting[0].bNumEndpoints; i++) {
-		struct usb_endpoint_descriptor *ep = &(dev->config[0].interface[0].altsetting[0].endpoint[i]);
-
-		if ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK) {
-			unsigned int direction = ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK;
-
-			if (!*out_ep && (direction == USB_DIR_OUT))
-				*out_ep = ep->bEndpointAddress;
-			else if (!*in_ep && (direction == USB_DIR_IN))
-				*in_ep = ep->bEndpointAddress;
-		}
-
-		if (*in_ep && *out_ep)
-			return 0;
-	}
-
-	return -1;
-}
-
-int
-option_zerocd_switch (struct usb_dev_handle *dh, struct usb_device *dev)
-{
-	const char const rezero_cbw[] = {
-		0x55, 0x53, 0x42, 0x43, /* bulk command signature (LE) */
-		0x78, 0x56, 0x34, 0x12, /* bulk command host tag */
-		0x01, 0x00, 0x00, 0x00, /* bulk command data transfer length (LE) */
-		0x80,                   /* flags: direction data-in */
-		0x00,                   /* LUN */
-		0x06,                   /* SCSI command length */
-		0x01,                   /* SCSI command: REZERO */
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* filler */
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	};
-
-	int ret = -1, ep_in = 0, ep_out = 0;
-	char buffer[256];
-
-	/* Find the device's bulk in and out endpoints */
-	if (find_endpoints (dev, &ep_in, &ep_out) < 0) {
-		debug ("%s: couldn't find correct USB endpoints.", dev->filename);
-		goto out;
-	}
-
-	usb_clear_halt (dh, ep_out);
-	ret = usb_set_altinterface (dh, 0);
-	if (ret != 0) {
-		debug ("%s: couldn't set device alternate interface.", dev->filename);
-		goto out;
-	}
-
-	/* Let the mass storage device settle */
-	sleep (1);
-
-	/* Send the modeswitch command */
-	ret = usb_bulk_write (dh, ep_out, (char *) rezero_cbw, sizeof (rezero_cbw), 1000);
-	if (ret < 0)
-		return ret;
-
-	debug ("%s: REZERO command sent.", dev->filename);
-
-	/* Some devices need to be read from */
-	ret = usb_bulk_read (dh, ep_in, buffer, sizeof (buffer), 1000);
-
-out:
-	return ret;
-}
-
diff --git a/extras/modem-modeswitch/option.h b/extras/modem-modeswitch/option.h
deleted file mode 100644
index e00dabf082..0000000000
--- a/extras/modem-modeswitch/option.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Modem mode switcher
- *
- * Copyright (C) 2008  Dan Williams <dcbw@redhat.com>
- * Copyright (C) 2008  Peter Henn <support@option.com>
- *
- * Heavily based on the 'ozerocdoff' tool by Peter Henn.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details:
- */
-
-#ifndef __OPTION_H__
-#define __OPTION_H__
-
-#include <usb.h>
-
-struct usb_device *option_zerocd_find (int vid, int pid);
-
-int option_zerocd_switch (struct usb_dev_handle *dh, struct usb_device *dev);
-
-#endif  /* __OPTION_H__ */