X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=blobdiff_plain;f=carlfw%2FKconfig;h=a122f804237d273b9627d2aaa063a82138be5e12;hp=4386ddb2da71d6b22c33afadebe70f8f3020defc;hb=af915846d44d23adc02c7ded807282d607b46faa;hpb=f3d4187104102344aff91ee5ddce4a780f5bf6ca

diff --git a/carlfw/Kconfig b/carlfw/Kconfig
index 4386ddb..a122f80 100644
--- a/carlfw/Kconfig
+++ b/carlfw/Kconfig
@@ -31,15 +31,6 @@ config CARL9170FW_RX_FRAME_LEN
 	default 16384 if CARL9170FW_RX_FRAME_LEN_16384
 	default 32768 if CARL9170FW_RX_FRAME_LEN_32768
 
-config CARL9170FW_WATCHDOG
-	def_bool y
-	prompt "Activate HW Watchdog"
-	---help---
-	 The watchdog will notify the application as soon as the firmware
-	 has stalled.
-
-	 Say Y.
-
 config CARL9170FW_GPIO_INTERRUPT
 	def_bool y
 	prompt "GPIO Software Interrupt"
@@ -76,20 +67,6 @@ endmenu
 
 menu "802.11 Firmware Features"
 
-config CARL9170FW_HANDLE_BACK_REQ
-	def_bool y
-	prompt "Handle BlockACK Requests in Firmware"
-	---help---
-	 Enables a firmware mechanism to answer incoming BlockACK requests.
-	 This feature is necessary to comply with 802.11n. So say Y,
-	 if you have plans to support this operation mode.
-
-config CARL9170FW_BACK_REQS_NUM
-	default 4
-	int
-	prompt "Number of max. active BlockACK Request"
-	depends on CARL9170FW_HANDLE_BACK_REQ
-
 config CARL9170FW_CAB_QUEUE
 	def_bool y
 	prompt "Support software-based Content after Beacon Queue"
@@ -123,34 +100,6 @@ config CARL9170FW_EXPERIMENTAL
 	def_bool y
 	prompt "Experimental Features"
 
-config CARL9170FW_PSM
-	def_bool y
-	prompt "Firmware Supported Power-saving Management"
-	depends on CARL9170FW_EXPERIMENTAL && CARL9170FW_RADIO_FUNCTIONS
-	---help---
-	 This options enables a interface for the application to
-	 switch off the RF/PHY (in order to save power). And the
-	 Firmware will automatically turn it on again, when the
-	 PRETBTT event fires.
-
-config CARL9170FW_DELAYED_TX
-	def_bool n
-	prompt "Delay and reorder TX"
-	depends on CARL9170FW_EXPERIMENTAL
-	---help---
-	 Delay incoming TX' from the application until wlan_complete
-	 has finished.
-
-	 This feature is necessary to keep A-MPDUs partially ordered.
-
-	 Doesn't work 100% yet, but in most cases other HW designs can
-	 deal with the fallout.
-
-config CARL9170FW_TX_AMPDU
-	def_bool n
-	prompt "Firmware-supported ampdu scheduling"
-	depends on CARL9170FW_EXPERIMENTAL
-
 config CARL9170FW_WOL_OPTION
 	def_bool n
 	prompt "Wakeup on WLAN"
@@ -164,19 +113,21 @@ config CARL9170FW_WOL
 	def_bool n
 	depends on CARL9170FW_WOL_OPTION
 
-config CARL9170FW_WOL_MAGIC_PACKET
+config CARL9170FW_WOL_NL80211_TRIGGERS
 	def_bool n
-	prompt "Magic Packet(tm)"
+	prompt "Standard NL80211 wakeup triggers"
 	depends on CARL9170FW_WOL_OPTION
 	select CARL9170FW_WOL
 	---help---
-	 Sniff all incoming data frames for the magic packet pattern.
+	 Available triggers:
+	  * Magic Packet(tm) pattern
+	  * disconnect event
 
 config CARL9170FW_WOL_PROBE_REQUEST
 	def_bool n
 	prompt "Probe Request"
 	depends on CARL9170FW_WOL_OPTION
-	select CARL9170FW_WOL_CHECK
+	select CARL9170FW_WOL
 	---help---
 	 Scan probe requests for a given SSID.
 
@@ -197,6 +148,11 @@ config CARL9170FW_FW_MAC_RESET
 	prompt "Firmware MAC Chip recovery"
 	depends on CARL9170FW_EXPERIMENTAL
 
+config CARL9170FW_NOISY_MAC_RESET
+	def_bool n
+	prompt "Notify MAC RESET events"
+	depends on CARL9170FW_FW_MAC_RESET
+
 config CARL9170FW_BROKEN_FEATURES
 	def_bool n
 	prompt "Broken Featurs"
@@ -226,7 +182,7 @@ config CARL9170FW_DEBUG_UART
 
 config CARL9170FW_WATCHDOG_BUTTON
 	def_bool n
-	depends on CARL9170FW_BROKEN && CARL9170FW_WATCHDOG && CARL9170FW_GPIO_INTERRUPT
+	depends on CARL9170FW_BROKEN && CARL9170FW_GPIO_INTERRUPT
 	prompt "Trigger Watchdog by pressing the WPS button"
 
 choice CARL9170FW_UART_CLOCK