Commit d3175167 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka
Browse files

iwlegacy: rename remaining IWLs to ILs 



Also rename config names IWLWIFI_LEGACY to IWLEGACY

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
parent 232913b5

drivers/net/wireless/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ obj-$(CONFIG_ADM8211) += adm8211.o 
obj-$(CONFIG_MWL8K)	+= mwl8k.o



obj-$(CONFIG_IWLWIFI)	+= iwlwifi/

obj-$(CONFIG_IWLWIFI_LEGACY)	+= iwlegacy/

obj-$(CONFIG_IWLEGACY)	+= iwlegacy/

obj-$(CONFIG_RT2X00)	+= rt2x00/



obj-$(CONFIG_P54_COMMON)	+= p54/

drivers/net/wireless/iwlegacy/Kconfig

+13 −13
Original line number Diff line number Diff line 
config IWLWIFI_LEGACY

config IWLEGACY

	tristate

	select FW_LOADER

	select NEW_LEDS
@@ -7,13 +7,13 @@ config IWLWIFI_LEGACY 
	select MAC80211_LEDS



menu "Debugging Options"

	depends on IWLWIFI_LEGACY

	depends on IWLEGACY



config IWLWIFI_LEGACY_DEBUG

	bool "Enable full debugging output in 4965 and 3945 drivers"

	depends on IWLWIFI_LEGACY

config IWLEGACY_DEBUG

	bool "Enable full debugging output in iwlegacy (iwl 3945/4965) drivers"

	depends on IWLEGACY

	---help---

	  This option will enable debug tracing output for the iwlwifilegacy

	  This option will enable debug tracing output for the iwlegacy

	  drivers.



	  This will result in the kernel module being ~100k larger.  You can
@@ -29,17 +29,17 @@ config IWLWIFI_LEGACY_DEBUG 
		  % echo 0x43fff > /sys/class/net/wlan0/device/debug_level



	  You can find the list of debug mask values in:

		  drivers/net/wireless/iwlwifilegacy/iwl-debug.h

		  drivers/net/wireless/iwlegacy/iwl-debug.h



	  If this is your first time using this driver, you should say Y here

	  as the debug information can assist others in helping you resolve

	  any problems you may encounter.



config IWLWIFI_LEGACY_DEBUGFS

        bool "4965 and 3945 debugfs support"

        depends on IWLWIFI_LEGACY && MAC80211_DEBUGFS

config IWLEGACY_DEBUGFS

        bool "iwlegacy (iwl 3945/4965) debugfs support"

        depends on IWLEGACY && MAC80211_DEBUGFS

        ---help---

	  Enable creation of debugfs files for the iwlwifilegacy drivers. This

	  Enable creation of debugfs files for the iwlegacy drivers. This

	  is a low-impact option that allows getting insight into the

	  driver's state at runtime.
@@ -48,7 +48,7 @@ endmenu 
config IWL4965

	tristate "Intel Wireless WiFi 4965AGN (iwl4965)"

	depends on PCI && MAC80211

	select IWLWIFI_LEGACY

	select IWLEGACY

	---help---

	  This option enables support for
@@ -76,7 +76,7 @@ config IWL4965 
config IWL3945

	tristate "Intel PRO/Wireless 3945ABG/BG Network Connection (iwl3945)"

	depends on PCI && MAC80211

	select IWLWIFI_LEGACY

	select IWLEGACY

	---help---

	  Select to build the driver supporting the:

drivers/net/wireless/iwlegacy/Makefile

+4 −4
Original line number Diff line number Diff line 
obj-$(CONFIG_IWLWIFI_LEGACY)	+= iwl-legacy.o

obj-$(CONFIG_IWLEGACY)	+= iwl-legacy.o

iwl-legacy-objs 		:= iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o

iwl-legacy-objs 		+= iwl-rx.o iwl-tx.o iwl-sta.o

iwl-legacy-objs 		+= iwl-scan.o iwl-led.o

iwl-legacy-$(CONFIG_IWLWIFI_LEGACY_DEBUGFS) += iwl-debugfs.o

iwl-legacy-$(CONFIG_IWLEGACY_DEBUGFS) += iwl-debugfs.o



iwl-legacy-objs += $(iwl-legacy-m)
@@ -12,11 +12,11 @@ iwl4965-objs := iwl-4965.o iwl4965-base.o iwl-4965-rs.o iwl-4965-led.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

iwl4965-$(CONFIG_IWLWIFI_LEGACY_DEBUGFS) += iwl-4965-debugfs.o

iwl4965-$(CONFIG_IWLEGACY_DEBUGFS) += iwl-4965-debugfs.o



# 3945

obj-$(CONFIG_IWL3945)	+= iwl3945.o

iwl3945-objs		:= iwl3945-base.o iwl-3945.o iwl-3945-rs.o iwl-3945-led.o

iwl3945-$(CONFIG_IWLWIFI_LEGACY_DEBUGFS) += iwl-3945-debugfs.o

iwl3945-$(CONFIG_IWLEGACY_DEBUGFS) += iwl-3945-debugfs.o



ccflags-y += -D__CHECK_ENDIAN__

drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include "iwl-core.h"

#include "iwl-debug.h"



#ifdef CONFIG_IWLWIFI_LEGACY_DEBUGFS

#ifdef CONFIG_IWLEGACY_DEBUGFS

ssize_t il3945_ucode_rx_stats_read(struct file *file, char __user *user_buf,

				    size_t count, loff_t *ppos);

ssize_t il3945_ucode_tx_stats_read(struct file *file, char __user *user_buf,

drivers/net/wireless/iwlegacy/iwl-3945-hw.h

+17 −17
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
#include "iwl-eeprom.h"



/* RSSI to dBm */

#define IWL39_RSSI_OFFSET	95

#define IL39_RSSI_OFFSET	95



/*

 * EEPROM related constants, enums, and structures.
@@ -214,7 +214,7 @@ struct il3945_eeprom { 
	u8 reserved16[172];	/* fill out to full 1024 byte block */

} __packed;



#define IWL3945_EEPROM_IMG_SIZE 1024

#define IL3945_EEPROM_IMG_SIZE 1024



/* End of EEPROM */
@@ -222,8 +222,8 @@ struct il3945_eeprom { 
#define PCI_CFG_REV_ID_BIT_RTP                      (0x80)	/* bit 7    */



/* 4 DATA + 1 CMD. There are 2 HCCA queues that are not used. */

#define IWL39_NUM_QUEUES        5

#define IWL39_CMD_QUEUE_NUM	4

#define IL39_NUM_QUEUES        5

#define IL39_CMD_QUEUE_NUM	4



#define IL_DEFAULT_TX_RETRY  15
@@ -245,27 +245,27 @@ struct il3945_eeprom { 


/* Sizes and addresses for instruction and data memory (SRAM) in

 * 3945's embedded processor.  Driver access is via HBUS_TARG_MEM_* regs. */

#define IWL39_RTC_INST_LOWER_BOUND		(0x000000)

#define IWL39_RTC_INST_UPPER_BOUND		(0x014000)

#define IL39_RTC_INST_LOWER_BOUND		(0x000000)

#define IL39_RTC_INST_UPPER_BOUND		(0x014000)



#define IWL39_RTC_DATA_LOWER_BOUND		(0x800000)

#define IWL39_RTC_DATA_UPPER_BOUND		(0x808000)

#define IL39_RTC_DATA_LOWER_BOUND		(0x800000)

#define IL39_RTC_DATA_UPPER_BOUND		(0x808000)



#define IWL39_RTC_INST_SIZE (IWL39_RTC_INST_UPPER_BOUND - \

				IWL39_RTC_INST_LOWER_BOUND)

#define IWL39_RTC_DATA_SIZE (IWL39_RTC_DATA_UPPER_BOUND - \

				IWL39_RTC_DATA_LOWER_BOUND)

#define IL39_RTC_INST_SIZE (IL39_RTC_INST_UPPER_BOUND - \

				IL39_RTC_INST_LOWER_BOUND)

#define IL39_RTC_DATA_SIZE (IL39_RTC_DATA_UPPER_BOUND - \

				IL39_RTC_DATA_LOWER_BOUND)



#define IWL39_MAX_INST_SIZE IWL39_RTC_INST_SIZE

#define IWL39_MAX_DATA_SIZE IWL39_RTC_DATA_SIZE

#define IL39_MAX_INST_SIZE IL39_RTC_INST_SIZE

#define IL39_MAX_DATA_SIZE IL39_RTC_DATA_SIZE



/* Size of uCode instruction memory in bootstrap state machine */

#define IWL39_MAX_BSM_SIZE IWL39_RTC_INST_SIZE

#define IL39_MAX_BSM_SIZE IL39_RTC_INST_SIZE



static inline int il3945_hw_valid_rtc_data_addr(u32 addr)

{

	return (addr >= IWL39_RTC_DATA_LOWER_BOUND &&

		addr < IWL39_RTC_DATA_UPPER_BOUND);

	return (addr >= IL39_RTC_DATA_LOWER_BOUND &&

		addr < IL39_RTC_DATA_UPPER_BOUND);

}



/* Base physical address of il3945_shared is provided to FH_TSSR_CBB_BASE