summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2018-09-22 09:11:14 -0400
committerSolomon Peachy <pizza@shaftnet.org>2018-09-22 09:11:14 -0400
commit47512cb277ec971e6d0a17cdf86de4e72ca65ea2 (patch)
tree2495ec3adef33a36a1308c5869b3407688c01b0a
parent8bf63e20ec05b6ec0f7db0ac5cd89acf87be0c50 (diff)
downloadselphy_print-47512cb277ec971e6d0a17cdf86de4e72ca65ea2.tar.gz
selphy_print-47512cb277ec971e6d0a17cdf86de4e72ca65ea2.tar.bz2
selphy_print-47512cb277ec971e6d0a17cdf86de4e72ca65ea2.zip
all: Revamp "backend names" to align with gutenprint model names.
Should have done this to begin with, whoops. (All old names are retained for backwards compatibility)
-rw-r--r--backend_canonselphy.c71
-rw-r--r--backend_canonselphyneo.c16
-rw-r--r--backend_dnpds40.c30
-rw-r--r--backend_kodak1400.c17
-rw-r--r--backend_kodak605.c7
-rw-r--r--backend_kodak6800.c10
-rw-r--r--backend_magicard.c14
-rw-r--r--backend_mitsu70x.c18
-rw-r--r--backend_mitsu9550.c36
-rw-r--r--backend_mitsud90.c6
-rw-r--r--backend_mitsup95d.c10
-rw-r--r--backend_shinkos1245.c8
-rw-r--r--backend_shinkos2145.c8
-rw-r--r--backend_shinkos6145.c10
-rw-r--r--backend_shinkos6245.c10
-rw-r--r--backend_sonyupdr150.c15
16 files changed, 175 insertions, 111 deletions
diff --git a/backend_canonselphy.c b/backend_canonselphy.c
index dd6accd..7ec1b31 100644
--- a/backend_canonselphy.c
+++ b/backend_canonselphy.c
@@ -1133,7 +1133,16 @@ static int canonselphy_query_markers(void *vctx, struct marker **markers, int *c
}
static const char *canonselphy_prefixes[] = {
- "canonselphy",
+ "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",
"selphycp510", "selphycp520", "selphycp530", "selphycp600",
@@ -1147,7 +1156,7 @@ static const char *canonselphy_prefixes[] = {
struct dyesub_backend canonselphy_backend = {
.name = "Canon SELPHY CP/ES (legacy)",
- .version = "0.102",
+ .version = "0.104",
.uri_prefixes = canonselphy_prefixes,
.cmdline_usage = canonselphy_cmdline,
.cmdline_arg = canonselphy_cmdline_arg,
@@ -1159,36 +1168,36 @@ struct dyesub_backend canonselphy_backend = {
.main_loop = canonselphy_main_loop,
.query_markers = canonselphy_query_markers,
.devices = {
- { USB_VID_CANON, USB_PID_CANON_CP10, P_CP10, NULL, "selphycp10"},
- { USB_VID_CANON, USB_PID_CANON_CP100, P_CP_XXX, NULL, "selphycp100"},
- { USB_VID_CANON, USB_PID_CANON_CP200, P_CP_XXX, NULL, "selphycp200"},
- { USB_VID_CANON, USB_PID_CANON_CP220, P_CP_XXX, NULL, "selphycp220"},
+ { USB_VID_CANON, USB_PID_CANON_CP10, P_CP10, NULL, "canon-cp10"},
+ { 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_CP330, P_CP_XXX, NULL, "selphycp330"},
- { USB_VID_CANON, USB_PID_CANON_CP400, P_CP_XXX, NULL, "selphycp400"},
- { USB_VID_CANON, USB_PID_CANON_CP500, P_CP_XXX, NULL, "selphycp500"},
- { USB_VID_CANON, USB_PID_CANON_CP510, P_CP_XXX, NULL, "selphycp510"},
- { USB_VID_CANON, USB_PID_CANON_CP520, P_CP_XXX, NULL, "selphycp520"},
- { USB_VID_CANON, USB_PID_CANON_CP530, P_CP_XXX, NULL, "selphycp530"},
- { USB_VID_CANON, USB_PID_CANON_CP600, P_CP_XXX, NULL, "selphycp600"},
- { USB_VID_CANON, USB_PID_CANON_CP710, P_CP_XXX, NULL, "selphycp710"},
- { USB_VID_CANON, USB_PID_CANON_CP720, P_CP_XXX, NULL, "selphycp720"},
- { USB_VID_CANON, USB_PID_CANON_CP730, P_CP_XXX, NULL, "selphycp730"},
- { USB_VID_CANON, USB_PID_CANON_CP740, P_CP_XXX, NULL, "selphycp740"},
- { USB_VID_CANON, USB_PID_CANON_CP750, P_CP_XXX, NULL, "selphycp750"},
- { USB_VID_CANON, USB_PID_CANON_CP760, P_CP_XXX, NULL, "selphycp760"},
- { USB_VID_CANON, USB_PID_CANON_CP770, P_CP_XXX, NULL, "selphycp770"},
- { USB_VID_CANON, USB_PID_CANON_CP780, P_CP_XXX, NULL, "selphycp780"},
- { USB_VID_CANON, USB_PID_CANON_CP790, P_CP790, NULL, "selphycp790"},
- { USB_VID_CANON, USB_PID_CANON_CP800, P_CP_XXX, NULL, "selphycp800"},
- { USB_VID_CANON, USB_PID_CANON_CP810, P_CP_XXX, NULL, "selphycp810"},
- { USB_VID_CANON, USB_PID_CANON_CP900, P_CP_XXX, NULL, "selphycp900"},
- { USB_VID_CANON, USB_PID_CANON_ES1, P_ES1, NULL, "selphyes1"},
- { USB_VID_CANON, USB_PID_CANON_ES2, P_ES2_20, NULL, "selphyes2"},
- { USB_VID_CANON, USB_PID_CANON_ES20, P_ES2_20, NULL, "selphyes20"},
- { USB_VID_CANON, USB_PID_CANON_ES3, P_ES3_30, NULL, "selphyes3"},
- { USB_VID_CANON, USB_PID_CANON_ES30, P_ES3_30, NULL, "selphyes30"},
- { USB_VID_CANON, USB_PID_CANON_ES40, P_ES40, NULL, "selphyes40"},
+ { 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"},
+ { USB_VID_CANON, USB_PID_CANON_CP510, P_CP_XXX, NULL, "canon-cp510"},
+ { USB_VID_CANON, USB_PID_CANON_CP520, P_CP_XXX, NULL, "canon-cp520"},
+ { USB_VID_CANON, USB_PID_CANON_CP530, P_CP_XXX, NULL, "canon-cp530"},
+ { USB_VID_CANON, USB_PID_CANON_CP600, P_CP_XXX, NULL, "canon-cp600"},
+ { USB_VID_CANON, USB_PID_CANON_CP710, P_CP_XXX, NULL, "canon-cp710"},
+ { USB_VID_CANON, USB_PID_CANON_CP720, P_CP_XXX, NULL, "canon-cp720"},
+ { USB_VID_CANON, USB_PID_CANON_CP730, P_CP_XXX, NULL, "canon-cp730"},
+ { USB_VID_CANON, USB_PID_CANON_CP740, P_CP_XXX, NULL, "canon-cp740"},
+ { USB_VID_CANON, USB_PID_CANON_CP750, P_CP_XXX, NULL, "canon-cp750"},
+ { USB_VID_CANON, USB_PID_CANON_CP760, P_CP_XXX, NULL, "canon-cp760"},
+ { USB_VID_CANON, USB_PID_CANON_CP770, P_CP_XXX, NULL, "canon-cp770"},
+ { USB_VID_CANON, USB_PID_CANON_CP780, P_CP_XXX, NULL, "canon-cp780"},
+ { USB_VID_CANON, USB_PID_CANON_CP790, P_CP790, NULL, "canon-cp790"},
+ { USB_VID_CANON, USB_PID_CANON_CP800, P_CP_XXX, NULL, "canon-cp800"},
+ { USB_VID_CANON, USB_PID_CANON_CP810, P_CP_XXX, NULL, "canon-cp810"},
+ { USB_VID_CANON, USB_PID_CANON_CP900, P_CP_XXX, NULL, "canon-cp900"},
+ { USB_VID_CANON, USB_PID_CANON_ES1, P_ES1, NULL, "canon-es1"},
+ { USB_VID_CANON, USB_PID_CANON_ES2, P_ES2_20, NULL, "canon-es2"},
+ { USB_VID_CANON, USB_PID_CANON_ES20, P_ES2_20, NULL, "canon-es20"},
+ { USB_VID_CANON, USB_PID_CANON_ES3, P_ES3_30, NULL, "canon-es3"},
+ { USB_VID_CANON, USB_PID_CANON_ES30, P_ES3_30, NULL, "canon-es30"},
+ { USB_VID_CANON, USB_PID_CANON_ES40, P_ES40, NULL, "canon-es40"},
{ 0, 0, 0, NULL, NULL}
}
};
diff --git a/backend_canonselphyneo.c b/backend_canonselphyneo.c
index 4f86df2..2ad8b16 100644
--- a/backend_canonselphyneo.c
+++ b/backend_canonselphyneo.c
@@ -532,14 +532,16 @@ static int selphyneo_query_markers(void *vctx, struct marker **markers, int *cou
}
static const char *canonselphyneo_prefixes[] = {
- "canonselphyneo",
+ "canonselphyneo", // Family name
+ "canon-cp820", "canon-cp910", "canon-cp1000", "canon-cp1200", "canon-cp1300",
+ // backwards compatibility
"selphycp820", "selphycp910", "selphycp1000", "selphycp1200", "selphycp1300",
NULL
};
struct dyesub_backend canonselphyneo_backend = {
.name = "Canon SELPHY CP (new)",
- .version = "0.19",
+ .version = "0.20",
.uri_prefixes = canonselphyneo_prefixes,
.cmdline_usage = selphyneo_cmdline,
.cmdline_arg = selphyneo_cmdline_arg,
@@ -551,11 +553,11 @@ struct dyesub_backend canonselphyneo_backend = {
.main_loop = selphyneo_main_loop,
.query_markers = selphyneo_query_markers,
.devices = {
- { USB_VID_CANON, USB_PID_CANON_CP820, P_CP910, NULL, "selphycp820"},
- { USB_VID_CANON, USB_PID_CANON_CP910, P_CP910, NULL, "selphycp910"},
- { USB_VID_CANON, USB_PID_CANON_CP1000, P_CP910, NULL, "elphycp1000"},
- { USB_VID_CANON, USB_PID_CANON_CP1200, P_CP910, NULL, "selphycp1200"},
- { USB_VID_CANON, USB_PID_CANON_CP1300, P_CP910, NULL, "selphycp1300"},
+ { USB_VID_CANON, USB_PID_CANON_CP820, P_CP910, NULL, "canon-cp820"},
+ { USB_VID_CANON, USB_PID_CANON_CP910, P_CP910, NULL, "canon-cp910"},
+ { USB_VID_CANON, USB_PID_CANON_CP1000, P_CP910, NULL, "canon-cp1000"},
+ { USB_VID_CANON, USB_PID_CANON_CP1200, P_CP910, NULL, "canon-cp1200"},
+ { USB_VID_CANON, USB_PID_CANON_CP1300, P_CP910, NULL, "canon-cp1300"},
{ 0, 0, 0, NULL, NULL}
}
};
diff --git a/backend_dnpds40.c b/backend_dnpds40.c
index 678acfa..062dca4 100644
--- a/backend_dnpds40.c
+++ b/backend_dnpds40.c
@@ -2991,9 +2991,15 @@ static int dnpds40_query_markers(void *vctx, struct marker **markers, int *count
}
static const char *dnpds40_prefixes[] = {
- "dnp_citizen",
- "dnpds40", "dnpds80", "dnpds80dx", "dnpds620", "dnpds820", "dnprx1",
+ "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",
+ // 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
};
@@ -3014,7 +3020,7 @@ static const char *dnpds40_prefixes[] = {
/* Exported */
struct dyesub_backend dnpds40_backend = {
.name = "DNP DS-series / Citizen C-series",
- .version = "0.107",
+ .version = "0.109",
.uri_prefixes = dnpds40_prefixes,
.flags = BACKEND_FLAG_JOBLIST,
.cmdline_usage = dnpds40_cmdline,
@@ -3028,15 +3034,15 @@ struct dyesub_backend dnpds40_backend = {
.query_serno = dnpds40_query_serno,
.query_markers = dnpds40_query_markers,
.devices = {
- { USB_VID_CITIZEN, USB_PID_DNP_DS40, P_DNP_DS40, NULL, "dnpds40"}, // Also Citizen CX
- { USB_VID_CITIZEN, USB_PID_DNP_DS80, P_DNP_DS80, NULL, "dnpds80"}, // Also Citizen CX-W and Mitsubishi CP-3800DW
- { USB_VID_CITIZEN, USB_PID_DNP_DSRX1, P_DNP_DSRX1, NULL, "dnpdx1"}, // Also Citizen CY
- { USB_VID_DNP, USB_PID_DNP_DS620, P_DNP_DS620, NULL, "dnpds620"},
- { USB_VID_CITIZEN, USB_PID_DNP_DS80D, P_DNP_DS80D, NULL, "dnpds80dx"},
- { USB_VID_CITIZEN, USB_PID_CITIZEN_CW01, P_CITIZEN_CW01, NULL, "citizencw01"}, // Also OP900 ?
- { USB_VID_CITIZEN, USB_PID_CITIZEN_CW02, P_CITIZEN_OP900II, NULL, "citizencw02"}, // Also OP900II
- { USB_VID_CITIZEN, USB_PID_CITIZEN_CX02, P_DNP_DS620, NULL, "citizencx02"},
- { USB_VID_DNP, USB_PID_DNP_DS820, P_DNP_DS820, NULL, "dnpds820"},
+ { 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_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_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_CX02, P_DNP_DS620, NULL, "citizen-cx-02"},
{ 0, 0, 0, NULL, NULL}
}
};
diff --git a/backend_kodak1400.c b/backend_kodak1400.c
index 30b7d57..c9ad58d 100644
--- a/backend_kodak1400.c
+++ b/backend_kodak1400.c
@@ -651,13 +651,18 @@ static int kodak1400_query_markers(void *vctx, struct marker **markers, int *cou
#define USB_PID_MITSU_3020DA 0x03AA
static const char *kodak1400_prefixes[] = {
- "kodak1400", "kodak805", "mitsu3020d", "mitsu3020da",
+ "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",
NULL,
};
struct dyesub_backend kodak1400_backend = {
.name = "Kodak 1400/805",
- .version = "0.38",
+ .version = "0.39",
.uri_prefixes = kodak1400_prefixes,
.cmdline_usage = kodak1400_cmdline,
.cmdline_arg = kodak1400_cmdline_arg,
@@ -669,10 +674,10 @@ struct dyesub_backend kodak1400_backend = {
.main_loop = kodak1400_main_loop,
.query_markers = kodak1400_query_markers,
.devices = {
- { USB_VID_KODAK, USB_PID_KODAK_1400, P_KODAK_1400_805, "Kodak", "kodak1400"},
- { USB_VID_KODAK, USB_PID_KODAK_805, P_KODAK_1400_805, "Kodak", "kodak805"},
- { USB_VID_MITSU, USB_PID_MITSU_3020D, P_KODAK_1400_805, NULL, "mitsu3020d"},
- { USB_VID_MITSU, USB_PID_MITSU_3020DA, P_KODAK_1400_805, NULL, "mitsu3020da" },
+ { 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_3020DA, P_KODAK_1400_805, NULL, "mitsubishi-3020da" },
{ 0, 0, 0, NULL, NULL}
}
};
diff --git a/backend_kodak605.c b/backend_kodak605.c
index feb8886..30b7bfc 100644
--- a/backend_kodak605.c
+++ b/backend_kodak605.c
@@ -710,14 +710,15 @@ static int kodak605_query_markers(void *vctx, struct marker **markers, int *coun
}
static const char *kodak605_prefixes[] = {
- "kodak605",
+ "kodak605", // Family driver, do NOT nuke.
+ "kodak-605",
NULL,
};
/* Exported */
struct dyesub_backend kodak605_backend = {
.name = "Kodak 605",
- .version = "0.32",
+ .version = "0.33",
.uri_prefixes = kodak605_prefixes,
.cmdline_usage = kodak605_cmdline,
.cmdline_arg = kodak605_cmdline_arg,
@@ -729,7 +730,7 @@ struct dyesub_backend kodak605_backend = {
.main_loop = kodak605_main_loop,
.query_markers = kodak605_query_markers,
.devices = {
- { USB_VID_KODAK, USB_PID_KODAK_605, P_KODAK_605, "Kodak", "kodaka605"},
+ { USB_VID_KODAK, USB_PID_KODAK_605, P_KODAK_605, "Kodak", "kodak-605"},
{ 0, 0, 0, NULL, NULL}
}
};
diff --git a/backend_kodak6800.c b/backend_kodak6800.c
index fd91e7d..065f4d9 100644
--- a/backend_kodak6800.c
+++ b/backend_kodak6800.c
@@ -1295,7 +1295,9 @@ static int kodak6800_query_markers(void *vctx, struct marker **markers, int *cou
}
static const char *kodak6800_prefixes[] = {
- "kodak68x0",
+ "kodak68x0", // Family driver, do not nuke.
+ "kodak-6800", "kodak-6850",
+ // Backwards-compatibility
"kodak6800", "kodak6850",
NULL
};
@@ -1303,7 +1305,7 @@ static const char *kodak6800_prefixes[] = {
/* Exported */
struct dyesub_backend kodak6800_backend = {
.name = "Kodak 6800/6850",
- .version = "0.64",
+ .version = "0.65",
.uri_prefixes = kodak6800_prefixes,
.cmdline_usage = kodak6800_cmdline,
.cmdline_arg = kodak6800_cmdline_arg,
@@ -1316,8 +1318,8 @@ struct dyesub_backend kodak6800_backend = {
.query_serno = kodak6800_query_serno,
.query_markers = kodak6800_query_markers,
.devices = {
- { USB_VID_KODAK, USB_PID_KODAK_6800, P_KODAK_6800, "Kodak", "kodak6800"},
- { USB_VID_KODAK, USB_PID_KODAK_6850, P_KODAK_6850, "Kodak", "kodak6850"},
+ { USB_VID_KODAK, USB_PID_KODAK_6800, P_KODAK_6800, "Kodak", "kodak-6800"},
+ { USB_VID_KODAK, USB_PID_KODAK_6850, P_KODAK_6850, "Kodak", "kodak-6850"},
{ 0, 0, 0, NULL, NULL}
}
};
diff --git a/backend_magicard.c b/backend_magicard.c
index b8f8484..9877925 100644
--- a/backend_magicard.c
+++ b/backend_magicard.c
@@ -935,14 +935,18 @@ static int magicard_query_markers(void *vctx, struct marker **markers, int *coun
}
static const char *magicard_prefixes[] = {
- "magicard",
+ "magicard", // Family name
+ "magicard-tango-2e", "magicard-enduro", "magicard-enduroplus",
+ // extras
+ "magicard-rio-2e",
+ // backwards compatibility
"tango2e", "enduro", "enduroplus",
NULL
};
struct dyesub_backend magicard_backend = {
.name = "Magicard family",
- .version = "0.14",
+ .version = "0.15",
.uri_prefixes = magicard_prefixes,
.cmdline_arg = magicard_cmdline_arg,
.cmdline_usage = magicard_cmdline,
@@ -954,9 +958,9 @@ struct dyesub_backend magicard_backend = {
.main_loop = magicard_main_loop,
.query_markers = magicard_query_markers,
.devices = {
- { USB_VID_MAGICARD, USB_PID_MAGICARD_TANGO2E, P_MAGICARD, NULL, "tango2e"},
- { USB_VID_MAGICARD, USB_PID_MAGICARD_ENDURO, P_MAGICARD, NULL, "enduro"},
- { USB_VID_MAGICARD, USB_PID_MAGICARD_ENDUROPLUS, P_MAGICARD, NULL, "enduroplus"},
+ { USB_VID_MAGICARD, USB_PID_MAGICARD_TANGO2E, P_MAGICARD, NULL, "magicard-tango2e"},
+ { 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"},
{ 0, 0, 0, NULL, "magicard"}
}
diff --git a/backend_mitsu70x.c b/backend_mitsu70x.c
index eacdc8d..61d347d 100644
--- a/backend_mitsu70x.c
+++ b/backend_mitsu70x.c
@@ -2437,7 +2437,11 @@ static int mitsu70x_query_markers(void *vctx, struct marker **markers, int *coun
}
static const char *mitsu70x_prefixes[] = {
- "mitsu70x",
+ "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,
};
@@ -2445,7 +2449,7 @@ static const char *mitsu70x_prefixes[] = {
/* Exported */
struct dyesub_backend mitsu70x_backend = {
.name = "Mitsubishi CP-D70 family",
- .version = "0.87",
+ .version = "0.88",
.uri_prefixes = mitsu70x_prefixes,
.flags = BACKEND_FLAG_JOBLIST,
.cmdline_usage = mitsu70x_cmdline,
@@ -2459,11 +2463,11 @@ struct dyesub_backend mitsu70x_backend = {
.query_serno = mitsu70x_query_serno,
.query_markers = mitsu70x_query_markers,
.devices = {
- { USB_VID_MITSU, USB_PID_MITSU_D70X, P_MITSU_D70X, NULL, "mitsu70x"},
- { USB_VID_MITSU, USB_PID_MITSU_K60, P_MITSU_K60, NULL, "mitsuk60"},
- { USB_VID_MITSU, USB_PID_MITSU_D80, P_MITSU_D80, NULL, "mitsud80"},
- { USB_VID_KODAK, USB_PID_KODAK305, P_KODAK_305, NULL, "kodak305"},
- { USB_VID_FUJIFILM, USB_PID_FUJI_ASK300, P_FUJI_ASK300, NULL, "fujiask300"},
+ { USB_VID_MITSU, USB_PID_MITSU_D70X, P_MITSU_D70X, NULL, "mitsubishi-d70dw"},
+ { 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"},
+ { USB_VID_FUJIFILM, USB_PID_FUJI_ASK300, P_FUJI_ASK300, NULL, "fujifilm-ask-300"},
{ 0, 0, 0, NULL, NULL}
}
};
diff --git a/backend_mitsu9550.c b/backend_mitsu9550.c
index 36aa34c..9a74462 100644
--- a/backend_mitsu9550.c
+++ b/backend_mitsu9550.c
@@ -1720,7 +1720,15 @@ static int mitsu9550_query_markers(void *vctx, struct marker **markers, int *cou
}
static const char *mitsu9550_prefixes[] = {
- "mitsu9xxx",
+ "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
};
@@ -1728,7 +1736,7 @@ static const char *mitsu9550_prefixes[] = {
/* Exported */
struct dyesub_backend mitsu9550_backend = {
.name = "Mitsubishi CP9xxx family",
- .version = "0.40",
+ .version = "0.41",
.uri_prefixes = mitsu9550_prefixes,
.cmdline_usage = mitsu9550_cmdline,
.cmdline_arg = mitsu9550_cmdline_arg,
@@ -1741,18 +1749,18 @@ struct dyesub_backend mitsu9550_backend = {
.query_serno = mitsu9550_query_serno,
.query_markers = mitsu9550_query_markers,
.devices = {
- { USB_VID_MITSU, USB_PID_MITSU_9000AM, P_MITSU_9550, NULL, "mitsu9000"},
- { USB_VID_MITSU, USB_PID_MITSU_9000D, P_MITSU_9550, NULL, "mitsu9000"},
- { USB_VID_MITSU, USB_PID_MITSU_9500D, P_MITSU_9550, NULL, "mitsu9500"},
- { USB_VID_MITSU, USB_PID_MITSU_9550D, P_MITSU_9550, NULL, "mitsu9550"},
- { USB_VID_MITSU, USB_PID_MITSU_9550DS, P_MITSU_9550S, NULL, "mitsu9550"},
- { USB_VID_MITSU, USB_PID_MITSU_9600D, P_MITSU_9600, NULL, "mitsu9600"},
-// { USB_VID_MITSU, USB_PID_MITSU_9600D, P_MITSU_9600S, NULL, "mitsu9600"},
- { USB_VID_MITSU, USB_PID_MITSU_9800D, P_MITSU_9800, NULL, "mitsu9800"},
- { USB_VID_MITSU, USB_PID_MITSU_9800DS, P_MITSU_9800S, NULL, "mitsu9800"},
- { USB_VID_MITSU, USB_PID_MITSU_98__D, P_MITSU_9810, NULL, "mitsu9810"},
-// { USB_VID_MITSU, USB_PID_MITSU_9810D, P_MITSU_9810, NULL, "mitsu9810"},
-// { USB_VID_MITSU, USB_PID_MITSU_9820DS, P_MITSU_9820S, NULL, "mitsu9820"}, // XXX add "mitsu9820"
+ { USB_VID_MITSU, USB_PID_MITSU_9000AM, P_MITSU_9550, NULL, "mitsubishi-9000dw"}, // XXX -am instead?
+ { 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_9550DS, P_MITSU_9550S, NULL, "mitsubishi-9550dw-s"},
+ { 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_9800DS, P_MITSU_9800S, NULL, "mitsubishi-9800dw-s"},
+ { USB_VID_MITSU, USB_PID_MITSU_98__D, P_MITSU_9810, NULL, "mitsubishi-9810dw"},
+// { 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}
}
};
diff --git a/backend_mitsud90.c b/backend_mitsud90.c
index 4516e73..1f8b508 100644
--- a/backend_mitsud90.c
+++ b/backend_mitsud90.c
@@ -1217,6 +1217,8 @@ static int mitsud90_query_markers(void *vctx, struct marker **markers, int *coun
}
static const char *mitsud90_prefixes[] = {
+ "mitsubishi-d90dw",
+ // backwards compatibility
"mitsud90",
NULL
};
@@ -1224,7 +1226,7 @@ static const char *mitsud90_prefixes[] = {
/* Exported */
struct dyesub_backend mitsud90_backend = {
.name = "Mitsubishi CP-D90DW",
- .version = "0.12",
+ .version = "0.13",
.uri_prefixes = mitsud90_prefixes,
.cmdline_arg = mitsud90_cmdline_arg,
.cmdline_usage = mitsud90_cmdline,
@@ -1236,7 +1238,7 @@ struct dyesub_backend mitsud90_backend = {
.main_loop = mitsud90_main_loop,
.query_markers = mitsud90_query_markers,
.devices = {
- { USB_VID_MITSU, USB_PID_MITSU_D90, P_MITSU_D90, NULL, "mitsud90"},
+ { USB_VID_MITSU, USB_PID_MITSU_D90, P_MITSU_D90, NULL, "mitsubishi-d90dw"},
{ 0, 0, 0, NULL, NULL}
}
};
diff --git a/backend_mitsup95d.c b/backend_mitsup95d.c
index 213ae78..dff8618 100644
--- a/backend_mitsup95d.c
+++ b/backend_mitsup95d.c
@@ -592,7 +592,9 @@ static int mitsup95d_query_markers(void *vctx, struct marker **markers, int *cou
}
static const char *mitsup95d_prefixes[] = {
- "mitsup9x",
+ "mitsup9x", // Family driver name
+ "mitsubishi-p95d", "mitsubishi-p93d",
+ // backwards compatibility
"mitsup95d", "mitsup93d",
NULL
};
@@ -600,7 +602,7 @@ static const char *mitsup95d_prefixes[] = {
/* Exported */
struct dyesub_backend mitsup95d_backend = {
.name = "Mitsubishi P93D/P95D",
- .version = "0.10",
+ .version = "0.11",
.uri_prefixes = mitsup95d_prefixes,
.cmdline_arg = mitsup95d_cmdline_arg,
.cmdline_usage = mitsup95d_cmdline,
@@ -612,8 +614,8 @@ struct dyesub_backend mitsup95d_backend = {
.main_loop = mitsup95d_main_loop,
.query_markers = mitsup95d_query_markers,
.devices = {
- { USB_VID_MITSU, USB_PID_MITSU_P93D, P_MITSU_P93D, NULL, "mitsup93d"},
- { USB_VID_MITSU, USB_PID_MITSU_P95D, P_MITSU_P95D, NULL, "mitsup95d"},
+ { USB_VID_MITSU, USB_PID_MITSU_P93D, P_MITSU_P93D, NULL, "mitsubishi-p93d"},
+ { USB_VID_MITSU, USB_PID_MITSU_P95D, P_MITSU_P95D, NULL, "mitsubishi-p95d"},
{ 0, 0, 0, NULL, NULL}
}
};
diff --git a/backend_shinkos1245.c b/backend_shinkos1245.c
index f34f840..8172a45 100644
--- a/backend_shinkos1245.c
+++ b/backend_shinkos1245.c
@@ -1689,13 +1689,17 @@ static int shinkos1245_query_markers(void *vctx, struct marker **markers, int *c
#define USB_PID_SHINKO_S1245 0x0007
static const char *shinkos1245_prefixes[] = {
+ "shinko-chcs1245",
+ // extra
+ "sinfonia-chcs1245",
+ // backwards-compatibility
"shinkos1245",
NULL
};
struct dyesub_backend shinkos1245_backend = {
.name = "Shinko/Sinfonia CHC-S1245/E1",
- .version = "0.25",
+ .version = "0.26",
.uri_prefixes = shinkos1245_prefixes,
.cmdline_usage = shinkos1245_cmdline,
.cmdline_arg = shinkos1245_cmdline_arg,
@@ -1708,7 +1712,7 @@ struct dyesub_backend shinkos1245_backend = {
.query_serno = shinkos1245_query_serno,
.query_markers = shinkos1245_query_markers,
.devices = {
- { USB_VID_SHINKO, USB_PID_SHINKO_S1245, P_SHINKO_S1245, NULL, "shinkos1245"},
+ { USB_VID_SHINKO, USB_PID_SHINKO_S1245, P_SHINKO_S1245, NULL, "shinko-chcs1245"},
{ 0, 0, 0, NULL, NULL}
}
};
diff --git a/backend_shinkos2145.c b/backend_shinkos2145.c
index 334d4f1..5879fa6 100644
--- a/backend_shinkos2145.c
+++ b/backend_shinkos2145.c
@@ -1795,13 +1795,17 @@ static int shinkos2145_query_markers(void *vctx, struct marker **markers, int *c
#define USB_PID_SHINKO_S2145 0x000E
static const char *shinkos2145_prefixes[] = {
+ "shinko-chcs2145",
+ // extras
+ "sinfonia-chcs2145",
+ // Backwards compatibility
"shinkos2145",
NULL
};
struct dyesub_backend shinkos2145_backend = {
.name = "Shinko/Sinfonia CHC-S2145/S2",
- .version = "0.54",
+ .version = "0.55",
.uri_prefixes = shinkos2145_prefixes,
.cmdline_usage = shinkos2145_cmdline,
.cmdline_arg = shinkos2145_cmdline_arg,
@@ -1814,7 +1818,7 @@ struct dyesub_backend shinkos2145_backend = {
.query_serno = shinkos2145_query_serno,
.query_markers = shinkos2145_query_markers,
.devices = {
- { USB_VID_SHINKO, USB_PID_SHINKO_S2145, P_SHINKO_S2145, NULL, "shinkos2145"},
+ { USB_VID_SHINKO, USB_PID_SHINKO_S2145, P_SHINKO_S2145, NULL, "shinko-chc2145"},
{ 0, 0, 0, NULL, NULL}
}
};
diff --git a/backend_shinkos6145.c b/backend_shinkos6145.c
index 68a3ce1..041aef5 100644
--- a/backend_shinkos6145.c
+++ b/backend_shinkos6145.c
@@ -2564,13 +2564,17 @@ static int shinkos6145_query_markers(void *vctx, struct marker **markers, int *c
#define USB_PID_SHINKO_S6145D 0x001E /* Aka CIAAT Brava 21 */
static const char *shinkos6145_prefixes[] = {
+ "sinfonia-chcs6145", "ciaat-brava-21",
+ // extras
+ "shinko-chcs6145",
+ // backwards-compatiblity
"shinkos6145", "brava21",
NULL
};
struct dyesub_backend shinkos6145_backend = {
.name = "Shinko/Sinfonia CHC-S6145/CS2",
- .version = "0.29",
+ .version = "0.30",
.uri_prefixes = shinkos6145_prefixes,
.cmdline_usage = shinkos6145_cmdline,
.cmdline_arg = shinkos6145_cmdline_arg,
@@ -2583,8 +2587,8 @@ struct dyesub_backend shinkos6145_backend = {
.query_serno = shinkos6145_query_serno,
.query_markers = shinkos6145_query_markers,
.devices = {
- { USB_VID_SHINKO, USB_PID_SHINKO_S6145, P_SHINKO_S6145, NULL, "shinkos6145"},
- { USB_VID_SHINKO, USB_PID_SHINKO_S6145D, P_SHINKO_S6145D, NULL, "brava21"},
+ { USB_VID_SHINKO, USB_PID_SHINKO_S6145, P_SHINKO_S6145, NULL, "sinfonia-chcs6145"},
+ { USB_VID_SHINKO, USB_PID_SHINKO_S6145D, P_SHINKO_S6145D, NULL, "ciaat-brava-21"},
{ 0, 0, 0, NULL, NULL}
}
};
diff --git a/backend_shinkos6245.c b/backend_shinkos6245.c
index 5dd0c9f..e54453e 100644
--- a/backend_shinkos6245.c
+++ b/backend_shinkos6245.c
@@ -1912,13 +1912,17 @@ static int shinkos6245_query_markers(void *vctx, struct marker **markers, int *c
#define USB_PID_HITI_P910L 0x000E
static const char *shinkos6245_prefixes[] = {
+ "sinfonia-chcs6245", "hiti-p910l",
+ // extras
+ "shinko-chcs6245",
+ // backwards compatibility
"shinkos6245", "hitip910",
NULL
};
struct dyesub_backend shinkos6245_backend = {
.name = "Shinko/Sinfonia CHC-S6245",
- .version = "0.13WIP",
+ .version = "0.14WIP",
.uri_prefixes = shinkos6245_prefixes,
.cmdline_usage = shinkos6245_cmdline,
.cmdline_arg = shinkos6245_cmdline_arg,
@@ -1931,8 +1935,8 @@ struct dyesub_backend shinkos6245_backend = {
.query_serno = shinkos6245_query_serno,
.query_markers = shinkos6245_query_markers,
.devices = {
- { USB_VID_SHINKO, USB_PID_SHINKO_S6245, P_SHINKO_S6245, NULL, "shinkos6245"},
- { USB_VID_HITI, USB_PID_HITI_P910L, P_SHINKO_S6245, NULL, "hitip910"},
+ { USB_VID_SHINKO, USB_PID_SHINKO_S6245, P_SHINKO_S6245, NULL, "shinfonia-chcs6245"},
+ { USB_VID_HITI, USB_PID_HITI_P910L, P_SHINKO_S6245, NULL, "hiti-p910l"},
{ 0, 0, 0, NULL, NULL}
}
};
diff --git a/backend_sonyupdr150.c b/backend_sonyupdr150.c
index 963f232..f493a40 100644
--- a/backend_sonyupdr150.c
+++ b/backend_sonyupdr150.c
@@ -310,8 +310,11 @@ static int updr150_query_markers(void *vctx, struct marker **markers, int *count
}
static const char *sonyupdr150_prefixes[] = {
- "sonyupdr150", "sonyupdr200", "sonyupcr10",
- "sonyupd895", "sonyupd897", "sonyupd898",
+ "sonyupdr150", // Family name.
+ "sony-updr150", "sony-updr200", "sony-upcr10",
+ // Backwards compatibility
+ "sonyupdr200", "sonyupcr10",
+// "sonyupd895", "sonyupd897", "sonyupd898",
NULL
};
@@ -326,7 +329,7 @@ static const char *sonyupdr150_prefixes[] = {
struct dyesub_backend updr150_backend = {
.name = "Sony UP-DR150/UP-DR200/UP-CR10",
- .version = "0.25",
+ .version = "0.26",
.uri_prefixes = sonyupdr150_prefixes,
.cmdline_arg = updr150_cmdline_arg,
.init = updr150_init,
@@ -337,9 +340,9 @@ struct dyesub_backend updr150_backend = {
.main_loop = updr150_main_loop,
.query_markers = updr150_query_markers,
.devices = {
- { USB_VID_SONY, USB_PID_SONY_UPDR150, P_SONY_UPDR150, NULL, "sonyupdr150"},
- { USB_VID_SONY, USB_PID_SONY_UPDR200, P_SONY_UPDR150, NULL, "sonyupdr200"},
- { USB_VID_SONY, USB_PID_SONY_UPCR10, P_SONY_UPCR10, NULL, "sonyupcr10"},
+ { 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-upcr10"},
// { USB_VID_SONY, USB_PID_SONY_UPD895MD, P_SONY_UPD89x, NULL, "sonyupd895"},
// { USB_VID_SONY, USB_PID_SONY_UPD897MD, P_SONY_UPD89x, NULL, "sonyupd897"},
// { USB_VID_SONY, USB_PID_SONY_UPD898MD, P_SONY_UPD89x, NULL, "sonyupd898"},