X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=include%2Fshared%2Ffwcmd.h;h=f1c8f9e81d80c48bcb192ba60674fb3738fdd5bb;hb=65dd584c008fdc28e8398bacfdb311b19ae80507;hp=c1879f5815f6bfff2f330fa75e7c45422db4a192;hpb=fa097d02ca1683946b2207c8ebf69538e8c3cb9c;p=carl9170fw.git

diff --git a/include/shared/fwcmd.h b/include/shared/fwcmd.h
index c1879f5..f1c8f9e 100644
--- a/include/shared/fwcmd.h
+++ b/include/shared/fwcmd.h
@@ -53,7 +53,6 @@ enum carl9170_cmd_oids {
 	CARL9170_CMD_REBOOT		= 0x04,
 	CARL9170_CMD_FLUSH_CAB		= 0x05,
 	CARL9170_CMD_READ_TSF		= 0x06,
-	CARL9170_CMD_USB_WD		= 0x07,
 
 	/* CAM */
 	CARL9170_CMD_EKEY		= 0x10,
@@ -66,7 +65,17 @@ enum carl9170_cmd_oids {
 	CARL9170_CMD_FREQ_START		= 0x23,
 	CARL9170_CMD_PSM		= 0x24,
 
+	/* Asychronous command flag */
+	CARL9170_CMD_ASYNC_FLAG		= 0x40,
+	CARL9170_CMD_WREG_ASYNC		= (CARL9170_CMD_WREG |
+					   CARL9170_CMD_ASYNC_FLAG),
+	CARL9170_CMD_REBOOT_ASYNC	= (CARL9170_CMD_REBOOT |
+					   CARL9170_CMD_ASYNC_FLAG),
+	CARL9170_CMD_FLUSH_CAB_ASYNC	= (CARL9170_CMD_FLUSH_CAB |
+					   CARL9170_CMD_ASYNC_FLAG),
+
 	/* responses and traps */
+	CARL9170_RSP_FLAG		= 0xc0,
 	CARL9170_RSP_PRETBTT		= 0xc0,
 	CARL9170_RSP_TXCOMP		= 0xc1,
 	CARL9170_RSP_BEACON_CONFIG	= 0xc2,
@@ -76,7 +85,7 @@ enum carl9170_cmd_oids {
 	CARL9170_RSP_HEXDUMP		= 0xcc,
 	CARL9170_RSP_RADAR		= 0xcd,
 	CARL9170_RSP_GPIO		= 0xce,
-	CARL9170_RSP_USB_WD		= 0xcf
+	CARL9170_RSP_BOOT		= 0xcf,
 };
 
 struct carl9170_set_key_cmd {
@@ -128,17 +137,8 @@ struct carl9170_rf_init {
 
 struct carl9170_rf_init_result {
 	__le32		ret;		/* AR9170_PHY_REG_AGC_CONTROL */
-	__le32		regs[6];
-} __packed;
-#define	CARL9170_RF_INIT_RESULT_SIZE	28
-
-#define	CARL9170_USB_WATCHDOG_INACTIVE	0
-#define	CARL9170_USB_WATCHDOG_ON_DUTY	1
-
-struct carl9170_watchdog_cmd {
-	__le32		state;
 } __packed;
-#define CARL9170_WATCHDOG_CMD_SIZE	4
+#define	CARL9170_RF_INIT_RESULT_SIZE	4
 
 #define	CARL9170_PSM_SLEEP		0x1000
 #define	CARL9170_PSM_SOFTWARE		0
@@ -152,9 +152,13 @@ struct carl9170_psm {
 #define CARL9170_PSM_SIZE		4
 
 struct carl9170_cab_flush_cmd {
-	__le32		vif_id;		/* currently unused */
+	__le32		vif_id;
+	__le32		mode;
 } __packed;
-#define CARL9170_CAB_FLUSH_CMD_SIZE	4
+#define CARL9170_CAB_FLUSH_CMD_SIZE	8
+
+#define CARL9170_CAB_FLUSH_DRAIN	0
+#define CARL9170_CAB_FLUSH_CAB_TRIGGER	1
 
 struct carl9170_cmd_head {
 	union {
@@ -175,7 +179,6 @@ struct carl9170_cmd {
 		struct carl9170_set_key_cmd	setkey;
 		struct carl9170_disable_key_cmd	disablekey;
 		struct carl9170_u32_list	echo;
-		struct carl9170_watchdog_cmd	watchdog;
 		struct carl9170_reg_list	rreg;
 		struct carl9170_write_reg	wreg;
 		struct carl9170_rf_init		rf_init;
@@ -249,7 +252,6 @@ struct carl9170_rsp {
 		struct carl9170_rf_init_result	rf_init_res;
 		struct carl9170_u32_list	rreg_res;
 		struct carl9170_u32_list	echo;
-		struct carl9170_watchdog_cmd	watchdog;
 		struct carl9170_tx_status	tx_status[0];
 		struct _carl9170_tx_status	_tx_status[0];
 		struct carl9170_gpio		gpio;