Commit Graph

8267 Commits

Author SHA1 Message Date
Hans de Goede
a4d1b6497f usbscsi: Switch from lockdev to flock
Currently there are 2 problems with the lockdev usage in usbscsi:
1) It breaks usbscsi completely due to a missing symbol when dlopening
   usbscsi.so, which is caused by libgphoto2_port/usbscsi/Makefile-files not
   adding $(SERIAL_LIBS) to usbscsi_la_LIBADD
2) lockdev uses /var/lock/lockdev, which by default is:
   drwxrwxr-x. 2 root lock 40 Sep 19 22:49 /var/lock/lockdev
   So despite our udev rules, gphoto using apps need to run as
   root (or group lockdev) to be able to work with usbscsi port devices

I've decided to fix 2) by moving to flock, lockdev makes sense for serial
ports, since other programs may be trying to access them at the same time,
for usbscsi however we only need to coordinate with other apps also using
libgphoto2, and flock then suffices, is much simpler and does not have
the rights issues of lockdev. This fix for 2), also fixes 1) by simply no
longer needing lockdev.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14114 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-09-19 21:41:34 +00:00
Hans de Goede
739a14749f ax203: Add support for SST25VF0?? spi eeproms
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14110 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-09-19 21:02:32 +00:00
Hans de Goede
e4c4f316f1 ax203: add ax203_get_checksum() function
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14109 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-09-19 20:59:54 +00:00
Hans de Goede
8cc4260c8b usbscsi: Increase the timeout
This is necessary for some ax203 devices where the spi flashing is offloaded
to the firmware, and this can take (much) longer then our old timeout.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14108 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-09-19 20:54:57 +00:00
Marcus Meissner
867d229494 disable olympus-wrap until done
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14107 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-09-19 12:06:19 +00:00
Hans de Goede
0afebd1e05 ax203: ax203_send_eeprom_cmd() add extra_arg
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14105 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-09-18 10:08:03 +00:00
Hans de Goede
21580e9885 Document ax206 checksum command
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14103 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-09-18 09:44:28 +00:00
Marcus Meissner
44bfd1a15e updated dutch
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14099 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-09-16 10:40:51 +00:00
Marcus Meissner
bb4203748e updated dutch, slovakian, vietnamese, danish
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14098 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-09-09 21:45:41 +00:00
Marcus Meissner
bbb1dbc17d updated vietnamese, ukrainian, danish
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14097 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-09-09 21:40:38 +00:00
Marcus Meissner
a320fd9479 added nikon d800e
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14096 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-09-05 07:17:16 +00:00
Marcus Meissner
565c846a50 added D800E id
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14095 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-09-05 06:35:53 +00:00
Marcus Meissner
27c1fca503 added some ids foudn out by t.ludewig
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14094 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-08-13 15:53:37 +00:00
Marcus Meissner
da32d22d13 added eos650d data
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14093 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-08-13 15:30:55 +00:00
Marcus Meissner
f88ad56593 added nikon j1
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14092 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-08-12 19:17:48 +00:00
Marcus Meissner
6226d11e86 added s2950
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14091 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-08-12 15:57:30 +00:00
Marcus Meissner
c0c78451a2 added serial_libs to get -llockdev
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14090 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-08-12 14:00:54 +00:00
Marcus Meissner
f716e291a5 added missing argument to gp_log
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14089 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-08-12 13:59:04 +00:00
Marcus Meissner
ad57fb4d84 umm, fixed uninitialized class variable match.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14085 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-08-01 21:36:04 +00:00
Marcus Meissner
bafaf42699 2.5.0.1 tempsnapshot
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14084 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-08-01 20:09:26 +00:00
Marcus Meissner
bda48da2d8 added olympus-wrap.[ch]
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14083 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-08-01 19:45:39 +00:00
Marcus Meissner
a1a13b016c hold devs/descs alongside the private context
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14082 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-08-01 15:49:44 +00:00
Marcus Meissner
5d4e3b1c3f the devices are freed a bit up
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14080 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-08-01 15:04:24 +00:00
Marcus Meissner
b6de622204 moved doc comment
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14078 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-08-01 14:38:08 +00:00
Marcus Meissner
0a7da52048 make libusb0 or libusb1 optional
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14077 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-08-01 13:54:38 +00:00
Marcus Meissner
3a8918c003 set gp_devs and gp_nrofdevs to 0 after free, otherwise
we reuse the freed area


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14076 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-08-01 12:10:21 +00:00
Marcus Meissner
33d093e72e updated vietnamese
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14073 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-07-29 08:28:12 +00:00
Marcus Meissner
0c30b5f468 updated polish
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14072 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-07-29 08:27:00 +00:00
Marcus Meissner
028ba052ce updated vietnamese, ukrain, russian
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14071 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-07-29 08:26:30 +00:00
Marcus Meissner
c870d6ae13 updated polish and vietnamese
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14070 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-07-29 08:24:30 +00:00
Marcus Meissner
64b2443599 added A800 powersnot id
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14068 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-07-23 12:59:19 +00:00
Marcus Meissner
2cf518a3ab backmerged start of olympus support from branch
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14067 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-07-23 09:25:51 +00:00
Marcus Meissner
42d8ef8222 do not use the global context to avoid crashes
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14066 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-07-19 16:52:14 +00:00
Marcus Meissner
2a850febba added also k200d id
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14064 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-07-15 17:44:12 +00:00
Marcus Meissner
70ce85b537 added k-5 id (weird enough not in the pentax namespace)
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14063 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-07-15 17:35:59 +00:00
Marcus Meissner
192d3bab16 added k10d and k100d usb ids
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14062 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-07-15 17:23:14 +00:00
Marcus Meissner
366010df63 merged improvements to EOS Shutter press code (also renamed)
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14061 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-07-12 18:22:30 +00:00
Marcus Meissner
a335d50aef libgphoto2 2.5 release
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14052 67ed7778-7388-44ab-90cf-0a291f65f57c
libgphoto2-2_5_0-release
2012-07-10 07:39:53 +00:00
Marcus Meissner
56cb651470 updated regarding ptp
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14051 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-07-10 07:36:10 +00:00
Marcus Meissner
6b5768bbd9 adjustments for 2.5
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14049 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-07-10 07:04:44 +00:00
Marcus Meissner
be5d3be8af adjust to libgphoto2 2.5 version
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14048 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-07-10 06:56:15 +00:00
Marcus Meissner
63ba7fb3de added GP_PORT_USB_SCSI case
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14047 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-07-10 05:49:23 +00:00
Marcus Meissner
a81f4bb86c ptp_strerror split off
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14043 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-07-03 07:26:38 +00:00
Marcus Meissner
a6beb52b44 retrieve root handle 0 for all storages, after
wildcarding. Helps Samsung Galaxy


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14042 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-06-22 16:00:35 +00:00
Marcus Meissner
d070ab9547 added nikon v1
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14041 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-06-21 14:25:11 +00:00
Marcus Meissner
a57472b74c added first getfilesystemmanifest code
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14040 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-06-21 14:24:35 +00:00
Marcus Meissner
4e949772ac added nikon v1 info
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14039 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-06-21 14:21:56 +00:00
Marcus Meissner
22f17a3f1c replace incorrect strncpy by strcpy
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14038 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-06-08 20:22:24 +00:00
Marcus Meissner
e29e45b8f8 some test fixes for trunk
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14034 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-06-03 18:22:50 +00:00
Marcus Meissner
191ffd36b8 added serbian
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14033 67ed7778-7388-44ab-90cf-0a291f65f57c
2012-06-03 11:59:04 +00:00