Hi all,
Stirred by the patch from Folkert van Heusden [1], I had a look at the
code and thought it might see a bit of cleanup before adding the patch
from [1]...
So here is a series of two incremental patches:
[2.6 PATCH 1/2]: ftdi_sio.h whitespace cleanup
[2.6 PATCH 2/2]: add support for Papouch TMU (USB thermometer)
they'll be posted as a reply to this one.
I couldn't figure who the maintainer is, so not CC-ing anybody.
[1] http://article.gmane.org/gmane.linux.kernel/392970
Kalin.
--
|[ ~~~~~~~~~~~~~~~~~~~~~~ ]|
+-> http://ThinRope.net/ <-+
|[ ______________________ ]|
This patch adds support for new vendor (papouch) and one of their
devices - TMU (a USB thermometer).
More information:
vendor homepage:
http://www.papouch.com/en/
product homepage (Polish):
http://www.papouch.com/shop/scripts/_detail.asp?katcislo=0188
This patch is based on the submission from Folkert van Heusden [1].
Folkert, please test it and add your ACK here.
Unfortunately I don't own such device, so this is not tested.
[1] http://article.gmane.org/gmane.linux.kernel/392970
Signed-off-by: Kalin KOZHUHAROV <[email protected]>
diff -pruN linux-2.6.16-K01/drivers/usb/serial/ftdi_sio.c linux-2.6.16-tmp/drivers/usb/serial/ftdi_sio.c
--- linux-2.6.16-K01/drivers/usb/serial/ftdi_sio.c 2006-03-20 14:53:29.000000000 +0900
+++ linux-2.6.16-tmp/drivers/usb/serial/ftdi_sio.c 2006-03-27 00:52:20.000000000 +0900
@@ -492,6 +492,7 @@ static struct usb_device_id id_table_com
{ USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_777_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_8900F_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_PCDJ_DAC2_PID) },
+ { USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) },
{ }, /* Optional parameter entry */
{ } /* Terminating entry */
};
diff -pruN linux-2.6.16-K01/drivers/usb/serial/ftdi_sio.h linux-2.6.16-tmp/drivers/usb/serial/ftdi_sio.h
--- linux-2.6.16-K01/drivers/usb/serial/ftdi_sio.h 2006-03-27 00:49:43.000000000 +0900
+++ linux-2.6.16-tmp/drivers/usb/serial/ftdi_sio.h 2006-03-27 00:46:55.000000000 +0900
@@ -392,6 +392,15 @@
#define FTDI_WESTREX_MODEL_777_PID 0xDC00 /* Model 777 */
#define FTDI_WESTREX_MODEL_8900F_PID 0xDC01 /* Model 8900F */
+/*
+ * Papouch products (http://www.papouch.com/)
+ * Submitted by Folkert van Heusden
+ */
+
+#define PAPOUCH_VID 0x5050 /* Vendor ID */
+#define PAPOUCH_TMU_PID 0x0400 /* TMU USB Thermometer */
+
+
/* Commands */
#define FTDI_SIO_RESET 0 /* Reset the port */
#define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */
--
|[ ~~~~~~~~~~~~~~~~~~~~~~ ]|
+-> http://ThinRope.net/ <-+
|[ ______________________ ]|
Acked-by: Folkert van Heusden <[email protected]>
On Mon, Mar 27, 2006 at 01:30:55AM +0900, Kalin KOZHUHAROV wrote:
>
> This patch adds support for new vendor (papouch) and one of their
> devices - TMU (a USB thermometer).
>
> More information:
> vendor homepage:
> http://www.papouch.com/en/
> product homepage (Polish):
> http://www.papouch.com/shop/scripts/_detail.asp?katcislo=0188
>
> This patch is based on the submission from Folkert van Heusden [1].
> Folkert, please test it and add your ACK here.
>
> Unfortunately I don't own such device, so this is not tested.
>
> [1] http://article.gmane.org/gmane.linux.kernel/392970
>
>
> Signed-off-by: Kalin KOZHUHAROV <[email protected]>
>
>
> diff -pruN linux-2.6.16-K01/drivers/usb/serial/ftdi_sio.c linux-2.6.16-tmp/drivers/usb/serial/ftdi_sio.c
> --- linux-2.6.16-K01/drivers/usb/serial/ftdi_sio.c 2006-03-20 14:53:29.000000000 +0900
> +++ linux-2.6.16-tmp/drivers/usb/serial/ftdi_sio.c 2006-03-27 00:52:20.000000000 +0900
> @@ -492,6 +492,7 @@ static struct usb_device_id id_table_com
> { USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_777_PID) },
> { USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_8900F_PID) },
> { USB_DEVICE(FTDI_VID, FTDI_PCDJ_DAC2_PID) },
> + { USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) },
> { }, /* Optional parameter entry */
> { } /* Terminating entry */
> };
> diff -pruN linux-2.6.16-K01/drivers/usb/serial/ftdi_sio.h linux-2.6.16-tmp/drivers/usb/serial/ftdi_sio.h
> --- linux-2.6.16-K01/drivers/usb/serial/ftdi_sio.h 2006-03-27 00:49:43.000000000 +0900
> +++ linux-2.6.16-tmp/drivers/usb/serial/ftdi_sio.h 2006-03-27 00:46:55.000000000 +0900
> @@ -392,6 +392,15 @@
> #define FTDI_WESTREX_MODEL_777_PID 0xDC00 /* Model 777 */
> #define FTDI_WESTREX_MODEL_8900F_PID 0xDC01 /* Model 8900F */
>
> +/*
> + * Papouch products (http://www.papouch.com/)
> + * Submitted by Folkert van Heusden
> + */
> +
> +#define PAPOUCH_VID 0x5050 /* Vendor ID */
> +#define PAPOUCH_TMU_PID 0x0400 /* TMU USB Thermometer */
> +
> +
> /* Commands */
> #define FTDI_SIO_RESET 0 /* Reset the port */
> #define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */
>
>
> --
> |[ ~~~~~~~~~~~~~~~~~~~~~~ ]|
> +-> http://ThinRope.net/ <-+
> |[ ______________________ ]|
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
Folkert van Heusden
--
iPod winnen? --> http://keetweej.vanheusden.com/redir.php?id=62
--------------------------------------------------------------------
Phone: +31-6-41278122, PGP-key: 1F28D8AE, http://www.vanheusden.com
I apparently had too little coffee today...
1. Couldn't find the MAINTAINERS file, because I was looking under Documentation/
2. PATCH 1/2 probably didn't make it to gmane
3. PATCH 1/2 is a bit problematic because of the encoding ...
So, I'll have to do something about 2 and 3, but that will be tomorrow.
Kalin.
--
|[ ~~~~~~~~~~~~~~~~~~~~~~ ]|
+-> http://ThinRope.net/ <-+
|[ ______________________ ]|
Hello Greg,
As the time flies by, I think it is better to have this patch in for now
and leave the "big mess" for later and another thread...
(the "big mess" refers as UTF-8 and other soup of encodings in kernel
code + tab and space usage).
The patch below applies (with fuzz 2, which I hope is OK) to 2.6.16 and
2.6.16.1 vanilla. The original submitter to LKML was Folkert van Heusden
and that is why I have included his name in the code. I have just
cleaned his code and fixed the style. Not sure of the order of
Signed-off-by lines, change it if you need.
The patch as submitted below was tested with the actual device by
Folkert and reported working.
This patch adds support for new vendor (papouch) and one of their
devices - TMU (a USB thermometer).
More information:
vendor homepage:
http://www.papouch.com/en/
product homepage (Polish):
http://www.papouch.com/shop/scripts/_detail.asp?katcislo=0188
This patch is based on the submission from Folkert van Heusden [1].
Then reviseted by Kalin KOZHUHAROV [2] and retested by Folkert.
[1] http://article.gmane.org/gmane.linux.kernel/392970
[2] http://article.gmane.org/gmane.linux.kernel/393386
Signed-off-by: Folkert van Heusden <[email protected]>
Signed-off-by: Kalin KOZHUHAROV <[email protected]>
diff -pruN linux-2.6.16-K01/drivers/usb/serial/ftdi_sio.c linux-2.6.16-tmp/drivers/usb/serial/ftdi_sio.c
--- linux-2.6.16-K01/drivers/usb/serial/ftdi_sio.c 2006-03-20 14:53:29.000000000 +0900
+++ linux-2.6.16-tmp/drivers/usb/serial/ftdi_sio.c 2006-03-27 00:52:20.000000000 +0900
@@ -492,6 +492,7 @@ static struct usb_device_id id_table_com
{ USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_777_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_WESTREX_MODEL_8900F_PID) },
{ USB_DEVICE(FTDI_VID, FTDI_PCDJ_DAC2_PID) },
+ { USB_DEVICE(PAPOUCH_VID, PAPOUCH_TMU_PID) },
{ }, /* Optional parameter entry */
{ } /* Terminating entry */
};
diff -pruN linux-2.6.16-K01/drivers/usb/serial/ftdi_sio.h linux-2.6.16-tmp/drivers/usb/serial/ftdi_sio.h
--- linux-2.6.16-K01/drivers/usb/serial/ftdi_sio.h 2006-03-27 00:49:43.000000000 +0900
+++ linux-2.6.16-tmp/drivers/usb/serial/ftdi_sio.h 2006-03-27 00:46:55.000000000 +0900
@@ -392,6 +392,15 @@
#define FTDI_WESTREX_MODEL_777_PID 0xDC00 /* Model 777 */
#define FTDI_WESTREX_MODEL_8900F_PID 0xDC01 /* Model 8900F */
+/*
+ * Papouch products (http://www.papouch.com/)
+ * Submitted by Folkert van Heusden
+ */
+
+#define PAPOUCH_VID 0x5050 /* Vendor ID */
+#define PAPOUCH_TMU_PID 0x0400 /* TMU USB Thermometer */
+
+
/* Commands */
#define FTDI_SIO_RESET 0 /* Reset the port */
#define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */
--
|[ ~~~~~~~~~~~~~~~~~~~~~~ ]|
+-> http://ThinRope.net/ <-+
|[ ______________________ ]|