Declared new models (yet untested) Pixma MX330 and MX860 in pixma backend, bump minor version number.

- backend/pixma_mp150.c: declared new models (yet untested) Pixma MX330 and MX860.
- doc/descriptions/pixma.desc, doc/sane-pixma.man: updated docs.
- backend/pixma.h: bump backend minor version number.
merge-requests/1/head
Nicolas Martin 2009-07-02 22:07:39 +02:00
rodzic 66995bb258
commit cb199d7f66
5 zmienionych plików z 22 dodań i 3 usunięć

Wyświetl plik

@ -1,3 +1,8 @@
2009-07-02 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma.h, backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
- Declared new models (yet untested) Pixma MX330 and MX860, updated docs.
- Bump backend minor version number.
2009-07-01 Alex Belkin <abc at telekom.ru> 2009-07-01 Alex Belkin <abc at telekom.ru>
* backend/xerox_mfp.conf.in: usbid for Samsung SCX-4500W * backend/xerox_mfp.conf.in: usbid for Samsung SCX-4500W

Wyświetl plik

@ -108,7 +108,7 @@ typedef uint32_t uint32_t;
/** \name Version of the driver */ /** \name Version of the driver */
/**@{*/ /**@{*/
#define PIXMA_VERSION_MAJOR 0 #define PIXMA_VERSION_MAJOR 0
#define PIXMA_VERSION_MINOR 15 #define PIXMA_VERSION_MINOR 16
#define PIXMA_VERSION_BUILD 0 #define PIXMA_VERSION_BUILD 0
/**@}*/ /**@}*/

Wyświetl plik

@ -141,9 +141,9 @@
#define MP190_PID 0x1734 #define MP190_PID 0x1734
/* PIXMA 2009 vintage */ /* PIXMA 2009 vintage */
#define MX860_PID 0x1735 /* untested */
#define MX320_PID 0x1736 /* untested */ #define MX320_PID 0x1736 /* untested */
#define MX330_PID UNKNOWN_PID /* TBD, untested */ #define MX330_PID 0x1737 /* untested */
#define MX860_PID UNKNOWN_PID /* TBD, untested */
enum mp150_state_t enum mp150_state_t

Wyświetl plik

@ -231,6 +231,12 @@
:status :untested :status :untested
:comment "Same protocol as Pixma Generation 3? Testers needed!" :comment "Same protocol as Pixma Generation 3? Testers needed!"
:model "PIXMA MX330"
:interface "USB"
:usbid "0x04a9" "0x1737"
:status :untested
:comment "Same protocol as Pixma Generation 3? Testers needed!"
:model "PIXMA MX700" :model "PIXMA MX700"
:interface "USB Ethernet" :interface "USB Ethernet"
:usbid "0x04a9" "0x1729" :usbid "0x04a9" "0x1729"
@ -243,6 +249,12 @@
:status :good :status :good
:comment "All resolutions supported (up to 2400DPI). Flatbed, ADF simplex and Duplex supported." :comment "All resolutions supported (up to 2400DPI). Flatbed, ADF simplex and Duplex supported."
:model "PIXMA MX860"
:interface "USB Ethernet"
:usbid "0x04a9" "0x1735"
:status :untested
:comment "Same protocol as Pixma Generation 3? Testers needed!"
:model "PIXMA MX7600" :model "PIXMA MX7600"
:interface "USB Ethernet" :interface "USB Ethernet"
:usbid "0x04a9" "0x171c" :usbid "0x04a9" "0x171c"

Wyświetl plik

@ -40,6 +40,8 @@ and must be switched off and on.
SmartBase MP360, MP370, MP390 SmartBase MP360, MP370, MP390
.br .br
MultiPASS PIXMA MP760, PIXMA MP780 MultiPASS PIXMA MP760, PIXMA MP780
.br
PIXMA MX320, MX330, MX860
.RE .RE
.PP .PP
The following models may use the same Pixma protocol as those listed The following models may use the same Pixma protocol as those listed