提交: f7631d3a9c500aeed76bc5d984e4cc688f803e3c - system-core (git)

system/core

Commit MetaInfo

• 修订版: f7631d3a9c500aeed76bc5d984e4cc688f803e3c (tree)
• 时间: 2009-11-14 04:44:00
• 作者: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

vold: rfkill bootstrapping

Simulate rfkill add uevents to change permission of bluetooth devices on boot.
This is better since it works after suspend and wakeup.

Also revert back rfkill handling in hotplug.

更改概述

• modified: toolbox/hotplug.c
• modified: vold/Android.mk
• modified: vold/misc.c
• add: vold/rfkill.c
• modified: vold/uevent.c
• modified: vold/usbdrive.c
• modified: vold/vold.c
• modified: vold/vold.h
• modified: vold/volmgr.c

差异

--- a/toolbox/hotplug.c
+++ b/toolbox/hotplug.c
@@ -1,7 +1,13 @@
 /*
  * Simple hotplug tool
  *
- * by Chih-Wei Huang <[e-mail]>  2009/11/06
+ * Copyright (C) 2009 The Android-x86 Open Source Project
+ *
+ * Author: Chih-Wei Huang <[e-mail]>
+ *
+ * Licensed under the Apache License, Version 2.0.
+ *
+ * Last updated: 2009/11/14
  *
  */
 
@@ -12,8 +18,6 @@
 #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"
 
@@ -60,25 +64,6 @@ 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;
@@ -108,8 +93,6 @@ 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;

--- a/vold/Android.mk
+++ b/vold/Android.mk
@@ -3,7 +3,7 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:=                \
-                  vold.c       \
+                  vold.c         \
                   cmd_dispatch.c \
                   uevent.c       \
                   mmc.c          \
@@ -19,6 +19,7 @@ LOCAL_SRC_FILES:=                \
                   logwrapper.c   \
                   ProcessKiller.c\
                   switch.c       \
+                  rfkill.c       \
                   format.c       \
                   devmapper.c
 

