darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Setting byte 0x46 in command packet is needed for (new) class 6,

Browse Source 
but causes other cameras to hang. I now do it only for class 6.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7637 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Stephen H. Westin
2005-03-09 21:35:01 +00:00
parent 0fcb115c06
commit 1968c42e09
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
camlibs/canon/usb.c
View File

@@ -1102,11 +1102,13 @@ canon_usb_dialogue (Camera *camera, canonCommandIndex canon_funct, int *return_l
packet[0x44] = cmd1;
packet[0x47] = cmd2;
htole32a (packet + 0x04, cmd3);
/* New style of protocol is picky about this byte. */
if ( cmd3 == 0x202 )
packet[0x46] = 0x20;
else
packet[0x46] = 0x10;
if ( camera->pl->md->model == CANON_CLASS_6 )
/* New style of protocol is picky about this byte. */
if ( cmd3 == 0x202 )
packet[0x46] = 0x20;
else
packet[0x46] = 0x10;
htole32a (packet + 0x4c, serial_code++); /* serial number */
htole32a (packet + 0x48, 0x10 + payload_length);
msgsize = 0x50 + payload_length; /* TOTAL msg size */