X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=blobdiff_plain;f=carlfw%2FKconfig;h=46eb1bb87399f5ba4250d43d71a5d05daa9412fe;hp=262c2471ec65e476a536543d76988af856c4a7fa;hb=195268cae3bb2f462d82dc0178dbca07f0cff706;hpb=439cedcac2fc950f32b120ff2b128968d6fb34ef

diff --git a/carlfw/Kconfig b/carlfw/Kconfig
index 262c247..46eb1bb 100644
--- a/carlfw/Kconfig
+++ b/carlfw/Kconfig
@@ -1,13 +1,7 @@
 menu "General"
 
-config CARL9170FW_MAKE_RELEASE
-	def_bool y
-	prompt "Update/Generate new release/revision files"
-
 config CARL9170FW_RELEASE_VERSION
 	int
-	depends on CARL9170FW_MAKE_RELEASE
-	prompt "Major CARL9170 Firmware Revision"
 	default 1
 
 menu "Selectable Hardware Options"
@@ -37,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"
@@ -80,35 +65,6 @@ config CARL9170FW_RADIO_FUNCTIONS
 
 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"
-	---help---
-	 This (software) queue is used to send any broad-/multi-cast buffered
-	 frames after the next DTIM beacon.
-
-	 This feature is required for Accesspoint mode operation.
-
-	 Say Y.
-
-endmenu
-
 source "carlfw/usb/Kconfig"
 
 menu "Experimental, Unstable & Testing Extensions"
@@ -129,34 +85,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"
@@ -170,19 +98,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.
 
@@ -203,9 +133,24 @@ 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_80MHZ_CLOCK
+	def_bool n
+	prompt "Allow 80/88MHz clock for HT40"
+	depends on CARL9170FW_EXPERIMENTAL
+	---help---
+	 The SoC can run up to 80/88MHz in HT40 mode. This improves
+	 throughput and timing accuracy over the 40/44MHz clock.
+	 However some devices don't have heat shields and they with
+	 this option enabled, they become unstable under load.
+
 config CARL9170FW_BROKEN_FEATURES
 	def_bool n
-	prompt "Broken Featurs"
+	prompt "Broken Features"
 
 config CARL9170FW_DEBUG
 	def_bool n
@@ -232,7 +177,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
@@ -248,40 +193,14 @@ config CARL9170FW_UART_CLOCK_40M
 
 endchoice
 
-
-choice
-	prompt "TX / RX Path"
-
-	default CARL9170FW_NORMAL_TX_RX
-
-	config CARL9170FW_NORMAL_TX_RX
-		bool
-		prompt "Normal WLAN TX/RX routines"
-
-	config CARL9170FW_LOOPBACK
-		bool
-		depends on CARL9170FW_BROKEN_FEATURES
-		prompt "TX->(tx feedback)->RX loopback"
-		---help---
-		 Useful carlu testcase.
-
-	config CARL9170FW_DISCARD
-		bool
-		depends on CARL9170FW_BROKEN_FEATURES
-		prompt "TX->(tx feedback)"
-		---help---
-		 Useful carlu testcase
-
-endchoice
-
 config CARL9170FW_UNUSABLE
 	def_bool y
-	depends on CARL9170FW_BROKEN || CARL9170FW_LOOPBACK
+	depends on CARL9170FW_BROKEN || CARL9170FW_DEBUG
 
 config CARL9170FW_USB_MODESWITCH
 	def_bool n
 	prompt "USB 1.1 / 2.0 switching support"
-	depends on CARL9170FW_BROKEN_FEATURES
+	depends on CARL9170FW_BROKEN_FEATURES && CARL9170FW_USB_STANDARD_CMDS
 	---help---
 	 Mostly implemented, but untested and some serious
 	 doubts remain.