etc: rename script more generic.
Signed-off-by: Steve Jeong <how2soft@gmail.com>
Change-Id: Ia3cdc818a9156a4aaad346e63efdea6e32ab864b
diff --git a/Android.mk b/Android.mk
index 6f3ad98..86621b0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH := $(my-dir)
include $(CLEAR_VARS)
-LOCAL_MODULE := odroid-wpi-pwm.sh
+LOCAL_MODULE := odroid-allowuser.sh
LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
LOCAL_SRC_FILES := etc/$(LOCAL_MODULE)
diff --git a/debian/odroid-wiringpi.postrm b/debian/odroid-wiringpi.postrm
index e6d3158..2550fa7 100644
--- a/debian/odroid-wiringpi.postrm
+++ b/debian/odroid-wiringpi.postrm
@@ -5,7 +5,7 @@
case "$1" in
purge)
rm -f /etc/udev/rules.d/99-odroid-wiringpi-*
- rm -f /etc/odroid-wpi-pwm.sh
+ rm -f /etc/odroid-allowuser.sh
rm -f /etc/sudoers.d/odroid-wpi-sudoers
;;
diff --git a/etc/odroid-allowuser.sh b/etc/odroid-allowuser.sh
new file mode 100644
index 0000000..1fe695a
--- /dev/null
+++ b/etc/odroid-allowuser.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# /etc/odroid-allowuser.sh
+# written by Steve Jeong <how2soft@gmail.com>
+#
+# allow access sys node (with odroid-wiringpi gpiomem).
+# udev rules: 99-odroid-wiringpi-*.rules
+
+cutoff=0
+
+while [ ! -d "$1" ]; do
+ cutoff=$(expr ${cutoff} + 1)
+ [ ${cutoff} -gt 5 ] && break
+ sleep .1
+done
+
+chmod -R ugo+rw $1
diff --git a/etc/odroid-wpi-pwm.sh b/etc/odroid-wpi-pwm.sh
deleted file mode 100644
index 0ebd025..0000000
--- a/etc/odroid-wpi-pwm.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# /etc/odroid-wpi-pwm.sh
-# written by Steve Jeong <how2soft@gmail.com>
-#
-# allow access pwm sys node (with odroid-wiringpi gpiomem).
-# udev rules: 99-odroid-wiringpi-pwm.rules
-# param: "/sys/class/pwm/pwmchip*" default.
-
-cutoff=0
-
-while [ ! -d "$1" ]; do
- cutoff=$(expr ${cutoff} + 1)
- [ ${cutoff} -gt 5 ] && break
- sleep .1
-done
-
-chmod -R ugo+rw $1
diff --git a/etc/sudoers.d/odroid-wpi-sudoers b/etc/sudoers.d/odroid-wpi-sudoers
index d37bca4..eee432b 100644
--- a/etc/sudoers.d/odroid-wpi-sudoers
+++ b/etc/sudoers.d/odroid-wpi-sudoers
@@ -1,2 +1,2 @@
# Allow members of the odroid group change permission of wpi
-%odroid ALL = (ALL) NOPASSWD: /usr/bin/sh /etc/odroid-wpi-pwm.sh*
+%odroid ALL = (ALL) NOPASSWD: /usr/bin/sh /etc/odroid-allowuser.sh*
diff --git a/udev/rules.d/99-odroid-wiringpi-pwm.rules b/udev/rules.d/99-odroid-wiringpi-pwm.rules
index da2d183..4684a0f 100644
--- a/udev/rules.d/99-odroid-wiringpi-pwm.rules
+++ b/udev/rules.d/99-odroid-wiringpi-pwm.rules
@@ -1 +1 @@
-ACTION=="add", KERNEL=="pwmchip*", SUBSYSTEM=="pwm", RUN+="/bin/sh /etc/odroid-wpi-pwm.sh /sys/class/pwm/pwmchip*"
+ACTION=="add", KERNEL=="pwmchip*", SUBSYSTEM=="pwm", RUN+="/bin/sh /etc/odroid-allowuser.sh /sys/class/pwm/pwmchip*"
diff --git a/wiringPi/odroidc4.c b/wiringPi/odroidc4.c
index badbe78..0a53acc 100644
--- a/wiringPi/odroidc4.c
+++ b/wiringPi/odroidc4.c
@@ -427,9 +427,9 @@
sprintf(pwmPinPath[pwmPin], "%s/pwm%d", sysPwmPath, (pwmPin % 2));
strncpy(setupedPwmPinPath[pwmPin], pwmPinPath[pwmPin], (BLOCK_SIZE - 1));
#ifdef ANDROID
- sprintf(cmd, "su -s sh -c %s %s", PWM_ACCESS_SCRIPT, pwmPinPath[pwmPin]);
+ sprintf(cmd, "su -s sh -c %s %s", SYS_ACCESS_SCRIPT, pwmPinPath[pwmPin]);
#else
- sprintf(cmd, "sudo sh %s %s", PWM_ACCESS_SCRIPT, pwmPinPath[pwmPin]);
+ sprintf(cmd, "sudo sh %s %s", SYS_ACCESS_SCRIPT, pwmPinPath[pwmPin]);
#endif
inputToSysNode(sysPwmPath, "export", pwmExport);
system(cmd);
diff --git a/wiringPi/odroidm1.c b/wiringPi/odroidm1.c
index 68d40e5..4977bd2 100644
--- a/wiringPi/odroidm1.c
+++ b/wiringPi/odroidm1.c
@@ -340,9 +340,9 @@
sprintf(pwmPinPath[pwmPin], "%s/pwm%d", sysPwmPath, 0);
strncpy(setupedPwmPinPath[pwmPin], pwmPinPath[pwmPin], (BLOCK_SIZE - 1));
#ifdef ANDROID
- sprintf(cmd, "su -s sh -c %s %s", PWM_ACCESS_SCRIPT, pwmPinPath[pwmPin]);
+ sprintf(cmd, "su -s sh -c %s %s", SYS_ACCESS_SCRIPT, pwmPinPath[pwmPin]);
#else
- sprintf(cmd, "sudo sh %s %s", PWM_ACCESS_SCRIPT, pwmPinPath[pwmPin]);
+ sprintf(cmd, "sudo sh %s %s", SYS_ACCESS_SCRIPT, pwmPinPath[pwmPin]);
#endif
inputToSysNode(sysPwmPath, "export", pwmExport);
system(cmd);
diff --git a/wiringPi/odroidn2.c b/wiringPi/odroidn2.c
index f83986c..9e36015 100644
--- a/wiringPi/odroidn2.c
+++ b/wiringPi/odroidn2.c
@@ -412,9 +412,9 @@
sprintf(pwmPinPath[pwmPin], "%s/pwm%d", sysPwmPath, (pwmPin % 2));
strncpy(setupedPwmPinPath[pwmPin], pwmPinPath[pwmPin], (BLOCK_SIZE - 1));
#ifdef ANDROID
- sprintf(cmd, "su -s sh -c %s %s", PWM_ACCESS_SCRIPT, pwmPinPath[pwmPin]);
+ sprintf(cmd, "su -s sh -c %s %s", SYS_ACCESS_SCRIPT, pwmPinPath[pwmPin]);
#else
- sprintf(cmd, "sudo sh %s %s", PWM_ACCESS_SCRIPT, pwmPinPath[pwmPin]);
+ sprintf(cmd, "sudo sh %s %s", SYS_ACCESS_SCRIPT, pwmPinPath[pwmPin]);
#endif
inputToSysNode(sysPwmPath, "export", pwmExport);
system(cmd);
diff --git a/wiringPi/wiringPi.h b/wiringPi/wiringPi.h
index 585ec98..177cfa3 100644
--- a/wiringPi/wiringPi.h
+++ b/wiringPi/wiringPi.h
@@ -102,8 +102,8 @@
// Module names
#define AML_MODULE_I2C "aml_i2c"
-// syspwm
-#define PWM_ACCESS_SCRIPT "/etc/odroid-wpi-pwm.sh"
+// sysnode
+#define SYS_ACCESS_SCRIPT "/etc/odroid-allowuser.sh"
// Threads
#define PI_THREAD(X) void *X (UNU void *dummy)