diff --git a/camlibs/ptp/library.c b/camlibs/ptp/library.c index 5328f95c6..cf3fd2368 100644 --- a/camlibs/ptp/library.c +++ b/camlibs/ptp/library.c @@ -190,55 +190,55 @@ static struct { * The very first PTP camera (with special firmware only), also * called "PTP Prototype", may report non PTP interface class */ - {"Kodak DC240 (PTP mode)", 0x040a, 0x0121}, + {"Kodak:DC240 (PTP mode)", 0x040a, 0x0121}, /* * Old DC-4800 firmware reported custom interface class, so we have * to detect it by product/vendor IDs */ - {"Kodak DC4800", 0x040a, 0x0160}, + {"Kodak:DC4800", 0x040a, 0x0160}, /* Below other camers known to be detected by interface class */ - {"Kodak DC3900", 0x040a, 0x0170}, - {"Kodak DX3215", 0x040a, 0x0525}, - {"Kodak DX3500", 0x040a, 0x0500}, - {"Kodak DX3600", 0x040a, 0x0510}, - {"Kodak DX3700", 0x040a, 0x0530}, - {"Kodak DX3900", 0x040a, 0x0170}, - {"Kodak DX4230", 0x040a, 0x0535}, - {"Kodak DX4300", 0x040a, 0x0566}, - {"Kodak DX4330", 0x040a, 0x0555}, - {"Kodak DX4900", 0x040a, 0x0550}, - {"Kodak MC3", 0x040a, 0x0400}, - {"Kodak LS420", 0x040a, 0x0540}, - {"Kodak LS443", 0x040a, 0x0568}, - {"Kodak CX4210", 0x040a, 0x0560}, - {"Kodak CX4230", 0x040a, 0x0535}, - {"Kodak CX4300", 0x040a, 0x0566}, + {"Kodak:DC3900", 0x040a, 0x0170}, + {"Kodak:DX3215", 0x040a, 0x0525}, + {"Kodak:DX3500", 0x040a, 0x0500}, + {"Kodak:DX3600", 0x040a, 0x0510}, + {"Kodak:DX3700", 0x040a, 0x0530}, + {"Kodak:DX3900", 0x040a, 0x0170}, + {"Kodak:DX4230", 0x040a, 0x0535}, + {"Kodak:DX4300", 0x040a, 0x0566}, + {"Kodak:DX4330", 0x040a, 0x0555}, + {"Kodak:DX4900", 0x040a, 0x0550}, + {"Kodak:MC3", 0x040a, 0x0400}, + {"Kodak:LS420", 0x040a, 0x0540}, + {"Kodak:LS443", 0x040a, 0x0568}, + {"Kodak:CX4210", 0x040a, 0x0560}, + {"Kodak:CX4230", 0x040a, 0x0535}, + {"Kodak:CX4300", 0x040a, 0x0566}, /* HP PTP cameras */ - {"HP PhotoSmart 318 (PTP mode)", 0x03f0, 0x6302}, - {"HP PhotoSmart 612 (PTP mode)", 0x03f0, 0x6302}, - {"HP PhotoSmart 715 (PTP mode)", 0x03f0, 0x6402}, - {"HP PhotoSmart 850 (PTP mode)", 0x03f0, 0x4302}, + {"HP:PhotoSmart 318 (PTP mode)", 0x03f0, 0x6302}, + {"HP:PhotoSmart 612 (PTP mode)", 0x03f0, 0x6302}, + {"HP:PhotoSmart 715 (PTP mode)", 0x03f0, 0x6402}, + {"HP:PhotoSmart 850 (PTP mode)", 0x03f0, 0x4302}, /* I got information that all SONY PTP cameras use the same product/vendor IDs */ - {"Sony DSC-P5 (PTP mode)", 0x054c, 0x004e}, - {"Sony DSC-F707V (PTP mode)", 0x054c, 0x004e}, - {"Sony DSC-P30 (PTP mode)", 0x054c, 0x004e}, - {"Sony DSC-P50 (PTP mode)", 0x054c, 0x004e}, - {"Sony DSC-S75 (PTP mode)", 0x054c, 0x004e}, - {"Sony DSC-S85 (PTP mode)", 0x054c, 0x004e}, - {"Sony MVC-CD300 (PTP mode)", 0x054c, 0x004e}, + {"Sony:DSC-P5 (PTP mode)", 0x054c, 0x004e}, + {"Sony:DSC-F707V (PTP mode)", 0x054c, 0x004e}, + {"Sony:DSC-P30 (PTP mode)", 0x054c, 0x004e}, + {"Sony:DSC-P50 (PTP mode)", 0x054c, 0x004e}, + {"Sony:DSC-S75 (PTP mode)", 0x054c, 0x004e}, + {"Sony:DSC-S85 (PTP mode)", 0x054c, 0x004e}, + {"Sony:MVC-CD300 (PTP mode)", 0x054c, 0x004e}, /* Nikon D100 has a PTP mode: westin 2002.10.16 */ - {"Nikon DSC D100 (PTP mode)", 0x04b0, 0x0402}, + {"Nikon:DSC D100 (PTP mode)", 0x04b0, 0x0402}, /* Nikon Coolpix 5700: A. Tanenbaum, 29 Oct 2002 */ - {"Nikon Coolpix 5700 (PTP mode)", 0x04b0, 0x010d}, + {"Nikon:Coolpix 5700 (PTP mode)", 0x04b0, 0x010d}, /* Nikon Coolpix 885: S. Anderson, 19 nov 2002 */ - {"Nikon Coolpix 885 (PTP mode)", 0x04b0, 0x0112}, + {"Nikon:Coolpix 885 (PTP mode)", 0x04b0, 0x0112}, /* Nikon Coolpix 4300: Marco Rodriguez, 10 dic 2002 */ - {"Nikon Coolpix 4300 (PTP mode)", 0x04b0, 0x010f}, + {"Nikon:Coolpix 4300 (PTP mode)", 0x04b0, 0x010f}, @@ -246,13 +246,13 @@ static struct { * PTP and "normal" (i.e. Canon) mode * Canon PS G3: A. Marinichev, 20 nov 2002 */ - {"Canon PowerShot S45 (PTP mode)", 0x04a9, 0x306d}, + {"Canon:PowerShot S45 (PTP mode)", 0x04a9, 0x306d}, /* 0x306c is S45 in normal (canon) mode */ - {"Canon PowerShot G3 (PTP mode)", 0x04a9, 0x306f}, + {"Canon:PowerShot G3 (PTP mode)", 0x04a9, 0x306f}, /* 0x306e is G3 in normal (canon) mode */ - {"Canon PowerShot S230 (PTP mode)", 0x04a9, 0x3071}, + {"Canon:PowerShot S230 (PTP mode)", 0x04a9, 0x3071}, /* 0x3070 is S230 in normal (canon) mode */ - {"Canon Digital IXUS v3 (PTP mode)", 0x04a9, 0x3071}, + {"Canon:Digital IXUS v3 (PTP mode)", 0x04a9, 0x3071}, /* it's the same as S230 */ /* more coming soon :) */ diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index a7c7b586e..c8ffe9776 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -192,67 +192,67 @@ static struct { * The very first PTP camera (with special firmware only), also * called "PTP Prototype", may report non PTP interface class */ - {"Kodak DC240 (PTP mode)", 0x040a, 0x0121}, + {"Kodak:DC240 (PTP mode)", 0x040a, 0x0121}, /* * Old DC-4800 firmware reported custom interface class, so we have * to detect it by product/vendor IDs */ - {"Kodak DC4800", 0x040a, 0x0160}, + {"Kodak:DC4800", 0x040a, 0x0160}, /* Below other camers known to be detected by interface class */ - {"Kodak DC3900", 0x040a, 0x0170}, - {"Kodak DX3215", 0x040a, 0x0525}, - {"Kodak DX3500", 0x040a, 0x0500}, - {"Kodak DX3600", 0x040a, 0x0510}, - {"Kodak DX3700", 0x040a, 0x0530}, - {"Kodak DX3900", 0x040a, 0x0170}, - {"Kodak DX4230", 0x040a, 0x0535}, - {"Kodak DX4300", 0x040a, 0x0566}, - {"Kodak DX4330", 0x040a, 0x0555}, - {"Kodak DX4900", 0x040a, 0x0550}, - {"Kodak MC3", 0x040a, 0x0400}, - {"Kodak LS420", 0x040a, 0x0540}, - {"Kodak LS443", 0x040a, 0x0568}, - {"Kodak CX4210", 0x040a, 0x0560}, - {"Kodak CX4230", 0x040a, 0x0535}, - {"Kodak CX4300", 0x040a, 0x0566}, + {"Kodak:DC3900", 0x040a, 0x0170}, + {"Kodak:DX3215", 0x040a, 0x0525}, + {"Kodak:DX3500", 0x040a, 0x0500}, + {"Kodak:DX3600", 0x040a, 0x0510}, + {"Kodak:DX3700", 0x040a, 0x0530}, + {"Kodak:DX3900", 0x040a, 0x0170}, + {"Kodak:DX4230", 0x040a, 0x0535}, + {"Kodak:DX4300", 0x040a, 0x0566}, + {"Kodak:DX4330", 0x040a, 0x0555}, + {"Kodak:DX4900", 0x040a, 0x0550}, + {"Kodak:MC3", 0x040a, 0x0400}, + {"Kodak:LS420", 0x040a, 0x0540}, + {"Kodak:LS443", 0x040a, 0x0568}, + {"Kodak:CX4210", 0x040a, 0x0560}, + {"Kodak:CX4230", 0x040a, 0x0535}, + {"Kodak:CX4300", 0x040a, 0x0566}, /* HP PTP cameras */ - {"HP PhotoSmart 318 (PTP mode)", 0x03f0, 0x6302}, - {"HP PhotoSmart 612 (PTP mode)", 0x03f0, 0x6302}, - {"HP PhotoSmart 715 (PTP mode)", 0x03f0, 0x6402}, + {"HP:PhotoSmart 318 (PTP mode)", 0x03f0, 0x6302}, + {"HP:PhotoSmart 612 (PTP mode)", 0x03f0, 0x6302}, + {"HP:PhotoSmart 715 (PTP mode)", 0x03f0, 0x6402}, /* I got information that all SONY PTP cameras use the same product/vendor IDs */ - {"Sony DSC-P5 (PTP mode)", 0x054c, 0x004e}, - {"Sony DSC-F707V (PTP mode)", 0x054c, 0x004e}, - {"Sony DSC-P30 (PTP mode)", 0x054c, 0x004e}, - {"Sony DSC-P50 (PTP mode)", 0x054c, 0x004e}, - {"Sony DSC-S75 (PTP mode)", 0x054c, 0x004e}, - {"Sony DSC-S85 (PTP mode)", 0x054c, 0x004e}, - {"Sony MVC-CD300 (PTP mode)", 0x054c, 0x004e}, + {"Sony:DSC-P5 (PTP mode)", 0x054c, 0x004e}, + {"Sony:DSC-F707V (PTP mode)", 0x054c, 0x004e}, + {"Sony:DSC-P30 (PTP mode)", 0x054c, 0x004e}, + {"Sony:DSC-P50 (PTP mode)", 0x054c, 0x004e}, + {"Sony:DSC-S75 (PTP mode)", 0x054c, 0x004e}, + {"Sony:DSC-S85 (PTP mode)", 0x054c, 0x004e}, + {"Sony:MVC-CD300 (PTP mode)", 0x054c, 0x004e}, /* Nikon D100 has a PTP mode: westin 2002.10.16 */ - {"Nikon DSC D100 (PTP mode)", 0x04b0, 0x0402}, + {"Nikon:DSC D100 (PTP mode)", 0x04b0, 0x0402}, /* Nikon Coolpix 5700: A. Tanenbaum, 29 Oct 2002 */ - {"Nikon Coolpix 5700 (PTP mode)", 0x04b0, 0x010d}, + {"Nikon:Coolpix 5700 (PTP mode)", 0x04b0, 0x010d}, /* Nikon Coolpix 885: S. Anderson, 19 nov 2002 */ - {"Nikon Coolpix 885 (PTP mode)", 0x04b0, 0x0112}, + {"Nikon:Coolpix 885 (PTP mode)", 0x04b0, 0x0112}, /* Nikon Coolpix 4300: Marco Rodriguez, 10 dic 2002 */ - {"Nikon Coolpix 4300 (PTP mode)", 0x04b0, 0x010f}, + {"Nikon:Coolpix 4300 (PTP mode)", 0x04b0, 0x010f}, /* (at least some) newer Canon cameras can be switched between * PTP and "normal" (i.e. Canon) mode * Canon PS G3: A. Marinichev, 20 nov 2002 */ - {"Canon PowerShot S45 (PTP mode)", 0x04a9, 0x306d}, + {"Canon:PowerShot S45 (PTP mode)", 0x04a9, 0x306d}, /* 0x306c is S45 in normal (canon) mode */ - {"Canon PowerShot G3 (PTP mode)", 0x04a9, 0x306f}, + {"Canon:PowerShot G3 (PTP mode)", 0x04a9, 0x306f}, /* 0x306e is G3 in normal (canon) mode */ - {"Canon PowerShot S230 (PTP mode)", 0x04a9, 0x3071}, + {"Canon:PowerShot S230 (PTP mode)", 0x04a9, 0x3071}, /* 0x3070 is S230 in normal (canon) mode */ - {"Canon Digital IXUS v3 (PTP mode)", 0x04a9, 0x3071}, + {"Canon:Digital IXUS v3 (PTP mode)", 0x04a9, 0x3071}, /* it's the same as S230 */ /* more coming soon :) */ diff --git a/camlibs/ricoh/library.c b/camlibs/ricoh/library.c index bee11cc66..6e3feae4e 100644 --- a/camlibs/ricoh/library.c +++ b/camlibs/ricoh/library.c @@ -56,21 +56,21 @@ static struct { RicohModel id; const char *model; } models[] = { - {RICOH_MODEL_1, "Ricoh RDC-1"}, - {RICOH_MODEL_2, "Ricoh RDC-2"}, - {RICOH_MODEL_2E, "Ricoh RDC-2E"}, - {RICOH_MODEL_100G, "Ricoh RDC-100G"}, - {RICOH_MODEL_300, "Ricoh RDC-300"}, - {RICOH_MODEL_300Z, "Ricoh RDC-300Z"}, - {RICOH_MODEL_4200, "Ricoh RDC-4200"}, - {RICOH_MODEL_4300, "Ricoh RDC-4300"}, - {RICOH_MODEL_5000, "Ricoh RDC-5000"}, - {RICOH_MODEL_ESP2, "Philips ESP2"}, - {RICOH_MODEL_ESP50, "Philips ESP50"}, - {RICOH_MODEL_ESP60, "Philips ESP60"}, - {RICOH_MODEL_ESP70, "Philips ESP70"}, - {RICOH_MODEL_ESP80, "Philips ESP80"}, - {RICOH_MODEL_ESP80SXG, "Philips ESP80SXG"}, + {RICOH_MODEL_1, "Ricoh:RDC-1"}, + {RICOH_MODEL_2, "Ricoh:RDC-2"}, + {RICOH_MODEL_2E, "Ricoh:RDC-2E"}, + {RICOH_MODEL_100G, "Ricoh:RDC-100G"}, + {RICOH_MODEL_300, "Ricoh:RDC-300"}, + {RICOH_MODEL_300Z, "Ricoh:RDC-300Z"}, + {RICOH_MODEL_4200, "Ricoh:RDC-4200"}, + {RICOH_MODEL_4300, "Ricoh:RDC-4300"}, + {RICOH_MODEL_5000, "Ricoh:RDC-5000"}, + {RICOH_MODEL_ESP2, "Philips:ESP2"}, + {RICOH_MODEL_ESP50, "Philips:ESP50"}, + {RICOH_MODEL_ESP60, "Philips:ESP60"}, + {RICOH_MODEL_ESP70, "Philips:ESP70"}, + {RICOH_MODEL_ESP80, "Philips:ESP80"}, + {RICOH_MODEL_ESP80SXG, "Philips:ESP80SXG"}, {0, NULL} }; diff --git a/camlibs/samsung/samsung.c b/camlibs/samsung/samsung.c index ec51046ab..1313687ab 100644 --- a/camlibs/samsung/samsung.c +++ b/camlibs/samsung/samsung.c @@ -139,10 +139,10 @@ camera_id (CameraText *id) static struct { const char *model; } models[] = { - {"Samsung digimax 800k"}, - {"Dynatron Dynacam 800"}, - {"Jenoptik JD12 800ff"}, - {"Praktica QD800"}, + {"Samsung:digimax 800k"}, + {"Dynatron:Dynacam 800"}, + {"Jenoptik:JD12 800ff"}, + {"Praktica:QD800"}, {NULL} }; diff --git a/camlibs/sierra/sierra.c b/camlibs/sierra/sierra.c index be4b224a0..8bb6c3342 100644 --- a/camlibs/sierra/sierra.c +++ b/camlibs/sierra/sierra.c @@ -1,6 +1,6 @@ /* sierra.c: * - * Copyright © 2001 Lutz Müller + * Copyright © 2001 Lutz Müller * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -63,101 +63,101 @@ const char TIFF_SOI_MARKER[] = { (char)0x49, (char)0x49, (char)0x2A, (char)0x00 static SierraCamera sierra_cameras[] = { /* Camera Model, Sierra Model, USB(vendor id, product id, USB wrapper protocol) */ - {"Agfa ePhoto 307", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Agfa ePhoto 780", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Agfa ePhoto 780C", SIERRA_MODEL_DEFAULT, 0, 0, SIERRA_NO_51|SIERRA_LOW_SPEED }, - {"Agfa ePhoto 1280", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Agfa ePhoto 1680", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Apple QuickTake 200", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Chinon ES-1000", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Epson PhotoPC 500", SIERRA_MODEL_EPSON, 0, 0, 0 }, - {"Epson PhotoPC 550", SIERRA_MODEL_EPSON, 0, 0, 0 }, - {"Epson PhotoPC 600", SIERRA_MODEL_EPSON, 0, 0, 0 }, - {"Epson PhotoPC 650", SIERRA_MODEL_EPSON, 0, 0, 0 }, - {"Epson PhotoPC 700", SIERRA_MODEL_EPSON, 0, 0, 0 }, - {"Epson PhotoPC 800", SIERRA_MODEL_EPSON, 0, 0, 0 }, - {"Epson PhotoPC 850z", SIERRA_MODEL_EPSON, 0x4b8, 0x402, 0}, - {"Epson PhotoPC 3000z", SIERRA_MODEL_CAM_DESC, 0x4b8, 0x403, 0, &ep3000z_cam_desc}, - {"Nikon CoolPix 100", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Nikon CoolPix 300", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Nikon CoolPix 700", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Nikon CoolPix 800", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Nikon CoolPix 880", SIERRA_MODEL_CAM_DESC, 0x04b0, 0x0103, 0, + {"Agfa:ePhoto 307", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Agfa:ePhoto 780", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Agfa:ePhoto 780C", SIERRA_MODEL_DEFAULT, 0, 0, SIERRA_NO_51|SIERRA_LOW_SPEED }, + {"Agfa:ePhoto 1280", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Agfa:ePhoto 1680", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Apple:QuickTake 200", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Chinon:ES-1000", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Epson:PhotoPC 500", SIERRA_MODEL_EPSON, 0, 0, 0 }, + {"Epson:PhotoPC 550", SIERRA_MODEL_EPSON, 0, 0, 0 }, + {"Epson:PhotoPC 600", SIERRA_MODEL_EPSON, 0, 0, 0 }, + {"Epson:PhotoPC 650", SIERRA_MODEL_EPSON, 0, 0, 0 }, + {"Epson:PhotoPC 700", SIERRA_MODEL_EPSON, 0, 0, 0 }, + {"Epson:PhotoPC 800", SIERRA_MODEL_EPSON, 0, 0, 0 }, + {"Epson:PhotoPC 850z", SIERRA_MODEL_EPSON, 0x4b8, 0x402, 0}, + {"Epson:PhotoPC 3000z", SIERRA_MODEL_CAM_DESC, 0x4b8, 0x403, 0, &ep3000z_cam_desc}, + {"Nikon:CoolPix 100", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Nikon:CoolPix 300", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Nikon:CoolPix 700", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Nikon:CoolPix 800", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Nikon:CoolPix 880", SIERRA_MODEL_CAM_DESC, 0x04b0, 0x0103, 0, &cp880_cam_desc}, - {"Nikon CoolPix 900", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Nikon CoolPix 900S", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Nikon CoolPix 910", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Nikon CoolPix 950", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Nikon CoolPix 950S", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Nikon CoolPix 990", SIERRA_MODEL_DEFAULT, 0x04b0, 0x0102, 0}, - {"Nikon CoolPix 995", SIERRA_MODEL_CAM_DESC, 0x04b0, 0x0104, SIERRA_WRAP_USB, + {"Nikon:CoolPix 900", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Nikon:CoolPix 900S", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Nikon:CoolPix 910", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Nikon:CoolPix 950", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Nikon:CoolPix 950S", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Nikon:CoolPix 990", SIERRA_MODEL_DEFAULT, 0x04b0, 0x0102, 0}, + {"Nikon:CoolPix 995", SIERRA_MODEL_CAM_DESC, 0x04b0, 0x0104, SIERRA_WRAP_USB, &cp995_cam_desc}, - {"Olympus D-100Z", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus D-200L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus D-220L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus D-300L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus D-320L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus D-330R", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus D-340L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus D-340R", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus D-360L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus D-400L Zoom", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus D-450Z", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus D-460Z", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus D-500L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus D-600L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus D-600XL", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus D-620L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-400", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-400L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-410", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-410L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-420", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-420L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-700UZ", SIERRA_MODEL_CAM_DESC, 0x07b4, 0x105, SIERRA_WRAP_USB, + {"Olympus:D-100Z", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:D-200L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:D-220L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:D-300L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:D-320L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:D-330R", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:D-340L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:D-340R", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:D-360L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:D-400L Zoom", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:D-450Z", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:D-460Z", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:D-500L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:D-600L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:D-600XL", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:D-620L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-400", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-400L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-410", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-410L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-420", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-420L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-700UZ", SIERRA_MODEL_CAM_DESC, 0x07b4, 0x105, SIERRA_WRAP_USB, &oly3040_cam_desc}, - {"Olympus C-800", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-800L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-820", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-820L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-830L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-840L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-860L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-900 Zoom", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-900L Zoom", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-1000L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-1400L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-1400XL", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-2000Z", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-2020Z", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, - {"Olympus C-2040Z", SIERRA_MODEL_CAM_DESC, 0x07b4, 0x105, SIERRA_WRAP_USB, + {"Olympus:C-800", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-800L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-820", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-820L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-830L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-840L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-860L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-900 Zoom", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-900L Zoom", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-1000L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-1400L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-1400XL", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-2000Z", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-2020Z", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-2040Z", SIERRA_MODEL_CAM_DESC, 0x07b4, 0x105, SIERRA_WRAP_USB, &oly3040_cam_desc}, - {"Olympus C-2100UZ", SIERRA_MODEL_CAM_DESC, 0x07b4, 0x100, 0, + {"Olympus:C-2100UZ", SIERRA_MODEL_CAM_DESC, 0x07b4, 0x100, 0, &oly3040_cam_desc}, - {"Olympus C-2500L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + {"Olympus:C-2500L", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, /* Does this model really exist? - * {"Olympus C-2500Z", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, + * {"Olympus:C-2500Z", SIERRA_MODEL_OLYMPUS, 0, 0, 0 }, */ - {"Olympus C-3000Z", SIERRA_MODEL_CAM_DESC, 0x07b4, 0x100, 0, + {"Olympus:C-3000Z", SIERRA_MODEL_CAM_DESC, 0x07b4, 0x100, 0, &oly3040_cam_desc}, - {"Olympus C-3020Z", SIERRA_MODEL_CAM_DESC, 0x07b4, 0x105, SIERRA_WRAP_USB, + {"Olympus:C-3020Z", SIERRA_MODEL_CAM_DESC, 0x07b4, 0x105, SIERRA_WRAP_USB, &oly3040_cam_desc}, - {"Olympus C-3030Z", SIERRA_MODEL_CAM_DESC, 0x07b4, 0x100, 0, + {"Olympus:C-3030Z", SIERRA_MODEL_CAM_DESC, 0x07b4, 0x100, 0, &oly3040_cam_desc}, - {"Olympus C-3040Z", SIERRA_MODEL_CAM_DESC, 0x07b4, 0x105, SIERRA_WRAP_USB, + {"Olympus:C-3040Z", SIERRA_MODEL_CAM_DESC, 0x07b4, 0x105, SIERRA_WRAP_USB, &oly3040_cam_desc}, - {"Olympus C-4040Z", SIERRA_MODEL_CAM_DESC, 0x07b4, 0x105, SIERRA_WRAP_USB, + {"Olympus:C-4040Z", SIERRA_MODEL_CAM_DESC, 0x07b4, 0x105, SIERRA_WRAP_USB, &oly3040_cam_desc}, - {"Panasonic Coolshot NV-DCF5E", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Polaroid PDC 640", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Polaroid PDC 2300Z", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Sanyo DSC-X300", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Sanyo DSC-X350", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Sanyo VPC-G200", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Sanyo VPC-G200EX", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Sanyo VPC-G210", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Sanyo VPC-G250", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, - {"Sierra Imaging SD640",SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Panasonic:Coolshot NV-DCF5E", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Polaroid:PDC 640", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Polaroid:PDC 2300Z", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Sanyo:DSC-X300", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Sanyo:DSC-X350", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Sanyo:VPC-G200", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Sanyo:VPC-G200EX", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Sanyo:VPC-G210", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Sanyo:VPC-G250", SIERRA_MODEL_DEFAULT, 0, 0, 0 }, + {"Sierra Imaging:SD640",SIERRA_MODEL_DEFAULT, 0, 0, 0 }, {"", SIERRA_MODEL_DEFAULT, 0, 0, 0 } }; @@ -2069,7 +2069,7 @@ camera_init (Camera *camera, GPContext *context) * 'Polaroid PDC 2300Z' (reported by William Bader * ). */ - if (strcmp (a.model, "Polaroid PDC 2300Z")) + if (strcmp (a.model, "Polaroid:PDC 2300Z")) CHECK (sierra_init (camera, context)); /* Establish a connection */ diff --git a/camlibs/sipix/sipix.c b/camlibs/sipix/sipix.c index ece4d6d49..c6c23e9f7 100644 --- a/camlibs/sipix/sipix.c +++ b/camlibs/sipix/sipix.c @@ -54,7 +54,7 @@ camera_abilities (CameraAbilitiesList *list) CameraAbilities a; memset(&a, 0, sizeof(a)); - strcpy(a.model, "SiPix Web2"); + strcpy(a.model, "SiPix:Web2"); a.status = GP_DRIVER_STATUS_EXPERIMENTAL; a.port = GP_PORT_USB; a.speed[0] = 0; @@ -66,7 +66,7 @@ camera_abilities (CameraAbilitiesList *list) gp_abilities_list_append(list, a); /* reported by Terry Lewis */ - strcpy(a.model, "SiPix SC2100"); + strcpy(a.model, "SiPix:SC2100"); a.usb_product = 0x1002; gp_abilities_list_append(list, a); return (GP_OK); diff --git a/camlibs/sonydscf55/sony.h b/camlibs/sonydscf55/sony.h index 4f92c03b2..999ba3c5c 100644 --- a/camlibs/sonydscf55/sony.h +++ b/camlibs/sonydscf55/sony.h @@ -21,10 +21,10 @@ #define SONY_H #define SONY_CAMERA_ID "sonydscf55" -#define SONY_MODEL_MSAC_SR1 "Sony MSAC-SR1" -#define SONY_MODEL_DCR_PC100 "Sony DCR-PC100" -#define SONY_MODEL_TRV_20E "Sony TRV-20E" -#define SONY_MODEL_DSC_F55 "Sony DSC-F55" +#define SONY_MODEL_MSAC_SR1 "Sony:MSAC-SR1" +#define SONY_MODEL_DCR_PC100 "Sony:DCR-PC100" +#define SONY_MODEL_TRV_20E "Sony:TRV-20E" +#define SONY_MODEL_DSC_F55 "Sony:DSC-F55" #define SONY_FILE_NAME_FMT "dsc%05d.jpg"