mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

pixma backend: Declared new Pixma models as untested, and modified some debug code: 

backend/pixma_mp150.c: Declared MP250, MP490, MP560, MP640, and MP990
backend/pixma_mp730.c: Modified some debug code.
merge-requests/1/head
Nicolas Martin 2009-09-13 10:24:46 +02:00
rodzic ec738ed266
commit 37f0efe2a2
3 zmienionych plików z 19 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
ChangeLog
Wyświetl plik

@ -1,3 +1,8 @@
2009-09-13 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp150.c, backend/pixma_mp730.c:
pixma backend: Declared new Pixma models MP250, MP490, MP560, MP640,
and MP990, all yet untested, and modified some debug code.
2009-09-11 Mattias Ellert <mattias.ellert@fysast.uu.se>
* tools/sane-find-scanner.c: Fix false warning about USB not
supported when linking with libusb-1.0.

13
backend/pixma_mp150.c
Wyświetl plik

@ -144,7 +144,11 @@
#define MX860_PID 0x1735
#define MX320_PID 0x1736 /* untested */
#define MX330_PID 0x1737 /* untested */
#define MP250_PID 0x173a /* untested */
#define MP490_PID 0x173c /* untested */
#define MP560_PID 0x173e /* untested */
#define MP640_PID 0x173f /* untested */
#define MP990_PID 0x1740 /* untested */
enum mp150_state_t
{
@ -1460,5 +1464,12 @@ const pixma_config_t pixma_mp150_devices[] = {
DEVICE ("Canon PIXMA MX330", "MX330", MX330_PID, 1200, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
DEVICE ("Canon PIXMA MX860", "MX860", MX860_PID, 2400, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP),
DEVICE ("Canon MP990 series", "MP990", MP990_PID, 4800, 638, 877, PIXMA_CAP_CCD | PIXMA_CAP_TPU),
DEVICE ("Canon PIXMA MP640", "MP640", MP640_PID, 4800, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA MP560", "MP560", MP560_PID, 2400, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA MP490", "MP490", MP490_PID, 1200, 638, 877, PIXMA_CAP_CIS),
DEVICE ("Canon PIXMA MP250", "MP250", MP250_PID, 600, 638, 877, PIXMA_CAP_CIS),
END_OF_DEVICE_LIST
};

4
backend/pixma_mp730.c
Wyświetl plik

@ -617,13 +617,13 @@ mp730_fill_buffer (pixma_t * s, pixma_imagebuf_t * ib)
s->cfg->pid != MF3110_PID)
{
/* color, and not an MF57x0 nor MF3110 */
PDBG (pixma_dbg (1, "DEBUG: Packing colors\n"));
PDBG (pixma_dbg (10, "DEBUG: Packing colors\n"));
pack_rgb (mp->imgbuf, n, mp->raw_width, mp->lbuf);
}
else
{
/* grayscale or MF57x0 or MF3110 */
PDBG (pixma_dbg (1, "DEBUG: not processing colors\n"));
PDBG (pixma_dbg (10, "DEBUG: not processing colors\n"));
memcpy (mp->lbuf, mp->imgbuf, n * s->param->line_size);
}
block_size = n * s->param->line_size;