From 9e9b149ddcd2f3fc6ab080483926c3a3ef6cc799 Mon Sep 17 00:00:00 2001 From: axxel Date: Mon, 30 Sep 2024 21:27:12 +0200 Subject: [PATCH] ptp2: work around an apparent firmware bug in the R5m2 causing it to hang --- camlibs/ptp2/ptp.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/camlibs/ptp2/ptp.h b/camlibs/ptp2/ptp.h index ecb463b06..633552281 100644 --- a/camlibs/ptp2/ptp.h +++ b/camlibs/ptp2/ptp.h @@ -4829,6 +4829,11 @@ ptp_operation_issupported(PTPParams* params, uint16_t operation) { uint32_t i=0; + /* The R5m2 fails to send a PTP response packet after the data packet of the GetDeviceInfoEx. + * This seems to be firmware bug present in version 1.0.0 and 1.0.1. See #1028. */ + if (operation == PTP_OC_CANON_EOS_GetDeviceInfoEx && !strcmp(params->deviceinfo.Model,"Canon EOS R5m2")) + return 0; + for (;ideviceinfo.OperationsSupported_len;i++) { if (params->deviceinfo.OperationsSupported[i]==operation) return 1;