commit 0dd7ca6e87abb689700c5e3a816a949b03b1154b
author Colin Cross <ccross@android.com> Tue Apr 13 19:25:51 2010 -0700
committer Colin Cross <ccross@android.com> Tue Apr 13 22:47:08 2010 -0700
tree 4ba1db5f734afc90c08d88f91cd83e6db615e3ef
parent a866695ebe3a396a0ec411c0f99e0921c74c0fd2

init: Move device_fd to devices.c

Change-Id: I11ed0f3e1b95d2cff4fdbd80b915c01572f76b0e

init/init.c

diff --git a/init/init.c b/init/init.c
index 03656e9..4e1accf 100755
--- a/init/init.c
+++ b/init/init.c
@@ -698,7 +698,7 @@
     drain_action_queue();
 
     INFO("device init\n");
-    device_fd = device_init();
+    device_init();
 
     property_init();
     
@@ -784,7 +784,7 @@
     }
 
     /* make sure we actually have all the pieces we need */
-    if ((device_fd < 0) ||
+    if ((get_device_fd() < 0) ||
         (property_set_fd < 0) ||
         (signal_recv_fd < 0)) {
         ERROR("init startup failure\n");
@@ -803,7 +803,7 @@
         /* enable property triggers */   
     property_triggers_enabled = 1;     
 
-    ufds[0].fd = device_fd;
+    ufds[0].fd = get_device_fd();
     ufds[0].events = POLLIN;
     ufds[1].fd = property_set_fd;
     ufds[1].events = POLLIN;
@@ -869,7 +869,7 @@
         }
 
         if (ufds[0].revents == POLLIN)
-            handle_device_fd(device_fd);
+            handle_device_fd();
 
         if (ufds[1].revents == POLLIN)
             handle_property_set_fd(property_set_fd);