Skip to contentSkip to conversation

cdc-acm: Add support of ATOL FPrint fiscal printers

PATCH In review Alexey Sokolov 3 participants 3 messages Jun 2, 2015

Subsystems (2)
USB USB ACM driver
lore
Share & tools
lore

Alexey Sokolov

author
#0 lore raw

PATCH 1/1 cdc-acm: Add support of ATOL FPrint fiscal printers

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 <[email protected]>
---
 drivers/usb/class/cdc-acm.c | 9 +++++++++
 drivers/usb/class/cdc-acm.h | 1 +
 2 files changed, 10 insertions(+)
drivers/usb/class/cdc-acm.c +9 -0
index 5c8f581..9d8a321 100644
@@ -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
drivers/usb/class/cdc-acm.h +1 -0
index ffeb3c8..b3b6c9d 100644
@@ -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)
Signature · 1 line
2.4.1
#1 lore raw
Quoted 14 lines · Alexey Sokolov

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 <[email protected]>
---
 drivers/usb/class/cdc-acm.c | 9 +++++++++
 drivers/usb/class/cdc-acm.h | 1 +
 2 files changed, 10 insertions(+)
drivers/usb/class/cdc-acm.c +0 -0
index 5c8f581..9d8a321 100644

drivers/usb/class/cdc-acm.c skip_countries: · line 1484

Quoted 8 lines
drivers/usb/class/cdc-acm.c +5 -0
@@ -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) {
Signature · 2 lines
Ben Dooks				http://www.codethink.co.uk/
Senior Engineer				Codethink - Providing Genius
maintainer
#2 lore raw
In reply to Alexey Sokolov
Quoted 3 lines · Alexey Sokolov

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.

Quoted 11 lines
Signed-off-by Alexey Sokolov <[email protected]>
---
 drivers/usb/class/cdc-acm.c | 9 +++++++++
 drivers/usb/class/cdc-acm.h | 1 +
 2 files changed, 10 insertions(+)
drivers/usb/class/cdc-acm.c +0 -0
index 5c8f581..9d8a321 100644

drivers/usb/class/cdc-acm.c skip_countries: · line 1480

Quoted 4 lines
drivers/usb/class/cdc-acm.c +1 -0
@@ -1477,6 +1477,11 @@ skip_countries:
 		goto alloc_fail8;
 	}
 
+	if (quirks == CLEAR_HALT_CONDITIONS) {

Please make that
quirks & CLEAR_HALT_CONDITIONS

Regards
Oliver