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

Commit f3379c39 authored by Naveen Singh's avatar Naveen Singh Committed by Greg Kroah-Hartman
Browse files

ath6kl: Extend WMI API used by AR6003 v2.1.1 



These commands and event IDs are used by AR6003 v2.1.1.
Some events are no longer needed so these are removed now.

Signed-off-by: default avatarNaveen Singh <nsingh@atheros.com>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 37f7949d

drivers/staging/ath6kl/include/common/wmi.h

+82 −13
Original line number Diff line number Diff line
@@ -429,12 +429,46 @@ typedef enum { 
    WMI_SET_BTCOEX_BT_OPERATING_STATUS_CMDID,

    WMI_GET_BTCOEX_STATS_CMDID,

    WMI_GET_BTCOEX_CONFIG_CMDID,

    WMI_GET_PMK_CMDID,

    WMI_SET_PASSPHRASE_CMDID,



	WMI_SET_DFS_ENABLE_CMDID,   /* F034 */

	WMI_SET_DFS_MINRSSITHRESH_CMDID,

	WMI_SET_DFS_MAXPULSEDUR_CMDID,

	WMI_DFS_RADAR_DETECTED_CMDID,



	/* P2P CMDS */

	WMI_P2P_SET_CONFIG_CMDID,    /* F038 */

	WMI_WPS_SET_CONFIG_CMDID,

	WMI_SET_REQ_DEV_ATTR_CMDID,

	WMI_P2P_FIND_CMDID,

	WMI_P2P_STOP_FIND_CMDID,

	WMI_P2P_GO_NEG_START_CMDID,

	WMI_P2P_LISTEN_CMDID,



	WMI_CONFIG_TX_MAC_RULES_CMDID,    /* F040 */

	WMI_SET_PROMISCUOUS_MODE_CMDID,

	WMI_RX_FRAME_FILTER_CMDID,

	WMI_SET_CHANNEL_CMDID,



	/* WAC commands */

	WMI_ENABLE_WAC_CMDID,

	WMI_WAC_SCAN_REPLY_CMDID,

	WMI_WAC_CTRL_REQ_CMDID,

	WMI_SET_DIV_PARAMS_CMDID,



	WMI_GET_PMK_CMDID,

	WMI_SET_PASSPHRASE_CMDID,

	WMI_SEND_ASSOC_RES_CMDID,

	WMI_SET_ASSOC_REQ_RELAY_CMDID,

	WMI_GET_RFKILL_MODE_CMDID,



	/* ACS command, consists of sub-commands */

	WMI_ACS_CTRL_CMDID,



	/* Ultra low power store / recall commands */

	WMI_STORERECALL_CONFIGURE_CMDID,

	WMI_STORERECALL_RECALL_CMDID,

	WMI_STORERECALL_HOST_READY_CMDID,

	WMI_FORCE_TARGET_ASSERT_CMDID,

	WMI_SET_EXCESS_TX_RETRY_THRES_CMDID,

} WMI_COMMAND_ID;
@@ -1965,12 +1999,47 @@ typedef enum { 
#endif

    WMI_REPORT_BTCOEX_STATS_EVENTID,

    WMI_REPORT_BTCOEX_CONFIG_EVENTID,

    WMI_ACM_REJECT_EVENTID,

	WMI_GET_PMK_EVENTID,



	/* DFS Events */

	WMI_DFS_HOST_ATTACH_EVENTID,

	WMI_DFS_HOST_INIT_EVENTID,

	WMI_DFS_RESET_DELAYLINES_EVENTID,

	WMI_DFS_RESET_RADARQ_EVENTID,

	WMI_DFS_RESET_AR_EVENTID,

	WMI_DFS_RESET_ARQ_EVENTID,

	WMI_DFS_SET_DUR_MULTIPLIER_EVENTID,

	WMI_DFS_SET_BANGRADAR_EVENTID,

	WMI_DFS_SET_DEBUGLEVEL_EVENTID,

	WMI_DFS_PHYERR_EVENTID,

	/* CCX Evants */

	WMI_CCX_RM_STATUS_EVENTID,



	/* P2P Events */

	WMI_P2P_GO_NEG_RESULT_EVENTID,



	WMI_WAC_SCAN_DONE_EVENTID,

	WMI_WAC_REPORT_BSS_EVENTID,

	WMI_WAC_START_WPS_EVENTID,

	WMI_WAC_CTRL_REQ_REPLY_EVENTID,



	/* RFKILL Events */

	WMI_RFKILL_STATE_CHANGE_EVENTID,

	WMI_RFKILL_GET_MODE_CMD_EVENTID,

	WMI_THIN_RESERVED_START_EVENTID = 0x8000,

    /* Events in this range are reserved for thinmode 

     * See wmi_thin.h for actual definitions */



	/*

	 * Events in this range are reserved for thinmode

	 * See wmi_thin.h for actual definitions

	 */

	WMI_THIN_RESERVED_END_EVENTID = 0x8fff,



	WMI_SET_CHANNEL_EVENTID,

	WMI_ASSOC_REQ_EVENTID,



	/* generic ACS event */

	WMI_ACS_EVENTID,

	WMI_REPORT_WMM_PARAMS_EVENTID

} WMI_EVENT_ID;

drivers/staging/ath6kl/wmi/wmi.c

+0 −19
Original line number Diff line number Diff line
@@ -129,8 +129,6 @@ wmi_get_pmkid_list_event_rx(struct wmi_t *wmip, u8 *datap, u32 len); 
static int

wmi_set_params_event_rx(struct wmi_t *wmip, u8 *datap, u32 len);



static int

wmi_acm_reject_event_rx(struct wmi_t *wmip, u8 *datap, u32 len);



#ifdef CONFIG_HOST_TCMD_SUPPORT

static int
@@ -1092,10 +1090,6 @@ wmi_control_rx(struct wmi_t *wmip, void *osbuf) 
        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_SET_PARAMS_REPLY Event\n", DBGARG));

        status = wmi_set_params_event_rx(wmip, datap, len);

        break;

    case (WMI_ACM_REJECT_EVENTID):

        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_SET_PARAMS_REPLY Event\n", DBGARG));

        status = wmi_acm_reject_event_rx(wmip, datap, len);

        break;		

    case (WMI_ADDBA_REQ_EVENTID):

        status = wmi_addba_req_event_rx(wmip, datap, len);

        break;
@@ -5289,19 +5283,6 @@ wmi_set_params_event_rx(struct wmi_t *wmip, u8 *datap, u32 len) 
}







static int

wmi_acm_reject_event_rx(struct wmi_t *wmip, u8 *datap, u32 len)

{

    WMI_ACM_REJECT_EVENT *ev;



    ev = (WMI_ACM_REJECT_EVENT *)datap;

    wmip->wmi_traffic_class = ev->trafficClass;

    printk("ACM REJECT %d\n",wmip->wmi_traffic_class);

    return 0;

}





#ifdef CONFIG_HOST_DSET_SUPPORT

int

wmi_dset_data_reply(struct wmi_t *wmip,