UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iwlegacy: merge iwl-power.h into common.h 

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
This commit is contained in:
Stanislaw Gruszka 2011-08-31 13:53:04 +02:00
parent 3fbbf9a808
commit 99412002a0
5 changed files with 12 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/iwlegacy/3945.h
View File

@ -37,7 +37,6 @@ extern const struct pci_device_id il3945_hw_card_ids[];
#include "common.h"
#include "iwl-prph.h"
#include "iwl-debug.h"
#include "iwl-power.h"
#include "iwl-led.h"
#include "iwl-eeprom.h"

2
drivers/net/wireless/iwlegacy/commands.h
View File

@ -64,6 +64,8 @@
#ifndef __il_commands_h__
#define __il_commands_h__
#include <linux/ieee80211.h>
struct il_priv;
/* uCode version contains 4 values: Major/Minor/API/Serial */

1
drivers/net/wireless/iwlegacy/common.c
View File

@ -43,7 +43,6 @@
#include "iwl-eeprom.h"
#include "iwl-debug.h"
#include "common.h"
#include "iwl-power.h"
const char *il_get_cmd_string(u8 cmd)
{

11
drivers/net/wireless/iwlegacy/common.h
View File

@ -33,12 +33,12 @@
#include <linux/wait.h>
#include <net/ieee80211_radiotap.h>
#include "commands.h"
#include "iwl-eeprom.h"
#include "csr.h"
#include "iwl-prph.h"
#include "iwl-debug.h"
#include "iwl-led.h"
#include "iwl-power.h"
struct il_host_cmd;
struct il_cmd;
@ -938,6 +938,13 @@ struct il_rxon_context {
} ht;
};
struct il_power_mgr {
struct il_powertable_cmd sleep_cmd;
struct il_powertable_cmd sleep_cmd_next;
int debug_sleep_level_override;
bool pci_pm;
};
struct il_priv {
/* ieee device used by generic ieee processing code */
@ -2996,4 +3003,6 @@ extern int il3945_rate_control_register(void);
extern void il4965_rate_control_unregister(void);
extern void il3945_rate_control_unregister(void);
extern int il_power_update_mode(struct il_priv *il, bool force);
extern void il_power_initialize(struct il_priv *il);
#endif /* __il_core_h__ */

55
drivers/net/wireless/iwlegacy/iwl-power.h
View File

@ -1,55 +0,0 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2011 Intel Corporation. All rights reserved.
*
* Portions of this file are derived from the ipw3945 project, as well
* as portions of the ieee80211 subsystem header files.
*
* 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_power_setting_h__
#define __il_power_setting_h__
#include "commands.h"
enum il_power_level {
IL_POWER_IDX_1,
IL_POWER_IDX_2,
IL_POWER_IDX_3,
IL_POWER_IDX_4,
IL_POWER_IDX_5,
IL_POWER_NUM
};
struct il_power_mgr {
struct il_powertable_cmd sleep_cmd;
struct il_powertable_cmd sleep_cmd_next;
int debug_sleep_level_override;
bool pci_pm;
};
int
il_power_set_mode(struct il_priv *il, struct il_powertable_cmd *cmd,
bool force);
int il_power_update_mode(struct il_priv *il, bool force);
void il_power_initialize(struct il_priv *il);
#endif /* __il_power_setting_h__ */