Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a862322 authored by Xinming Hu's avatar Xinming Hu Committed by Kalle Valo
Browse files

mwifiex: keep original structure in decl header file 



memory_type_mapping strucuture did not refer to other mwifiex
specific strture. A better software design method would keep
it in decl header file, which does not include other mwifiex
header file.

Signed-off-by: default avatarXinming Hu <huxm@marvell.com>
Signed-off-by: default avatarCathy Luo <cluo@marvell.com>
Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 0172404d

drivers/net/wireless/marvell/mwifiex/decl.h

+21 −0
Original line number Diff line number Diff line
@@ -270,4 +270,25 @@ struct mwifiex_11h_intf_state { 
	bool is_11h_enabled;

	bool is_11h_active;

} __packed;



#define MWIFIEX_FW_DUMP_IDX		0xff

#define MWIFIEX_DRV_INFO_IDX		20

#define FW_DUMP_MAX_NAME_LEN		8

#define FW_DUMP_HOST_READY      0xEE

#define FW_DUMP_DONE			0xFF

#define FW_DUMP_READ_DONE		0xFE



struct memory_type_mapping {

	u8 mem_name[FW_DUMP_MAX_NAME_LEN];

	u8 *mem_ptr;

	u32 mem_size;

	u8 done_flag;

};



enum rdwr_status {

	RDWR_STATUS_SUCCESS = 0,

	RDWR_STATUS_FAILURE = 1,

	RDWR_STATUS_DONE = 2

};



#endif /* !_MWIFIEX_DECL_H_ */

drivers/net/wireless/marvell/mwifiex/main.h

+0 −20
Original line number Diff line number Diff line
@@ -489,26 +489,6 @@ struct mwifiex_roc_cfg { 
	struct ieee80211_channel chan;

};



#define MWIFIEX_FW_DUMP_IDX		0xff

#define MWIFIEX_DRV_INFO_IDX		20

#define FW_DUMP_MAX_NAME_LEN		8

#define FW_DUMP_HOST_READY		0xEE

#define FW_DUMP_DONE			0xFF

#define FW_DUMP_READ_DONE		0xFE



struct memory_type_mapping {

	u8 mem_name[FW_DUMP_MAX_NAME_LEN];

	u8 *mem_ptr;

	u32 mem_size;

	u8 done_flag;

};



enum rdwr_status {

	RDWR_STATUS_SUCCESS = 0,

	RDWR_STATUS_FAILURE = 1,

	RDWR_STATUS_DONE = 2

};



enum mwifiex_iface_work_flags {

	MWIFIEX_IFACE_WORK_DEVICE_DUMP,

	MWIFIEX_IFACE_WORK_CARD_RESET,

drivers/net/wireless/marvell/mwifiex/pcie.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include    <linux/pcieport_if.h>

#include    <linux/interrupt.h>



#include    "decl.h"

#include    "main.h"



#define PCIE8766_DEFAULT_FW_NAME "mrvl/pcie8766_uapsta.bin"