X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fusbmode.git;a=blobdiff_plain;f=switch.c;h=cc0423702398858a4d570d330ce4e30f7bd8d255;hp=9f1f3b4c3fbd7991b7b846cc7e63b2ac8fdd9049;hb=f40f84c27534159066c94dadc0c08e0b255c3e26;hpb=b62a33af03c39a8970249ce7afe7baec7ea9b91b

diff --git a/switch.c b/switch.c
index 9f1f3b4..cc04237 100644
--- a/switch.c
+++ b/switch.c
@@ -3,6 +3,7 @@
 
 enum {
 	DATA_MODE,
+	DATA_MODEVAL,
 	DATA_MSG,
 	DATA_INTERFACE,
 	DATA_MSG_EP,
@@ -11,6 +12,7 @@ enum {
 	DATA_RELEASE_DELAY,
 	DATA_CONFIG,
 	DATA_ALT,
+	DATA_DEV_CLASS,
 	__DATA_MAX
 };
 
@@ -137,6 +139,57 @@ static void handle_huawei(struct usbdev_data *data, struct blob_attr **tb)
 	send_control_packet(data, type, LIBUSB_REQUEST_SET_FEATURE, 1, 0, 0);
 }
 
+static void handle_huaweinew(struct usbdev_data *data, struct blob_attr **tb)
+{
+	static struct msg_entry msgs[] = {
+		{
+			"\x55\x53\x42\x43\x12\x34\x56\x78\x00\x00\x00\x00\x00\x00\x00\x11"
+			"\x06\x20\x00\x00\x01\x01\x00\x01\x00\x00\x00\x00\x00\x00\x00", 31
+		}
+	};
+
+	detach_driver(data);
+	data->need_response = false;
+	send_messages(data, msgs, ARRAY_SIZE(msgs));
+}
+
+static void handle_option(struct usbdev_data *data, struct blob_attr **tb)
+{
+	static struct msg_entry msgs[] = {
+		{
+			"\x55\x53\x42\x43\x12\x34\x56\x78\x00\x00\x00\x00\x00\x00\x06\x01"
+			"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 31
+		}
+	};
+
+	detach_driver(data);
+	data->need_response = false;
+	send_messages(data, msgs, ARRAY_SIZE(msgs));
+}
+
+static void handle_standardeject(struct usbdev_data *data, struct blob_attr **tb)
+{
+	static struct msg_entry msgs[] = {
+		{
+			"\x55\x53\x42\x43\x12\x34\x56\x78\x00\x00\x00\x00\x00\x00\x06\x1e"
+			"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 31
+		}, {
+			"\x55\x53\x42\x43\x12\x34\x56\x79\x00\x00\x00\x00\x00\x00\x06\x1b"
+			"\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 31
+		}, {
+			"\x55\x53\x42\x43\x12\x34\x56\x78\x00\x00\x00\x00\x00\x01\x06\x1e"
+			"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 31
+		}, {
+			"\x55\x53\x42\x43\x12\x34\x56\x79\x00\x00\x00\x00\x00\x01\x06\x1b"
+			"\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 31
+		}
+	};
+
+	detach_driver(data);
+	data->need_response = true;
+	send_messages(data, msgs, ARRAY_SIZE(msgs));
+}
+
 static void handle_sierra(struct usbdev_data *data, struct blob_attr **tb)
 {
 	int type = LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE;
@@ -288,6 +341,70 @@ static void handle_cisco(struct usbdev_data *data, struct blob_attr **tb)
 	send_messages(data, msgs, ARRAY_SIZE(msgs));
 }
 
