technology: Remove global rfkill table

[framework/connectivity/connman.git] / src / rfkill.c

diff --git a/src/rfkill.c b/src/rfkill.c
index ad624ff..3d214ef 100644 (file)
--- a/src/rfkill.c
+++ b/src/rfkill.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2009  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -39,6 +39,8 @@ enum rfkill_type {
        RFKILL_TYPE_UWB,
        RFKILL_TYPE_WIMAX,
        RFKILL_TYPE_WWAN,
+       RFKILL_TYPE_GPS,
+       RFKILL_TYPE_FM,
 };
 
 enum rfkill_operation {
@@ -56,48 +58,77 @@ struct rfkill_event {
        uint8_t  hard;
 };
 
-static gboolean rfkill_event(GIOChannel *chan,
-                               GIOCondition cond, gpointer data)
+static enum connman_service_type convert_type(uint8_t type)
+{
+       switch (type) {
+       case RFKILL_TYPE_WLAN:
+               return CONNMAN_SERVICE_TYPE_WIFI;
+       case RFKILL_TYPE_BLUETOOTH:
+               return CONNMAN_SERVICE_TYPE_BLUETOOTH;
+       case RFKILL_TYPE_WIMAX:
+               return CONNMAN_SERVICE_TYPE_WIMAX;
+       case RFKILL_TYPE_WWAN:
+               return CONNMAN_SERVICE_TYPE_CELLULAR;
+       }
+
+       return CONNMAN_SERVICE_TYPE_UNKNOWN;
+}
+
+static GIOStatus rfkill_process(GIOChannel *chan)
 {
        unsigned char buf[32];
        struct rfkill_event *event = (void *) buf;
-       char sysname[32];
-       connman_bool_t blocked;
+       enum connman_service_type type;
        gsize len;
-       GIOError err;
+       GIOStatus status;
 
-       if (cond & (G_IO_NVAL | G_IO_HUP | G_IO_ERR))
-               return FALSE;
+       DBG("");
 
        memset(buf, 0, sizeof(buf));
 
-       err = g_io_channel_read(chan, (gchar *) buf, sizeof(buf), &len);
-       if (err) {
-               if (err == G_IO_ERROR_AGAIN)
-                       return TRUE;
-               return FALSE;
-       }
+       status = g_io_channel_read_chars(chan, (gchar *) buf,
+                       sizeof(struct rfkill_event), &len, NULL);
+
+       if (status != G_IO_STATUS_NORMAL)
+               return status;
 
        if (len != sizeof(struct rfkill_event))
-               return TRUE;
+               return status;
 
-       DBG("idx %u type %u op %u soft %u hard %u",
-                                       event->idx, event->type, event->op,
+       DBG("idx %u type %u op %u soft %u hard %u", event->idx,
+                                               event->type, event->op,
                                                event->soft, event->hard);
 
-       snprintf(sysname, sizeof(sysname) - 1, "rfkill%d", event->idx);
-
-       blocked = (event->soft || event->hard) ? TRUE : FALSE;
+       type = convert_type(event->type);
 
-       switch (event->type) {
-       case RFKILL_TYPE_ALL:
-       case RFKILL_TYPE_WLAN:
-               __connman_udev_rfkill(sysname, blocked);
+       switch (event->op) {
+       case RFKILL_OP_ADD:
+               __connman_technology_add_rfkill(event->idx, type,
+                                               event->soft, event->hard);
+               break;
+       case RFKILL_OP_DEL:
+               __connman_technology_remove_rfkill(event->idx, type);
+               break;
+       case RFKILL_OP_CHANGE:
+               __connman_technology_update_rfkill(event->idx, type,
+                                               event->soft, event->hard);
                break;
        default:
                break;
        }
 
+       return status;
+}
+
+static gboolean rfkill_event(GIOChannel *chan,
+                               GIOCondition cond, gpointer data)
+{
+       if (cond & (G_IO_NVAL | G_IO_HUP | G_IO_ERR))
+               return FALSE;
+
+       if (rfkill_process(chan) == G_IO_STATUS_ERROR)
+               return FALSE;
+
        return TRUE;
 }
 
@@ -105,6 +136,7 @@ static GIOChannel *channel = NULL;
 
 int __connman_rfkill_init(void)
 {
+       GIOFlags flags;
        int fd;
 
        DBG("");
@@ -118,6 +150,16 @@ int __connman_rfkill_init(void)
        channel = g_io_channel_unix_new(fd);
        g_io_channel_set_close_on_unref(channel, TRUE);
 
+       g_io_channel_set_encoding(channel, NULL, NULL);
+       g_io_channel_set_buffered(channel, FALSE);
+
+       flags = g_io_channel_get_flags(channel);
+       flags |= G_IO_FLAG_NONBLOCK;
+       g_io_channel_set_flags(channel, flags, NULL);
+
+       /* Process current RFKILL events sent on device open */
+       while (rfkill_process(channel) == G_IO_STATUS_NORMAL);
+
        g_io_add_watch(channel, G_IO_IN | G_IO_NVAL | G_IO_HUP | G_IO_ERR,
                                                        rfkill_event, NULL);