projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
carl9170 firmware: update API to 1.8.8.2
[carl9170fw.git]
/
include
/
shared
/
fwcmd.h
diff --git
a/include/shared/fwcmd.h
b/include/shared/fwcmd.h
index fb5ab3f62639902646cdbe6c770d6529179929ab..d4a4e1dbef0695d1d9c3acd72a9df29485d42f1b 100644
(file)
--- a/
include/shared/fwcmd.h
+++ b/
include/shared/fwcmd.h
@@
-1,7
+1,7
@@
/*
/*
- *
Atheros AR9170 driv
er
+ *
Shared Atheros AR9170 Head
er
*
*
- *
f
irmware command interface definitions
+ *
F
irmware command interface definitions
*
* Copyright 2008, Johannes Berg <johannes@sipsolutions.net>
* Copyright 2009, 2010, Christian Lamparter <chunkeey@googlemail.com>
*
* Copyright 2008, Johannes Berg <johannes@sipsolutions.net>
* Copyright 2009, 2010, Christian Lamparter <chunkeey@googlemail.com>
@@
-51,9
+51,8
@@
enum carl9170_cmd_oids {
CARL9170_CMD_ECHO = 0x02,
CARL9170_CMD_SWRST = 0x03,
CARL9170_CMD_REBOOT = 0x04,
CARL9170_CMD_ECHO = 0x02,
CARL9170_CMD_SWRST = 0x03,
CARL9170_CMD_REBOOT = 0x04,
- CARL9170_CMD_
FLUSH_CAB
= 0x05,
+ CARL9170_CMD_
BCN_CTRL
= 0x05,
CARL9170_CMD_READ_TSF = 0x06,
CARL9170_CMD_READ_TSF = 0x06,
- CARL9170_CMD_USB_WD = 0x07,
/* CAM */
CARL9170_CMD_EKEY = 0x10,
/* CAM */
CARL9170_CMD_EKEY = 0x10,
@@
-72,7
+71,9
@@
enum carl9170_cmd_oids {
CARL9170_CMD_ASYNC_FLAG),
CARL9170_CMD_REBOOT_ASYNC = (CARL9170_CMD_REBOOT |
CARL9170_CMD_ASYNC_FLAG),
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_BCN_CTRL_ASYNC = (CARL9170_CMD_BCN_CTRL |
+ CARL9170_CMD_ASYNC_FLAG),
+ CARL9170_CMD_PSM_ASYNC = (CARL9170_CMD_PSM |
CARL9170_CMD_ASYNC_FLAG),
/* responses and traps */
CARL9170_CMD_ASYNC_FLAG),
/* responses and traps */
@@
-86,7
+87,7
@@
enum carl9170_cmd_oids {
CARL9170_RSP_HEXDUMP = 0xcc,
CARL9170_RSP_RADAR = 0xcd,
CARL9170_RSP_GPIO = 0xce,
CARL9170_RSP_HEXDUMP = 0xcc,
CARL9170_RSP_RADAR = 0xcd,
CARL9170_RSP_GPIO = 0xce,
- CARL9170_RSP_
USB_WD = 0xcf
+ CARL9170_RSP_
BOOT = 0xcf,
};
struct carl9170_set_key_cmd {
};
struct carl9170_set_key_cmd {
@@
-141,14
+142,6
@@
struct carl9170_rf_init_result {
} __packed;
#define CARL9170_RF_INIT_RESULT_SIZE 4
} __packed;
#define CARL9170_RF_INIT_RESULT_SIZE 4
-#define CARL9170_USB_WATCHDOG_INACTIVE 0
-#define CARL9170_USB_WATCHDOG_ON_DUTY 1
-
-struct carl9170_watchdog_cmd {
- __le32 state;
-} __packed;
-#define CARL9170_WATCHDOG_CMD_SIZE 4
-
#define CARL9170_PSM_SLEEP 0x1000
#define CARL9170_PSM_SOFTWARE 0
#define CARL9170_PSM_WAKE 0 /* internally used. */
#define CARL9170_PSM_SLEEP 0x1000
#define CARL9170_PSM_SOFTWARE 0
#define CARL9170_PSM_WAKE 0 /* internally used. */
@@
-160,10
+153,16
@@
struct carl9170_psm {
} __packed;
#define CARL9170_PSM_SIZE 4
} __packed;
#define CARL9170_PSM_SIZE 4
-struct carl9170_cab_flush_cmd {
- __le32 vif_id; /* currently unused */
+struct carl9170_bcn_ctrl_cmd {
+ __le32 vif_id;
+ __le32 mode;
+ __le32 bcn_addr;
+ __le32 bcn_len;
} __packed;
} __packed;
-#define CARL9170_CAB_FLUSH_CMD_SIZE 4
+#define CARL9170_BCN_CTRL_CMD_SIZE 16
+
+#define CARL9170_BCN_CTRL_DRAIN 0
+#define CARL9170_BCN_CTRL_CAB_TRIGGER 1
struct carl9170_cmd_head {
union {
struct carl9170_cmd_head {
union {
@@
-184,12
+183,11
@@
struct carl9170_cmd {
struct carl9170_set_key_cmd setkey;
struct carl9170_disable_key_cmd disablekey;
struct carl9170_u32_list echo;
struct carl9170_set_key_cmd setkey;
struct carl9170_disable_key_cmd disablekey;
struct carl9170_u32_list echo;
- struct carl9170_watchdog_cmd watchdog;
struct carl9170_reg_list rreg;
struct carl9170_write_reg wreg;
struct carl9170_rf_init rf_init;
struct carl9170_psm psm;
struct carl9170_reg_list rreg;
struct carl9170_write_reg wreg;
struct carl9170_rf_init rf_init;
struct carl9170_psm psm;
- struct carl9170_
cab_flush_cmd cab_flush
;
+ struct carl9170_
bcn_ctrl_cmd bcn_ctrl
;
u8 data[CARL9170_MAX_CMD_PAYLOAD_LEN];
} __packed;
} __packed;
u8 data[CARL9170_MAX_CMD_PAYLOAD_LEN];
} __packed;
} __packed;
@@
-258,7
+256,6
@@
struct carl9170_rsp {
struct carl9170_rf_init_result rf_init_res;
struct carl9170_u32_list rreg_res;
struct carl9170_u32_list echo;
struct carl9170_rf_init_result rf_init_res;
struct carl9170_u32_list rreg_res;
struct carl9170_u32_list echo;
- struct carl9170_watchdog_cmd watchdog;
struct carl9170_tx_status tx_status[0];
struct _carl9170_tx_status _tx_status[0];
struct carl9170_gpio gpio;
struct carl9170_tx_status tx_status[0];
struct _carl9170_tx_status _tx_status[0];
struct carl9170_gpio gpio;