From: <mar...@us...> - 2009-07-10 17:53:22
|
Revision: 12215 http://gphoto.svn.sourceforge.net/gphoto/?rev=12215&view=rev Author: marcusmeissner Date: 2009-07-10 17:53:20 +0000 (Fri, 10 Jul 2009) Log Message: ----------- nikon_device_ready -> generic Modified Paths: -------------- trunk/libgphoto2/camlibs/ptp2/ptp.c trunk/libgphoto2/camlibs/ptp2/ptp.h Modified: trunk/libgphoto2/camlibs/ptp2/ptp.c =================================================================== --- trunk/libgphoto2/camlibs/ptp2/ptp.c 2009-07-10 17:49:19 UTC (rev 12214) +++ trunk/libgphoto2/camlibs/ptp2/ptp.c 2009-07-10 17:53:20 UTC (rev 12215) @@ -2840,28 +2840,6 @@ } /** - * ptp_nikon_device_ready: - * - * This command checks if the device is ready. Used after - * a capture. - * - * params: PTPParams* - * - * Return values: Some PTP_RC_* code. - * - **/ -uint16_t -ptp_nikon_device_ready (PTPParams* params) -{ - PTPContainer ptp; - - PTP_CNT_INIT(ptp); - ptp.Code=PTP_OC_NIKON_DeviceReady; - ptp.Nparam=0; - return ptp_transaction(params, &ptp, PTP_DP_NODATA, 0, NULL, NULL); -} - -/** * ptp_nikon_getptpipinfo: * * This command gets the ptpip info data. Modified: trunk/libgphoto2/camlibs/ptp2/ptp.h =================================================================== --- trunk/libgphoto2/camlibs/ptp2/ptp.h 2009-07-10 17:49:19 UTC (rev 12214) +++ trunk/libgphoto2/camlibs/ptp2/ptp.h 2009-07-10 17:53:20 UTC (rev 12215) @@ -2193,7 +2193,18 @@ uint16_t ptp_nikon_check_event (PTPParams* params, PTPContainer **evt, int *evtcnt); uint16_t ptp_nikon_getfileinfoinblock (PTPParams* params, uint32_t p1, uint32_t p2, uint32_t p3, unsigned char **data, unsigned int *size); -uint16_t ptp_nikon_device_ready (PTPParams* params); +/** + * ptp_nikon_device_ready: + * + * This command checks if the device is ready. Used after + * a capture. + * + * params: PTPParams* + * + * Return values: Some PTP_RC_* code. + * + **/ +#define ptp_nikon_device_ready(params) ptp_generic_no_data (params, PTP_OC_NIKON_DeviceReady, 0) uint16_t ptp_mtp_getobjectpropssupported (PTPParams* params, uint16_t ofc, uint32_t *propnum, uint16_t **props); /* Non PTP protocol functions */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |