wl1251: remove wl1251_ops
Now wl1271 is splitted to separate files, no need to use wl1251_ops anymore. So remove struct wl1251_chip and wl1251_ops.c. Signed-off-by: Kalle Valo <kalle.valo@nokia.com> Reviewed-by: Vidhya Govindan <vidhya.govindan@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:

committed by
John W. Linville

parent
b5ed9c1b6f
commit
0e71bb084a
@@ -143,35 +143,6 @@ struct wl1251_partition_set {
|
||||
|
||||
struct wl1251;
|
||||
|
||||
/* FIXME: I'm not sure about this structure name */
|
||||
struct wl1251_chip {
|
||||
u32 id;
|
||||
|
||||
const char *fw_filename;
|
||||
const char *nvs_filename;
|
||||
|
||||
char fw_ver[21];
|
||||
|
||||
unsigned int power_on_sleep;
|
||||
int intr_cmd_complete;
|
||||
int intr_init_complete;
|
||||
|
||||
int (*op_upload_fw)(struct wl1251 *wl);
|
||||
int (*op_upload_nvs)(struct wl1251 *wl);
|
||||
int (*op_boot)(struct wl1251 *wl);
|
||||
void (*op_set_ecpu_ctrl)(struct wl1251 *wl, u32 flag);
|
||||
void (*op_target_enable_interrupts)(struct wl1251 *wl);
|
||||
int (*op_hw_init)(struct wl1251 *wl);
|
||||
int (*op_plt_init)(struct wl1251 *wl);
|
||||
void (*op_tx_flush)(struct wl1251 *wl);
|
||||
void (*op_fw_version)(struct wl1251 *wl);
|
||||
int (*op_cmd_join)(struct wl1251 *wl, u8 bss_type, u8 dtim_interval,
|
||||
u16 beacon_interval, u8 wait);
|
||||
|
||||
struct wl1251_partition_set *p_table;
|
||||
enum wl12xx_acx_int_reg *acx_reg_table;
|
||||
};
|
||||
|
||||
struct wl1251_stats {
|
||||
struct acx_statistics *fw_stats;
|
||||
unsigned long fw_stats_update;
|
||||
@@ -307,8 +278,6 @@ struct wl1251 {
|
||||
int virtual_mem_addr;
|
||||
int virtual_reg_addr;
|
||||
|
||||
struct wl1251_chip chip;
|
||||
|
||||
int cmd_box_addr;
|
||||
int event_box_addr;
|
||||
struct boot_attr boot_attr;
|
||||
@@ -401,6 +370,9 @@ struct wl1251 {
|
||||
u32 buffer_cmd;
|
||||
u8 buffer_busyword[WL1251_BUSY_WORD_LEN];
|
||||
struct wl1251_rx_descriptor *rx_descriptor;
|
||||
|
||||
u32 chip_id;
|
||||
char fw_ver[21];
|
||||
};
|
||||
|
||||
int wl1251_plt_start(struct wl1251 *wl);
|
||||
@@ -420,16 +392,25 @@ void wl1251_disable_interrupts(struct wl1251 *wl);
|
||||
|
||||
#define WL1251_TX_QUEUE_MAX_LENGTH 20
|
||||
|
||||
/* Different chips need different sleep times after power on. WL1271 needs
|
||||
* 200ms, WL1251 needs only 10ms. By default we use 200ms, but as soon as we
|
||||
* know the chip ID, we change the sleep value in the wl1251 chip structure,
|
||||
* so in subsequent power ons, we don't waste more time then needed. */
|
||||
#define WL1251_DEFAULT_POWER_ON_SLEEP 200
|
||||
|
||||
#define CHIP_ID_1251_PG10 (0x7010101)
|
||||
#define CHIP_ID_1251_PG11 (0x7020101)
|
||||
#define CHIP_ID_1251_PG12 (0x7030101)
|
||||
#define CHIP_ID_1271_PG10 (0x4030101)
|
||||
#define CHIP_ID_1271_PG20 (0x4030111)
|
||||
|
||||
#define WL1251_FW_NAME "wl1251-fw.bin"
|
||||
#define WL1251_NVS_NAME "wl1251-nvs.bin"
|
||||
|
||||
#define WL1251_POWER_ON_SLEEP 10 /* in miliseconds */
|
||||
|
||||
#define WL1251_PART_DOWN_MEM_START 0x0
|
||||
#define WL1251_PART_DOWN_MEM_SIZE 0x16800
|
||||
#define WL1251_PART_DOWN_REG_START REGISTERS_BASE
|
||||
#define WL1251_PART_DOWN_REG_SIZE REGISTERS_DOWN_SIZE
|
||||
|
||||
#define WL1251_PART_WORK_MEM_START 0x28000
|
||||
#define WL1251_PART_WORK_MEM_SIZE 0x14000
|
||||
#define WL1251_PART_WORK_REG_START REGISTERS_BASE
|
||||
#define WL1251_PART_WORK_REG_SIZE REGISTERS_WORK_SIZE
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user