--- a/vold/misc.c
+++ b/vold/misc.c
@@ -27,9 +27,9 @@
 
 void *read_file(char *filename, ssize_t *_size)
 {
-	int ret, fd;
+	int fd;
 	struct stat sb;
-	ssize_t size;
+	ssize_t size, ret;
 	void *buffer = NULL;
 
 	/* open the file */
@@ -43,12 +43,13 @@ void *read_file(char *filename, ssize_t *_size)
 	size = sb.st_size;
 
 	/* allocate memory for it to be read into */
-	buffer = malloc(size);
+	buffer = malloc(size + 1);
 	if (!buffer)
 		goto bail;
 
 	/* slurp it into our buffer */
 	ret = read(fd, buffer, size);
+	((char *)buffer)[ret] = '\0';
 	if (ret != size)
 		goto bail;
 

--- /dev/null
+++ b/vold/rfkill.c
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2009 The Android-x86 Open Source Project
+ *
+ * Author: Chih-Wei Huang <[e-mail]>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "vold.h"
+
+#include <dirent.h>
+#include <errno.h>
+
+#define DEBUG_RFKILL_BOOTSTRAP 0
+
+#define SYSFS_CLASS_RFKILL_PATH "/sys/class/rfkill"
+
+/*
+ * Bootstrap rfkill interfaces
+ */
+int rfkill_bootstrap()
+{
+    DIR *d;
+    struct dirent *de;
+
+    if (!(d = opendir(SYSFS_CLASS_RFKILL_PATH))) {
+        LOG_ERROR("Unable to open '%s' (%s)", SYSFS_CLASS_RFKILL_PATH,
+                strerror(errno));
+        return -errno;
+    }
+
+    while ((de = readdir(d)))
+        if (de->d_name[0] != '.') {
+            char path[SYSFS_PATH_MAX];
+            sprintf(path, "%s/%s", SYSFS_CLASS_RFKILL_PATH, de->d_name);
+#if DEBUG_RFKILL_BOOTSTRAP
+            LOG_VOL("Simulate add: %s", de->d_name);
+#endif
+            if (simulate_add_device("rfkill", path + 4)) {
+                LOG_ERROR("Simulate add device %s error: %s", path,
+                        strerror(errno));
+            }
+        }
+
+    closedir(d);
+    return 0;
+}

--- a/vold/uevent.c
+++ b/vold/uevent.c
@@ -30,6 +30,8 @@
 #include "volmgr.h"
 #include "media.h"
 
+#include "private/android_filesystem_config.h"
+
 #define DEBUG_UEVENT 1
 
 #define UEVENT_PARAMS_MAX 32
@@ -62,6 +64,7 @@ static int handle_block_event(struct uevent *);
 static int handle_bdi_event(struct uevent *);
 static void _cb_blkdev_ok_to_destroy(blkdev_t *dev);
 static int handle_scsi_event(struct uevent *event);
+static int handle_rfkill_event(struct uevent *event);
 
 static struct uevent_dispatch dispatch_table[] = {
     { "switch", handle_switch_event }, 
@@ -71,6 +74,7 @@ static struct uevent_dispatch dispatch_table[] = {
     { "bdi", handle_bdi_event },
     { "power_supply", handle_powersupply_event },
     { "scsi", handle_scsi_event },
+    { "rfkill", handle_rfkill_event },
     { NULL, NULL }
 };
 
@@ -135,7 +139,7 @@ int process_uevent_message(int socket)
     return rc;
 }
 
-int simulate_uevent(char *subsys, char *path, char *action, char **params)
+int simulate_uevent(const char *subsys, const char *path, const char *action, char **params)
 {
     struct uevent *event;
     char tmp[255];
@@ -174,6 +178,28 @@ int simulate_uevent(char *subsys, char *path, char *action, char **params)
     return rc;
 }
 
+int simulate_add_device(const char *subsys, const char *path)
+{
+    int i;
+    char line[1024];
+    char devpath[SYSFS_PATH_MAX] = "DEVPATH=";
+    char *uevent, *saveptr, *uevent_params[UEVENT_PARAMS_MAX];
+
+    if (!read_sysfs_var(line, sizeof(line), path, "uevent")) {
+        LOGE("Unable to open '/sys%s/%s' (%s)", path, "uevent", strerror(errno));
+        return -errno;
+    }
+
+    strcat(devpath, path);
+    uevent_params[0] = devpath;
+    for (i = 1, uevent = line; i < UEVENT_PARAMS_MAX - 1; ++i, uevent = NULL)
+        if (!(uevent_params[i] = strtok_r(uevent, "\n", &saveptr)))
+            break;
+    uevent_params[i] = NULL;
+
+    return simulate_uevent(subsys, path, "add", uevent_params);
+}
+
 static int dispatch_uevent(struct uevent *event)
 {
     int i;
@@ -244,7 +270,7 @@ static char *get_uevent_param(struct uevent *event, char *param_name)
     }
 
     LOGE("get_uevent_param(): No parameter '%s' found", param_name);
-    return NULL;
+    return ""; /* return a valid pointer to avoid checking */
 }
 
 /*
@@ -466,6 +492,21 @@ static int handle_scsi_event(struct uevent *event)
     return 0;
 }
 
+static int handle_rfkill_event(struct uevent *event)
+{
+    if (event->action == action_add) {
+        const char *type = get_uevent_param(event, "RFKILL_TYPE");
+        if (!strncmp(type, "bluetooth", 9)) {
+            char path[SYSFS_PATH_MAX];
+            snprintf(path, sizeof(path), "/sys%s/state", event->path);
+            chown(path, AID_BLUETOOTH, AID_BLUETOOTH);
+            chmod(path, S_IRUSR|S_IRGRP|S_IWUSR|S_IWGRP);
+            LOG_VOL("Change permission for %s", path);
+        }
+    }
+    return 0;
+}
+
 static void _cb_blkdev_ok_to_destroy(blkdev_t *dev)
 {
     media_t *media = media_lookup_by_dev(dev);

--- a/vold/usbdrive.c
+++ b/vold/usbdrive.c
@@ -253,32 +253,5 @@ static int usb_bootstrap_sdx(const char *sysfs_path)
 
 static int usb_bootstrap_sdx_partition(const char *sysfs_path)
 {
-    int i;
-    char *uevent_params[5];
-    char tmp[SYSFS_PATH_MAX];
-    FILE *fp;
-    char line[1024];
-    char *uevent, *saveptr;
-    const char *devpath = sysfs_path + 4;
-
-#if DEBUG_USB_BOOTSTRAP
-    LOG_VOL("usb_bootstrap_sdx_partition(%s):", devpath);
-#endif
-
-    if (!read_sysfs_var(line, sizeof(line), devpath, "uevent")) {
-        LOGE("Unable to open '%s/%s' (%s)", sysfs_path, "uevent", strerror(errno));
-        return -errno;
-    }
-    sprintf(tmp, "DEVPATH=%s", devpath);
-    uevent_params[0] = tmp;
-    for (i = 1, uevent = line; i < 4; ++i, uevent = NULL)
-        if (!(uevent_params[i] = strtok_r(uevent, "\n", &saveptr)))
-            break;
-    uevent_params[i] = NULL;
-
-    if (simulate_uevent("block", tmp + 8, "add", uevent_params) < 0) {
-        LOGE("Error simulating uevent (%s)", strerror(errno));
-        return -errno;
-    }
-    return 0;
+    return simulate_add_device("block", sysfs_path + 4);
 }

--- a/vold/vold.c
+++ b/vold/vold.c
@@ -123,10 +123,14 @@ int main(int argc, char **argv)
     // Switch
     switch_bootstrap();
 
+    // Rfkill interfaces
+    rfkill_bootstrap();
+
     bootstrap = 0;
 
-    //USB drive
+    // USB drive
     usb_bootstrap();
+
     /*
      * Main loop
      */

