X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=blobdiff_plain;f=carlfw%2Fsrc%2Fcmd.c;h=a222c6ca25dff0bbaeb272c64e872423dd8498cf;hp=7652214f476a5d4a0df9298bc80889c626c78e3a;hb=19e4d682fca010ef72e0a304335910f670c2268a;hpb=acca5dfdf46f522105f8181c8aff4392eecce8de

diff --git a/carlfw/src/cmd.c b/carlfw/src/cmd.c
index 7652214..a222c6c 100644
--- a/carlfw/src/cmd.c
+++ b/carlfw/src/cmd.c
@@ -42,7 +42,7 @@ void handle_cmd(struct carl9170_rsp *resp)
 	resp->hdr.ext = cmd->hdr.ext;
 	resp->hdr.seq |= cmd->hdr.seq;
 
-	switch (cmd->hdr.cmd) {
+	switch (cmd->hdr.cmd & ~CARL9170_CMD_ASYNC_FLAG) {
 	case CARL9170_CMD_RREG:
 		for (i = 0; i < (cmd->hdr.len / 4); i++)
 			resp->rreg_res.vals[i] = get(cmd->rreg.regs[i]);
@@ -59,17 +59,21 @@ void handle_cmd(struct carl9170_rsp *resp)
 		break;
 
 	case CARL9170_CMD_SWRST:
-		resp->hdr.len = 0;
+#ifdef CONFIG_CARL9170FW_FW_MAC_RESET
+		/*
+		 * Command has no payload, so the response
+		 * has no payload either.
+		 * resp->hdr.len = 0;
+		 */
 		fw.wlan.mac_reset = CARL9170_MAC_RESET_FORCE;
+#endif /* CONFIG_CARL9170FW_FW_MAC_RESET */
 		break;
 
 	case CARL9170_CMD_REBOOT:
 		/*
-		 * reboot does not return and generates no response
 		 * resp->len = 0;
 		 */
-
-		reboot();
+		fw.reboot = 1;
 		break;
 
 	case CARL9170_CMD_READ_TSF:
@@ -77,24 +81,36 @@ void handle_cmd(struct carl9170_rsp *resp)
 		read_tsf((uint32_t *)resp->tsf.tsf);
 		break;
 
+	case CARL9170_CMD_RX_FILTER:
+		resp->hdr.len = 0;
+		fw.wlan.rx_filter = cmd->rx_filter.rx_filter;
+		break;
+
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
-	case CARL9170_CMD_FLUSH_CAB:
+	case CARL9170_CMD_BCN_CTRL:
 		resp->hdr.len = 0;
-		fw.wlan.cab_flush_trigger = CARL9170_CAB_TRIGGER_ARMED;
-		fw.wlan.cab_flush_time = get_clock_counter() +
-					 CARL9170_TBTT_DELTA;
+
+		if (cmd->bcn_ctrl.mode & CARL9170_BCN_CTRL_CAB_TRIGGER) {
+			wlan_modify_beacon(cmd->bcn_ctrl.vif_id,
+				cmd->bcn_ctrl.bcn_addr, cmd->bcn_ctrl.bcn_len);
+			set(AR9170_MAC_REG_BCN_ADDR, cmd->bcn_ctrl.bcn_addr);
+			set(AR9170_MAC_REG_BCN_LENGTH, cmd->bcn_ctrl.bcn_len);
+			set(AR9170_MAC_REG_BCN_CTRL, AR9170_BCN_CTRL_READY);
+		} else {
+			wlan_cab_flush_queue(cmd->bcn_ctrl.vif_id);
+			fw.wlan.cab_flush_trigger[i] = CARL9170_CAB_TRIGGER_EMPTY;
+		}
 		break;
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
 #ifdef CONFIG_CARL9170FW_SECURITY_ENGINE
 	case CARL9170_CMD_EKEY:
-		resp->hdr.len = 1;
+		resp->hdr.len = 0;
 		set_key(&cmd->setkey);
 		break;
 
 	case CARL9170_CMD_DKEY:
-		/* Disable Key */
-		resp->hdr.len = 1;
+		resp->hdr.len = 0;
 		disable_key(&cmd->disablekey);
 		break;
 #endif /* CONFIG_CARL9170FW_SECURIT_ENGINE */
@@ -106,7 +122,9 @@ void handle_cmd(struct carl9170_rsp *resp)
 		break;
 
 	case CARL9170_CMD_FREQ_START:
-		resp->hdr.len = 0;
+		/*
+		 * resp->hdr.len = 0;
+		 */
 		rf_notify_set_channel();
 		break;
 
@@ -119,15 +137,8 @@ void handle_cmd(struct carl9170_rsp *resp)
 # endif /* CONFIG_CARL9170FW_PSM */
 #endif /* CONFIG_CARL9170FW_RADIO_FUNCTIOS */
 
-#ifdef CONFIG_CARL9170FW_USB_WATCHDOG
-	case CARL9170_CMD_USB_WD:
-		resp->hdr.len = 4;
-		fw.usb.watchdog.state = le32_to_cpu(cmd->watchdog.state);
-		break;
-
-#endif /* CONFIG_CARL9170FW_USB_WATCHDOG */
-
 	default:
+		BUG("Unknown command %x\n", cmd->hdr.cmd);
 		break;
 	}
 }