* [PATCH 1/1] cdc-acm: Add support of ATOL FPrint fiscal printers
@ 2015-06-02 8:49 Alexey Sokolov
0 siblings, 0 replies; 4+ messages in thread
From: Alexey Sokolov @ 2015-06-02 8:49 UTC (permalink / raw)
To: oliver, gregkh, linux-usb, linux-kernel
ATOL FPrint fiscal printers require usb_clear_halt to be executed
to work properly. Add quirk to fix the issue.
Signed-off-by: Alexey Sokolov <sokolov@7pikes.com>
---
drivers/usb/class/cdc-acm.c | 9 +++++++++
drivers/usb/class/cdc-acm.h | 1 +
2 files changed, 10 insertions(+)
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 5c8f581..a086e1d 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1477,6 +1477,11 @@ skip_countries:
goto alloc_fail8;
}
+ if (quirks & CLEAR_HALT_CONDITIONS) {
+ usb_clear_halt(usb_dev, usb_rcvbulkpipe(usb_dev, epread->bEndpointAddress));
+ usb_clear_halt(usb_dev, usb_sndbulkpipe(usb_dev, epwrite->bEndpointAddress));
+ }
+
return 0;
alloc_fail8:
if (acm->country_codes) {
@@ -1756,6 +1761,10 @@ static const struct usb_device_id acm_ids[] = {
.driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */
},
+ { USB_DEVICE(0x2912, 0x0001), /* ATOL FPrint */
+ .driver_info = CLEAR_HALT_CONDITIONS,
+ },
+
/* Nokia S60 phones expose two ACM channels. The first is
* a modem and is picked up by the standard AT-command
* information below. The second is 'vendor-specific' but
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
index ffeb3c8..b3b6c9d 100644
--- a/drivers/usb/class/cdc-acm.h
+++ b/drivers/usb/class/cdc-acm.h
@@ -133,3 +133,4 @@ struct acm {
#define NO_DATA_INTERFACE BIT(4)
#define IGNORE_DEVICE BIT(5)
#define QUIRK_CONTROL_LINE_STATE BIT(6)
+#define CLEAR_HALT_CONDITIONS BIT(7)
--
2.4.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 1/1] cdc-acm: Add support of ATOL FPrint fiscal printers
@ 2015-06-02 8:05 Alexey Sokolov
2015-06-02 8:07 ` Ben Dooks
2015-06-02 8:12 ` Oliver Neukum
0 siblings, 2 replies; 4+ messages in thread
From: Alexey Sokolov @ 2015-06-02 8:05 UTC (permalink / raw)
To: oliver, gregkh, linux-usb, linux-kernel
ATOL FPrint fiscal printers require usb_clear_halt to be executed
to work properly. Add quirk to fix the issue.
Signed-off-by: Alexey Sokolov <sokolov@7pikes.com>
---
drivers/usb/class/cdc-acm.c | 9 +++++++++
drivers/usb/class/cdc-acm.h | 1 +
2 files changed, 10 insertions(+)
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 5c8f581..9d8a321 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1477,6 +1477,11 @@ skip_countries:
goto alloc_fail8;
}
+ if (quirks == CLEAR_HALT_CONDITIONS) {
+ usb_clear_halt(usb_dev, usb_rcvbulkpipe(usb_dev, epread->bEndpointAddress));
+ usb_clear_halt(usb_dev, usb_sndbulkpipe(usb_dev, epwrite->bEndpointAddress));
+ }
+
return 0;
alloc_fail8:
if (acm->country_codes) {
@@ -1756,6 +1761,10 @@ static const struct usb_device_id acm_ids[] = {
.driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */
},
+ { USB_DEVICE(0x2912, 0x0001), /* ATOL FPrint */
+ .driver_info = CLEAR_HALT_CONDITIONS,
+ },
+
/* Nokia S60 phones expose two ACM channels. The first is
* a modem and is picked up by the standard AT-command
* information below. The second is 'vendor-specific' but
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
index ffeb3c8..b3b6c9d 100644
--- a/drivers/usb/class/cdc-acm.h
+++ b/drivers/usb/class/cdc-acm.h
@@ -133,3 +133,4 @@ struct acm {
#define NO_DATA_INTERFACE BIT(4)
#define IGNORE_DEVICE BIT(5)
#define QUIRK_CONTROL_LINE_STATE BIT(6)
+#define CLEAR_HALT_CONDITIONS BIT(7)
--
2.4.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/1] cdc-acm: Add support of ATOL FPrint fiscal printers
2015-06-02 8:05 Alexey Sokolov
@ 2015-06-02 8:07 ` Ben Dooks
2015-06-02 8:12 ` Oliver Neukum
1 sibling, 0 replies; 4+ messages in thread
From: Ben Dooks @ 2015-06-02 8:07 UTC (permalink / raw)
To: Alexey Sokolov, oliver, gregkh, linux-usb, linux-kernel
On 02/06/15 11:05, Alexey Sokolov wrote:
> ATOL FPrint fiscal printers require usb_clear_halt to be executed
> to work properly. Add quirk to fix the issue.
>
> Signed-off-by: Alexey Sokolov <sokolov@7pikes.com>
> ---
> drivers/usb/class/cdc-acm.c | 9 +++++++++
> drivers/usb/class/cdc-acm.h | 1 +
> 2 files changed, 10 insertions(+)
>
> diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
> index 5c8f581..9d8a321 100644
> --- a/drivers/usb/class/cdc-acm.c
> +++ b/drivers/usb/class/cdc-acm.c
> @@ -1477,6 +1477,11 @@ skip_countries:
> goto alloc_fail8;
> }
>
> + if (quirks == CLEAR_HALT_CONDITIONS) {
> + usb_clear_halt(usb_dev, usb_rcvbulkpipe(usb_dev, epread->bEndpointAddress));
> + usb_clear_halt(usb_dev, usb_sndbulkpipe(usb_dev, epwrite->bEndpointAddress));
> + }
> +
Given quirks looks like a bitfield, it would be better if this is
if (quirks & CLEAR_HALT_CONDITIONS) {
--
Ben Dooks http://www.codethink.co.uk/
Senior Engineer Codethink - Providing Genius
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 1/1] cdc-acm: Add support of ATOL FPrint fiscal printers
2015-06-02 8:05 Alexey Sokolov
2015-06-02 8:07 ` Ben Dooks
@ 2015-06-02 8:12 ` Oliver Neukum
1 sibling, 0 replies; 4+ messages in thread
From: Oliver Neukum @ 2015-06-02 8:12 UTC (permalink / raw)
To: Alexey Sokolov; +Cc: gregkh, linux-usb, linux-kernel
On Tue, 2015-06-02 at 11:05 +0300, Alexey Sokolov wrote:
> ATOL FPrint fiscal printers require usb_clear_halt to be executed
> to work properly. Add quirk to fix the issue.
>
Hi,
thank you for this patch.
> Signed-off-by: Alexey Sokolov <sokolov@7pikes.com>
> ---
> drivers/usb/class/cdc-acm.c | 9 +++++++++
> drivers/usb/class/cdc-acm.h | 1 +
> 2 files changed, 10 insertions(+)
>
> diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
> index 5c8f581..9d8a321 100644
> --- a/drivers/usb/class/cdc-acm.c
> +++ b/drivers/usb/class/cdc-acm.c
> @@ -1477,6 +1477,11 @@ skip_countries:
> goto alloc_fail8;
> }
>
> + if (quirks == CLEAR_HALT_CONDITIONS) {
Please make that
quirks & CLEAR_HALT_CONDITIONS
Regards
Oliver
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-06-02 8:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-02 8:49 [PATCH 1/1] cdc-acm: Add support of ATOL FPrint fiscal printers Alexey Sokolov
-- strict thread matches above, loose matches on Subject: below --
2015-06-02 8:05 Alexey Sokolov
2015-06-02 8:07 ` Ben Dooks
2015-06-02 8:12 ` Oliver Neukum
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.