diff --git a/camlibs/ptp2/cameras/canon-eos400d.txt b/camlibs/ptp2/cameras/canon-eos400d.txt index a64eb8063..477f05116 100644 --- a/camlibs/ptp2/cameras/canon-eos400d.txt +++ b/camlibs/ptp2/cameras/canon-eos400d.txt @@ -61,3 +61,37 @@ Device Properties Supported: 0xd045 0xd049 0xd04a + +Camera summary: +Model: Canon EOS 400D DIGITAL + device version: 3-1.1.1 + serial number: 000000000000000000000000xxxxxxxx +Vendor extension ID: 0x0000000b +Vendor extension description: (null) + +Capture Formats: JPEG +Display Formats: Association/Directory, Script, MS AVI, MS Wave, JPEG, CRW, Unknown(b103), Unknown(bf02), Defined Type + +Device Capabilities: + File Download, File Deletion, File Upload + No Image Capture, No Open Capture, No vendor specific capture + +Storage Devices Summary: +store_00010001: + StorageDescription: CF + VolumeLabel: + Storage Type: Removable RAM (memory card) + Filesystemtype: Digital Camera Layout (DCIM) + Access Capability: Read-Write + Maximum Capability: 4112781312 (3922 MB) + Free Space (Bytes): 3969277952 (3785 MB) + Free Space (Images): -1 + +Device Property Summary: +Event Emulate Mode(0xd045):(readwrite) (type=0x4) Enumeration [1,2,3,4,5,6,7] value: 2 +Property 0xd402:(read only) (type=0xffff) 'Canon EOS 400D DIGITAL' +Property 0xd407:(read only) (type=0x6) 1 +Property 0xd406:(readwrite) (type=0xffff) 'Unknown Initiator' +Model ID(0xd049):(read only) (type=0x6) 2147484214 +Property 0xd04a:(readwrite) (type=0x2) Enumeration [0,1,2,3] value: 0 + diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index c782c635d..333aa9225 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -577,6 +577,8 @@ static struct { {"Nikon:Coolpix L3 (PTP mode)", 0x04b0, 0x041a, 0}, /* Pat Shanahan, http://sourceforge.net/tracker/index.php?func=detail&aid=1924511&group_id=8874&atid=358874 */ {"Nikon:D3 (PTP mode)", 0x04b0, 0x041c, PTP_CAP}, + /* irc reporter Benjamin Schindler */ + {"Nikon:DSC D60 (PTP mode)", 0x04b0, 0x041e, PTP_CAP}, /* Thomas Luzat */ /* this was reported as not working, mass storage only: