Commit: adbd6c30a6e37938e5c0f3b0699f4a5990209f13 - system-core (git)

system/core

Commit MetaInfo

• Revision: adbd6c30a6e37938e5c0f3b0699f4a5990209f13 (tree)
• Zeit: 2010-02-27 16:12:49
• Autor: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

hotplug.c: handle add bluetooth rfkill events

Change the permission and owner of state to be bluetooth service accessible.

Ändern Zusammenfassung

• modified: toolbox/hotplug.c

Diff

--- a/toolbox/hotplug.c
+++ b/toolbox/hotplug.c
@@ -1,7 +1,7 @@
 /*
  * Simple hotplug tool
  *
- * by Chih-Wei Huang <[e-mail]>  2009/08/03
+ * by Chih-Wei Huang <[e-mail]>  2009/11/06
  *
  */
 
@@ -12,6 +12,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "private/android_filesystem_config.h"
+
 #define HOTPLUG_LOG	"/tmp/hotplug.log"
 #define FIRMWARE_PATH	"/system/lib/firmware"
 
@@ -46,8 +48,7 @@ static int load_firmware()
 				goto clean3;
 			}
 	}
-	if (write(loading_fd, "0", 1) == 1)
-		ret = 0;
+	ret = !(write(loading_fd, "0", 1) == 1);
 
   clean3:
 	close(data_fd);
@@ -59,6 +60,25 @@ static int load_firmware()
 	return ret;
 }
 
+static int set_rfkill()
+{
+	int ret = -1;
+	if (strcmp(getenv("RFKILL_TYPE"), "bluetooth") == 0) {
+		chdir("/sys");
+		chdir(getenv("DEVPATH") + 1);
+		ret = chown("state", AID_BLUETOOTH, AID_BLUETOOTH);
+		ret |= chmod("state", S_IRUSR|S_IRGRP|S_IWUSR|S_IWGRP);
+#if 0 /* we may not need the hack */
+		if (!strncmp(getenv("RFKILL_NAME"), "hci", 3) && !strcmp(getenv("RFKILL_STATE"), "0")) {
+			int fd = open("state", O_WRONLY);
+			if (fd >= 0)
+				ret |= !(write(fd, "1", 1) == 1);
+		}
+#endif
+	}
+	return ret;
+}
+
 int hotplug_main(int argc, char **argv)
 {
 	int ret = -1;
@@ -88,6 +108,8 @@ int hotplug_main(int argc, char **argv)
 		if (strcmp(action, "add") == 0) {
 			if (strcmp(argv[1], "firmware") == 0)
 				ret = load_firmware();
+			else if (strcmp(argv[1], "rfkill") == 0)
+				ret = set_rfkill();
 		}
 	}
 	return ret;