all: Clean up the manufacturer override field in the devices.

master
Solomon Peachy 5 years ago
parent 6c99b08b2d
commit 56cd04bd2a
  1. 62
      backend_canonselphy.c
  2. 12
      backend_canonselphyneo.c
  3. 6
      backend_citizencw01.c
  4. 6
      backend_common.c
  5. 18
      backend_dnpds40.c
  6. 6
      backend_kodak1400.c
  7. 2
      backend_kodak605.c
  8. 2
      backend_kodak6800.c
  9. 6
      backend_magicard.c
  10. 14
      backend_mitsu70x.c
  11. 26
      backend_mitsu9550.c
  12. 6
      backend_mitsup95d.c
  13. 4
      backend_shinkos1245.c
  14. 4
      backend_shinkos2145.c
  15. 6
      backend_shinkos6145.c
  16. 6
      backend_shinkos6245.c
  17. 8
      backend_sonyupdr150.c

@ -1061,37 +1061,37 @@ struct dyesub_backend canonselphy_backend = {
.read_parse = canonselphy_read_parse,
.main_loop = canonselphy_main_loop,
.devices = {
{ USB_VID_CANON, USB_PID_CANON_CP10, P_CP10, ""},
{ USB_VID_CANON, USB_PID_CANON_CP100, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP200, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP220, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP300, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP330, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP400, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP500, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP510, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP520, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP530, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP600, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP710, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP720, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP730, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP740, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP750, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP760, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP770, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP780, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP790, P_CP790, ""},
{ USB_VID_CANON, USB_PID_CANON_CP800, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP810, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_CP900, P_CP_XXX, ""},
{ USB_VID_CANON, USB_PID_CANON_ES1, P_ES1, ""},
{ USB_VID_CANON, USB_PID_CANON_ES2, P_ES2_20, ""},
{ USB_VID_CANON, USB_PID_CANON_ES20, P_ES2_20, ""},
{ USB_VID_CANON, USB_PID_CANON_ES3, P_ES3_30, ""},
{ USB_VID_CANON, USB_PID_CANON_ES30, P_ES3_30, ""},
{ USB_VID_CANON, USB_PID_CANON_ES40, P_ES40, ""},
{ 0, 0, 0, ""}
{ USB_VID_CANON, USB_PID_CANON_CP10, P_CP10, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP100, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP200, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP220, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP300, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP330, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP400, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP500, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP510, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP520, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP530, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP600, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP710, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP720, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP730, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP740, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP750, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP760, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP770, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP780, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP790, P_CP790, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP800, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP810, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP900, P_CP_XXX, NULL},
{ USB_VID_CANON, USB_PID_CANON_ES1, P_ES1, NULL},
{ USB_VID_CANON, USB_PID_CANON_ES2, P_ES2_20, NULL},
{ USB_VID_CANON, USB_PID_CANON_ES20, P_ES2_20, NULL},
{ USB_VID_CANON, USB_PID_CANON_ES3, P_ES3_30, NULL},
{ USB_VID_CANON, USB_PID_CANON_ES30, P_ES3_30, NULL},
{ USB_VID_CANON, USB_PID_CANON_ES40, P_ES40, NULL},
{ 0, 0, 0, NULL}
}
};
/*

@ -401,12 +401,12 @@ struct dyesub_backend canonselphyneo_backend = {
.read_parse = selphyneo_read_parse,
.main_loop = selphyneo_main_loop,
.devices = {
{ USB_VID_CANON, USB_PID_CANON_CP820, P_CP910, ""},
{ USB_VID_CANON, USB_PID_CANON_CP910, P_CP910, ""},
{ USB_VID_CANON, USB_PID_CANON_CP1000, P_CP910, ""},
{ USB_VID_CANON, USB_PID_CANON_CP1200, P_CP910, ""},
// { USB_VID_CANON, USB_PID_CANON_CP1300, P_CP910, ""},
{ 0, 0, 0, ""}
{ USB_VID_CANON, USB_PID_CANON_CP820, P_CP910, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP910, P_CP910, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP1000, P_CP910, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP1200, P_CP910, NULL},
// { USB_VID_CANON, USB_PID_CANON_CP1300, P_CP910, NULL},
{ 0, 0, 0, NULL}
}
};
/*

@ -868,9 +868,9 @@ struct dyesub_backend cw01_backend = {
.main_loop = cw01_main_loop,
.query_serno = cw01_query_serno,
.devices = {
{ USB_VID_CITIZEN, USB_PID_CITIZEN_CW01, P_CITIZEN_CW01, ""},
// { USB_VID_CITIZEN, USB_PID_OLMEC_OP900, P_CITIZEN_CW01, ""},
{ 0, 0, 0, ""}
{ USB_VID_CITIZEN, USB_PID_CITIZEN_CW01, P_CITIZEN_CW01, NULL},
// { USB_VID_CITIZEN, USB_PID_OLMEC_OP900, P_CITIZEN_CW01, NULL},
{ 0, 0, 0, NULL}
}
};

@ -361,7 +361,7 @@ static char *url_decode(char *str) {
static int print_scan_output(struct libusb_device *device,
struct libusb_device_descriptor *desc,
char *prefix, char *manuf2,
char *prefix, char *manuf_override,
int found,
int scan_only, char *match_serno,
uint8_t *r_iface, uint8_t *r_altset,
@ -460,8 +460,8 @@ candidate:
}
/* Look up mfg string. */
if (manuf2 && strlen(manuf2)) {
manuf = url_encode(manuf2); /* Backend supplied */
if (manuf_override && strlen(manuf_override)) {
manuf = url_encode(manuf_override); /* Backend supplied */
} else if ((manuf = dict_find("MANUFACTURER", dlen, dict))) {
manuf = url_encode(manuf);
} else if ((manuf = dict_find("MFG", dlen, dict))) {

@ -2497,14 +2497,14 @@ struct dyesub_backend dnpds40_backend = {
.main_loop = dnpds40_main_loop,
.query_serno = dnpds40_query_serno,
.devices = {
{ USB_VID_CITIZEN, USB_PID_DNP_DS40, P_DNP_DS40, ""},
{ USB_VID_CITIZEN, USB_PID_DNP_DS80, P_DNP_DS80, ""},
{ USB_VID_CITIZEN, USB_PID_DNP_DSRX1, P_DNP_DSRX1, ""},
{ USB_VID_CITIZEN, USB_PID_DNP_DS620_OLD, P_DNP_DS620, ""},
{ USB_VID_DNP, USB_PID_DNP_DS620, P_DNP_DS620, ""},
{ USB_VID_DNP, USB_PID_DNP_DS80D, P_DNP_DS80D, ""},
{ USB_VID_CITIZEN, USB_PID_CITIZEN_CW02, P_DNP_DS40, ""},
{ USB_VID_DNP, USB_PID_DNP_DS820, P_DNP_DS820, ""},
{ 0, 0, 0, ""}
{ USB_VID_CITIZEN, USB_PID_DNP_DS40, P_DNP_DS40, NULL},
{ USB_VID_CITIZEN, USB_PID_DNP_DS80, P_DNP_DS80, NULL},
{ USB_VID_CITIZEN, USB_PID_DNP_DSRX1, P_DNP_DSRX1, NULL},
{ USB_VID_CITIZEN, USB_PID_DNP_DS620_OLD, P_DNP_DS620, NULL},
{ USB_VID_DNP, USB_PID_DNP_DS620, P_DNP_DS620, NULL},
{ USB_VID_DNP, USB_PID_DNP_DS80D, P_DNP_DS80D, NULL},
{ USB_VID_CITIZEN, USB_PID_CITIZEN_CW02, P_DNP_DS40, NULL},
{ USB_VID_DNP, USB_PID_DNP_DS820, P_DNP_DS820, NULL},
{ 0, 0, 0, NULL}
}
};

@ -626,9 +626,9 @@ struct dyesub_backend kodak1400_backend = {
.devices = {
{ USB_VID_KODAK, USB_PID_KODAK_1400, P_KODAK_1400_805, "Kodak"},
{ USB_VID_KODAK, USB_PID_KODAK_805, P_KODAK_1400_805, "Kodak"},
{ USB_VID_MITSU, USB_PID_MITSU_3020D, P_KODAK_1400_805, ""},
{ USB_VID_MITSU, USB_PID_MITSU_3020DA, P_KODAK_1400_805, ""},
{ 0, 0, 0, ""}
{ USB_VID_MITSU, USB_PID_MITSU_3020D, P_KODAK_1400_805, NULL},
{ USB_VID_MITSU, USB_PID_MITSU_3020DA, P_KODAK_1400_805, NULL},
{ 0, 0, 0, NULL}
}
};

@ -685,7 +685,7 @@ struct dyesub_backend kodak605_backend = {
.main_loop = kodak605_main_loop,
.devices = {
{ USB_VID_KODAK, USB_PID_KODAK_605, P_KODAK_605, "Kodak"},
{ 0, 0, 0, ""}
{ 0, 0, 0, NULL}
}
};

@ -1270,7 +1270,7 @@ struct dyesub_backend kodak6800_backend = {
.devices = {
{ USB_VID_KODAK, USB_PID_KODAK_6800, P_KODAK_6800, "Kodak"},
{ USB_VID_KODAK, USB_PID_KODAK_6850, P_KODAK_6850, "Kodak"},
{ 0, 0, 0, ""}
{ 0, 0, 0, NULL}
}
};

@ -350,9 +350,9 @@ struct dyesub_backend magicard_backend = {
.read_parse = magicard_read_parse,
.main_loop = magicard_main_loop,
.devices = {
{ USB_VID_MAGICARD, USB_PID_MAGICARD_TANGO2E, P_MAGICARD, ""},
{ USB_VID_MAGICARD, 0xFFFF, P_MAGICARD, ""},
{ 0, 0, 0, ""}
{ USB_VID_MAGICARD, USB_PID_MAGICARD_TANGO2E, P_MAGICARD, NULL},
{ USB_VID_MAGICARD, 0xFFFF, P_MAGICARD, NULL},
{ 0, 0, 0, NULL}
}
};

@ -1914,13 +1914,13 @@ struct dyesub_backend mitsu70x_backend = {
.main_loop = mitsu70x_main_loop,
.query_serno = mitsu70x_query_serno,
.devices = {
{ USB_VID_MITSU, USB_PID_MITSU_D70X, P_MITSU_D70X, ""},
{ USB_VID_MITSU, USB_PID_MITSU_K60, P_MITSU_K60, ""},
{ USB_VID_MITSU, USB_PID_MITSU_D80, P_MITSU_D80, ""},
// { USB_VID_MITSU, USB_PID_MITSU_D90, P_MITSU_D90, ""},
{ USB_VID_KODAK, USB_PID_KODAK305, P_KODAK_305, ""},
{ USB_VID_FUJIFILM, USB_PID_FUJI_ASK300, P_FUJI_ASK300, ""},
{ 0, 0, 0, ""}
{ USB_VID_MITSU, USB_PID_MITSU_D70X, P_MITSU_D70X, NULL},
{ USB_VID_MITSU, USB_PID_MITSU_K60, P_MITSU_K60, NULL},
{ USB_VID_MITSU, USB_PID_MITSU_D80, P_MITSU_D80, NULL},
// { USB_VID_MITSU, USB_PID_MITSU_D90, P_MITSU_D90, NULL},
{ USB_VID_KODAK, USB_PID_KODAK305, P_KODAK_305, NULL},
{ USB_VID_FUJIFILM, USB_PID_FUJI_ASK300, P_FUJI_ASK300, NULL},
{ 0, 0, 0, NULL}
}
};

@ -1205,19 +1205,19 @@ struct dyesub_backend mitsu9550_backend = {
.main_loop = mitsu9550_main_loop,
.query_serno = mitsu9550_query_serno,
.devices = {
{ USB_VID_MITSU, USB_PID_MITSU_9000AM, P_MITSU_9550, ""},
{ USB_VID_MITSU, USB_PID_MITSU_9000D, P_MITSU_9550, ""},
{ USB_VID_MITSU, USB_PID_MITSU_9500D, P_MITSU_9550, ""},
{ USB_VID_MITSU, USB_PID_MITSU_9550D, P_MITSU_9550, ""},
{ USB_VID_MITSU, USB_PID_MITSU_9550DS, P_MITSU_9550S, ""},
{ USB_VID_MITSU, USB_PID_MITSU_9600D, P_MITSU_9600, ""},
// { USB_VID_MITSU, USB_PID_MITSU_9600D, P_MITSU_9600S, ""},
{ USB_VID_MITSU, USB_PID_MITSU_9800D, P_MITSU_9800, ""},
{ USB_VID_MITSU, USB_PID_MITSU_9800DS, P_MITSU_9800S, ""},
{ USB_VID_MITSU, USB_PID_MITSU_98__D, P_MITSU_9810, ""},
// { USB_VID_MITSU, USB_PID_MITSU_9810D, P_MITSU_9810, ""},
// { USB_VID_MITSU, USB_PID_MITSU_9820DS, P_MITSU_9820S, ""},
{ 0, 0, 0, ""}
{ USB_VID_MITSU, USB_PID_MITSU_9000AM, P_MITSU_9550, NULL},
{ USB_VID_MITSU, USB_PID_MITSU_9000D, P_MITSU_9550, NULL},
{ USB_VID_MITSU, USB_PID_MITSU_9500D, P_MITSU_9550, NULL},
{ USB_VID_MITSU, USB_PID_MITSU_9550D, P_MITSU_9550, NULL},
{ USB_VID_MITSU, USB_PID_MITSU_9550DS, P_MITSU_9550S, NULL},
{ USB_VID_MITSU, USB_PID_MITSU_9600D, P_MITSU_9600, NULL},
// { USB_VID_MITSU, USB_PID_MITSU_9600D, P_MITSU_9600S, NULL},
{ USB_VID_MITSU, USB_PID_MITSU_9800D, P_MITSU_9800, NULL},
{ USB_VID_MITSU, USB_PID_MITSU_9800DS, P_MITSU_9800S, NULL},
{ USB_VID_MITSU, USB_PID_MITSU_98__D, P_MITSU_9810, NULL},
// { USB_VID_MITSU, USB_PID_MITSU_9810D, P_MITSU_9810, NULL},
// { USB_VID_MITSU, USB_PID_MITSU_9820DS, P_MITSU_9820S, NULL},
{ 0, 0, 0, NULL}
}
};

@ -491,9 +491,9 @@ struct dyesub_backend mitsup95d_backend = {
.read_parse = mitsup95d_read_parse,
.main_loop = mitsup95d_main_loop,
.devices = {
{ USB_VID_MITSU, USB_PID_MITSU_P93D, P_MITSU_P93D, ""},
{ USB_VID_MITSU, USB_PID_MITSU_P95D, P_MITSU_P95D, ""},
{ 0, 0, 0, ""}
{ USB_VID_MITSU, USB_PID_MITSU_P93D, P_MITSU_P93D, NULL},
{ USB_VID_MITSU, USB_PID_MITSU_P95D, P_MITSU_P95D, NULL},
{ 0, 0, 0, NULL}
}
};

@ -1651,8 +1651,8 @@ struct dyesub_backend shinkos1245_backend = {
.main_loop = shinkos1245_main_loop,
.query_serno = shinkos1245_query_serno,
.devices = {
{ USB_VID_SHINKO, USB_PID_SHINKO_S1245, P_SHINKO_S1245, ""},
{ 0, 0, 0, ""}
{ USB_VID_SHINKO, USB_PID_SHINKO_S1245, P_SHINKO_S1245, NULL},
{ 0, 0, 0, NULL}
}
};

@ -1764,8 +1764,8 @@ struct dyesub_backend shinkos2145_backend = {
.main_loop = shinkos2145_main_loop,
.query_serno = shinkos2145_query_serno,
.devices = {
{ USB_VID_SHINKO, USB_PID_SHINKO_S2145, P_SHINKO_S2145, ""},
{ 0, 0, 0, ""}
{ USB_VID_SHINKO, USB_PID_SHINKO_S2145, P_SHINKO_S2145, NULL},
{ 0, 0, 0, NULL}
}
};

@ -2499,9 +2499,9 @@ struct dyesub_backend shinkos6145_backend = {
.main_loop = shinkos6145_main_loop,
.query_serno = shinkos6145_query_serno,
.devices = {
{ USB_VID_SHINKO, USB_PID_SHINKO_S6145, P_SHINKO_S6145, ""},
{ USB_VID_SHINKO, USB_PID_SHINKO_S6145D, P_SHINKO_S6145D, ""},
{ 0, 0, 0, ""}
{ USB_VID_SHINKO, USB_PID_SHINKO_S6145, P_SHINKO_S6145, NULL},
{ USB_VID_SHINKO, USB_PID_SHINKO_S6145D, P_SHINKO_S6145D, NULL},
{ 0, 0, 0, NULL}
}
};

@ -1908,9 +1908,9 @@ struct dyesub_backend shinkos6245_backend = {
.main_loop = shinkos6245_main_loop,
.query_serno = shinkos6245_query_serno,
.devices = {
{ USB_VID_SHINKO, USB_PID_SHINKO_S6245, P_SHINKO_S6245, ""},
{ USB_VID_HITI, USB_PID_HITI_P910L, P_SHINKO_S6245, ""},
{ 0, 0, 0, ""}
{ USB_VID_SHINKO, USB_PID_SHINKO_S6245, P_SHINKO_S6245, NULL},
{ USB_VID_HITI, USB_PID_HITI_P910L, P_SHINKO_S6245, NULL},
{ 0, 0, 0, NULL}
}
};

@ -286,10 +286,10 @@ struct dyesub_backend updr150_backend = {
.read_parse = updr150_read_parse,
.main_loop = updr150_main_loop,
.devices = {
{ USB_VID_SONY, USB_PID_SONY_UPDR150, P_SONY_UPDR150, ""},
{ USB_VID_SONY, USB_PID_SONY_UPDR200, P_SONY_UPDR150, ""},
{ USB_VID_SONY, USB_PID_SONY_UPCR10, P_SONY_UPCR10, ""},
{ 0, 0, 0, ""}
{ USB_VID_SONY, USB_PID_SONY_UPDR150, P_SONY_UPDR150, NULL},
{ USB_VID_SONY, USB_PID_SONY_UPDR200, P_SONY_UPDR150, NULL},
{ USB_VID_SONY, USB_PID_SONY_UPCR10, P_SONY_UPCR10, NULL},
{ 0, 0, 0, NULL}
}
};

Loading…
Cancel
Save