X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-fixes/blobdiff_plain/dea0f4b0ccb139fe558e88c18547c019c934add0..882feaf4ee0f0bb6bc15a551021c37e215e943de:/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java

diff --git a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
index 6901353..f790c58 100644
--- a/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
+++ b/MS2Debounce/src/de/rmdir/ms2debounce/DebounceModuleHelper.java
@@ -4,7 +4,10 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.File;
 import java.io.FileReader;
+import java.io.FileWriter;
 import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.DataOutputStream;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -13,16 +16,35 @@ public class DebounceModuleHelper
 {
 	private Context ctx;
 	public static final String PREFS_NAME = "DebounceCfg";
+	final int SUPERUSER_REQUEST = 4223;
 
 	public DebounceModuleHelper(Context context) {
 		ctx = context;
 	}
 
+	public void setAllValues() {
+		setDelay(getSavedDelay());
+		setSettle(getSavedSettle());
+		setPoll(getSavedPoll());
+	}
+
 	public void loadModule() {
-		loadModule(getSavedDelay());
+		_loadModule();
+		setAllValues();
 	}
 
-	public synchronized void loadModule(int delay) {
+	protected void runAsRoot(String command) throws java.io.IOException,java.lang.InterruptedException {
+		Process rootcmd = Runtime.getRuntime().exec(new String[]{"su","-c","sh"});
+		DataOutputStream sh = new DataOutputStream(rootcmd.getOutputStream());
+		sh.writeBytes(command + "\n");
+		sh.writeBytes("exit\n");
+		sh.flush();
+		sh.close();
+
+		rootcmd.waitFor();
+	}
+
+	public synchronized void _loadModule() {
 		File debounce_ko = new File(ctx.getFilesDir() + "/debounce.ko");
 
 		extractModule();
@@ -35,8 +57,7 @@ public class DebounceModuleHelper
 		}
 
 		try {
-			Process insmod = Runtime.getRuntime().exec(new String[]{"su","-c","/system/bin/insmod " + debounce_ko + " debounce_delay=" + delay});
-			insmod.waitFor();
+			runAsRoot("/system/bin/insmod " + debounce_ko);
 		} catch (Exception e) {
 			return;
 		}
@@ -45,7 +66,7 @@ public class DebounceModuleHelper
 			return;
 		}
 
-		if (getDelay() <= 0) {
+		if (getDelay() < 0) {
 			return;
 		}
 
@@ -56,8 +77,7 @@ public class DebounceModuleHelper
 
 	public synchronized void unloadModule() {
 		try {
-			Process rmmod = Runtime.getRuntime().exec(new String[]{"su","-c","/system/bin/rmmod debounce"});
-			rmmod.waitFor();
+			runAsRoot("/system/bin/rmmod debounce");
 		} catch (Exception e) {}
 	}
 
@@ -82,40 +102,69 @@ public class DebounceModuleHelper
 		return loaded;
 	}
 
-	public synchronized int getDelay() {
-		int debounce_delay = -1;
+	private synchronized int getValue(String parameter) {
+		int value = -1;
 
 		try {
 			String read;
 
-			FileReader delay = new FileReader("/sys/module/debounce/parameters/debounce_delay");
-			BufferedReader delay_buf = new BufferedReader(delay);
+			FileReader fr = new FileReader("/sys/devices/debounce/" + parameter);
+			BufferedReader fbuf = new BufferedReader(fr);
 
-			read = delay_buf.readLine();
+			read = fbuf.readLine();
 			if (read != null) {
-				debounce_delay = Integer.parseInt(read.trim());
+				value = Integer.parseInt(read.trim());
 			}
+
+			fbuf.close();
 		} catch (Exception e) {}
 
-		return debounce_delay;
+		return value;
 	}
 
-	public synchronized void setDelay(int delay) {
-		if (isLoaded()) {
-			if (getDelay() == delay) {
-				return;
-			}
-
-			unloadModule();
+	private synchronized void setValue(String parameter, int value) {
+		if (!isLoaded()) {
+			return;
 		}
 
-		loadModule(delay);
+		try {
+			FileWriter fw = new FileWriter("/sys/devices/debounce/" + parameter);
+			BufferedWriter fbuf = new BufferedWriter(fw);
+
+			fbuf.write((new Integer(value)).toString());
+
+			fbuf.close();
+		} catch (Exception e) {}
+	}
+
+	public synchronized int getDelay() {
+		return getValue("debounce_delay");
+	}
+
+	public synchronized void setDelay(int debounce_delay) {
+		setValue("debounce_delay", debounce_delay);
+	}
+
+	public synchronized int getSettle() {
+		return getValue("settle_time");
+	}
+
+	public synchronized void setSettle(int settle_time) {
+		setValue("settle_time", settle_time);
+	}
+
+	public synchronized int getPoll() {
+		return getValue("poll_time");
+	}
+
+	public synchronized void setPoll(int poll_time) {
+		setValue("poll_time", poll_time);
 	}
 
 	public synchronized int getSavedDelay() {
 		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
 
-		return settings.getInt("debounce_delay", 10);
+		return settings.getInt("debounce_delay", 8);
 	}
 
 	public synchronized void setSavedDelay(int delay) {
@@ -126,11 +175,50 @@ public class DebounceModuleHelper
 		editor.commit();
 	}
 
+	public synchronized int getSavedSettle() {
+		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+		return settings.getInt("settle_time", 150);
+	}
+
+	public synchronized void setSavedSettle(int settle) {
+		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+		SharedPreferences.Editor editor = settings.edit();
+
+		editor.putInt("settle_time", settle);
+		editor.commit();
+	}
+
+	public synchronized int getSavedPoll() {
+		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+
+		return settings.getInt("poll_time", 10);
+	}
+
+	public synchronized void setSavedPoll(int poll) {
+		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+		SharedPreferences.Editor editor = settings.edit();
+
+		editor.putInt("poll_time", poll);
+		editor.commit();
+	}
+
 	public synchronized boolean is_safe_to_load() {
 		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
-		boolean safe_to_load = settings.getBoolean("safe_to_load", false);
+		return settings.getBoolean("safe_to_load", false);
+	}
+
+	public synchronized boolean get_on_boot() {
+		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+		return settings.getBoolean("on_boot", false);
+	}
 
-		return safe_to_load;
+	public synchronized void set_on_boot(boolean on_boot) {
+		SharedPreferences settings = ctx.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+		SharedPreferences.Editor editor = settings.edit();
+
+		editor.putBoolean("on_boot", on_boot);
+		editor.commit();
 	}
 
 	private synchronized void extractModule() {