From aaf658e15bb9d50d0b6be80e762da8ea9646a180 Mon Sep 17 00:00:00 2001 From: petabyt Date: Sun, 15 Sep 2024 04:09:32 +0000 Subject: [PATCH] deploy: 7c181754349589ef956cf0bcbc473d5f15d5c38e --- camlib_8h_source.html | 155 +++++++++++++++++----------------- doxygen_crawl.html | 1 - functions.html | 1 - functions_func.html | 1 - search/all_a.js | 57 ++++++------- search/functions_0.js | 29 +++---- structPtpRuntime-members.html | 45 +++++----- structPtpRuntime.html | 27 +----- 8 files changed, 141 insertions(+), 175 deletions(-) diff --git a/camlib_8h_source.html b/camlib_8h_source.html index 615cb7d..02e4d92 100644 --- a/camlib_8h_source.html +++ b/camlib_8h_source.html @@ -284,86 +284,84 @@
251
254PUB void ptp_mutex_unlock(struct PtpRuntime *r);
255
-
258PUB void ptp_mutex_unlock_thread(struct PtpRuntime *r);
-
259
-
265PUB void ptp_mutex_keep_locked(struct PtpRuntime *r);
-
266
-
269PUB void ptp_mutex_lock(struct PtpRuntime *r);
-
270
-
274PUB int ptp_device_type(struct PtpRuntime *r);
-
275
-
279PUB int ptp_check_opcode(struct PtpRuntime *r, int opcode);
-
280
-
284PUB int ptp_check_prop(struct PtpRuntime *r, int code);
-
285
-
289PUB int ptp_buffer_resize(struct PtpRuntime *r, size_t size);
-
290
-
291// Data structure functions
-
292PUB int ptp_write_unicode_string(char *dat, const char *string);
-
293PUB int ptp_read_unicode_string(char *buffer, char *dat, int max);
-
294PUB int ptp_read_utf8_string(void *dat, char *string, int max);
-
295PUB int ptp_read_string(uint8_t *dat, char *string, int max);
-
296PUB int ptp_write_string(uint8_t *dat, const char *string);
-
297PUB int ptp_write_utf8_string(void *dat, const char *string);
-
298PUB int ptp_read_uint16_array(const uint8_t *dat, uint16_t *buf, int max, int *length);
-
299PUB int ptp_read_uint16_array_s(uint8_t *bs, uint8_t *be, uint16_t *buf, int max, int *length);
-
300inline static int ptp_write_u8 (void *buf, uint8_t out) { ((uint8_t *)buf)[0] = out; return 1; }
-
301inline static int ptp_write_u16(void *buf, uint16_t out) { ((uint16_t *)buf)[0] = out; return 2; }
-
302inline static int ptp_write_u32(void *buf, uint32_t out) { ((uint32_t *)buf)[0] = out; return 4; }
-
303inline static int ptp_read_u32 (const void *buf, uint32_t *out) { *out = ((const uint32_t *)buf)[0]; return 4; }
-
304inline static int ptp_read_u16 (const void *buf, uint16_t *out) { *out = ((const uint16_t *)buf)[0]; return 2; }
-
305inline static int ptp_read_u8 (const void *buf, uint8_t *out) { *out = ((const uint8_t *)buf)[0]; return 1; }
+
259PUB void ptp_mutex_unlock_thread(struct PtpRuntime *r);
+
260
+
263PUB void ptp_mutex_lock(struct PtpRuntime *r);
+
264
+
268PUB int ptp_device_type(struct PtpRuntime *r);
+
269
+
273PUB int ptp_check_opcode(struct PtpRuntime *r, int opcode);
+
274
+
278PUB int ptp_check_prop(struct PtpRuntime *r, int code);
+
279
+
283PUB int ptp_buffer_resize(struct PtpRuntime *r, size_t size);
+
284
+
285// Data structure functions
+
286PUB int ptp_write_unicode_string(char *dat, const char *string);
+
287PUB int ptp_read_unicode_string(char *buffer, char *dat, int max);
+
288PUB int ptp_read_utf8_string(void *dat, char *string, int max);
+
289PUB int ptp_read_string(uint8_t *dat, char *string, int max);
+
290PUB int ptp_write_string(uint8_t *dat, const char *string);
+
291PUB int ptp_write_utf8_string(void *dat, const char *string);
+
292PUB int ptp_read_uint16_array(const uint8_t *dat, uint16_t *buf, int max, int *length);
+
293PUB int ptp_read_uint16_array_s(uint8_t *bs, uint8_t *be, uint16_t *buf, int max, int *length);
+
294inline static int ptp_write_u8 (void *buf, uint8_t out) { ((uint8_t *)buf)[0] = out; return 1; }
+
295inline static int ptp_write_u16(void *buf, uint16_t out) { ((uint16_t *)buf)[0] = out; return 2; }
+
296inline static int ptp_write_u32(void *buf, uint32_t out) { ((uint32_t *)buf)[0] = out; return 4; }
+
297inline static int ptp_read_u32 (const void *buf, uint32_t *out) { *out = ((const uint32_t *)buf)[0]; return 4; }
+
298inline static int ptp_read_u16 (const void *buf, uint16_t *out) { *out = ((const uint16_t *)buf)[0]; return 2; }
+
299inline static int ptp_read_u8 (const void *buf, uint8_t *out) { *out = ((const uint8_t *)buf)[0]; return 1; }
+
300
+
301// Build a new PTP/IP or PTP/USB command packet in r->data
+
302int ptp_new_cmd_packet(struct PtpRuntime *r, struct PtpCommand *cmd);
+
303
+
304// Only for PTP_USB or PTP_USB_IP use
+
305int ptp_new_data_packet(struct PtpRuntime *r, struct PtpCommand *cmd, void *data, int data_length);
306
-
307// Build a new PTP/IP or PTP/USB command packet in r->data
-
308int ptp_new_cmd_packet(struct PtpRuntime *r, struct PtpCommand *cmd);
-
309
-
310// Only for PTP_USB or PTP_USB_IP use
-
311int ptp_new_data_packet(struct PtpRuntime *r, struct PtpCommand *cmd, void *data, int data_length);
-
312
-
313// Only use for PTP_IP
-
314int ptpip_data_start_packet(struct PtpRuntime *r, int data_length);
-
315int ptpip_data_end_packet(struct PtpRuntime *r, void *data, int data_length);
+
307// Only use for PTP_IP
+
308int ptpip_data_start_packet(struct PtpRuntime *r, int data_length);
+
309int ptpip_data_end_packet(struct PtpRuntime *r, void *data, int data_length);
+
310
+
311// Used only by ptp_open_session
+
312void ptp_update_transaction(struct PtpRuntime *r, int t);
+
313
+
314// Set avail info for prop
+
315void ptp_set_prop_avail_info(struct PtpRuntime *r, int code, int memb_size, int cnt, void *data);
316
-
317// Used only by ptp_open_session
-
318void ptp_update_transaction(struct PtpRuntime *r, int t);
-
319
-
320// Set avail info for prop
-
321void ptp_set_prop_avail_info(struct PtpRuntime *r, int code, int memb_size, int cnt, void *data);
+
317void *ptp_dup_payload(struct PtpRuntime *r);
+
318
+
321int ptp_dump(struct PtpRuntime *r);
322
-
323void *ptp_dup_payload(struct PtpRuntime *r);
-
324
-
327int ptp_dump(struct PtpRuntime *r);
-
328
-
329#define CAMLIB_INCLUDE_IMPL
-
330#include "cl_data.h"
-
331#include "cl_backend.h"
-
332#include "cl_ops.h"
-
333#include "cl_enum.h"
-
334#include "cl_bind.h"
-
335
-
336// Backwards compatibility (mostly renamed functions)
-
337#ifndef CAMLIB_NO_COMPAT
-
338 #define ptp_get_last_transaction(...) ptp_get_last_transaction_id(__VA_ARGS__)
-
339 #define ptp_generic_new(...) ptp_new(__VA_ARGS__)
-
340 #define ptp_generic_close(...) ptp_close(__VA_ARGS__)
-
341 #define ptp_generic_reset(...) ptp_reset(__VA_ARGS__)
-
342 #define ptp_generic_init(...) ptp_init(__VA_ARGS__)
-
343 #define ptp_generic_send(...) ptp_send(__VA_ARGS__)
-
344 #define ptp_generic_send_data(...) ptp_send_data(__VA_ARGS__)
-
345#endif
-
346
-
347typedef void ptp_object_found_callback(struct PtpRuntime *r, struct PtpObjectInfo *oi, void *arg);
-
348
-
349// Object service api (object.c) - optional
-
350// Not documented yet
-
351struct ObjectCache *ptp_create_object_service(int *handles, int length, ptp_object_found_callback *callback, void *arg);
-
352struct PtpObjectInfo *ptp_object_service_get(struct PtpRuntime *r, struct ObjectCache *oc, int handle);
-
353struct PtpObjectInfo *ptp_object_service_get_index(struct PtpRuntime *r, struct ObjectCache *oc, int req_i);
-
354int ptp_object_service_length(struct PtpRuntime *r, struct ObjectCache *oc);
-
355int ptp_object_service_step(struct PtpRuntime *r, struct ObjectCache *oc);
-
356void ptp_object_service_add_priority(struct PtpRuntime *r, struct ObjectCache *oc, int handle);
-
357
-
358#endif
+
323#define CAMLIB_INCLUDE_IMPL
+
324#include "cl_data.h"
+
325#include "cl_backend.h"
+
326#include "cl_ops.h"
+
327#include "cl_enum.h"
+
328#include "cl_bind.h"
+
329
+
330// Backwards compatibility (mostly renamed functions)
+
331#ifndef CAMLIB_NO_COMPAT
+
332 #define ptp_get_last_transaction(...) ptp_get_last_transaction_id(__VA_ARGS__)
+
333 #define ptp_generic_new(...) ptp_new(__VA_ARGS__)
+
334 #define ptp_generic_close(...) ptp_close(__VA_ARGS__)
+
335 #define ptp_generic_reset(...) ptp_reset(__VA_ARGS__)
+
336 #define ptp_generic_init(...) ptp_init(__VA_ARGS__)
+
337 #define ptp_generic_send(...) ptp_send(__VA_ARGS__)
+
338 #define ptp_generic_send_data(...) ptp_send_data(__VA_ARGS__)
+
339#endif
+
340
+
341typedef void ptp_object_found_callback(struct PtpRuntime *r, struct PtpObjectInfo *oi, void *arg);
+
342
+
343// Object service api (object.c) - optional
+
344// Not documented yet
+
345struct ObjectCache *ptp_create_object_service(int *handles, int length, ptp_object_found_callback *callback, void *arg);
+
346struct PtpObjectInfo *ptp_object_service_get(struct PtpRuntime *r, struct ObjectCache *oc, int handle);
+
347struct PtpObjectInfo *ptp_object_service_get_index(struct PtpRuntime *r, struct ObjectCache *oc, int req_i);
+
348int ptp_object_service_length(struct PtpRuntime *r, struct ObjectCache *oc);
+
349int ptp_object_service_step(struct PtpRuntime *r, struct ObjectCache *oc);
+
350void ptp_object_service_add_priority(struct PtpRuntime *r, struct ObjectCache *oc, int handle);
+
351
+
352#endif
ptp_dump
int ptp_dump(struct PtpRuntime *r)
Write r->data to a file called DUMP.
ptp_perror
const char * ptp_perror(int rc)
Evaluates PtpGeneralError into string message.
PtpConnType
PtpConnType
Tells lib what backend and packet style to use.
Definition camlib.h:97
@@ -414,11 +412,10 @@
PtpRuntime::ptp_get_return_code
PUB int ptp_get_return_code(struct PtpRuntime *r)
Returns the return code (RC) currently in the data buffer.
PtpRuntime::di
struct PtpDeviceInfo * di
Info about current connection, used to detect camera type, supported opodes, etc.
Definition camlib.h:141
PtpRuntime::wait_for_response
uint8_t wait_for_response
Optionally wait up to 256 seconds for a response. Some PTP operations require this,...
Definition camlib.h:159
-
PtpRuntime::ptp_mutex_unlock_thread
PUB void ptp_mutex_unlock_thread(struct PtpRuntime *r)
Completely unlock the mutex for the current thread, to ensure there isn't a deadlock.
+
PtpRuntime::ptp_mutex_unlock_thread
PUB void ptp_mutex_unlock_thread(struct PtpRuntime *r)
Completely unlock the mutex for the current thread, to ensure there isn't a deadlock....
PtpRuntime::ptp_device_type
PUB int ptp_device_type(struct PtpRuntime *r)
Gets type of device from r->di.
PtpRuntime::connection_type
uint8_t connection_type
One of enum PtpConnType.
Definition camlib.h:124
PtpRuntime::ptp_get_payload_length
PUB int ptp_get_payload_length(struct PtpRuntime *r)
Get length of payload returned by ptp_get_payload.
-
PtpRuntime::ptp_mutex_keep_locked
PUB void ptp_mutex_keep_locked(struct PtpRuntime *r)
Keep the mutex locked one more time for the current thread.
diff --git a/doxygen_crawl.html b/doxygen_crawl.html index f4d16ba..c9661d9 100644 --- a/doxygen_crawl.html +++ b/doxygen_crawl.html @@ -166,6 +166,5 @@ - diff --git a/functions.html b/functions.html index 5cfdb91..14032c2 100644 --- a/functions.html +++ b/functions.html @@ -136,7 +136,6 @@

