pixma: fix for PTHREAD compilation, add support for MP990 in docs.

- backend/pixma.c: fix end of scan buggy exit when compiled with USE_PTHREAD/-lpthread
- backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
  change support to complete for MP990 in documentation, as reported by Jean-Michel Pouré.
merge-requests/1/head
Nicolas Martin 2009-11-28 15:11:05 +01:00
rodzic eb9df3a727
commit 13641ac5b3
5 zmienionych plików z 15 dodań i 9 usunięć

Wyświetl plik

@ -1,3 +1,9 @@
2009-11-28 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma.c, backend/pixma_mp1580.c,
doc/descriptions/pixma.desc, doc/sane-pixma.man:
pixma: fix pixma backend (end of scan), when compiled with USE_PTHREAD/-lpthread
set support to complete for MP990 in documentation, as reported by Jean-Michel Poure.
2009-11-28 Stéphane Voltz <stef.dev at free.fr>
* backend/gt68xx_generic.h backend/gt68xx_generic.c
backend/gt68xx_low.h backend/gt68xx_high.c backend/gt68xx_high.h

Wyświetl plik

@ -852,7 +852,7 @@ terminate_reader_task (pixma_sane_t * ss, int *exit_code)
else
{
ss->reader_stop = SANE_TRUE;
pixma_cancel (ss->s);
/* pixma_cancel (ss->s); What is this for ? Makes end-of-scan buggy => removing */
}
result = sanei_thread_waitpid (pid, &status);
ss->reader_taskid = -1;

Wyświetl plik

@ -146,13 +146,13 @@
#define MX330_PID 0x1737 /* untested */
/* Generation 4 */
#define MP250_PID 0x173a /* untested */
#define MP250_PID 0x173a
#define MP270_PID 0x173b
#define MP490_PID 0x173c /* untested */
#define MP550_PID 0x173d /* untested */
#define MP550_PID 0x173d
#define MP560_PID 0x173e /* untested */
#define MP640_PID 0x173f
#define MP990_PID 0x1740 /* untested */
#define MP990_PID 0x1740
#define XML_START_1 \
"<?xml version=\"1.0\" encoding=\"utf-8\" ?>\

Wyświetl plik

@ -265,13 +265,13 @@
:interface "USB Ethernet"
:usbid "0x04a9" "0x172d"
:status :complete
:comment "Reported to be working fine at all resolutions."
:comment "Working fine at all resolutions."
:model "PIXMA MP990"
:interface "USB Ethernet"
:usbid "0x04a9" "0x1740"
:status :untested
:comment "Same protocol as Pixma Generation 3? Testers needed!"
:status :complete
:comment "Working fine at all resolutions."
:model "PIXMA MP640"
:interface "USB Ethernet"

Wyświetl plik

@ -22,7 +22,7 @@ PIXMA MP500, MP510, MP520, MP530, MP540
.br
PIXMA MP600, MP600R, MP610, MP620, MP630, MP640, MP710
.br
PIXMA MP800, MP800R, MP810, MP830, MP960, MP970, MP980
PIXMA MP800, MP800R, MP810, MP830, MP960, MP970, MP980, MP990
.br
PIXMA MX300, MX310, MX700, MX850, MX860, MX7600
.br
@ -54,7 +54,7 @@ Feedback in the Sane-dev mailing list welcome.
.RS
PIXMA MP740
.br
PIXMA MX320, MX330, MP490, MP550, MP560, MP990
PIXMA MX320, MX330, MP490, MP550, MP560
.br
ImageCLASS MF3240, MF5630, MF5650, MF5730, MF5750, MF8170c
.RE