All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Add support for POD HD400 to line6usb driver
@ 2013-10-28  4:01 Chris Bajumpaa
       [not found] ` <20131209012213.GA25305@kroah.com>
  0 siblings, 1 reply; 3+ messages in thread
From: Chris Bajumpaa @ 2013-10-28  4:01 UTC (permalink / raw)
  To: linux-kernel

[-- Attachment #1: Type: text/plain, Size: 4726 bytes --]

Hello,

     This patch adds support for the Line 6 POD HD400 to the line6usb 
driver.


--- 8< Patch starts here ----

diff -ur stock/linux-3.11.6/drivers/staging/line6/driver.c 
line6/linux-3.11.6/drivers/staging/line6/driver.c
--- stock/linux-3.11.6/drivers/staging/line6/driver.c    2013-10-18 
14:24:16.000000000 -0400
+++ line6/linux-3.11.6/drivers/staging/line6/driver.c    2013-10-27 
23:49:03.238659004 -0400
@@ -38,6 +38,7 @@
      {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_GUITARPORT)},
      {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_POCKETPOD)},
      {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD300)},
+    {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD400)},
      {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD500)},
      {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODSTUDIO_GX)},
      {USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODSTUDIO_UX1)},
@@ -64,6 +65,7 @@
      { LINE6_BIT_GUITARPORT,    "GuitarPort",    "GuitarPort", 
LINE6_BIT_PCM               },
      { LINE6_BIT_POCKETPOD,     "PocketPOD",     "Pocket POD", 
LINE6_BIT_CONTROL           },
      { LINE6_BIT_PODHD300,      "PODHD300",      "POD HD300", 
LINE6_BIT_CONTROL_PCM_HWMON },
+    { LINE6_BIT_PODHD400,      "PODHD400",      "POD HD400", 
LINE6_BIT_CONTROL_PCM_HWMON },
      { LINE6_BIT_PODHD500,      "PODHD500",      "POD HD500", 
LINE6_BIT_CONTROL_PCM_HWMON },
      { LINE6_BIT_PODSTUDIO_GX,  "PODStudioGX",   "POD Studio GX", 
LINE6_BIT_PCM               },
      { LINE6_BIT_PODSTUDIO_UX1, "PODStudioUX1",  "POD Studio UX1", 
LINE6_BIT_PCM               },
@@ -352,6 +354,7 @@
              break;

          case LINE6_DEVID_PODHD300:
+        case LINE6_DEVID_PODHD400:
          case LINE6_DEVID_PODHD500:
              break; /* let userspace handle MIDI */

@@ -693,6 +696,7 @@
      case LINE6_DEVID_PODXT:
      case LINE6_DEVID_PODXTPRO:
      case LINE6_DEVID_PODHD300:
+    case LINE6_DEVID_PODHD400:
          alternate = 5;
          break;

@@ -747,6 +751,7 @@
          break;

      case LINE6_DEVID_PODHD300:
+    case LINE6_DEVID_PODHD400:
          size = sizeof(struct usb_line6_podhd);
          ep_read = 0x84;
          ep_write = 0x03;
@@ -905,6 +910,7 @@
          break;

      case LINE6_DEVID_PODHD300:
+    case LINE6_DEVID_PODHD400:
      case LINE6_DEVID_PODHD500:
          ret = line6_podhd_init(interface,
                         (struct usb_line6_podhd *)line6);
@@ -1032,6 +1038,7 @@
              break;

          case LINE6_DEVID_PODHD300:
+        case LINE6_DEVID_PODHD400:
          case LINE6_DEVID_PODHD500:
              line6_podhd_disconnect(interface);
              break;
diff -ur stock/linux-3.11.6/drivers/staging/line6/pcm.c 
line6/linux-3.11.6/drivers/staging/line6/pcm.c
--- stock/linux-3.11.6/drivers/staging/line6/pcm.c    2013-10-18 
14:24:16.000000000 -0400
+++ line6/linux-3.11.6/drivers/staging/line6/pcm.c    2013-10-27 
23:49:03.238659004 -0400
@@ -439,6 +439,7 @@
      case LINE6_DEVID_PODXTLIVE:
      case LINE6_DEVID_PODXTPRO:
      case LINE6_DEVID_PODHD300:
+    case LINE6_DEVID_PODHD400:
          ep_read = 0x82;
          ep_write = 0x01;
          break;
diff -ur stock/linux-3.11.6/drivers/staging/line6/usbdefs.h 
line6/linux-3.11.6/drivers/staging/line6/usbdefs.h
--- stock/linux-3.11.6/drivers/staging/line6/usbdefs.h    2013-10-18 
14:24:16.000000000 -0400
+++ line6/linux-3.11.6/drivers/staging/line6/usbdefs.h    2013-10-27 
23:49:03.238659004 -0400
@@ -25,6 +25,7 @@
  #define LINE6_DEVID_GUITARPORT    0x4750
  #define LINE6_DEVID_POCKETPOD     0x5051
  #define LINE6_DEVID_PODHD300      0x5057
+#define LINE6_DEVID_PODHD400      0x5058
  #define LINE6_DEVID_PODHD500      0x414D
  #define LINE6_DEVID_PODSTUDIO_GX  0x4153
  #define LINE6_DEVID_PODSTUDIO_UX1 0x4150
@@ -48,6 +49,7 @@
      LINE6_INDEX_GUITARPORT,
      LINE6_INDEX_POCKETPOD,
      LINE6_INDEX_PODHD300,
+    LINE6_INDEX_PODHD400,
      LINE6_INDEX_PODHD500,
      LINE6_INDEX_PODSTUDIO_GX,
      LINE6_INDEX_PODSTUDIO_UX1,
@@ -68,6 +70,7 @@
      LINE6_BIT(GUITARPORT),
      LINE6_BIT(POCKETPOD),
      LINE6_BIT(PODHD300),
+    LINE6_BIT(PODHD400),
      LINE6_BIT(PODHD500),
      LINE6_BIT(PODSTUDIO_GX),
      LINE6_BIT(PODSTUDIO_UX1),
@@ -88,7 +91,9 @@
      LINE6_BITS_PODXTALL = LINE6_BIT_PODXT | LINE6_BIT_PODXTLIVE |
                    LINE6_BIT_PODXTPRO,
      LINE6_BITS_PODX3ALL = LINE6_BIT_PODX3 | LINE6_BIT_PODX3LIVE,
-    LINE6_BITS_PODHDALL = LINE6_BIT_PODHD300 | LINE6_BIT_PODHD500,
+    LINE6_BITS_PODHDALL =     LINE6_BIT_PODHD300 |
+                LINE6_BIT_PODHD400 |
+                LINE6_BIT_PODHD500,
      LINE6_BITS_BASSPODXTALL    = LINE6_BIT_BASSPODXT |
                    LINE6_BIT_BASSPODXTLIVE |
                    LINE6_BIT_BASSPODXTPRO




[-- Attachment #2: line6-hd400-3.11.6.patch --]
[-- Type: text/x-patch, Size: 4188 bytes --]

diff -ur stock/linux-3.11.6/drivers/staging/line6/driver.c line6/linux-3.11.6/drivers/staging/line6/driver.c
--- stock/linux-3.11.6/drivers/staging/line6/driver.c	2013-10-18 14:24:16.000000000 -0400
+++ line6/linux-3.11.6/drivers/staging/line6/driver.c	2013-10-27 23:49:03.238659004 -0400
@@ -38,6 +38,7 @@
 	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_GUITARPORT)},
 	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_POCKETPOD)},
 	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD300)},
+	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD400)},
 	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD500)},
 	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODSTUDIO_GX)},
 	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODSTUDIO_UX1)},
@@ -64,6 +65,7 @@
 	{ LINE6_BIT_GUITARPORT,    "GuitarPort",    "GuitarPort",       LINE6_BIT_PCM               },
 	{ LINE6_BIT_POCKETPOD,     "PocketPOD",     "Pocket POD",       LINE6_BIT_CONTROL           },
 	{ LINE6_BIT_PODHD300,      "PODHD300",      "POD HD300",        LINE6_BIT_CONTROL_PCM_HWMON },
+	{ LINE6_BIT_PODHD400,      "PODHD400",      "POD HD400",        LINE6_BIT_CONTROL_PCM_HWMON },
 	{ LINE6_BIT_PODHD500,      "PODHD500",      "POD HD500",        LINE6_BIT_CONTROL_PCM_HWMON },
 	{ LINE6_BIT_PODSTUDIO_GX,  "PODStudioGX",   "POD Studio GX",    LINE6_BIT_PCM               },
 	{ LINE6_BIT_PODSTUDIO_UX1, "PODStudioUX1",  "POD Studio UX1",   LINE6_BIT_PCM               },
@@ -352,6 +354,7 @@
 			break;
 
 		case LINE6_DEVID_PODHD300:
+		case LINE6_DEVID_PODHD400:
 		case LINE6_DEVID_PODHD500:
 			break; /* let userspace handle MIDI */
 
@@ -693,6 +696,7 @@
 	case LINE6_DEVID_PODXT:
 	case LINE6_DEVID_PODXTPRO:
 	case LINE6_DEVID_PODHD300:
+	case LINE6_DEVID_PODHD400:
 		alternate = 5;
 		break;
 
@@ -747,6 +751,7 @@
 		break;
 
 	case LINE6_DEVID_PODHD300:
+	case LINE6_DEVID_PODHD400:
 		size = sizeof(struct usb_line6_podhd);
 		ep_read = 0x84;
 		ep_write = 0x03;
@@ -905,6 +910,7 @@
 		break;
 
 	case LINE6_DEVID_PODHD300:
+	case LINE6_DEVID_PODHD400:
 	case LINE6_DEVID_PODHD500:
 		ret = line6_podhd_init(interface,
 				       (struct usb_line6_podhd *)line6);
@@ -1032,6 +1038,7 @@
 			break;
 
 		case LINE6_DEVID_PODHD300:
+		case LINE6_DEVID_PODHD400:
 		case LINE6_DEVID_PODHD500:
 			line6_podhd_disconnect(interface);
 			break;
diff -ur stock/linux-3.11.6/drivers/staging/line6/pcm.c line6/linux-3.11.6/drivers/staging/line6/pcm.c
--- stock/linux-3.11.6/drivers/staging/line6/pcm.c	2013-10-18 14:24:16.000000000 -0400
+++ line6/linux-3.11.6/drivers/staging/line6/pcm.c	2013-10-27 23:49:03.238659004 -0400
@@ -439,6 +439,7 @@
 	case LINE6_DEVID_PODXTLIVE:
 	case LINE6_DEVID_PODXTPRO:
 	case LINE6_DEVID_PODHD300:
+	case LINE6_DEVID_PODHD400:
 		ep_read = 0x82;
 		ep_write = 0x01;
 		break;
diff -ur stock/linux-3.11.6/drivers/staging/line6/usbdefs.h line6/linux-3.11.6/drivers/staging/line6/usbdefs.h
--- stock/linux-3.11.6/drivers/staging/line6/usbdefs.h	2013-10-18 14:24:16.000000000 -0400
+++ line6/linux-3.11.6/drivers/staging/line6/usbdefs.h	2013-10-27 23:49:03.238659004 -0400
@@ -25,6 +25,7 @@
 #define LINE6_DEVID_GUITARPORT    0x4750
 #define LINE6_DEVID_POCKETPOD     0x5051
 #define LINE6_DEVID_PODHD300      0x5057
+#define LINE6_DEVID_PODHD400      0x5058
 #define LINE6_DEVID_PODHD500      0x414D
 #define LINE6_DEVID_PODSTUDIO_GX  0x4153
 #define LINE6_DEVID_PODSTUDIO_UX1 0x4150
@@ -48,6 +49,7 @@
 	LINE6_INDEX_GUITARPORT,
 	LINE6_INDEX_POCKETPOD,
 	LINE6_INDEX_PODHD300,
+	LINE6_INDEX_PODHD400,
 	LINE6_INDEX_PODHD500,
 	LINE6_INDEX_PODSTUDIO_GX,
 	LINE6_INDEX_PODSTUDIO_UX1,
@@ -68,6 +70,7 @@
 	LINE6_BIT(GUITARPORT),
 	LINE6_BIT(POCKETPOD),
 	LINE6_BIT(PODHD300),
+	LINE6_BIT(PODHD400),
 	LINE6_BIT(PODHD500),
 	LINE6_BIT(PODSTUDIO_GX),
 	LINE6_BIT(PODSTUDIO_UX1),
@@ -88,7 +91,9 @@
 	LINE6_BITS_PODXTALL = LINE6_BIT_PODXT | LINE6_BIT_PODXTLIVE |
 			      LINE6_BIT_PODXTPRO,
 	LINE6_BITS_PODX3ALL = LINE6_BIT_PODX3 | LINE6_BIT_PODX3LIVE,
-	LINE6_BITS_PODHDALL = LINE6_BIT_PODHD300 | LINE6_BIT_PODHD500,
+	LINE6_BITS_PODHDALL = 	LINE6_BIT_PODHD300 | 
+				LINE6_BIT_PODHD400 |
+				LINE6_BIT_PODHD500,
 	LINE6_BITS_BASSPODXTALL	= LINE6_BIT_BASSPODXT |
 				  LINE6_BIT_BASSPODXTLIVE |
 				  LINE6_BIT_BASSPODXTPRO

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] Add support for POD HD400 to line6usb driver
       [not found]     ` <20131221174453.GB27957@kroah.com>
