iwlegacy: merge iwl-4965-led.c into 4965.c
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
This commit is contained in:
parent
61fe55f61f
commit
fc19cbde0c
|
@ -58,7 +58,6 @@
|
|||
#include "iwl-sta.h"
|
||||
#include "iwl-4965-calib.h"
|
||||
#include "iwl-4965.h"
|
||||
#include "iwl-4965-led.h"
|
||||
|
||||
|
||||
/******************************************************************************
|
||||
|
|
|
@ -44,10 +44,39 @@
|
|||
#include "iwl-helpers.h"
|
||||
#include "iwl-4965-calib.h"
|
||||
#include "iwl-sta.h"
|
||||
#include "iwl-4965-led.h"
|
||||
#include "iwl-4965.h"
|
||||
#include "iwl-4965-debugfs.h"
|
||||
|
||||
/* Send led command */
|
||||
static int
|
||||
il4965_send_led_cmd(struct il_priv *il, struct il_led_cmd *led_cmd)
|
||||
{
|
||||
struct il_host_cmd cmd = {
|
||||
.id = REPLY_LEDS_CMD,
|
||||
.len = sizeof(struct il_led_cmd),
|
||||
.data = led_cmd,
|
||||
.flags = CMD_ASYNC,
|
||||
.callback = NULL,
|
||||
};
|
||||
u32 reg;
|
||||
|
||||
reg = _il_rd(il, CSR_LED_REG);
|
||||
if (reg != (reg & CSR_LED_BSM_CTRL_MSK))
|
||||
_il_wr(il, CSR_LED_REG, reg & CSR_LED_BSM_CTRL_MSK);
|
||||
|
||||
return il_send_cmd(il, &cmd);
|
||||
}
|
||||
|
||||
/* Set led register off */
|
||||
void il4965_led_enable(struct il_priv *il)
|
||||
{
|
||||
_il_wr(il, CSR_LED_REG, CSR_LED_REG_TRUN_ON);
|
||||
}
|
||||
|
||||
const struct il_led_ops il4965_led_ops = {
|
||||
.cmd = il4965_send_led_cmd,
|
||||
};
|
||||
|
||||
static int il4965_send_tx_power(struct il_priv *il);
|
||||
static int il4965_hw_get_temperature(struct il_priv *il);
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ iwl-legacy-objs += $(iwl-legacy-m)
|
|||
|
||||
# 4965
|
||||
obj-$(CONFIG_IWL4965) += iwl4965.o
|
||||
iwl4965-objs := 4965.o 4965-mac.o iwl-4965-rs.o iwl-4965-led.o
|
||||
iwl4965-objs := 4965.o 4965-mac.o iwl-4965-rs.o
|
||||
iwl4965-objs += iwl-4965-ucode.o iwl-4965-tx.o
|
||||
iwl4965-objs += iwl-4965-lib.o iwl-4965-rx.o iwl-4965-calib.o
|
||||
iwl4965-objs += iwl-4965-sta.o iwl-4965-eeprom.o
|
||||
|
|
|
@ -1,73 +0,0 @@
|
|||
/******************************************************************************
|
||||
*
|
||||
* Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of version 2 of the GNU General Public License as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
|
||||
*
|
||||
* The full GNU General Public License is included in this distribution in the
|
||||
* file called LICENSE.
|
||||
*
|
||||
* Contact Information:
|
||||
* Intel Linux Wireless <ilw@linux.intel.com>
|
||||
* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/netdevice.h>
|
||||
#include <net/mac80211.h>
|
||||
#include <linux/etherdevice.h>
|
||||
#include <asm/unaligned.h>
|
||||
|
||||
#include "iwl-commands.h"
|
||||
#include "iwl-dev.h"
|
||||
#include "iwl-core.h"
|
||||
#include "iwl-io.h"
|
||||
#include "iwl-4965-led.h"
|
||||
|
||||
/* Send led command */
|
||||
static int
|
||||
il4965_send_led_cmd(struct il_priv *il, struct il_led_cmd *led_cmd)
|
||||
{
|
||||
struct il_host_cmd cmd = {
|
||||
.id = REPLY_LEDS_CMD,
|
||||
.len = sizeof(struct il_led_cmd),
|
||||
.data = led_cmd,
|
||||
.flags = CMD_ASYNC,
|
||||
.callback = NULL,
|
||||
};
|
||||
u32 reg;
|
||||
|
||||
reg = _il_rd(il, CSR_LED_REG);
|
||||
if (reg != (reg & CSR_LED_BSM_CTRL_MSK))
|
||||
_il_wr(il, CSR_LED_REG, reg & CSR_LED_BSM_CTRL_MSK);
|
||||
|
||||
return il_send_cmd(il, &cmd);
|
||||
}
|
||||
|
||||
/* Set led register off */
|
||||
void il4965_led_enable(struct il_priv *il)
|
||||
{
|
||||
_il_wr(il, CSR_LED_REG, CSR_LED_REG_TRUN_ON);
|
||||
}
|
||||
|
||||
const struct il_led_ops il4965_led_ops = {
|
||||
.cmd = il4965_send_led_cmd,
|
||||
};
|
|
@ -1,33 +0,0 @@
|
|||
/******************************************************************************
|
||||
*
|
||||
* Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of version 2 of the GNU General Public License as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
|
||||
*
|
||||
* The full GNU General Public License is included in this distribution in the
|
||||
* file called LICENSE.
|
||||
*
|
||||
* Contact Information:
|
||||
* Intel Linux Wireless <ilw@linux.intel.com>
|
||||
* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#ifndef __il_4965_led_h__
|
||||
#define __il_4965_led_h__
|
||||
|
||||
extern const struct il_led_ops il4965_led_ops;
|
||||
void il4965_led_enable(struct il_priv *il);
|
||||
|
||||
#endif /* __il_4965_led_h__ */
|
|
@ -279,4 +279,6 @@ int il4965_mac_sta_add(struct ieee80211_hw *hw,
|
|||
void il4965_mac_channel_switch(struct ieee80211_hw *hw,
|
||||
struct ieee80211_channel_switch *ch_switch);
|
||||
|
||||
void il4965_led_enable(struct il_priv *il);
|
||||
|
||||
#endif /* __il_4965_h__ */
|
||||
|
|
Loading…
Reference in a new issue