Replace udev rules with TI provided rules

4 files changed, 26 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 31f3241bad21..359b2f63c9c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Fri Jan 29 23:53:23 UTC 2016
+# Sat Jan 30 00:06:17 UTC 2016
 pkgbase = energia
 	pkgdesc = Energia is a Arduino IDE clone for use with the MSP430 launchpad
 	pkgver = 0017
@@ -17,9 +17,9 @@ pkgbase = energia
 	options = !strip
 	options = staticlibs
 	source = energia.desktop
-	source = 10-msp430-launchpad.rules
+	source = 71-ti-permissions.rules
 	md5sums = a7ce061d9fc0f9530e058204e532b40b
-	md5sums = 9bcbda86498c3a71b4af1309a743716d
+	md5sums = 4d16b78cdc123adeed25600803998ee9
 
 pkgname = energia
 
diff --git a/10-msp430-launchpad.rules b/10-msp430-launchpad.rules
deleted file mode 100644
index ec4c4548417b..000000000000
--- a/10-msp430-launchpad.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-ATTRS{idVendor}=="0451", ATTRS{idProduct}=="f432", GROUP="uucp", MODE="0660"
-ATTRS{idVendor}=="1cbe", ATTRS{idProduct}=="00fd", GROUP="uucp", MODE="0660"
diff --git a/71-ti-permissions.rules b/71-ti-permissions.rules
new file mode 100644
index 000000000000..9aea01387a93
--- /dev/null
+++ b/71-ti-permissions.rules
@@ -0,0 +1,20 @@
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6010", MODE:="0660"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="a6d0", MODE:="0660"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="a6d1", MODE:="0660"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="0451", ATTRS{idProduct}=="bef1", MODE:="0660"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="0451", ATTRS{idProduct}=="bef2", MODE:="0660"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="0451", ATTRS{idProduct}=="bef3", MODE:="0660"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="0451", ATTRS{idProduct}=="bef4", MODE:="0660"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="0451", ATTRS{idProduct}=="f432", MODE:="0660"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="0d28", ATTRS{idProduct}=="0204", MODE:="0660"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="1cbe", ATTRS{idProduct}=="00fd", MODE:="0660"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="1cbe", ATTRS{idProduct}=="00ff", MODE:="0660"
+
+KERNEL=="hidraw*", ATTRS{busnum}=="*", ATTRS{idVendor}=="0d28", ATTRS{idProduct}=="0204", MODE:="0660"
+
+ATTRS{idVendor}=="0451", ATTRS{idProduct}=="bef0", ENV{ID_MM_DEVICE_IGNORE}="1"
+ATTRS{idVendor}=="0c55" ,ATTRS{idProduct}=="0220", ENV{ID_MM_DEVICE_IGNORE}="1"
+
+KERNEL=="ttyACM[0-9]*",MODE:="0660"
+
+SUBSYSTEM=="usb", ATTRS{idVendor}=="0451", ATTRS{idProduct}=="c32a", MODE="0660", GROUP="uucp", RUN+="/sbin/modprobe ftdi-sio" RUN+="/bin/sh -c '/bin/echo 0451 c32a > /sys/bus/usb-serial/drivers/ftdi_sio/new_id'"
diff --git a/PKGBUILD b/PKGBUILD
index 6dbe0dfabb42..a6cbcbbcfafb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,9 +15,9 @@ provides=('energia')
 options=(!strip staticlibs)
 install='energia.install'
 source=('energia.desktop'
-        '10-msp430-launchpad.rules')
+        '71-ti-permissions.rules')
 md5sums=('a7ce061d9fc0f9530e058204e532b40b'
-         '9bcbda86498c3a71b4af1309a743716d')
+         '4d16b78cdc123adeed25600803998ee9')
 if [[ $CARCH == "x86_64" ]]; then
  source+=("$pkgname-$pkgver-$CARCH.tgz::http://energia.nu/downloads/downloadv3.php?file=energia-0101E$pkgver-linux64.tgz")
  md5sums+=('cbb348ff40c2f9d42c025eb9a6484ae2')
@@ -50,7 +50,7 @@ _patch_package_for_lock_issues() {
     ln -sf /usr/lib/librxtxSerial.so "$pkgdir/opt/energia/lib/librxtxSerial${arch}.so"
   done
   ln -sf /usr/share/java/rxtx/RXTXcomm.jar "$pkgdir/opt/energia/lib/RXTXcomm.jar"
-  install -m755 "$srcdir/10-msp430-launchpad.rules" "$pkgdir/etc/udev/rules.d/"
+  install -m755 "$srcdir/71-ti-permissions.rules" "$pkgdir/etc/udev/rules.d/"
 }
 
 _link_binary_to_bin() {