projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
carl9170 firmware: remove BAR->BA clutter
[carl9170fw.git]
/
carlfw
/
include
/
carl9170.h
diff --git
a/carlfw/include/carl9170.h
b/carlfw/include/carl9170.h
index 8cf84c0e3d35c06e1a9c3a0bb4332848200a78b0..d10a74e8064448eebbb60502a53b23c1bc7744ad 100644
(file)
--- a/
carlfw/include/carl9170.h
+++ b/
carlfw/include/carl9170.h
@@
-39,7
+39,6
@@
struct carl9170_bar_ctx {
uint8_t ra[6];
__le16 start_seq_num;
__le16 control;
uint8_t ra[6];
__le16 start_seq_num;
__le16 control;
- __le32 phy;
};
#ifdef CONFIG_CARL9170FW_CAB_QUEUE
};
#ifdef CONFIG_CARL9170FW_CAB_QUEUE
@@
-141,17
+140,8
@@
struct firmware_context_struct {
/* BA(R) Request Handler */
struct carl9170_bar_ctx ba_cache[CONFIG_CARL9170FW_BACK_REQS_NUM];
unsigned int ba_tail_idx,
/* BA(R) Request Handler */
struct carl9170_bar_ctx ba_cache[CONFIG_CARL9170FW_BACK_REQS_NUM];
unsigned int ba_tail_idx,
- ba_head_idx;
-
-#ifdef CONFIG_CARL9170FW_WOL
- struct {
- struct carl9170_wol_cmd cmd;
- unsigned int last_beacon;
- unsigned int lost_null;
- unsigned int last_null;
- bool wake_up;
- } wol;
-#endif /* CONFIG_CARL9170FW_WOL */
+ ba_head_idx,
+ queued_ba;
} wlan;
struct {
} wlan;
struct {
@@
-204,6
+194,17
@@
struct firmware_context_struct {
unsigned int tally_clock;
struct carl9170_tally_rsp tally;
unsigned int tally_clock;
struct carl9170_tally_rsp tally;
+ unsigned int tx_time;
+
+#ifdef CONFIG_CARL9170FW_WOL
+ struct {
+ struct carl9170_wol_cmd cmd;
+ unsigned int last_beacon;
+ unsigned int lost_null;
+ unsigned int last_null;
+ bool wake_up;
+ } wol;
+#endif /* CONFIG_CARL9170FW_WOL */
#ifdef CONFIG_CARL9170FW_GPIO_INTERRUPT
struct carl9170_gpio cached_gpio_state;
#ifdef CONFIG_CARL9170FW_GPIO_INTERRUPT
struct carl9170_gpio cached_gpio_state;