+static void handle_mbim(struct usbdev_data *data, struct blob_attr **tb)
+{
+	int j;
+
+	if (data->desc.bNumConfigurations < 2)
+		return;
+
+	for (j = 0; j < data->desc.bNumConfigurations; j++) {
+		struct libusb_config_descriptor *config;
+		int i;
+
+		libusb_get_config_descriptor(data->dev, j, &config);
+
+		for (i = 0; i < config->bNumInterfaces; i++) {
+			if (config->interface[i].altsetting[0].bInterfaceClass == 2) {
+				if (config->interface[i].altsetting[0].bInterfaceSubClass == 0x0e) {
+					struct libusb_config_descriptor *active;
+					int count = 5;
+
+				        libusb_get_active_config_descriptor(data->dev, &active);
+					if (active->bConfigurationValue == config->bConfigurationValue)
+						return;
+					while ((libusb_set_configuration(data->devh, config->bConfigurationValue) < 0) && --count)
+						libusb_detach_kernel_driver(data->devh, active->interface[0].altsetting[0].bInterfaceNumber);
+
+					libusb_free_config_descriptor(config);
+					return;
+				}
+			}
+		}
+
+		libusb_free_config_descriptor(config);
+	}
+}
+
+static void handle_quanta(struct usbdev_data *data, struct blob_attr **tb)
+{
+	int type = LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE | LIBUSB_ENDPOINT_IN;
+
+	detach_driver(data);
+	send_control_packet(data, type, 0xff, 0, 0, 8);
+}
+
+static void handle_blackberry(struct usbdev_data *data, struct blob_attr **tb)
+{
+	int type = LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE | LIBUSB_ENDPOINT_IN;
+
+	detach_driver(data);
+	send_control_packet(data, type, 0xb1, 0x0000, 0, 8);
+	send_control_packet(data, type, 0xa9, 0x000e, 0, 8);
+}
+
+static void handle_pantech(struct usbdev_data *data, struct blob_attr **tb)
+{
+	int type = LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE | LIBUSB_ENDPOINT_OUT;
+	int val = 1;
+
+	if (tb[DATA_MODEVAL])
+		val = blobmsg_get_u32(tb[DATA_MODEVAL]);
+	detach_driver(data);
+	if (val > 1)
+		send_control_packet(data, type, 0x70, val, 0, 0);
+}
+
 static void set_alt_setting(struct usbdev_data *data, int setting)
 {
 	if (libusb_claim_interface(data->devh, data->interface))
@@ -300,7 +417,9 @@ static void set_alt_setting(struct usbdev_data *data, int setting)
 enum {
 	MODE_GENERIC,
 	MODE_HUAWEI,
+	MODE_HUAWEINEW,
 	MODE_SIERRA,
+	MODE_STDEJECT,
 	MODE_SONY,
 	MODE_QISDA,
 	MODE_GCT,
@@ -308,6 +427,11 @@ enum {
 	MODE_SEQUANS,
 	MODE_MOBILE_ACTION,
 	MODE_CISCO,
+	MODE_MBIM,
+	MODE_OPTION,
+	MODE_QUANTA,
+	MODE_BLACKBERRY,
+	MODE_PANTECH,
 	__MODE_MAX
 };
 
@@ -316,7 +440,9 @@ static const struct {
 	void (*cb)(struct usbdev_data *data, struct blob_attr **tb);
 } modeswitch_cb[__MODE_MAX] = {
 	[MODE_GENERIC] = { "Generic", handle_generic },
+	[MODE_STDEJECT] = { "StandardEject", handle_standardeject },
 	[MODE_HUAWEI] = { "Huawei", handle_huawei },
+	[MODE_HUAWEINEW] = { "HuaweiNew", handle_huaweinew },
 	[MODE_SIERRA] = { "Sierra", handle_sierra },
 	[MODE_SONY] = { "Sony", handle_sony },
 	[MODE_QISDA] = { "Qisda", handle_qisda },
@@ -325,25 +451,36 @@ static const struct {
 	[MODE_SEQUANS] = { "Sequans", handle_sequans },
 	[MODE_MOBILE_ACTION] = { "MobileAction", handle_mobile_action },
 	[MODE_CISCO] = { "Cisco", handle_cisco },
+	[MODE_MBIM] = { "MBIM", handle_mbim },
+	[MODE_OPTION] = { "Option", handle_option },
+	[MODE_QUANTA] = { "Quanta", handle_quanta },
+	[MODE_BLACKBERRY] = { "Blackberry", handle_blackberry },
+	[MODE_PANTECH] = { "Pantech", handle_pantech },
 };
 
 void handle_switch(struct usbdev_data *data)
 {
 	static const struct blobmsg_policy data_policy[__DATA_MAX] = {
 		[DATA_MODE] = { .name = "mode", .type = BLOBMSG_TYPE_STRING },
+		[DATA_MODEVAL] = { .name = "modeval", .type = BLOBMSG_TYPE_INT32 },
 		[DATA_MSG] = { .name = "msg", .type = BLOBMSG_TYPE_ARRAY },
 		[DATA_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_INT32 },
 		[DATA_MSG_EP] = { .name = "msg_endpoint", .type = BLOBMSG_TYPE_INT32 },
 		[DATA_RES_EP] = { .name = "response_endpoint", .type = BLOBMSG_TYPE_INT32 },
-		[DATA_RESPONSE] = { .name = "response", .type = BLOBMSG_TYPE_INT32 },
+		[DATA_RESPONSE] = { .name = "response", .type = BLOBMSG_TYPE_BOOL },
 		[DATA_CONFIG] = { .name = "config", .type = BLOBMSG_TYPE_INT32 },
 		[DATA_ALT] = { .name = "alt", .type = BLOBMSG_TYPE_INT32 },
+		[DATA_DEV_CLASS] = { .name = "t_class", .type = BLOBMSG_TYPE_INT32 },
 	};
 	struct blob_attr *tb[__DATA_MAX];
 	int mode = MODE_GENERIC;
+	int t_class = 0;
 
 	blobmsg_parse(data_policy, __DATA_MAX, tb, blobmsg_data(data->info), blobmsg_data_len(data->info));
 
+	if (tb[DATA_DEV_CLASS])
+		t_class = blobmsg_get_u32(tb[DATA_DEV_CLASS]);
+
 	if (tb[DATA_INTERFACE])
 		data->interface = blobmsg_get_u32(tb[DATA_INTERFACE]);
 
@@ -359,6 +496,9 @@ void handle_switch(struct usbdev_data *data)
 	if (tb[DATA_RESPONSE])
 		data->need_response = blobmsg_get_bool(tb[DATA_RESPONSE]);
 
+	if (t_class > 0 && data->dev_class != t_class)
+		return;
+
 	if (tb[DATA_MODE]) {
 		const char *modestr;
 		int i;