Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[linux-2.6.git] / drivers / net / wireless / b43 / rfkill.c
index 7137537..70c2fce 100644 (file)
@@ -3,7 +3,7 @@
   Broadcom B43 wireless driver
   RFKILL support
 
-  Copyright (c) 2007 Michael Buesch <mb@bu3sch.de>
+  Copyright (c) 2007 Michael Buesch <m@bues.ch>
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
 
 */
 
-#include "rfkill.h"
 #include "b43.h"
-#include "phy_common.h"
-
-#include <linux/kmod.h>
 
 
 /* Returns TRUE, if the radio is enabled in hardware. */
-static bool b43_is_hw_radio_enabled(struct b43_wldev *dev)
+bool b43_is_hw_radio_enabled(struct b43_wldev *dev)
 {
-       if (dev->phy.rev >= 3) {
-               if (!(b43_read32(dev, B43_MMIO_RADIO_HWENABLED_HI)
-                     & B43_MMIO_RADIO_HWENABLED_HI_MASK))
-                       return 1;
-       } else {
-               if (b43_read16(dev, B43_MMIO_RADIO_HWENABLED_LO)
-                   & B43_MMIO_RADIO_HWENABLED_LO_MASK)
-                       return 1;
-       }
-       return 0;
+       return !(b43_read32(dev, B43_MMIO_RADIO_HWENABLED_HI)
+               & B43_MMIO_RADIO_HWENABLED_HI_MASK);
 }
 
 /* The poll callback for the hardware button. */
