diff options
| author |  Jonathan Beck | 2009-03-27 16:18:43 +0100 |
|---|---|---|
| committer | Jonathan Beck | 2009-03-27 16:18:43 +0100 |
| commit | 86289b387daebfa5607435a76b15848bcb46916e (patch) | |
| tree | 7e2f71ad9b334c47e1d47a94e20ba0fe453e6d82 | |
| parent | 85b8a301be39c4b86cb7f38e80c3cb592240ccb9 (diff) | |
| parent | 443edc808d8b2e0ac8d6c497248815a5a1a5a9c9 (diff) | |
| download | libimobiledevice-86289b387daebfa5607435a76b15848bcb46916e.tar.gz libimobiledevice-86289b387daebfa5607435a76b15848bcb46916e.tar.bz2 | |
Merge branch 'master' of git://github.com/MattColyer/libiphone into contact_sync
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | udev/89-libiphone.rules (renamed from udev/89-libiphone.rules.in) | 12 | ||||
| -rw-r--r-- | udev/Makefile.am | 10 | ||||
| -rwxr-xr-x | udev/set-usb-configuration-3.sh | 3 |
4 files changed, 10 insertions, 19 deletions
@@ -56,10 +56,10 @@ code: git clone git://github.com/MattColyer/libiphone.git tickets: - http://iphone-linux.lighthouseapp.com/projects/27916-iphone-linux/tickets?q=all + http://libiphone.lighthouseapp.com/projects/27916-libiphone/tickets?q=all mailing list: http://lists.mattcolyer.com/listinfo.cgi/iphone-linux-dev-mattcolyer.com updated: - 2009-03-23 + 2009-03-25 diff --git a/udev/89-libiphone.rules.in b/udev/89-libiphone.rules index 48e9a16..0982d29 100644 --- a/udev/89-libiphone.rules.in +++ b/udev/89-libiphone.rules @@ -1,5 +1,9 @@ +ATTR{idVendor}!="05ac", GOTO="libiphone_rules_end" + # Forces iPhone 1.0, 3G and iPodTouch 1 and 2 to USB configuration 3 -KERNEL=="?-?", ATTRS{idVendor}=="05ac", ATTRS{idProduct}=="1290", ACTION=="add", RUN+="@bindir@/set-usb-configuration-3.sh" -KERNEL=="?-?", ATTRS{idVendor}=="05ac", ATTRS{idProduct}=="1291", ACTION=="add", RUN+="@bindir@/set-usb-configuration-3.sh" -KERNEL=="?-?", ATTRS{idVendor}=="05ac", ATTRS{idProduct}=="1292", ACTION=="add", RUN+="@bindir@/set-usb-configuration-3.sh" -KERNEL=="?-?", ATTRS{idVendor}=="05ac", ATTRS{idProduct}=="1293", ACTION=="add", RUN+="@bindir@/set-usb-configuration-3.sh" +KERNEL=="?-?", ATTRS{idVendor}=="05ac", ATTRS{idProduct}=="1290", ACTION=="add", ATTR{bConfigurationValue}="3" +KERNEL=="?-?", ATTRS{idVendor}=="05ac", ATTRS{idProduct}=="1291", ACTION=="add", ATTR{bConfigurationValue}="3" +KERNEL=="?-?", ATTRS{idVendor}=="05ac", ATTRS{idProduct}=="1292", ACTION=="add", ATTR{bConfigurationValue}="3" +KERNEL=="?-?", ATTRS{idVendor}=="05ac", ATTRS{idProduct}=="1293", ACTION=="add", ATTR{bConfigurationValue}="3" + +LABEL="libiphone_rules_end" diff --git a/udev/Makefile.am b/udev/Makefile.am index 27cc456..d7b8a2f 100644 --- a/udev/Makefile.am +++ b/udev/Makefile.am @@ -1,12 +1,2 @@ udevdir=$(sysconfdir)/udev/rules.d/ udev_DATA=89-libiphone.rules - -edit = sed \ - -e 's|@bindir[@]|$(bindir)|g' - -89-libiphone.rules: - rm -f $@ $@.tmp - $(edit) '$(srcdir)/$@.in' >$@.tmp - mv $@.tmp $@ - -bin_SCRIPTS = set-usb-configuration-3.sh diff --git a/udev/set-usb-configuration-3.sh b/udev/set-usb-configuration-3.sh deleted file mode 100755 index ace07f0..0000000 --- a/udev/set-usb-configuration-3.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -echo 3 > /sys$DEVPATH/bConfigurationValue |