mirror of
git://slackware.nl/current.git
synced 2025-02-06 20:46:02 +01:00
9664bee729
Wed Sep 26 01:10:42 UTC 2012 Slackware 14.0 x86_64 stable is released! We're perfectionists here at Slackware, so this release has been a long time a-brewing. But we think you'll agree that it was worth the wait. Slackware 14.0 combines modern components, ease of use, and flexible configuration... our "KISS" philosophy demands it. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Thanks to everyone who helped make this happen. The Slackware team, the upstream developers, and (of course) the awesome Slackware user community. Have fun! :-)
74 lines
2.4 KiB
Diff
74 lines
2.4 KiB
Diff
--- backend/usb-libusb.c.orig 2012-07-16 19:10:55.000000000 +0200
|
|
+++ backend/usb-libusb.c 2012-08-06 11:01:58.034150159 +0200
|
|
@@ -70,7 +70,7 @@
|
|
read_endp, /* Read endpoint */
|
|
protocol, /* Protocol: 1 = Uni-di, 2 = Bi-di. */
|
|
usblp_attached, /* "usblp" kernel module attached? */
|
|
- opened_for_job; /* Set to 1 by print_device() */
|
|
+ reset_after_job; /* Set to 1 by print_device() */
|
|
unsigned int quirks; /* Quirks flags */
|
|
struct libusb_device_handle *handle; /* Open handle to device */
|
|
} usb_printer_t;
|
|
@@ -122,6 +122,8 @@
|
|
#define USBLP_QUIRK_USB_INIT 0x2 /* needs vendor USB init string */
|
|
#define USBLP_QUIRK_BAD_CLASS 0x4 /* descriptor uses vendor-specific
|
|
Class or SubClass */
|
|
+#define USBLP_QUIRK_RESET 0x4000 /* After printing do a reset
|
|
+ for clean-up */
|
|
#define USBLP_QUIRK_NO_REATTACH 0x8000 /* After printing we cannot re-attach
|
|
the usblp kernel module */
|
|
|
|
@@ -147,9 +149,11 @@
|
|
{ 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt
|
|
Printer M129C */
|
|
{ 0x067b, 0x2305, USBLP_QUIRK_BIDIR |
|
|
- USBLP_QUIRK_NO_REATTACH },
|
|
+ USBLP_QUIRK_NO_REATTACH |
|
|
+ USBLP_QUIRK_RESET },
|
|
/* Prolific Technology, Inc. PL2305 Parallel Port
|
|
(USB -> Parallel adapter) */
|
|
+ { 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices */
|
|
{ 0, 0 }
|
|
};
|
|
|
|
@@ -256,7 +260,12 @@
|
|
}
|
|
|
|
g.print_fd = print_fd;
|
|
- g.printer->opened_for_job = 1;
|
|
+
|
|
+ /*
|
|
+ * Some devices need a reset after finishing a job, these devices are
|
|
+ * marked with the USBLP_QUIRK_RESET quirk.
|
|
+ */
|
|
+ g.printer->reset_after_job = (g.printer->quirks & USBLP_QUIRK_RESET ? 1 : 0);
|
|
|
|
/*
|
|
* If we are printing data from a print driver on stdin, ignore SIGTERM
|
|
@@ -772,7 +781,7 @@
|
|
* Reset the device to clean up after the job
|
|
*/
|
|
|
|
- if (printer->opened_for_job == 1)
|
|
+ if (printer->reset_after_job == 1)
|
|
{
|
|
if ((errcode = libusb_reset_device(printer->handle)) < 0)
|
|
fprintf(stderr,
|
|
@@ -1288,7 +1297,7 @@
|
|
}
|
|
|
|
printer->usblp_attached = 0;
|
|
- printer->opened_for_job = 0;
|
|
+ printer->reset_after_job = 0;
|
|
|
|
if (verbose)
|
|
fputs("STATE: +connecting-to-device\n", stderr);
|
|
@@ -1586,7 +1595,7 @@
|
|
for (i = 0; quirk_printers[i].vendorId; i++)
|
|
{
|
|
if (vendor == quirk_printers[i].vendorId &&
|
|
- product == quirk_printers[i].productId)
|
|
+ (product == 0x0000 || product == quirk_printers[i].productId))
|
|
return quirk_printers[i].quirks;
|
|
}
|
|
return 0;
|