-static void b43_rfkill_poll(struct input_polled_dev *poll_dev)
+void b43_rfkill_poll(struct ieee80211_hw *hw)
 {
-       struct b43_wldev *dev = poll_dev->private;
-       struct b43_wl *wl = dev->wl;
+       struct b43_wl *wl = hw_to_b43_wl(hw);
+       struct b43_wldev *dev = wl->current_dev;
        bool enabled;
-       bool report_change = 0;
+       bool brought_up = false;
 
        mutex_lock(&wl->mutex);
        if (unlikely(b43_status(dev) < B43_STAT_INITIALIZED)) {
-               mutex_unlock(&wl->mutex);
-               return;
+               if (b43_bus_powerup(dev, 0)) {
+                       mutex_unlock(&wl->mutex);
+                       return;
+               }
+               b43_device_enable(dev, 0);
+               brought_up = true;
        }
+
        enabled = b43_is_hw_radio_enabled(dev);
+
        if (unlikely(enabled != dev->radio_hw_enable)) {
                dev->radio_hw_enable = enabled;
-               report_change = 1;
                b43info(wl, "Radio hardware status changed to %s\n",
                        enabled ? "ENABLED" : "DISABLED");
+               wiphy_rfkill_set_hw_state(hw->wiphy, !enabled);
+               if (enabled != dev->phy.radio_on)
+                       b43_software_rfkill(dev, !enabled);
        }
-       mutex_unlock(&wl->mutex);
 
-       /* send the radio switch event to the system - note both a key press
-        * and a release are required */
-       if (unlikely(report_change)) {
-               input_report_key(poll_dev->input, KEY_WLAN, 1);
-               input_report_key(poll_dev->input, KEY_WLAN, 0);
+       if (brought_up) {
+               b43_device_disable(dev, 0);
+               b43_bus_may_powerdown(dev);
        }
-}
-
-/* Called when the RFKILL toggled in software. */
-static int b43_rfkill_soft_toggle(void *data, enum rfkill_state state)
-{
-       struct b43_wldev *dev = data;
-       struct b43_wl *wl = dev->wl;
-       int err = -EBUSY;
-
-       if (!wl->rfkill.registered)
-               return 0;
 
-       mutex_lock(&wl->mutex);
-       if (b43_status(dev) < B43_STAT_INITIALIZED)
-               goto out_unlock;
-       err = 0;
-       switch (state) {
-       case RFKILL_STATE_UNBLOCKED:
-               if (!dev->radio_hw_enable) {
-                       /* No luck. We can't toggle the hardware RF-kill
-                        * button from software. */
-                       err = -EBUSY;
-                       goto out_unlock;
-               }
-               if (!dev->phy.radio_on)
-                       b43_software_rfkill(dev, state);
-               break;
-       case RFKILL_STATE_SOFT_BLOCKED:
-               if (dev->phy.radio_on)
-                       b43_software_rfkill(dev, state);
-               break;
-       default:
-               b43warn(wl, "Received unexpected rfkill state %d.\n", state);
-               break;
-       }
-out_unlock:
        mutex_unlock(&wl->mutex);
-
-       return err;
-}
-
-char * b43_rfkill_led_name(struct b43_wldev *dev)
-{
-       struct b43_rfkill *rfk = &(dev->wl->rfkill);
-
-       if (!rfk->registered)
-               return NULL;
-       return rfkill_get_led_name(rfk->rfkill);
-}
-
-void b43_rfkill_init(struct b43_wldev *dev)
-{
-       struct b43_wl *wl = dev->wl;
-       struct b43_rfkill *rfk = &(wl->rfkill);
-       int err;
-
-       rfk->registered = 0;
-
-       rfk->rfkill = rfkill_allocate(dev->dev->dev, RFKILL_TYPE_WLAN);
-       if (!rfk->rfkill)
-               goto out_error;
-       snprintf(rfk->name, sizeof(rfk->name),
-                "b43-%s", wiphy_name(wl->hw->wiphy));
-       rfk->rfkill->name = rfk->name;
-       rfk->rfkill->state = RFKILL_STATE_UNBLOCKED;
-       rfk->rfkill->data = dev;
-       rfk->rfkill->toggle_radio = b43_rfkill_soft_toggle;
-       rfk->rfkill->user_claim_unsupported = 1;
-
-       rfk->poll_dev = input_allocate_polled_device();
-       if (!rfk->poll_dev) {
-               rfkill_free(rfk->rfkill);
-               goto err_freed_rfk;
-       }
-
-       rfk->poll_dev->private = dev;
-       rfk->poll_dev->poll = b43_rfkill_poll;
-       rfk->poll_dev->poll_interval = 1000; /* msecs */
-
-       rfk->poll_dev->input->name = rfk->name;
-       rfk->poll_dev->input->id.bustype = BUS_HOST;
-       rfk->poll_dev->input->id.vendor = dev->dev->bus->boardinfo.vendor;
-       rfk->poll_dev->input->evbit[0] = BIT(EV_KEY);
-       set_bit(KEY_WLAN, rfk->poll_dev->input->keybit);
-
-       err = rfkill_register(rfk->rfkill);
-       if (err)
-               goto err_free_polldev;
-
-#ifdef CONFIG_RFKILL_INPUT_MODULE
-       /* B43 RF-kill isn't useful without the rfkill-input subsystem.
-        * Try to load the module. */
-       err = request_module("rfkill-input");
-       if (err)
-               b43warn(wl, "Failed to load the rfkill-input module. "
-                       "The built-in radio LED will not work.\n");
-#endif /* CONFIG_RFKILL_INPUT */
-
-#if !defined(CONFIG_RFKILL_INPUT) && !defined(CONFIG_RFKILL_INPUT_MODULE)
-       b43warn(wl, "The rfkill-input subsystem is not available. "
-               "The built-in radio LED will not work.\n");
-#endif
-
-       err = input_register_polled_device(rfk->poll_dev);
-       if (err)
-               goto err_unreg_rfk;
-
-       rfk->registered = 1;
-
-       return;
-err_unreg_rfk:
-       rfkill_unregister(rfk->rfkill);
-err_free_polldev:
-       input_free_polled_device(rfk->poll_dev);
-       rfk->poll_dev = NULL;
-err_freed_rfk:
-       rfk->rfkill = NULL;
-out_error:
-       rfk->registered = 0;
-       b43warn(wl, "RF-kill button init failed\n");
-}
-
-void b43_rfkill_exit(struct b43_wldev *dev)
-{
-       struct b43_rfkill *rfk = &(dev->wl->rfkill);
-
-       if (!rfk->registered)
-               return;
-       rfk->registered = 0;
-
-       input_unregister_polled_device(rfk->poll_dev);
-       rfkill_unregister(rfk->rfkill);
-       input_free_polled_device(rfk->poll_dev);
-       rfk->poll_dev = NULL;
-       rfk->rfkill = NULL;
 }