carl9170 firmware: move cmd.c into hostif.c

The command handler is part of the host
application interface too, so it will fit
there nicely.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>

diff --git a/carlfw/CMakeLists.txt b/carlfw/CMakeLists.txt
index be09ab4a230db533e062cf0e44ae99b5f61509c3..2a87dc0b99c3a0feada90e99ff4d58f80636ed13 100644 (file)
--- a/carlfw/CMakeLists.txt
+++ b/carlfw/CMakeLists.txt
@@ -17,7 +17,7 @@ set(CARLFW_CFLAGS "${CARLFW_CFLAGS_DEF} ${CARLFW_CFLAGS_EXTRA} ${CARLFW_CFLAGS_A
 include_directories (../include/linux ../include/shared ../include include)
 
 set(carl9170_main_src src/main.c src/wlan.c src/fw.c src/gpio.c src/timer.c
-                     src/cmd.c src/uart.c src/dma.c src/hostif.c src/reboot.S
+                     src/uart.c src/dma.c src/hostif.c src/reboot.S
                      src/printf.c src/rf.c src/cam.c src/wol.c)
 
 set(carl9170_lib_src src/ashlsi3.S src/memcpy.S src/memset.S src/udivsi3_i4i-Os.S)

diff --git a/carlfw/src/cmd.c b/carlfw/src/cmd.c
deleted file mode 100644 (file)
index 5382083..0000000
--- a/carlfw/src/cmd.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * carl9170 firmware - used by the ar9170 wireless device
- *
- * Code to handle commands from the host driver.
- *
- * Copyright (c) 2000-2005 ZyDAS Technology Corporation
- * Copyright (c) 2007-2009 Atheros Communications, Inc.
- * Copyright   2009    Johannes Berg <johannes@sipsolutions.net>
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * 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.
- */
-
-#include "carl9170.h"
-#include "io.h"
-#include "cam.h"
-#include "rf.h"
-#include "printf.h"
-#include "timer.h"
-#include "wl.h"
-#include "wol.h"
-
-void handle_cmd(struct carl9170_rsp *resp)
-{
-       struct carl9170_cmd *cmd = &dma_mem.reserved.cmd.cmd;
-       unsigned int i;
-
-       /* copies cmd, len and extra fields */
-       resp->hdr.len = cmd->hdr.len;
-       resp->hdr.cmd = cmd->hdr.cmd;
-       resp->hdr.ext = cmd->hdr.ext;
-       resp->hdr.seq |= cmd->hdr.seq;
-
-       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]);
-               break;
-
-       case CARL9170_CMD_WREG:
-               resp->hdr.len = 0;
-               for (i = 0; i < (cmd->hdr.len / 8); i++)
-                       set(cmd->wreg.regs[i].addr, cmd->wreg.regs[i].val);
-               break;
-
-       case CARL9170_CMD_ECHO:
-               memcpy(resp->echo.vals, cmd->echo.vals, cmd->hdr.len);
-               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:
-               /*
-                * resp->len = 0;
-                */
-               fw.reboot = 1;
-               break;
-
-       case CARL9170_CMD_READ_TSF:
-               resp->hdr.len = 8;
-               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;
-
-       case CARL9170_CMD_WOL:
-               wol_cmd(&cmd->wol);
-               break;
-
-       case CARL9170_CMD_TALLY:
-               resp->hdr.len = sizeof(struct carl9170_tally_rsp);
-               memcpy(&resp->tally, &fw.tally, sizeof(struct carl9170_tally_rsp));
-               resp->tally.tick = fw.ticks_per_usec;
-               memset(&fw.tally, 0, sizeof(struct carl9170_tally_rsp));
-               break;
-
-#ifdef CONFIG_CARL9170FW_CAB_QUEUE
-       case CARL9170_CMD_BCN_CTRL:
-               resp->hdr.len = 0;
-
-               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[cmd->bcn_ctrl.vif_id] = CARL9170_CAB_TRIGGER_EMPTY;
-               }
-               break;
-#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
-
-#ifdef CONFIG_CARL9170FW_SECURITY_ENGINE
-       case CARL9170_CMD_EKEY:
-               resp->hdr.len = 0;
-               set_key(&cmd->setkey);
-               break;
-
-       case CARL9170_CMD_DKEY:
-               resp->hdr.len = 0;
-               disable_key(&cmd->disablekey);
-               break;
-#endif /* CONFIG_CARL9170FW_SECURITY_ENGINE */
-
-#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
-       case CARL9170_CMD_FREQUENCY:
-       case CARL9170_CMD_RF_INIT:
-               rf_cmd(cmd, resp);
-               break;
-
-       case CARL9170_CMD_FREQ_START:
-               /*
-                * resp->hdr.len = 0;
-                */
-               rf_notify_set_channel();
-               break;
-
-       case CARL9170_CMD_PSM:
-               resp->hdr.len = 0;
-               fw.phy.psm.state = le32_to_cpu(cmd->psm.state);
-               rf_psm();
-               break;
-#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
-
-       default:
-               BUG("Unknown command %x\n", cmd->hdr.cmd);
-               break;
-       }
-}

