* merged patch for Snap from Thomas Coffy <karm@happycoders.org>,

changes some usb lowlevel stuff.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7152 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Marcus Meissner
2004-04-01 21:11:06 +00:00
parent 75e0b014e0
commit 613cdcf675
2 changed files with 15 additions and 6 deletions

View File

@@ -1,3 +1,8 @@
2004-04-01 Marcus Meissner <marcus@jet.franken.de>
* merged patch for Snap from Thomas Coffy <karm@happycoders.org>,
changes some usb lowlevel stuff.
2004-01-19 Marcus Meissner <marcus@jet.franken.de>
* blink2.c: Some alignment issues, set altsetting.

View File

@@ -55,8 +55,10 @@ blink2_getnumpics(
) {
char buf[6];
int ret;
ret = gp_port_usb_msg_read(port, BLINK2_GET_NUMPICS, 0x03, 0, buf, 6);
ret = gp_port_usb_msg_read(port, 0x18, 0x03, 0, buf, 6);
ret = gp_port_usb_msg_read(port, BLINK2_GET_NUMPICS, 0x03, 0, buf, 2);
ret = gp_port_usb_msg_read(port, BLINK2_GET_NUMPICS, 0x03, 0, buf, 2);
if (ret<GP_OK)
return ret;
*numpics = (buf[0]<<8) | buf[1];
@@ -96,7 +98,7 @@ file_list_func (CameraFilesystem *fs, const char *folder, CameraList *list,
bytes = ((8*(1+numpics))+0x3f) & ~0x3f;
xbuf = malloc(bytes);
ret = gp_port_usb_msg_read( camera->port,BLINK2_GET_DIR,0x03,0,buf,8 );
ret = gp_port_usb_msg_read( camera->port,BLINK2_GET_DIR,0x03,0,buf,1 );
if (ret < GP_OK) {
free(xbuf);
return ret;
@@ -144,7 +146,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
free(xbuf);
return GP_ERROR_NO_MEMORY;
}
ret = gp_port_usb_msg_read( camera->port,BLINK2_GET_DIR,0x03,0,buf,8 );
ret = gp_port_usb_msg_read( camera->port,BLINK2_GET_DIR,0x03,0,buf,1 );
if (ret < GP_OK) {
free(addrs);
free(xbuf);
@@ -388,10 +390,12 @@ camera_init (Camera *camera, GPContext *context)
settings.usb.altsetting = 0;
ret = gp_port_set_settings (camera->port, settings);
if (ret < GP_OK) return ret;
ret = gp_port_usb_msg_read( camera->port, 0x18, 0x0300, 0x0000, buf, 6);
ret = gp_port_usb_msg_read( camera->port, 0x18, 0x03, 0, buf, 6);
if (ret < GP_OK)
return ret;
ret = gp_port_usb_msg_read( camera->port, 0x04, 0x0300, 0x0000, buf, 8);
ret = gp_port_usb_msg_read( camera->port, 0x04, 0x03, 0, buf, 1);
if (ret < GP_OK)
return ret;
return GP_OK;