@ 2013-12-21 22:51       ` Chris Bajumpaa
  2013-12-22  0:02         ` Greg KH
  0 siblings, 1 reply; 3+ messages in thread
From: Chris Bajumpaa @ 2013-12-21 22:51 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-kernel

[-- Attachment #1: Type: text/plain, Size: 4751 bytes --]

This one applies clean to a current tree and has a Signed-off-by: line.
And is CC'd to the right places. And doesn't have the tabs eaten...

Sorry about that.

This patch adds support for the Line 6 POD HD400 to the line6usb driver.

Signed-off-by: Chris Bajumpaa <cbajumpa@gmail.com>

---

diff -uprN linux/drivers/staging/line6/driver.c line6/drivers/staging/line6/driver.c
--- linux/drivers/staging/line6/driver.c	2013-12-21 01:42:31.115328441 -0500
+++ line6/drivers/staging/line6/driver.c	2013-12-21 02:05:16.839285680 -0500
@@ -38,6 +38,7 @@ static const struct usb_device_id line6_
  	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_GUITARPORT)},
  	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_POCKETPOD)},
  	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD300)},
+	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD400)},
  	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD500)},
  	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODSTUDIO_GX)},
  	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODSTUDIO_UX1)},
@@ -64,6 +65,7 @@ static struct line6_properties line6_pro
  	{ LINE6_BIT_GUITARPORT,    "GuitarPort",    "GuitarPort",       LINE6_BIT_PCM               },
  	{ LINE6_BIT_POCKETPOD,     "PocketPOD",     "Pocket POD",       LINE6_BIT_CONTROL           },
  	{ LINE6_BIT_PODHD300,      "PODHD300",      "POD HD300",        LINE6_BIT_CONTROL_PCM_HWMON },