diff --git a/carlfw/src/hostif.c b/carlfw/src/hostif.c
index e445d5f164ad008ef7c14e25ca08b1e17766650b..ba7a6e102ed19645f3404f2bf1fa9dec71b5a380 100644 (file)
--- a/carlfw/src/hostif.c
+++ b/carlfw/src/hostif.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-2011 Christian Lamparter <chunkeey@googlemail.com>
+ * Copyright 2009-2012 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
@@ -27,6 +27,11 @@
 #include "hostif.h"
 #include "printf.h"
 #include "wl.h"
+#include "io.h"
+#include "cam.h"
+#include "rf.h"
+#include "timer.h"
+#include "wol.h"
 
 static bool length_check(struct dma_desc *desc)
 {
@@ -163,3 +168,124 @@ void handle_host_interface(void)
 
 #undef HANDLER
 }
+
+void handle_cmd(struct carl9170_rsp *resp)
+{
+       struct carl9170_cmd *cmd = &dma_mem.reserved.cmd.cmd;
+       unsigned int i;
+
+       /* copies cmd, len and extra fields */
+       resp->hdr.len = cmd->hdr.len;
+       resp->hdr.cmd = cmd->hdr.cmd;
+       resp->hdr.ext = cmd->hdr.ext;
+       resp->hdr.seq |= cmd->hdr.seq;
+
+       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]);
+               break;
+
+       case CARL9170_CMD_WREG:
+               resp->hdr.len = 0;
+               for (i = 0; i < (cmd->hdr.len / 8); i++)
+                       set(cmd->wreg.regs[i].addr, cmd->wreg.regs[i].val);
+               break;
+
+       case CARL9170_CMD_ECHO:
+               memcpy(resp->echo.vals, cmd->echo.vals, cmd->hdr.len);
+               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:
+               /*
+                * resp->len = 0;
+                */
+               fw.reboot = 1;
+               break;
+
+       case CARL9170_CMD_READ_TSF:
+               resp->hdr.len = 8;
+               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;
+
+       case CARL9170_CMD_WOL:
+               wol_cmd(&cmd->wol);
+               break;
+
+       case CARL9170_CMD_TALLY:
+               resp->hdr.len = sizeof(struct carl9170_tally_rsp);
+               memcpy(&resp->tally, &fw.tally, sizeof(struct carl9170_tally_rsp));
+               resp->tally.tick = fw.ticks_per_usec;
+               memset(&fw.tally, 0, sizeof(struct carl9170_tally_rsp));
+               break;
+
+#ifdef CONFIG_CARL9170FW_CAB_QUEUE
+       case CARL9170_CMD_BCN_CTRL:
+               resp->hdr.len = 0;
+
+               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[cmd->bcn_ctrl.vif_id] = CARL9170_CAB_TRIGGER_EMPTY;
+               }
+               break;
+#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
+
+#ifdef CONFIG_CARL9170FW_SECURITY_ENGINE
+       case CARL9170_CMD_EKEY:
+               resp->hdr.len = 0;
+               set_key(&cmd->setkey);
+               break;
+
+       case CARL9170_CMD_DKEY:
+               resp->hdr.len = 0;
+               disable_key(&cmd->disablekey);
+               break;
+#endif /* CONFIG_CARL9170FW_SECURITY_ENGINE */
+
+#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
+       case CARL9170_CMD_FREQUENCY:
+       case CARL9170_CMD_RF_INIT:
+               rf_cmd(cmd, resp);
+               break;
+
+       case CARL9170_CMD_FREQ_START:
+               /*
+                * resp->hdr.len = 0;
+                */
+               rf_notify_set_channel();
+               break;
+
+       case CARL9170_CMD_PSM:
+               resp->hdr.len = 0;
+               fw.phy.psm.state = le32_to_cpu(cmd->psm.state);
+               rf_psm();
+               break;
+#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
+
+       default:
+               BUG("Unknown command %x\n", cmd->hdr.cmd);
+               break;
+       }
+}