* ptp.c: sync with libptp2 code.

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6963 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Mariusz Woloszyn
2004-01-05 10:20:34 +00:00
parent ddab1a030c
commit 67a0de940b
2 changed files with 6 additions and 3 deletions

View File

@@ -1,3 +1,6 @@
2004-01-05 Mariusz Woloszyn
* ptp.c: sync with libptp2 code.
2004-01-04 Marcus Meissner <marcus@jet.franken.de>
* ptp.c: Added Canon Digital IXUS i as reported.

View File

@@ -152,7 +152,7 @@ ptp_usb_senddata (PTPParams* params, PTPContainer* ptp,
ret = PTP_ERROR_IO;
/* ptp_error (params,
"PTP: request code 0x%04x sending data error 0x%04x",
ptp->Code,ret);*/
ptp->Code,ret); */
}
return ret;
}
@@ -253,9 +253,9 @@ ptp_usb_getresp (PTPParams* params, PTPContainer* resp)
/* major PTP functions */
/* Transaction data phase description */
#define PTP_DP_NODATA 0x0000 /* No Data Phase */
#define PTP_DP_NODATA 0x0000 /* no data phase */
#define PTP_DP_SENDDATA 0x0001 /* sending data */
#define PTP_DP_GETDATA 0x0002 /* geting data */
#define PTP_DP_GETDATA 0x0002 /* receiving data */
#define PTP_DP_DATA_MASK 0x00ff /* data phase mask */
/* Number of PTP Request phase parameters */