+	{ LINE6_BIT_PODHD400,      "PODHD400",      "POD HD400",        LINE6_BIT_CONTROL_PCM_HWMON },
  	{ LINE6_BIT_PODHD500,      "PODHD500",      "POD HD500",        LINE6_BIT_CONTROL_PCM_HWMON },
  	{ LINE6_BIT_PODSTUDIO_GX,  "PODStudioGX",   "POD Studio GX",    LINE6_BIT_PCM               },
  	{ LINE6_BIT_PODSTUDIO_UX1, "PODStudioUX1",  "POD Studio UX1",   LINE6_BIT_PCM               },
@@ -352,6 +354,7 @@ static void line6_data_received(struct u
  			break;
  
  		case LINE6_DEVID_PODHD300:
+		case LINE6_DEVID_PODHD400:
  		case LINE6_DEVID_PODHD500:
  			break; /* let userspace handle MIDI */
  
@@ -693,6 +696,7 @@ static int line6_probe(struct usb_interf
  	case LINE6_DEVID_PODXT:
  	case LINE6_DEVID_PODXTPRO:
  	case LINE6_DEVID_PODHD300:
+	case LINE6_DEVID_PODHD400:
  		alternate = 5;
  		break;
  
@@ -747,6 +751,7 @@ static int line6_probe(struct usb_interf
  		break;
  
  	case LINE6_DEVID_PODHD300:
+	case LINE6_DEVID_PODHD400:
  		size = sizeof(struct usb_line6_podhd);
  		ep_read = 0x84;
  		ep_write = 0x03;
@@ -905,6 +910,7 @@ static int line6_probe(struct usb_interf
  		break;
  
  	case LINE6_DEVID_PODHD300:
+	case LINE6_DEVID_PODHD400:
  	case LINE6_DEVID_PODHD500:
  		ret = line6_podhd_init(interface,
  				       (struct usb_line6_podhd *)line6);
@@ -1032,6 +1038,7 @@ static void line6_disconnect(struct usb_
  			break;
  
  		case LINE6_DEVID_PODHD300:
+		case LINE6_DEVID_PODHD400:
  		case LINE6_DEVID_PODHD500:
  			line6_podhd_disconnect(interface);
  			break;
diff -uprN linux/drivers/staging/line6/pcm.c line6/drivers/staging/line6/pcm.c
--- linux/drivers/staging/line6/pcm.c	2013-12-21 01:42:31.115328441 -0500
+++ line6/drivers/staging/line6/pcm.c	2013-12-21 02:05:16.839285680 -0500
@@ -439,6 +439,7 @@ int line6_init_pcm(struct usb_line6 *lin
  	case LINE6_DEVID_PODXTLIVE:
  	case LINE6_DEVID_PODXTPRO:
  	case LINE6_DEVID_PODHD300:
+	case LINE6_DEVID_PODHD400:
  		ep_read = 0x82;
  		ep_write = 0x01;
  		break;
diff -uprN linux/drivers/staging/line6/usbdefs.h line6/drivers/staging/line6/usbdefs.h
--- linux/drivers/staging/line6/usbdefs.h	2013-12-21 01:42:31.115328441 -0500
+++ line6/drivers/staging/line6/usbdefs.h	2013-12-21 02:05:16.843285680 -0500
@@ -25,6 +25,7 @@
  #define LINE6_DEVID_GUITARPORT    0x4750
  #define LINE6_DEVID_POCKETPOD     0x5051
  #define LINE6_DEVID_PODHD300      0x5057
+#define LINE6_DEVID_PODHD400      0x5058
  #define LINE6_DEVID_PODHD500      0x414D
  #define LINE6_DEVID_PODSTUDIO_GX  0x4153
  #define LINE6_DEVID_PODSTUDIO_UX1 0x4150
@@ -48,6 +49,7 @@ enum {
  	LINE6_INDEX_GUITARPORT,
  	LINE6_INDEX_POCKETPOD,
  	LINE6_INDEX_PODHD300,
+	LINE6_INDEX_PODHD400,
  	LINE6_INDEX_PODHD500,
  	LINE6_INDEX_PODSTUDIO_GX,
  	LINE6_INDEX_PODSTUDIO_UX1,
@@ -68,6 +70,7 @@ enum {
  	LINE6_BIT(GUITARPORT),
  	LINE6_BIT(POCKETPOD),
  	LINE6_BIT(PODHD300),
+	LINE6_BIT(PODHD400),
  	LINE6_BIT(PODHD500),
  	LINE6_BIT(PODSTUDIO_GX),
  	LINE6_BIT(PODSTUDIO_UX1),
@@ -88,7 +91,9 @@ enum {
  	LINE6_BITS_PODXTALL = LINE6_BIT_PODXT | LINE6_BIT_PODXTLIVE |
  			      LINE6_BIT_PODXTPRO,
  	LINE6_BITS_PODX3ALL = LINE6_BIT_PODX3 | LINE6_BIT_PODX3LIVE,
-	LINE6_BITS_PODHDALL = LINE6_BIT_PODHD300 | LINE6_BIT_PODHD500,
+	LINE6_BITS_PODHDALL = 	LINE6_BIT_PODHD300 |
+				LINE6_BIT_PODHD400 |
+				LINE6_BIT_PODHD500,
  	LINE6_BITS_BASSPODXTALL	= LINE6_BIT_BASSPODXT |
  				  LINE6_BIT_BASSPODXTLIVE |
  				  LINE6_BIT_BASSPODXTPRO



[-- Attachment #2: line6-hd400-clean-2.patch --]
[-- Type: text/x-patch, Size: 4387 bytes --]

diff -uprN linux/drivers/staging/line6/driver.c line6/drivers/staging/line6/driver.c
--- linux/drivers/staging/line6/driver.c	2013-12-21 01:42:31.115328441 -0500
+++ line6/drivers/staging/line6/driver.c	2013-12-21 02:05:16.839285680 -0500
@@ -38,6 +38,7 @@ static const struct usb_device_id line6_
 	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_GUITARPORT)},
 	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_POCKETPOD)},
 	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD300)},
+	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD400)},
 	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODHD500)},
 	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODSTUDIO_GX)},
 	{USB_DEVICE(LINE6_VENDOR_ID, LINE6_DEVID_PODSTUDIO_UX1)},
