carl9170 firmware: put power management definitions into the correct place

[carl9170fw.git] / include / shared / fwcmd.h

diff --git a/include/shared/fwcmd.h b/include/shared/fwcmd.h
index 49fdb2f71a731ec25c0561e6ffe333b4b4be9898..fb5ab3f62639902646cdbe6c770d6529179929ab 100644 (file)
--- a/include/shared/fwcmd.h
+++ b/include/shared/fwcmd.h
@@ -66,7 +66,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,
@@ -128,9 +138,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_RF_INIT_RESULT_SIZE    4
 
 #define        CARL9170_USB_WATCHDOG_INACTIVE  0
 #define        CARL9170_USB_WATCHDOG_ON_DUTY   1
@@ -185,11 +194,12 @@ struct carl9170_cmd {
        } __packed;
 } __packed;
 
-#define        CARL9170_TX_STATUS_QUEUE_MASK   3
-#define        CARL9170_TX_STATUS_RIX_SHIFT    2
-#define        CARL9170_TX_STATUS_RIX_MASK     (3 << CARL9170_TX_STATUS_RIX_SHIFT)
-#define        CARL9170_TX_STATUS_TRIES_SHIFT  4
-#define        CARL9170_TX_STATUS_TRIES_MASK   (7 << CARL9170_TX_STATUS_TRIES_SHIFT)
+#define        CARL9170_TX_STATUS_QUEUE        3
+#define        CARL9170_TX_STATUS_QUEUE_S      0
+#define        CARL9170_TX_STATUS_RIX_S        2
+#define        CARL9170_TX_STATUS_RIX          (3 << CARL9170_TX_STATUS_RIX_S)
+#define        CARL9170_TX_STATUS_TRIES_S      4
+#define        CARL9170_TX_STATUS_TRIES        (7 << CARL9170_TX_STATUS_TRIES_S)
 #define        CARL9170_TX_STATUS_SUCCESS      0x80
 
 /*