carl9170 firmware: mac reset refactoring, take-2

[carl9170fw.git] / carlfw / src / cmd.c

diff --git a/carlfw/src/cmd.c b/carlfw/src/cmd.c
index e04e8da486b44dfac8eafe62374cb4cd595a6831..281ae9c9a1b19ad1f8befb896843e54c10a23771 100644 (file)
--- a/carlfw/src/cmd.c
+++ b/carlfw/src/cmd.c
@@ -59,12 +59,14 @@ void handle_cmd(struct carl9170_rsp *resp)
                break;
 
        case CARL9170_CMD_SWRST:
+#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:
@@ -82,21 +84,26 @@ void handle_cmd(struct carl9170_rsp *resp)
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
        case CARL9170_CMD_FLUSH_CAB:
                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->cab_flush.mode & CARL9170_CAB_FLUSH_CAB_TRIGGER) {
+                       wlan_cab_modify_dtim_beacon(cmd->cab_flush.vif_id);
+                       set(AR9170_MAC_REG_BCN_CTRL, AR9170_BCN_CTRL_READY);
+               } else {
+                       wlan_cab_flush_queue(cmd->cab_flush.vif_id);
+                       if (fw.wlan.cab_flush_vif == cmd->cab_flush.vif_id)
+                               fw.wlan.cab_flush_trigger = 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 */
@@ -124,6 +131,7 @@ void handle_cmd(struct carl9170_rsp *resp)
 #endif /* CONFIG_CARL9170FW_RADIO_FUNCTIOS */
 
        default:
+               BUG("Unknown command %x\n", cmd->hdr.cmd);
                break;
        }
 }