X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Finclude%2Fconfig.h;h=ccaf5f40b0a9358f5bcd77cb03a4026cf0d765a1;hb=f239f43b91dfa5fbec1a8d19b41db0b792d4c751;hp=b947f59b60f8fa4d3fdd2563853ec7ec9b9ed0ed;hpb=e72388a0aa23da8bc8e24a0cbe9d523c5a9ce294;p=carl9170fw.git

diff --git a/carlfw/include/config.h b/carlfw/include/config.h
index b947f59..ccaf5f4 100644
--- a/carlfw/include/config.h
+++ b/carlfw/include/config.h
@@ -10,8 +10,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "generated/autoconf.h"
@@ -19,12 +18,11 @@
 #include "types.h"
 #include "compiler.h"
 #include "fwcmd.h"
+#include "hw.h"
 
 #ifndef __CARL9170FW_CONFIG_H
 #define __CARL9170FW_CONFIG_H
 
-#define __CARL9170FW__
-
 #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
 
 #if GCC_VERSION < 40400
@@ -32,9 +30,9 @@
 # error "See: http://gcc.gnu.org/gcc-4.4/changes.html / Caveats No. 4"
 #endif
 
-#if ((defined CONFIG_CARL9170FW_PRINTF) &&		\
-     (!defined CONFIG_CARL9170FW_DEBUG_USB) &&		\
-    (!defined CONFIG_CARL9170FW_DEBUG_UART))
+#if ((defined CONFIG_CARL9170FW_PRINTF) &&			\
+	(!defined CONFIG_CARL9170FW_DEBUG_USB) &&		\
+	(!defined CONFIG_CARL9170FW_DEBUG_UART))
 # warning "You have disabled all debug message transports."
 # warning "However CONFIG_CARL9170FW_PRINTF is still set..."
 # warning "Which is a waste of firmware space, if you ask me."
@@ -43,7 +41,6 @@
 #define CARL9170_TX_STATUS_NUM		(CARL9170_RSP_TX_STATUS_NUM)
 #define CARL9170_INT_RQ_CACHES		16
 #define AR9170_INT_MAGIC_HEADER_SIZE	12
-#define CARL9170_USB_WATCHDOG_TRIGGER_THRESHOLD	4
 #define CARL9170_TBTT_DELTA		(CARL9170_PRETBTT_KUS + 1)
 
 #define CARL9170_GPIO_MASK		(AR9170_GPIO_PORT_WPS_BUTTON_PRESSED)
@@ -54,20 +51,13 @@
 #define CARL9170_INTF_NUM		(1)
 #endif /* CONFIG_CARL9170FW_VIFS_NUM */
 
-#if ((defined CONFIG_CARL9170FW_DEBUG) ||	\
-     (defined CONFIG_CARL9170FW_LOOPBACK))
-#define CARL9170FW_UNUSABLE	y
-#endif
+#define CONFIG_CARL9170FW_BACK_REQS_NUM	4
 
 static inline void __config_check(void)
 {
 	BUILD_BUG_ON(!CARL9170_TX_STATUS_NUM);
-	BUILD_BUG_ON(CARL9170_USB_WATCHDOG_TRIGGER_THRESHOLD < 2);
 	BUILD_BUG_ON(CARL9170_INTF_NUM < 1);
-
-#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
-	BUILD_BUG_ON(!CONFIG_CARL9170FW_BACK_REQS_NUM);
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
+	BUILD_BUG_ON(CARL9170_INTF_NUM >= AR9170_MAX_VIRTUAL_MAC);
 }
 
 #endif /* __CARL9170FW_CONFIG_H */