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

Commit 1a281473 authored Feb 06, 2017 by Ping-Ke Shih Committed by Kalle Valo Feb 07, 2017

rtlwifi: btcoexist: Add vendor definition for new btcoexist



Routine halbtc_get() will need to be able to get the vendor ID.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

parent 6f85c03b

drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -335,6 +335,9 @@ static bool halbtc_get(void void_btcoexist, u8 get_type, void out_buf)
	case BTC_GET_U4_BT_PATCH_VER:		case BTC_GET_U4_BT_PATCH_VER:
	*u32_tmp = halbtc_get_bt_patch_version(btcoexist);		*u32_tmp = halbtc_get_bt_patch_version(btcoexist);
	break;		break;
			case BTC_GET_U4_VENDOR:
			*u32_tmp = BTC_VENDOR_OTHER;
			break;
	case BTC_GET_U1_WIFI_DOT11_CHNL:		case BTC_GET_U1_WIFI_DOT11_CHNL:
	*u8_tmp = rtlphy->current_channel;		*u8_tmp = rtlphy->current_channel;
	break;		break;

drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -228,6 +228,7 @@ enum btc_get_type {
	BTC_GET_U4_WIFI_FW_VER,		BTC_GET_U4_WIFI_FW_VER,
	BTC_GET_U4_WIFI_LINK_STATUS,		BTC_GET_U4_WIFI_LINK_STATUS,
	BTC_GET_U4_BT_PATCH_VER,		BTC_GET_U4_BT_PATCH_VER,
			BTC_GET_U4_VENDOR,

	/* type u1Byte */		/* type u1Byte */
	BTC_GET_U1_WIFI_DOT11_CHNL,		BTC_GET_U1_WIFI_DOT11_CHNL,
	@@ -245,6 +246,12 @@ enum btc_get_type {
	BTC_GET_MAX		BTC_GET_MAX
	};		};

			enum btc_vendor {
			BTC_VENDOR_LENOVO,
			BTC_VENDOR_ASUS,
			BTC_VENDOR_OTHER
			};

	enum btc_set_type {		enum btc_set_type {
	/* type bool */		/* type bool */
	BTC_SET_BL_BT_DISABLE,		BTC_SET_BL_BT_DISABLE,