@@ -64,6 +65,7 @@ static struct line6_properties line6_pro
 	{ LINE6_BIT_GUITARPORT,    "GuitarPort",    "GuitarPort",       LINE6_BIT_PCM               },
 	{ LINE6_BIT_POCKETPOD,     "PocketPOD",     "Pocket POD",       LINE6_BIT_CONTROL           },
 	{ LINE6_BIT_PODHD300,      "PODHD300",      "POD HD300",        LINE6_BIT_CONTROL_PCM_HWMON },
+	{ LINE6_BIT_PODHD400,      "PODHD400",      "POD HD400",        LINE6_BIT_CONTROL_PCM_HWMON },
 	{ LINE6_BIT_PODHD500,      "PODHD500",      "POD HD500",        LINE6_BIT_CONTROL_PCM_HWMON },
 	{ LINE6_BIT_PODSTUDIO_GX,  "PODStudioGX",   "POD Studio GX",    LINE6_BIT_PCM               },
 	{ LINE6_BIT_PODSTUDIO_UX1, "PODStudioUX1",  "POD Studio UX1",   LINE6_BIT_PCM               },
@@ -352,6 +354,7 @@ static void line6_data_received(struct u
 			break;
 
 		case LINE6_DEVID_PODHD300:
+		case LINE6_DEVID_PODHD400:
 		case LINE6_DEVID_PODHD500:
 			break; /* let userspace handle MIDI */
 
@@ -693,6 +696,7 @@ static int line6_probe(struct usb_interf
 	case LINE6_DEVID_PODXT:
 	case LINE6_DEVID_PODXTPRO:
 	case LINE6_DEVID_PODHD300:
+	case LINE6_DEVID_PODHD400:
 		alternate = 5;
 		break;
 
@@ -747,6 +751,7 @@ static int line6_probe(struct usb_interf
 		break;
 
 	case LINE6_DEVID_PODHD300:
+	case LINE6_DEVID_PODHD400:
 		size = sizeof(struct usb_line6_podhd);
 		ep_read = 0x84;
 		ep_write = 0x03;
@@ -905,6 +910,7 @@ static int line6_probe(struct usb_interf
 		break;
 
 	case LINE6_DEVID_PODHD300:
+	case LINE6_DEVID_PODHD400:
 	case LINE6_DEVID_PODHD500:
 		ret = line6_podhd_init(interface,
 				       (struct usb_line6_podhd *)line6);
@@ -1032,6 +1038,7 @@ static void line6_disconnect(struct usb_
 			break;
 
 		case LINE6_DEVID_PODHD300:
+		case LINE6_DEVID_PODHD400:
 		case LINE6_DEVID_PODHD500:
 			line6_podhd_disconnect(interface);
 			break;
diff -uprN linux/drivers/staging/line6/pcm.c line6/drivers/staging/line6/pcm.c
--- linux/drivers/staging/line6/pcm.c	2013-12-21 01:42:31.115328441 -0500
+++ line6/drivers/staging/line6/pcm.c	2013-12-21 02:05:16.839285680 -0500
@@ -439,6 +439,7 @@ int line6_init_pcm(struct usb_line6 *lin
 	case LINE6_DEVID_PODXTLIVE:
 	case LINE6_DEVID_PODXTPRO:
 	case LINE6_DEVID_PODHD300:
+	case LINE6_DEVID_PODHD400:
 		ep_read = 0x82;
 		ep_write = 0x01;
 		break;
diff -uprN linux/drivers/staging/line6/usbdefs.h line6/drivers/staging/line6/usbdefs.h
--- linux/drivers/staging/line6/usbdefs.h	2013-12-21 01:42:31.115328441 -0500
+++ line6/drivers/staging/line6/usbdefs.h	2013-12-21 02:05:16.843285680 -0500
@@ -25,6 +25,7 @@
 #define LINE6_DEVID_GUITARPORT    0x4750
 #define LINE6_DEVID_POCKETPOD     0x5051
 #define LINE6_DEVID_PODHD300      0x5057
+#define LINE6_DEVID_PODHD400      0x5058
 #define LINE6_DEVID_PODHD500      0x414D
 #define LINE6_DEVID_PODSTUDIO_GX  0x4153
 #define LINE6_DEVID_PODSTUDIO_UX1 0x4150
@@ -48,6 +49,7 @@ enum {
 	LINE6_INDEX_GUITARPORT,
 	LINE6_INDEX_POCKETPOD,
 	LINE6_INDEX_PODHD300,
+	LINE6_INDEX_PODHD400,
 	LINE6_INDEX_PODHD500,
 	LINE6_INDEX_PODSTUDIO_GX,
 	LINE6_INDEX_PODSTUDIO_UX1,
@@ -68,6 +70,7 @@ enum {
 	LINE6_BIT(GUITARPORT),
 	LINE6_BIT(POCKETPOD),
 	LINE6_BIT(PODHD300),
+	LINE6_BIT(PODHD400),
 	LINE6_BIT(PODHD500),
 	LINE6_BIT(PODSTUDIO_GX),
 	LINE6_BIT(PODSTUDIO_UX1),
@@ -88,7 +91,9 @@ enum {
 	LINE6_BITS_PODXTALL = LINE6_BIT_PODXT | LINE6_BIT_PODXTLIVE |
 			      LINE6_BIT_PODXTPRO,
 	LINE6_BITS_PODX3ALL = LINE6_BIT_PODX3 | LINE6_BIT_PODX3LIVE,
-	LINE6_BITS_PODHDALL = LINE6_BIT_PODHD300 | LINE6_BIT_PODHD500,
+	LINE6_BITS_PODHDALL = 	LINE6_BIT_PODHD300 | 
+				LINE6_BIT_PODHD400 |
+				LINE6_BIT_PODHD500,
 	LINE6_BITS_BASSPODXTALL	= LINE6_BIT_BASSPODXT |
 				  LINE6_BIT_BASSPODXTLIVE |
 				  LINE6_BIT_BASSPODXTPRO

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] Add support for POD HD400 to line6usb driver
  2013-12-21 22:51       ` Chris Bajumpaa
@ 2013-12-22  0:02         ` Greg KH
  0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2013-12-22  0:02 UTC (permalink / raw)
  To: Chris Bajumpaa; +Cc: linux-kernel

On Sat, Dec 21, 2013 at 05:51:24PM -0500, Chris Bajumpaa wrote:
> This one applies clean to a current tree and has a Signed-off-by: line.
> And is CC'd to the right places. And doesn't have the tabs eaten...
> 
> Sorry about that.

But you sent two copies, and these two paragraphs didn't need to be
there, as I have to edit them out by hand...

Don't worry, I'll do it, but next time please be more careful.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-12-22  0:02 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-28  4:01 [PATCH] Add support for POD HD400 to line6usb driver Chris Bajumpaa
     [not found] ` <20131209012213.GA25305@kroah.com>
     [not found]   ` <52B54525.30002@gmail.com>
     [not found]     ` <20131221174453.GB27957@kroah.com>
2013-12-21 22:51       ` Chris Bajumpaa
2013-12-22  0:02         ` Greg KH

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.