Rename udev.rule and update CMakeList.txt

- rename 10-*_userspace.rules
- update Makefile and CMakeLists.txt for new naming
- add support for ft232r in CMakeList.txt

diff --git a/10-gpio_userspace.rules b/10-gpio_userspace.rules
new file mode 100755 (executable)
index 0000000..16af484
--- /dev/null
+++ b/10-gpio_userspace.rules
@@ -0,0 +1,6 @@
+# PL2303 rules to allow userspace access to the dongle
+# Copy this file to /etc/udev/rules.d, reload udev rules and replug
+
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="067b", ATTR{idProduct}=="2303", GROUP="users", MODE="0666"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="10c4", ATTR{idProduct}=="ea60", GROUP="users", MODE="0666"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", GROUP="users", MODE="0666"

diff --git a/10-pl2303_cp210x_userspace.rules b/10-pl2303_cp210x_userspace.rules
deleted file mode 100755 (executable)
index 16af484..0000000
--- a/10-pl2303_cp210x_userspace.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-# PL2303 rules to allow userspace access to the dongle
-# Copy this file to /etc/udev/rules.d, reload udev rules and replug
-
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="067b", ATTR{idProduct}=="2303", GROUP="users", MODE="0666"
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="10c4", ATTR{idProduct}=="ea60", GROUP="users", MODE="0666"
-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", GROUP="users", MODE="0666"

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b18abb..687faba 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,10 +25,18 @@ TARGET_LINK_LIBRARIES(cp2103gpio
     ${LIBUSB_LIBRARIES}
 )
 
     ${LIBUSB_LIBRARIES}
 )
 

-INSTALL(TARGETS cp2103gpio pl2303gpio
+ADD_EXECUTABLE(ft232rgpio
+    ft232r.c main.c usb.c
+)
+
+TARGET_LINK_LIBRARIES(ft232rgpio
+    ${LIBUSB_LIBRARIES}
+)
+
+INSTALL(TARGETS cp2103gpio pl2303gpio ft232rgpio

        DESTINATION bin)
         
        DESTINATION bin)
         

-INSTALL(FILES 10-pl2303_cp210x_userspace.rules
+INSTALL(FILES 10-gpio_userspace.rules

         DESTINATION /etc/udev/rules.d/)
 
 #INSTALL(CODE "execute_process(COMMAND udevadm control --reload-rules)")
         DESTINATION /etc/udev/rules.d/)
 
 #INSTALL(CODE "execute_process(COMMAND udevadm control --reload-rules)")

diff --git a/Makefile b/Makefile
index 44b6fa7..1f8280a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ install: pl2303gpio cp2103gpio ft232rgpio
        install ft232rgpio $(PREFIX)/bin
 
 install-rules: 
        install ft232rgpio $(PREFIX)/bin
 
 install-rules: 

-       cp 10-pl2303_cp210x_userspace.rules /etc/udev/rules.d
+       cp 10-gpio_userspace.rules /etc/udev/rules.d

        udevadm control --reload-rules
 
 install-scripts:
        udevadm control --reload-rules
 
 install-scripts: