diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2017-03-10 14:40:52 +0100 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2017-03-10 14:40:52 +0100 |
| commit | c4db6362b35c8c9455452696a8c1537ab1556c5e (patch) | |
| tree | 964b040d118da0517fec1a570c9db22865634394 | |
| parent | 0bce32b1dd7e9575f9d8d8b7daa892f2a3e7b9ff (diff) | |
| download | libgphoto2-c4db6362b35c8c9455452696a8c1537ab1556c5e.tar.gz | |
apple iphone storage hack: fixed the detection
| -rw-r--r-- | camlibs/ptp2/library.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index e1ee7f166..539b740a1 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -7982,7 +7982,11 @@ camera_init (Camera *camera, GPContext *context) gp_port_get_timeout (camera->port, &timeout); gp_port_set_timeout (camera->port, 3000); while (tries--) { - if (params->storageids.n && ((params->storageids.Storage[0] & 0xffff0000) != 0x00010000)) + /* 0xfeedface and 0x00000000 seem bad storageid values for iPhones */ + if (params->storageids.n && ( + (params->storageids.Storage[0] != 0xfeedface) && + (params->storageids.Storage[0] != 0x00000000) + )) break; C_PTP_REP (ptp_wait_event (params)); while (ptp_get_one_event (params, &event)) { |