- p -

  • ptp_get_return_code() : PtpRuntime
  • ptp_get_thumbnail() : PtpRuntime
  • ptp_init() : PtpRuntime
    • -
  • ptp_mutex_keep_locked() : PtpRuntime
  • ptp_mutex_lock() : PtpRuntime
  • ptp_mutex_unlock() : PtpRuntime
  • ptp_mutex_unlock_thread() : PtpRuntime
    • diff --git a/functions_func.html b/functions_func.html index 3d6a9f5..3f7ecd3 100644 --- a/functions_func.html +++ b/functions_func.html @@ -107,7 +107,6 @@

    - p -

    • ptp_get_return_code() : PtpRuntime
    • ptp_get_thumbnail() : PtpRuntime
    • ptp_init() : PtpRuntime
      • -
    • ptp_mutex_keep_locked() : PtpRuntime
    • ptp_mutex_lock() : PtpRuntime
    • ptp_mutex_unlock() : PtpRuntime
    • ptp_mutex_unlock_thread() : PtpRuntime
      • diff --git a/search/all_a.js b/search/all_a.js index a3d0a4b..7fcd91e 100644 --- a/search/all_a.js +++ b/search/all_a.js @@ -31,33 +31,32 @@ var searchData= ['ptp_5fget_5fthumbnail_28',['ptp_get_thumbnail',['../structPtpRuntime.html#a1349640be24b23301f82338a4e89202e',1,'PtpRuntime']]], ['ptp_5finit_29',['ptp_init',['../structPtpRuntime.html#a13bae3755015236bc0d80f03262f8564',1,'PtpRuntime']]], ['ptp_5fio_5ferr_30',['PTP_IO_ERR',['../camlib_8h.html#a9fa077df1a63de2388ae3428b9defd2fa86c997554de6876e8141e174a6518a66',1,'camlib.h']]], - ['ptp_5fmutex_5fkeep_5flocked_31',['ptp_mutex_keep_locked',['../structPtpRuntime.html#afd673777a9471de1d465f16c570e8ed6',1,'PtpRuntime']]], - ['ptp_5fmutex_5flock_32',['ptp_mutex_lock',['../structPtpRuntime.html#a35af7e9c296ee5cdbfba5a981454f0a0',1,'PtpRuntime']]], - ['ptp_5fmutex_5funlock_33',['ptp_mutex_unlock',['../structPtpRuntime.html#aab6f6615255ef672a7170fac815c8fa3',1,'PtpRuntime']]], - ['ptp_5fmutex_5funlock_5fthread_34',['ptp_mutex_unlock_thread',['../structPtpRuntime.html#ae6f46ce011eb239897a9756d11c60d57',1,'PtpRuntime']]], - ['ptp_5fnew_35',['ptp_new',['../structPtpRuntime.html#a16ebc69184e82c377375ff8fc663339a',1,'PtpRuntime']]], - ['ptp_5fno_5fdevice_36',['PTP_NO_DEVICE',['../camlib_8h.html#a9fa077df1a63de2388ae3428b9defd2fa2b7ab22ac83d3cca579a663f28a87eca',1,'camlib.h']]], - ['ptp_5fno_5fperm_37',['PTP_NO_PERM',['../camlib_8h.html#a9fa077df1a63de2388ae3428b9defd2facf86b39141e38033a9f26bcde63681f3',1,'camlib.h']]], - ['ptp_5fopen_5ffail_38',['PTP_OPEN_FAIL',['../camlib_8h.html#a9fa077df1a63de2388ae3428b9defd2fa88bf42a9045fae4232a711ff5f7ea223',1,'camlib.h']]], - ['ptp_5fopen_5fsession_39',['ptp_open_session',['../structPtpRuntime.html#ac1f078ea0df6b7f09bba6af0643f10b5',1,'PtpRuntime']]], - ['ptp_5fout_5fof_5fmem_40',['PTP_OUT_OF_MEM',['../camlib_8h.html#a9fa077df1a63de2388ae3428b9defd2fad7b5d94a6766a38a465375688e4b740e',1,'camlib.h']]], - ['ptp_5fperror_41',['ptp_perror',['../camlib_8h.html#a4be7b7db9e745e655b26523a9429b009',1,'camlib.h']]], - ['ptp_5fpre_5ftake_5fpicture_42',['ptp_pre_take_picture',['../structPtpRuntime.html#aa317218a1bbbd18bc3b20ae9db1624f9',1,'PtpRuntime']]], - ['ptp_5freset_43',['ptp_reset',['../structPtpRuntime.html#a2b58d078aae65e43bca41d037ccdf2d5',1,'PtpRuntime']]], - ['ptp_5fruntime_5ferr_44',['PTP_RUNTIME_ERR',['../camlib_8h.html#a9fa077df1a63de2388ae3428b9defd2fa49f251229c1a3a6bcdc11554ed780885',1,'camlib.h']]], - ['ptp_5fsend_45',['ptp_send',['../structPtpRuntime.html#a025478ecd387e2c1be6dfb7cc41488ea',1,'PtpRuntime']]], - ['ptp_5fsend_5fdata_46',['ptp_send_data',['../structPtpRuntime.html#a04dd3974506089f9c0b248e94b34a0ed',1,'PtpRuntime']]], - ['ptp_5fset_5fgeneric_5fproperty_47',['ptp_set_generic_property',['../structPtpRuntime.html#a14deac23d2f24cc1188c499a1255e5f9',1,'PtpRuntime']]], - ['ptp_5ftake_5fpicture_48',['ptp_take_picture',['../structPtpRuntime.html#aace66256ef8a5a751e1b1bdf38787aa1',1,'PtpRuntime']]], - ['ptp_5funsupported_49',['PTP_UNSUPPORTED',['../camlib_8h.html#a9fa077df1a63de2388ae3428b9defd2fad6a32c999f672344284e734de090b18d',1,'camlib.h']]], - ['ptparray_50',['PtpArray',['../structPtpArray.html',1,'']]], - ['ptpcommand_51',['PtpCommand',['../structPtpCommand.html',1,'']]], - ['ptpconntype_52',['PtpConnType',['../camlib_8h.html#a4d84e1a866c4b0808d10dd1b7125a639',1,'camlib.h']]], - ['ptpgeneralerror_53',['PtpGeneralError',['../camlib_8h.html#a9fa077df1a63de2388ae3428b9defd2f',1,'camlib.h']]], - ['ptpgenericevent_54',['PtpGenericEvent',['../structPtpGenericEvent.html',1,'']]], - ['ptpip_5finit_5fcommand_5frequest_55',['ptpip_init_command_request',['../structPtpRuntime.html#a35ecd085b423e6312a5214b1d0573e4c',1,'PtpRuntime']]], - ['ptpip_5finit_5fevents_56',['ptpip_init_events',['../structPtpRuntime.html#aab71c60e32fb92e3c5458431006c57da',1,'PtpRuntime']]], - ['ptppropavail_57',['PtpPropAvail',['../structPtpPropAvail.html',1,'']]], - ['ptpruntime_58',['PtpRuntime',['../structPtpRuntime.html',1,'']]], - ['ptpvendors_59',['PtpVendors',['../camlib_8h.html#aa57ec9e18aa521972749b8655ca36e21',1,'camlib.h']]] + ['ptp_5fmutex_5flock_31',['ptp_mutex_lock',['../structPtpRuntime.html#a35af7e9c296ee5cdbfba5a981454f0a0',1,'PtpRuntime']]], + ['ptp_5fmutex_5funlock_32',['ptp_mutex_unlock',['../structPtpRuntime.html#aab6f6615255ef672a7170fac815c8fa3',1,'PtpRuntime']]], + ['ptp_5fmutex_5funlock_5fthread_33',['ptp_mutex_unlock_thread',['../structPtpRuntime.html#ae6f46ce011eb239897a9756d11c60d57',1,'PtpRuntime']]], + ['ptp_5fnew_34',['ptp_new',['../structPtpRuntime.html#a16ebc69184e82c377375ff8fc663339a',1,'PtpRuntime']]], + ['ptp_5fno_5fdevice_35',['PTP_NO_DEVICE',['../camlib_8h.html#a9fa077df1a63de2388ae3428b9defd2fa2b7ab22ac83d3cca579a663f28a87eca',1,'camlib.h']]], + ['ptp_5fno_5fperm_36',['PTP_NO_PERM',['../camlib_8h.html#a9fa077df1a63de2388ae3428b9defd2facf86b39141e38033a9f26bcde63681f3',1,'camlib.h']]], + ['ptp_5fopen_5ffail_37',['PTP_OPEN_FAIL',['../camlib_8h.html#a9fa077df1a63de2388ae3428b9defd2fa88bf42a9045fae4232a711ff5f7ea223',1,'camlib.h']]], + ['ptp_5fopen_5fsession_38',['ptp_open_session',['../structPtpRuntime.html#ac1f078ea0df6b7f09bba6af0643f10b5',1,'PtpRuntime']]], + ['ptp_5fout_5fof_5fmem_39',['PTP_OUT_OF_MEM',['../camlib_8h.html#a9fa077df1a63de2388ae3428b9defd2fad7b5d94a6766a38a465375688e4b740e',1,'camlib.h']]], + ['ptp_5fperror_40',['ptp_perror',['../camlib_8h.html#a4be7b7db9e745e655b26523a9429b009',1,'camlib.h']]], + ['ptp_5fpre_5ftake_5fpicture_41',['ptp_pre_take_picture',['../structPtpRuntime.html#aa317218a1bbbd18bc3b20ae9db1624f9',1,'PtpRuntime']]], + ['ptp_5freset_42',['ptp_reset',['../structPtpRuntime.html#a2b58d078aae65e43bca41d037ccdf2d5',1,'PtpRuntime']]], + ['ptp_5fruntime_5ferr_43',['PTP_RUNTIME_ERR',['../camlib_8h.html#a9fa077df1a63de2388ae3428b9defd2fa49f251229c1a3a6bcdc11554ed780885',1,'camlib.h']]], + ['ptp_5fsend_44',['ptp_send',['../structPtpRuntime.html#a025478ecd387e2c1be6dfb7cc41488ea',1,'PtpRuntime']]], + ['ptp_5fsend_5fdata_45',['ptp_send_data',['../structPtpRuntime.html#a04dd3974506089f9c0b248e94b34a0ed',1,'PtpRuntime']]], + ['ptp_5fset_5fgeneric_5fproperty_46',['ptp_set_generic_property',['../structPtpRuntime.html#a14deac23d2f24cc1188c499a1255e5f9',1,'PtpRuntime']]], + ['ptp_5ftake_5fpicture_47',['ptp_take_picture',['../structPtpRuntime.html#aace66256ef8a5a751e1b1bdf38787aa1',1,'PtpRuntime']]], + ['ptp_5funsupported_48',['PTP_UNSUPPORTED',['../camlib_8h.html#a9fa077df1a63de2388ae3428b9defd2fad6a32c999f672344284e734de090b18d',1,'camlib.h']]], + ['ptparray_49',['PtpArray',['../structPtpArray.html',1,'']]], + ['ptpcommand_50',['PtpCommand',['../structPtpCommand.html',1,'']]], + ['ptpconntype_51',['PtpConnType',['../camlib_8h.html#a4d84e1a866c4b0808d10dd1b7125a639',1,'camlib.h']]], + ['ptpgeneralerror_52',['PtpGeneralError',['../camlib_8h.html#a9fa077df1a63de2388ae3428b9defd2f',1,'camlib.h']]], + ['ptpgenericevent_53',['PtpGenericEvent',['../structPtpGenericEvent.html',1,'']]], + ['ptpip_5finit_5fcommand_5frequest_54',['ptpip_init_command_request',['../structPtpRuntime.html#a35ecd085b423e6312a5214b1d0573e4c',1,'PtpRuntime']]], + ['ptpip_5finit_5fevents_55',['ptpip_init_events',['../structPtpRuntime.html#aab71c60e32fb92e3c5458431006c57da',1,'PtpRuntime']]], + ['ptppropavail_56',['PtpPropAvail',['../structPtpPropAvail.html',1,'']]], + ['ptpruntime_57',['PtpRuntime',['../structPtpRuntime.html',1,'']]], + ['ptpvendors_58',['PtpVendors',['../camlib_8h.html#aa57ec9e18aa521972749b8655ca36e21',1,'camlib.h']]] ]; diff --git a/search/functions_0.js b/search/functions_0.js index 5f933c7..75a2d53 100644 --- a/search/functions_0.js +++ b/search/functions_0.js @@ -21,19 +21,18 @@ var searchData= ['ptp_5fget_5fstorage_5fids_18',['ptp_get_storage_ids',['../cl__ops_8h.html#a61bc40b52adf3c423d850587f0d368ba',1,'cl_ops.h']]], ['ptp_5fget_5fthumbnail_19',['ptp_get_thumbnail',['../structPtpRuntime.html#a1349640be24b23301f82338a4e89202e',1,'PtpRuntime']]], ['ptp_5finit_20',['ptp_init',['../structPtpRuntime.html#a13bae3755015236bc0d80f03262f8564',1,'PtpRuntime']]], - ['ptp_5fmutex_5fkeep_5flocked_21',['ptp_mutex_keep_locked',['../structPtpRuntime.html#afd673777a9471de1d465f16c570e8ed6',1,'PtpRuntime']]], - ['ptp_5fmutex_5flock_22',['ptp_mutex_lock',['../structPtpRuntime.html#a35af7e9c296ee5cdbfba5a981454f0a0',1,'PtpRuntime']]], - ['ptp_5fmutex_5funlock_23',['ptp_mutex_unlock',['../structPtpRuntime.html#aab6f6615255ef672a7170fac815c8fa3',1,'PtpRuntime']]], - ['ptp_5fmutex_5funlock_5fthread_24',['ptp_mutex_unlock_thread',['../structPtpRuntime.html#ae6f46ce011eb239897a9756d11c60d57',1,'PtpRuntime']]], - ['ptp_5fnew_25',['ptp_new',['../structPtpRuntime.html#a16ebc69184e82c377375ff8fc663339a',1,'PtpRuntime']]], - ['ptp_5fopen_5fsession_26',['ptp_open_session',['../structPtpRuntime.html#ac1f078ea0df6b7f09bba6af0643f10b5',1,'PtpRuntime']]], - ['ptp_5fperror_27',['ptp_perror',['../camlib_8h.html#a4be7b7db9e745e655b26523a9429b009',1,'camlib.h']]], - ['ptp_5fpre_5ftake_5fpicture_28',['ptp_pre_take_picture',['../structPtpRuntime.html#aa317218a1bbbd18bc3b20ae9db1624f9',1,'PtpRuntime']]], - ['ptp_5freset_29',['ptp_reset',['../structPtpRuntime.html#a2b58d078aae65e43bca41d037ccdf2d5',1,'PtpRuntime']]], - ['ptp_5fsend_30',['ptp_send',['../structPtpRuntime.html#a025478ecd387e2c1be6dfb7cc41488ea',1,'PtpRuntime']]], - ['ptp_5fsend_5fdata_31',['ptp_send_data',['../structPtpRuntime.html#a04dd3974506089f9c0b248e94b34a0ed',1,'PtpRuntime']]], - ['ptp_5fset_5fgeneric_5fproperty_32',['ptp_set_generic_property',['../structPtpRuntime.html#a14deac23d2f24cc1188c499a1255e5f9',1,'PtpRuntime']]], - ['ptp_5ftake_5fpicture_33',['ptp_take_picture',['../structPtpRuntime.html#aace66256ef8a5a751e1b1bdf38787aa1',1,'PtpRuntime']]], - ['ptpip_5finit_5fcommand_5frequest_34',['ptpip_init_command_request',['../structPtpRuntime.html#a35ecd085b423e6312a5214b1d0573e4c',1,'PtpRuntime']]], - ['ptpip_5finit_5fevents_35',['ptpip_init_events',['../structPtpRuntime.html#aab71c60e32fb92e3c5458431006c57da',1,'PtpRuntime']]] + ['ptp_5fmutex_5flock_21',['ptp_mutex_lock',['../structPtpRuntime.html#a35af7e9c296ee5cdbfba5a981454f0a0',1,'PtpRuntime']]], + ['ptp_5fmutex_5funlock_22',['ptp_mutex_unlock',['../structPtpRuntime.html#aab6f6615255ef672a7170fac815c8fa3',1,'PtpRuntime']]], + ['ptp_5fmutex_5funlock_5fthread_23',['ptp_mutex_unlock_thread',['../structPtpRuntime.html#ae6f46ce011eb239897a9756d11c60d57',1,'PtpRuntime']]], + ['ptp_5fnew_24',['ptp_new',['../structPtpRuntime.html#a16ebc69184e82c377375ff8fc663339a',1,'PtpRuntime']]], + ['ptp_5fopen_5fsession_25',['ptp_open_session',['../structPtpRuntime.html#ac1f078ea0df6b7f09bba6af0643f10b5',1,'PtpRuntime']]], + ['ptp_5fperror_26',['ptp_perror',['../camlib_8h.html#a4be7b7db9e745e655b26523a9429b009',1,'camlib.h']]], + ['ptp_5fpre_5ftake_5fpicture_27',['ptp_pre_take_picture',['../structPtpRuntime.html#aa317218a1bbbd18bc3b20ae9db1624f9',1,'PtpRuntime']]], + ['ptp_5freset_28',['ptp_reset',['../structPtpRuntime.html#a2b58d078aae65e43bca41d037ccdf2d5',1,'PtpRuntime']]], + ['ptp_5fsend_29',['ptp_send',['../structPtpRuntime.html#a025478ecd387e2c1be6dfb7cc41488ea',1,'PtpRuntime']]], + ['ptp_5fsend_5fdata_30',['ptp_send_data',['../structPtpRuntime.html#a04dd3974506089f9c0b248e94b34a0ed',1,'PtpRuntime']]], + ['ptp_5fset_5fgeneric_5fproperty_31',['ptp_set_generic_property',['../structPtpRuntime.html#a14deac23d2f24cc1188c499a1255e5f9',1,'PtpRuntime']]], + ['ptp_5ftake_5fpicture_32',['ptp_take_picture',['../structPtpRuntime.html#aace66256ef8a5a751e1b1bdf38787aa1',1,'PtpRuntime']]], + ['ptpip_5finit_5fcommand_5frequest_33',['ptpip_init_command_request',['../structPtpRuntime.html#a35ecd085b423e6312a5214b1d0573e4c',1,'PtpRuntime']]], + ['ptpip_5finit_5fevents_34',['ptpip_init_events',['../structPtpRuntime.html#aab71c60e32fb92e3c5458431006c57da',1,'PtpRuntime']]] ]; diff --git a/structPtpRuntime-members.html b/structPtpRuntime-members.html index abaafee..b079af3 100644 --- a/structPtpRuntime-members.html +++ b/structPtpRuntime-members.html @@ -132,29 +132,28 @@ ptp_init_capture(struct PtpRuntime *r, int storage_id, int object_format) (defined in PtpRuntime)PtpRuntime ptp_init_open_capture(struct PtpRuntime *r, int storage_id, int object_format) (defined in PtpRuntime)PtpRuntime ptp_move_object(struct PtpRuntime *r, int storage_id, int handle, int folder) (defined in PtpRuntime)PtpRuntime - ptp_mutex_keep_locked(struct PtpRuntime *r)PtpRuntime - ptp_mutex_lock(struct PtpRuntime *r)PtpRuntime - ptp_mutex_unlock(struct PtpRuntime *r)PtpRuntime - ptp_mutex_unlock_thread(struct PtpRuntime *r)PtpRuntime - ptp_new(int options)PtpRuntime - ptp_open_session(struct PtpRuntime *r)PtpRuntime - ptp_pre_take_picture(struct PtpRuntime *r)PtpRuntime - ptp_reset(struct PtpRuntime *r)PtpRuntime - ptp_send(struct PtpRuntime *r, struct PtpCommand *cmd)PtpRuntime - ptp_send_data(struct PtpRuntime *r, struct PtpCommand *cmd, void *data, int length)PtpRuntime - ptp_send_object_info(struct PtpRuntime *r, int storage_id, int handle, struct PtpObjectInfo *oi) (defined in PtpRuntime)PtpRuntime - ptp_set_generic_property(struct PtpRuntime *r, const char *name, int value)PtpRuntime - ptp_set_prop_value(struct PtpRuntime *r, int code, int value) (defined in PtpRuntime)PtpRuntime - ptp_set_prop_value_data(struct PtpRuntime *r, int code, void *data, int length) (defined in PtpRuntime)PtpRuntime - ptp_take_picture(struct PtpRuntime *r)PtpRuntime - ptp_terminate_open_capture(struct PtpRuntime *r, int trans) (defined in PtpRuntime)PtpRuntime - ptpip_init_command_request(struct PtpRuntime *r, const char *device_name)PtpRuntime - ptpip_init_events(struct PtpRuntime *r)PtpRuntime - response_wait_defaultPtpRuntime - session (defined in PtpRuntime)PtpRuntime - transactionPtpRuntime - userdataPtpRuntime - wait_for_responsePtpRuntime + ptp_mutex_lock(struct PtpRuntime *r)PtpRuntime + ptp_mutex_unlock(struct PtpRuntime *r)PtpRuntime + ptp_mutex_unlock_thread(struct PtpRuntime *r)PtpRuntime + ptp_new(int options)PtpRuntime + ptp_open_session(struct PtpRuntime *r)PtpRuntime + ptp_pre_take_picture(struct PtpRuntime *r)PtpRuntime + ptp_reset(struct PtpRuntime *r)PtpRuntime + ptp_send(struct PtpRuntime *r, struct PtpCommand *cmd)PtpRuntime + ptp_send_data(struct PtpRuntime *r, struct PtpCommand *cmd, void *data, int length)PtpRuntime + ptp_send_object_info(struct PtpRuntime *r, int storage_id, int handle, struct PtpObjectInfo *oi) (defined in PtpRuntime)PtpRuntime + ptp_set_generic_property(struct PtpRuntime *r, const char *name, int value)PtpRuntime + ptp_set_prop_value(struct PtpRuntime *r, int code, int value) (defined in PtpRuntime)PtpRuntime + ptp_set_prop_value_data(struct PtpRuntime *r, int code, void *data, int length) (defined in PtpRuntime)PtpRuntime + ptp_take_picture(struct PtpRuntime *r)PtpRuntime + ptp_terminate_open_capture(struct PtpRuntime *r, int trans) (defined in PtpRuntime)PtpRuntime + ptpip_init_command_request(struct PtpRuntime *r, const char *device_name)PtpRuntime + ptpip_init_events(struct PtpRuntime *r)PtpRuntime + response_wait_defaultPtpRuntime + session (defined in PtpRuntime)PtpRuntime + transactionPtpRuntime + userdataPtpRuntime + wait_for_responsePtpRuntime
      diff --git a/structPtpRuntime.html b/structPtpRuntime.html index 5e0d034..366beee 100644 --- a/structPtpRuntime.html +++ b/structPtpRuntime.html @@ -152,11 +152,8 @@   PUB void ptp_mutex_unlock_thread (struct PtpRuntime *r) - Completely unlock the mutex for the current thread, to ensure there isn't a deadlock.
      + Completely unlock the mutex for the current thread, to ensure there isn't a deadlock. This is normally used on handling errors, and when exiting a thread.
        -PUB void ptp_mutex_keep_locked (struct PtpRuntime *r) - Keep the mutex locked one more time for the current thread.
      -  PUB void ptp_mutex_lock (struct PtpRuntime *r)  Lock the IO mutex - only should be used by backend.
      @@ -619,28 +616,6 @@

      ptp_get_payload()

      Note
      Not thread safe.
      - - - -

      ◆ ptp_mutex_keep_locked()

      - -
      -
      - - - - - - - -
      PUB void ptp_mutex_keep_locked (struct PtpRuntime * r)
      -
      - -

      Keep the mutex locked one more time for the current thread.

      -
      Note
      When calling a thread-safe function, this will garuntee the mutex locked, in the case that you want to continue using the buffer. Must be unlocked or will cause deadlock.
      -
      -camlib uses a recursive mutex.
      -