slp
/
selphy_print
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

All: Leave the "prefix" list for family or backwards-compatible names only.

Browse Source 
...use the name in the DEVICE entry for backend matches!
master
Solomon Peachy 3 years ago
parent 3eb2903def
commit 697486b467
19 changed files with 60 additions and 81 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      backend_canonselphy.c
  2. 1
      backend_canonselphyneo.c
  3. 9
      backend_common.c
  4. 25
      backend_dnpds40.c
  5. 4
      backend_hiti.c
  6. 8
      backend_kodak1400.c
  7. 4
      backend_kodak605.c
  8. 1
      backend_kodak6800.c
  9. 4
      backend_magicard.c
  10. 4
      backend_mitsu70x.c
  11. 12
      backend_mitsu9550.c
  12. 4
      backend_mitsud90.c
  13. 1
      backend_mitsup95d.c
  14. 7
      backend_shinkos1245.c
  15. 7
      backend_shinkos2145.c
  16. 10
      backend_shinkos6145.c
  17. 11
      backend_shinkos6245.c
  18. 12
      backend_sonyupd.c
  19. 5
      backend_sonyupdneo.c

12
backend_canonselphy.c
Unescape View File

@ -1122,14 +1122,6 @@ static int canonselphy_query_markers(void *vctx, struct marker **markers, int *c
static const char *canonselphy_prefixes[] = {
"canonselphy", // Family name
"canon-cp10", "canon-cp100", "canon-cp200", "canon-cp220",
"canon-cp300", "canon-cp330", "canon-cp400", "canon-cp500",
"canon-cp510", "canon-cp520", "canon-cp530", "canon-cp600",
"canon-cp710", "canon-cp720", "canon-cp730", "canon-cp740",
"canon-cp750", "canon-cp760", "canon-cp770", "canon-cp780",
"canon-cp790", "canon-cp800", "canon-cp810", "canon-cp900",
"canon-es1", "canon-es2", "canon-es20", "canon-es3",
"canon-es30", "canon-es40",
// backwards compatibility
"selphycp10", "selphycp100", "selphycp200", "selphycp220",
"selphycp300", "selphycp330", "selphycp400", "selphycp500",
@ -1144,7 +1136,7 @@ static const char *canonselphy_prefixes[] = {
struct dyesub_backend canonselphy_backend = {
.name = "Canon SELPHY CP/ES (legacy)",
.version = "0.104",
.version = "0.105",
.uri_prefixes = canonselphy_prefixes,
.cmdline_usage = canonselphy_cmdline,
.cmdline_arg = canonselphy_cmdline_arg,
@ -1159,7 +1151,7 @@ struct dyesub_backend canonselphy_backend = {
{ USB_VID_CANON, USB_PID_CANON_CP100, P_CP_XXX, NULL, "canon-cp100"},
{ USB_VID_CANON, USB_PID_CANON_CP200, P_CP_XXX, NULL, "canon-cp200"},
{ USB_VID_CANON, USB_PID_CANON_CP220, P_CP_XXX, NULL, "canon-cp220"},
{ USB_VID_CANON, USB_PID_CANON_CP300, P_CP_XXX, NULL, "selpyhcp300"},
{ USB_VID_CANON, USB_PID_CANON_CP300, P_CP_XXX, NULL, "canon-cp300"},
{ USB_VID_CANON, USB_PID_CANON_CP330, P_CP_XXX, NULL, "canon-cp330"},
{ USB_VID_CANON, USB_PID_CANON_CP400, P_CP_XXX, NULL, "canon-cp400"},
{ USB_VID_CANON, USB_PID_CANON_CP500, P_CP_XXX, NULL, "canon-cp500"},

1
backend_canonselphyneo.c
Unescape View File

@ -513,7 +513,6 @@ static int selphyneo_query_markers(void *vctx, struct marker **markers, int *cou
static const char *canonselphyneo_prefixes[] = {
"canonselphyneo", // Family name
"canon-cp820", "canon-cp910", "canon-cp1000", "canon-cp1200", "canon-cp1300",
// backwards compatibility
"selphycp820", "selphycp910", "selphycp1000", "selphycp1200", "selphycp1300",
NULL

9
backend_common.c
Unescape View File

@ -836,12 +836,18 @@ static struct dyesub_backend *find_backend(const char *uri_prefix)
for (i = 0; ; i++) {
struct dyesub_backend *backend = backends[i];
const char **alias;
int j;
if (!backend)
return NULL;
for (alias = backend->uri_prefixes ; alias && *alias ; alias++) {
if (!strcmp(uri_prefix, *alias))
return backend;
}
for (j = 0 ; backend->devices[j].vid ; j++) {
if (!strcmp(uri_prefix,backend->devices[j].prefix)) {
return backend;
}
}
}
return NULL;
}
@ -1025,11 +1031,14 @@ void print_help(const char *argv0, const struct dyesub_backend *backend)
}
} else {
const char **alias;
int j;
DEBUG("Standalone %s backend version %s\n",
backend->name, backend->version);
DEBUG("\t supporting: ");
for (alias = backend->uri_prefixes ; alias && *alias ; alias++)
DEBUG2("%s ", *alias);
for (j = 0 ; backend->devices[j].vid ; j++)
DEBUG2("%s ", backend->devices[j].prefix);
DEBUG2("\n");
DEBUG("\t[ -D ] [ -G ] [ -f ]\n");

25
backend_dnpds40.c
Unescape View File

@ -3208,15 +3208,9 @@ static int dnp_job_polarity(void *vctx)
static const char *dnpds40_prefixes[] = {
"dnp_citizen", "dnpds40", // Family names, do *not* nuke.
"dnp-ds40", "dnp-ds80", "dnp-ds80dx", "dnp-ds620", "dnp-ds820", "dnp-dsrx1",
"citizen-cw-01", "citizen-cw-02", "citizen-cx-02",
"citizen-cx-02w",
// backwards compatibility
"dnpds80", "dnpds80dx", "dnpds620", "dnpds820", "dnprx1",
"citizencw01", "citizencw02", "citizencx02",
// These are all extras.
"citizen-cx", "citizen-cx-w", "citizen-cy", "citizen-cy-02",
"citizen-op900", "citizen-op900ii",
NULL
};
@ -3226,7 +3220,7 @@ static const char *dnpds40_prefixes[] = {
#define USB_PID_DNP_DSRX1 0x0005 // Also Citizen CY
#define USB_PID_DNP_DS80D 0x0008
#define USB_PID_CITIZEN_CW01 0x0002 // Maybe others?
#define USB_PID_CITIZEN_CW01 0x0002 // Also OP900
#define USB_PID_CITIZEN_CW02 0x0006 // Also OP900II
#define USB_PID_CITIZEN_CX02 0x000A
#define USB_PID_CITIZEN_CX02W 0x000B
@ -3254,14 +3248,21 @@ struct dyesub_backend dnpds40_backend = {
.combine_jobs = dnp_combine_jobs,
.job_polarity = dnp_job_polarity,
.devices = {
{ USB_VID_CITIZEN, USB_PID_DNP_DS40, P_DNP_DS40, NULL, "dnp-ds40"}, // Also Citizen CX
{ USB_VID_CITIZEN, USB_PID_DNP_DS80, P_DNP_DS80, NULL, "dnp-ds80"}, // Also Citizen CX-W and Mitsubishi CP-3800DW
{ USB_VID_CITIZEN, USB_PID_DNP_DS40, P_DNP_DS40, NULL, "dnp-ds40"},
{ USB_VID_CITIZEN, USB_PID_DNP_DS40, P_DNP_DS40, NULL, "citizen-cx"}, /* Duplicate */
{ USB_VID_CITIZEN, USB_PID_DNP_DS80, P_DNP_DS80, NULL, "dnp-ds80"},
{ USB_VID_CITIZEN, USB_PID_DNP_DS80, P_DNP_DS80, NULL, "citizen-cx-w"}, /* Duplicate */
{ USB_VID_CITIZEN, USB_PID_DNP_DS80, P_DNP_DS80, NULL, "mitsubishi-cp3800dw"}, /* Duplicate */
{ USB_VID_CITIZEN, USB_PID_DNP_DS80D, P_DNP_DS80D, NULL, "dnp-ds80dx"},
{ USB_VID_CITIZEN, USB_PID_DNP_DSRX1, P_DNP_DSRX1, NULL, "dnp-dsrx1"}, // Also Citizen CY
{ USB_VID_CITIZEN, USB_PID_DNP_DSRX1, P_DNP_DSRX1, NULL, "dnp-dsrx1"},
{ USB_VID_CITIZEN, USB_PID_DNP_DSRX1, P_DNP_DSRX1, NULL, "citizen-cy"}, /* Duplicate */
{ USB_VID_CITIZEN, USB_PID_DNP_DSRX1, P_DNP_DSRX1, NULL, "citizen-cy-02"}, /* Duplicate */
{ USB_VID_DNP, USB_PID_DNP_DS620, P_DNP_DS620, NULL, "dnp-ds620"},
{ USB_VID_DNP, USB_PID_DNP_DS820, P_DNP_DS820, NULL, "dnp-ds820"},
{ USB_VID_CITIZEN, USB_PID_CITIZEN_CW01, P_CITIZEN_CW01, NULL, "citizen-cw-01"}, // Also OP900 ?
{ USB_VID_CITIZEN, USB_PID_CITIZEN_CW02, P_CITIZEN_OP900II, NULL, "citizen-cw-02"}, // Also OP900II
{ USB_VID_CITIZEN, USB_PID_CITIZEN_CW01, P_CITIZEN_CW01, NULL, "citizen-cw-01"},
{ USB_VID_CITIZEN, USB_PID_CITIZEN_CW01, P_CITIZEN_CW01, NULL, "citizen-op900"}, /* Duplicate */
{ USB_VID_CITIZEN, USB_PID_CITIZEN_CW02, P_CITIZEN_OP900II, NULL, "citizen-cw-02"},
{ USB_VID_CITIZEN, USB_PID_CITIZEN_CW02, P_CITIZEN_OP900II, NULL, "citizen-op900ii"}, /* Duplicate */
{ USB_VID_CITIZEN, USB_PID_CITIZEN_CX02, P_DNP_DS620, NULL, "citizen-cx-02"},
{ USB_VID_CITIZEN, USB_PID_CITIZEN_CX02W, P_DNP_DS820, NULL, "citizen-cx-02w"},
{ 0, 0, 0, NULL, NULL}

4
backend_hiti.c
Unescape View File

@ -2142,8 +2142,7 @@ static int hiti_query_stats(void *vctx, struct printerstats *stats)
static const char *hiti_prefixes[] = {
"hiti", // Family name
"hiti-p52x",
"hiti-p520l", "hiti-p525l", "hiti-p720l", "hiti-p750l",
"hiti-p52x", /* Just in case */
NULL
};
@ -2184,6 +2183,7 @@ struct dyesub_backend hiti_backend = {
.query_stats = hiti_query_stats,
.devices = {
{ USB_VID_HITI, USB_PID_HITI_P52X, P_HITI_52X, NULL, "hiti-p520l"},
{ USB_VID_HITI, USB_PID_HITI_P52X, P_HITI_52X, NULL, "hiti-p525l"}, /* Duplicate */
{ USB_VID_HITI, USB_PID_HITI_P720, P_HITI_720, NULL, "hiti-p720l"},
{ USB_VID_HITI, USB_PID_HITI_P750, P_HITI_750, NULL, "hiti-p750l"},
{ 0, 0, 0, NULL, NULL}

8
backend_kodak1400.c
Unescape View File

@ -626,11 +626,8 @@ static int kodak1400_query_markers(void *vctx, struct marker **markers, int *cou
static const char *kodak1400_prefixes[] = {
"kodak1400", // Family driver, do NOT nuke!
"kodak-1400", "kodak-805", "mitsubishi-3020d", "mitsubishi-3020da",
// backwards compatibility
"kodak805", "mitsu3020d", "mitsu3020da",
// Extras.
"mitsubishi-3020dae", "mitsubishi-3020de", "mitsubishi-3020du",
"kodak805",
NULL,
};
@ -650,7 +647,10 @@ struct dyesub_backend kodak1400_backend = {
{ USB_VID_KODAK, USB_PID_KODAK_1400, P_KODAK_1400_805, "Kodak", "kodak-1400"},
{ USB_VID_KODAK, USB_PID_KODAK_805, P_KODAK_1400_805, "Kodak", "kodak-805"},
{ USB_VID_MITSU, USB_PID_MITSU_3020D, P_KODAK_1400_805, NULL, "mitsubishi-3020d"},
{ USB_VID_MITSU, USB_PID_MITSU_3020D, P_KODAK_1400_805, NULL, "mitsubishi-3020du"}, /* Duplicate */
{ USB_VID_MITSU, USB_PID_MITSU_3020D, P_KODAK_1400_805, NULL, "mitsubishi-3020de"}, /* Duplicate */
{ USB_VID_MITSU, USB_PID_MITSU_3020DA, P_KODAK_1400_805, NULL, "mitsubishi-3020da" },
{ USB_VID_MITSU, USB_PID_MITSU_3020DA, P_KODAK_1400_805, NULL, "mitsubishi-3020dae" }, /* Duplicate */
{ 0, 0, 0, NULL, NULL}
}
};

4
backend_kodak605.c
Unescape View File

@ -893,7 +893,7 @@ static int kodak605_query_stats(void *vctx, struct printerstats *stats)
static const char *kodak605_prefixes[] = {
"kodak605", // Family driver, do NOT nuke.
"kodak-605", "kodak-7000", "kodak-7010", "kodak-7015",
"kodak-701x", // Just in case
NULL,
};
@ -915,7 +915,7 @@ struct dyesub_backend kodak605_backend = {
{ USB_VID_KODAK, USB_PID_KODAK_605, P_KODAK_605, "Kodak", "kodak-605"},
{ USB_VID_KODAK, USB_PID_KODAK_7000, P_KODAK_7000, "Kodak", "kodak-7000"},
{ USB_VID_KODAK, USB_PID_KODAK_7010, P_KODAK_701X, "Kodak", "kodak-7010"},
{ USB_VID_KODAK, USB_PID_KODAK_7015, P_KODAK_701X, "Kodak", "kodak-7015"},
{ USB_VID_KODAK, USB_PID_KODAK_7015, P_KODAK_701X, "Kodak", "kodak-7015"}, /* Duplicate */
{ 0, 0, 0, NULL, NULL}
}
};

1
backend_kodak6800.c
Unescape View File

@ -1071,7 +1071,6 @@ static int kodak6800_query_stats(void *vctx, struct printerstats *stats)
static const char *kodak6800_prefixes[] = {
"kodak68x0", // Family driver, do not nuke.
"kodak-6800", "kodak-6850",
// Backwards-compatibility
"kodak6800", "kodak6850",
NULL

4
backend_magicard.c
Unescape View File

@ -928,9 +928,6 @@ static int magicard_query_markers(void *vctx, struct marker **markers, int *coun
static const char *magicard_prefixes[] = {
"magicard", // Family name
"magicard-tango-2e", "magicard-enduro", "magicard-enduroplus",
// extras
"magicard-rio-2e",
// backwards compatibility
"tango2e", "enduro", "enduroplus",
NULL
@ -950,6 +947,7 @@ struct dyesub_backend magicard_backend = {
.query_markers = magicard_query_markers,
.devices = {
{ USB_VID_MAGICARD, USB_PID_MAGICARD_TANGO2E, P_MAGICARD, NULL, "magicard-tango2e"},
// { USB_VID_MAGICARD, USB_PID_MAGICARD_TANGO2E, P_MAGICARD, NULL, "magicard-rio2e"},
{ USB_VID_MAGICARD, USB_PID_MAGICARD_ENDURO, P_MAGICARD, NULL, "magicard-enduro"},
{ USB_VID_MAGICARD, USB_PID_MAGICARD_ENDUROPLUS, P_MAGICARD, NULL, "magicard-enduroplus"},
{ USB_VID_MAGICARD, 0xFFFF, P_MAGICARD, NULL, "magicard"},

4
backend_mitsu70x.c
Unescape View File

@ -2546,9 +2546,6 @@ static int mitsu70x_query_stats(void *vctx, struct printerstats *stats)
static const char *mitsu70x_prefixes[] = {
"mitsu70x", // Family entry, do not nuke.
"mitsubishi-d70dw", "mitsubishi-d80dw", "mitsubishi-k60dw", "kodak-305", "fujifilm-ask-300",
// Extras
"mitsubishi-d707dw", "mitsubishi-k60dws",
// backwards compatibility
"mitsud80", "mitsuk60", "kodak305", "fujiask300",
NULL,
@ -2575,6 +2572,7 @@ struct dyesub_backend mitsu70x_backend = {
.job_polarity = mitsu70x_job_polarity,
.devices = {
{ USB_VID_MITSU, USB_PID_MITSU_D70X, P_MITSU_D70X, NULL, "mitsubishi-d70dw"},
{ USB_VID_MITSU, USB_PID_MITSU_D70X, P_MITSU_D70X, NULL, "mitsubishi-d707dw"}, /* Duplicate */
{ USB_VID_MITSU, USB_PID_MITSU_K60, P_MITSU_K60, NULL, "mitsubishi-k60dw"},
{ USB_VID_MITSU, USB_PID_MITSU_D80, P_MITSU_D80, NULL, "mitsubishi-d80dw"},
{ USB_VID_KODAK, USB_PID_KODAK305, P_KODAK_305, NULL, "kodak-305"},

12
backend_mitsu9550.c
Unescape View File

@ -1667,13 +1667,6 @@ static int mitsu9550_query_markers(void *vctx, struct marker **markers, int *cou
static const char *mitsu9550_prefixes[] = {
"mitsu9xxx", // Family driver, do not nuke.
"mitsubishi-9000dw", "mitsubishi-9500dw",
"mitsubishi-9550dw", "mitsubishi-9550dw-s",
"mitsubishi-9600dw", // "mitsubishi-9600dw-s",
"mitsubishi-9800dw", "mitsubishi-9800dw-s",
"mitsubishi-9810dw",
// extras
"mitsubishi-9550d", "mitsubishi-9550dz", "mitsubishi-9800d", "mitsubishi-9800dz", "mitsubishi-9810d",
// Backwards compatibility
"mitsu9000", "mitsu9500", "mitsu9550", "mitsu9600", "mitsu9800", "mitsu9810",
NULL
@ -1699,12 +1692,17 @@ struct dyesub_backend mitsu9550_backend = {
{ USB_VID_MITSU, USB_PID_MITSU_9000D, P_MITSU_9550, NULL, "mitsubishi-9000dw"},
{ USB_VID_MITSU, USB_PID_MITSU_9500D, P_MITSU_9550, NULL, "mitsubishi-9500dw"},
{ USB_VID_MITSU, USB_PID_MITSU_9550D, P_MITSU_9550, NULL, "mitsubishi-9550dw"},
{ USB_VID_MITSU, USB_PID_MITSU_9550D, P_MITSU_9550, NULL, "mitsubishi-9550d"}, /* Duplicate */
{ USB_VID_MITSU, USB_PID_MITSU_9550DS, P_MITSU_9550S, NULL, "mitsubishi-9550dw-s"},
{ USB_VID_MITSU, USB_PID_MITSU_9550DS, P_MITSU_9550S, NULL, "mitsubishi-9550dz"}, /* Duplicate */
{ USB_VID_MITSU, USB_PID_MITSU_9600D, P_MITSU_9600, NULL, "mitsubishi-9600dw"},
// { USB_VID_MITSU, USB_PID_MITSU_9600D, P_MITSU_9600S, NULL, "mitsubishi-9600dw-s"},
{ USB_VID_MITSU, USB_PID_MITSU_9800D, P_MITSU_9800, NULL, "mitsubishi-9800dw"},
{ USB_VID_MITSU, USB_PID_MITSU_9800D, P_MITSU_9800, NULL, "mitsubishi-9800d"}, /* Duplicate */
{ USB_VID_MITSU, USB_PID_MITSU_9800DS, P_MITSU_9800S, NULL, "mitsubishi-9800dw-s"},
{ USB_VID_MITSU, USB_PID_MITSU_9800DS, P_MITSU_9800S, NULL, "mitsubishi-9800dz"}, /* Duplicate */
{ USB_VID_MITSU, USB_PID_MITSU_98__D, P_MITSU_9810, NULL, "mitsubishi-9810dw"},
{ USB_VID_MITSU, USB_PID_MITSU_98__D, P_MITSU_9810, NULL, "mitsubishi-9810d"}, /* Duplicate */
// { USB_VID_MITSU, USB_PID_MITSU_9810D, P_MITSU_9810, NULL, "mitsubishi-9810dw"},
// { USB_VID_MITSU, USB_PID_MITSU_9820DS, P_MITSU_9820S, NULL, "mitsubishi-9820dw-s"},
{ 0, 0, 0, NULL, NULL}

4
backend_mitsud90.c
Unescape View File

@ -1304,9 +1304,7 @@ static int mitsud90_query_stats(void *vctx, struct printerstats *stats)
}
static const char *mitsud90_prefixes[] = {
"mitsubishi-d90dw",
// backwards compatibility
"mitsud90",
"mitsud90", /* Family Name */
NULL
};

1
backend_mitsup95d.c
Unescape View File

@ -574,7 +574,6 @@ static int mitsup95d_query_markers(void *vctx, struct marker **markers, int *cou
static const char *mitsup95d_prefixes[] = {
"mitsup9x", // Family driver name
"mitsubishi-p95d", "mitsubishi-p93d",
// backwards compatibility
"mitsup95d", "mitsup93d",
NULL

7
backend_shinkos1245.c
Unescape View File

@ -1293,11 +1293,7 @@ static int shinkos1245_query_stats(void *vctx, struct printerstats *stats)
#define USB_PID_SHINKO_S1245 0x0007
static const char *shinkos1245_prefixes[] = {
"shinko-chcs1245",
// extra
"sinfonia-chcs1245",
// backwards-compatibility
"shinkos1245",
"shinkos1245", /* Family Name */
NULL
};
@ -1317,6 +1313,7 @@ struct dyesub_backend shinkos1245_backend = {
.query_stats = shinkos1245_query_stats,
.devices = {
{ USB_VID_SHINKO, USB_PID_SHINKO_S1245, P_SHINKO_S1245, NULL, "shinko-chcs1245"},
{ USB_VID_SHINKO, USB_PID_SHINKO_S1245, P_SHINKO_S1245, NULL, "sinfonia-chcs1245"}, /* Duplicate */
{ 0, 0, 0, NULL, NULL}
}
};

7
backend_shinkos2145.c
Unescape View File

@ -1230,11 +1230,7 @@ static int shinkos2145_query_stats(void *vctx, struct printerstats *stats)
#define USB_PID_SHINKO_S2145 0x000E
static const char *shinkos2145_prefixes[] = {
"shinko-chcs2145",
// extras
"sinfonia-chcs2145",
// Backwards compatibility
"shinkos2145",
"shinkos2145", /* Family Name */
NULL
};
@ -1254,6 +1250,7 @@ struct dyesub_backend shinkos2145_backend = {
.query_stats = shinkos2145_query_stats,
.devices = {
{ USB_VID_SHINKO, USB_PID_SHINKO_S2145, P_SHINKO_S2145, NULL, "shinko-chc2145"},
{ USB_VID_SHINKO, USB_PID_SHINKO_S2145, P_SHINKO_S2145, NULL, "sinfonia-chc2145"}, /* Duplicate */
{ 0, 0, 0, NULL, NULL}
}
};

10
backend_shinkos6145.c
Unescape View File

@ -534,7 +534,7 @@ struct shinkos6145_ctx {
uint8_t jobid;
uint8_t image_avg[3]; /* CMY */
uint8_t image_avg[3]; /* YMC */
char serial[32];
char fwver[32];
@ -1636,12 +1636,9 @@ static int shinkos6145_query_stats(void *vctx, struct printerstats *stats)
}
static const char *shinkos6145_prefixes[] = {
"sinfonia-chcs6145", "ciaat-brava-21",
"sinfonia-chcs2245", "hiti-m610", "kodak-6900",
// extras
"shinko-chcs6145",
"shinkos6145", /* Family Name */
// backwards-compatiblity
"shinkos6145", "brava21",
"brava21",
NULL
};
@ -1662,6 +1659,7 @@ struct dyesub_backend shinkos6145_backend = {
.query_stats = shinkos6145_query_stats,
.devices = {
{ USB_VID_SHINKO, USB_PID_SHINKO_S6145, P_SHINKO_S6145, NULL, "sinfonia-chcs6145"},
{ USB_VID_SHINKO, USB_PID_SHINKO_S6145, P_SHINKO_S6145, NULL, "shinko-chcs6145"}, /* Duplicate */
{ USB_VID_SHINKO, USB_PID_SHINKO_S6145D, P_SHINKO_S6145D, NULL, "ciaat-brava-21"},
{ USB_VID_SHINKO, USB_PID_SHINKO_S2245, P_SHINKO_S2245, NULL, "sinfonia-chcs2245"},
{ USB_VID_KODAKALARIS, USB_PID_KA_6900, P_SHINKO_S2245, NULL, "kodak-6900"},

11
backend_shinkos6245.c
Unescape View File

@ -1508,17 +1508,15 @@ static int shinkos6245_query_stats(void *vctx, struct printerstats *stats)
#define USB_PID_KODAK_8810 0x404D
static const char *shinkos6245_prefixes[] = {
"sinfonia-chcs6245", "hiti-p910l", "kodak-8810",
// extras
"shinko-chcs6245",
"shinkos6245", /* Family Name */
// backwards compatibility
"shinkos6245", "hitip910",
"hitip910",
NULL
};
struct dyesub_backend shinkos6245_backend = {
.name = "Sinfonia CHC-S6245 / Kodak 8810",
.version = "0.32" " (lib " LIBSINFONIA_VER ")",
.version = "0.33" " (lib " LIBSINFONIA_VER ")",
.uri_prefixes = shinkos6245_prefixes,
.cmdline_usage = shinkos6245_cmdline,
.cmdline_arg = shinkos6245_cmdline_arg,
@ -1531,7 +1529,8 @@ struct dyesub_backend shinkos6245_backend = {
.query_markers = shinkos6245_query_markers,
.query_stats = shinkos6245_query_stats,
.devices = {
{ USB_VID_SHINKO, USB_PID_SHINKO_S6245, P_SHINKO_S6245, NULL, "shinfonia-chcs6245"},
{ USB_VID_SHINKO, USB_PID_SHINKO_S6245, P_SHINKO_S6245, NULL, "sinfonia-chcs6245"},
{ USB_VID_SHINKO, USB_PID_SHINKO_S6245, P_SHINKO_S6245, NULL, "shinko-chcs6245"}, /* Duplicate */
{ USB_VID_HITI, USB_PID_HITI_P910L, P_HITI_910, NULL, "hiti-p910l"},
{ USB_VID_KODAK, USB_PID_KODAK_8810, P_KODAK_8810, NULL, "kodak-8810"},
{ 0, 0, 0, NULL, NULL}

12
backend_sonyupd.c
Unescape View File

@ -588,12 +588,10 @@ static int upd_query_markers(void *vctx, struct marker **markers, int *count)
}
static const char *sonyupd_prefixes[] = {
"sonyupd",
"sony-updr150", "sony-updr200", "sony-upcr10l",
"sony-upd895", "sony-upd897", "dnp-sl10",
"sonyupd", /* Family Name */
"dnp-sl10", // Unknown if shared with CR10L
// Backwards compatibility
"sonyupdr150",
"sonyupdr200", "sonyupcr10",
"sonyupdr150", "sonyupdr200", "sonyupcr10",
NULL
};
@ -607,7 +605,7 @@ static const char *sonyupd_prefixes[] = {
struct dyesub_backend sonyupd_backend = {
.name = "Sony UP-D",
.version = "0.38",
.version = "0.39",
.uri_prefixes = sonyupd_prefixes,
.cmdline_arg = upd_cmdline_arg,
.cmdline_usage = upd_cmdline,
@ -621,7 +619,7 @@ struct dyesub_backend sonyupd_backend = {
{ USB_VID_SONY, USB_PID_SONY_UPDR150, P_SONY_UPDR150, NULL, "sony-updr150"},
{ USB_VID_SONY, USB_PID_SONY_UPDR200, P_SONY_UPDR150, NULL, "sony-updr200"},
{ USB_VID_SONY, USB_PID_SONY_UPCR10, P_SONY_UPCR10, NULL, "sony-upcr10l"},
{ USB_VID_SONY, USB_PID_SONY_UPD895, P_SONY_UPD895, NULL, "sonyupd895"},
{ USB_VID_SONY, USB_PID_SONY_UPD895, P_SONY_UPD895, NULL, "sony-upd895"},
{ USB_VID_SONY, USB_PID_SONY_UPD897, P_SONY_UPD897, NULL, "sony-upd897"},
{ 0, 0, 0, NULL, NULL}
}

5
backend_sonyupdneo.c
Unescape View File

@ -613,9 +613,8 @@ static int updneo_query_markers(void *vctx, struct marker **markers, int *count)
}
static const char *sonyupdneo_prefixes[] = {
"sonyupdneo",
"sony-upd898", "sony-upcr20l", "sony-updr80", "sony-updr80md",
"dnp-sl20",
"sonyupdneo", /* Family Name */
"dnp-sl20", // extra, unknown if shared with CR20L
NULL
};

Write Preview
Loading…
Cancel
Save