--- a/vold/vold.h
+++ b/vold/vold.h
@@ -81,7 +81,8 @@ int process_inotify_event(int fd);
 int inotify_bootstrap(void);
 
 int process_uevent_message(int socket);
-int simulate_uevent(char *subsystem, char *path, char *action, char **params);
+int simulate_uevent(const char *subsys, const char *path, const char *action, char **params);
+int simulate_add_device(const char *subsys, const char *path);
 
 int mmc_bootstrap(void);
 int usb_bootstrap(void);
@@ -91,6 +92,8 @@ int volmgr_bootstrap(void);
 
 int switch_bootstrap(void);
 
+int rfkill_bootstrap(void);
+
 void *read_file(char *filename, ssize_t *_size);
 char *truncate_sysfs_path(char *path, int num_elements_to_remove, char *buffer, int buffer_size);
 char *read_sysfs_var(char *buffer, size_t maxlen, const char *devpath, const char *var);

--- a/vold/volmgr.c
+++ b/vold/volmgr.c
@@ -101,6 +101,7 @@ static boolean _check_mounted(const char *mp, int idx)
     char rest[256];
     FILE *fp;
     char line[1024];
+    const char *devname;
     boolean ret = false;
 
     if (mp == NULL)
@@ -113,18 +114,17 @@ static boolean _check_mounted(const char *mp, int idx)
 
     while (fgets(line, sizeof(line), fp)) {
         sscanf(line, "%255s %255s %255s\n", device, mount_path, rest);
-        if (idx == 1) {
-            char *devname = strrchr(device, '/');
-            if (!devname || strcmp(++devname, mp))
-                continue;
-        } else if (idx == 2) {
-            if (strcmp(mount_path, mp))
-                continue;
-        }
+        if (idx == 1)
+            ret = (devname = strrchr(device, '/')) && !strcmp(++devname, mp);
+        else if (idx == 2)
+            ret = !strcmp(mount_path, mp);
+        else
+            break;
 
-        LOGI("%s is already mounted", mp);
-        ret = true;
-        break;
+        if (ret) {
+            LOGI("%s is already mounted", mp);
+            break;
+        }
     }
 
     fclose(fp);