projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/chr/carl9170fw
[carl9170fw.git]
/
carlfw
/
include
/
carl9170.h
diff --git
a/carlfw/include/carl9170.h
b/carlfw/include/carl9170.h
index 85ea1d2425bd5895915aff9525cb407a61f01bac..4b0738d651a3fd0bdc93552284c3ed4e63652b85 100644
(file)
--- a/
carlfw/include/carl9170.h
+++ b/
carlfw/include/carl9170.h
@@
-69,6
+69,8
@@
enum carl9170_suspend_mode {
CARL9170_AWAKE_HOST,
};
CARL9170_AWAKE_HOST,
};
+typedef void (*fw_desc_callback_t)(void *, const bool);
+
/*
* This platform - being an odd 32-bit architecture - prefers to
* have 32-Bit variables.
/*
* This platform - being an odd 32-bit architecture - prefers to
* have 32-Bit variables.
@@
-129,14
+131,26
@@
struct firmware_context_struct {
tx_status_tail_idx;
struct carl9170_tx_status tx_status_cache[CARL9170_TX_STATUS_NUM];
tx_status_tail_idx;
struct carl9170_tx_status tx_status_cache[CARL9170_TX_STATUS_NUM];
-#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
+ /* internal descriptor for use within the service routines */
+ struct dma_desc *fw_desc;
+ unsigned int fw_desc_available;
+ void *fw_desc_data;
+ fw_desc_callback_t fw_desc_callback;
+
/* BA(R) Request Handler */
/* BA(R) Request Handler */
- struct dma_desc *ba_desc;
struct carl9170_bar_ctx ba_cache[CONFIG_CARL9170FW_BACK_REQS_NUM];
struct carl9170_bar_ctx ba_cache[CONFIG_CARL9170FW_BACK_REQS_NUM];
- unsigned int ba_desc_available,
- ba_tail_idx,
+ unsigned int ba_tail_idx,
ba_head_idx;
ba_head_idx;
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
+
+#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 */
} wlan;
struct {
} wlan;
struct {