X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fcmd.c;h=f7490db3940a14b00304b63d167c5dfa4902cc5f;hb=d57b31e45dca1087cefd56876a0a8064efe4e29c;hp=e04e8da486b44dfac8eafe62374cb4cd595a6831;hpb=95e0b3d5f76e191546422c4dbb7afd2ad679ff8d;p=carl9170fw.git

diff --git a/carlfw/src/cmd.c b/carlfw/src/cmd.c
index e04e8da..f7490db 100644
--- a/carlfw/src/cmd.c
+++ b/carlfw/src/cmd.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2000-2005 ZyDAS Technology Corporation
  * Copyright (c) 2007-2009 Atheros Communications, Inc.
  * Copyright	2009	Johannes Berg <johannes@sipsolutions.net>
- * Copyright 2009, 2010 Christian Lamparter <chunkeey@googlemail.com>
+ * Copyright 2009-2011	Christian Lamparter <chunkeey@googlemail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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:
@@ -79,24 +81,49 @@ 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_WOL
+	case CARL9170_CMD_WOL:
+		memcpy(&fw.wlan.wol.cmd, &cmd->wol, sizeof(cmd->wol));
+		break;
+#endif /* CONFIG_CARL9170FW_WOL */
+
+	case CARL9170_CMD_TALLY:
+		resp->hdr.len = sizeof(struct carl9170_tally_rsp);
+		memcpy(&resp->tally, &fw.tally, sizeof(struct carl9170_tally_rsp));
+		tally_update();
+		memset(&fw.tally, 0, sizeof(struct carl9170_tally_rsp));
+		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 */
@@ -114,16 +141,15 @@ void handle_cmd(struct carl9170_rsp *resp)
 		rf_notify_set_channel();
 		break;
 
-# ifdef CONFIG_CARL9170FW_PSM
 	case CARL9170_CMD_PSM:
 		resp->hdr.len = 0;
 		fw.phy.psm.state = le32_to_cpu(cmd->psm.state);
 		rf_psm();
 		break;
-# endif /* CONFIG_CARL9170FW_PSM */
 #endif /* CONFIG_CARL9170FW_RADIO_FUNCTIOS */
 
 	default:
+		BUG("Unknown command %x\n", cmd->hdr.cmd);
 		break;
 	}
 }