projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
carl9170 firwmare: toolchain gcc 4.6.2
[carl9170fw.git]
/
carlfw
/
include
/
carl9170.h
diff --git
a/carlfw/include/carl9170.h
b/carlfw/include/carl9170.h
index 29e1e29c062d70b058665ba5396a2dcd6d0fda02..ab8e9ff696d723c7328fe4fb53fbd124486fa7d0 100644
(file)
--- a/
carlfw/include/carl9170.h
+++ b/
carlfw/include/carl9170.h
@@
-3,7
+3,7
@@
*
* Firmware context definition
*
*
* Firmware context definition
*
- * Copyright 2009
, 2010
Christian Lamparter <chunkeey@googlemail.com>
+ * 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
*
* 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
@@
-69,6
+69,13
@@
enum carl9170_suspend_mode {
CARL9170_AWAKE_HOST,
};
CARL9170_AWAKE_HOST,
};
+enum carl9170_phy_state {
+ CARL9170_PHY_OFF = 0,
+ CARL9170_PHY_ON
+};
+
+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.
@@
-76,7
+83,7
@@
enum carl9170_suspend_mode {
struct firmware_context_struct {
/* timer / clocks */
struct firmware_context_struct {
/* timer / clocks */
- unsigned int ticks_per_
m
sec;
+ unsigned int ticks_per_
u
sec;
unsigned int counter; /* main() cycles */
/* misc */
unsigned int counter; /* main() cycles */
/* misc */
@@
-93,35
+100,24
@@
struct firmware_context_struct {
struct {
/* Hardware DMA queues */
struct dma_queue tx_queue[__AR9170_NUM_TX_QUEUES]; /* wlan tx queue */
struct {
/* Hardware DMA queues */
struct dma_queue tx_queue[__AR9170_NUM_TX_QUEUES]; /* wlan tx queue */
+ struct dma_queue tx_retry;
struct dma_queue rx_queue; /* wlan rx queue */
struct dma_queue rx_queue; /* wlan rx queue */
-#ifdef CONFIG_CARL9170FW_DELAYED_TX
- struct dma_queue tx_delay[__AR9170_NUM_TX_QUEUES];
- struct dma_queue tx_retry;
- unsigned int tx_trigger;
-#endif /* CONFIG_CARL9170FW_DELAYED_TX */
+ /* tx aggregate scheduling */
+ struct carl9170_tx_superframe *ampdu_prev[__AR9170_NUM_TX_QUEUES];
/* Hardware DMA queue unstuck/fix detection */
/* Hardware DMA queue unstuck/fix detection */
- unsigned int last_
tx_desc
_num[__AR9170_NUM_TX_QUEUES];
- struct
dma_desc *last_tx_desc
[__AR9170_NUM_TX_QUEUES];
+ unsigned int last_
super
_num[__AR9170_NUM_TX_QUEUES];
+ struct
carl9170_tx_superframe *last_super
[__AR9170_NUM_TX_QUEUES];
unsigned int mac_reset;
unsigned int soft_int;
/* rx filter */
unsigned int rx_filter;
unsigned int mac_reset;
unsigned int soft_int;
/* rx filter */
unsigned int rx_filter;
- /* rx statistics */
- unsigned int rx_total;
- unsigned int rx_overruns;
-
/* tx sequence control counters */
unsigned int sequence[CARL9170_INTF_NUM];
/* tx sequence control counters */
unsigned int sequence[CARL9170_INTF_NUM];
-#ifdef CONFIG_CARL9170FW_TX_AMPDU
- /* tx aggregate scheduling */
- struct carl9170_tx_superframe *ampdu_prev[__AR9170_NUM_TX_QUEUES];
-#endif /* CONFIG_CARL9170FW_TX_AMPDU */
-
#ifdef CONFIG_CARL9170FW_CAB_QUEUE
/* CAB */
struct dma_queue cab_queue[CARL9170_INTF_NUM];
#ifdef CONFIG_CARL9170FW_CAB_QUEUE
/* CAB */
struct dma_queue cab_queue[CARL9170_INTF_NUM];
@@
-136,14
+132,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 {
@@
-189,12
+197,15
@@
struct firmware_context_struct {
unsigned int frequency;
unsigned int ht_settings;
unsigned int frequency;
unsigned int ht_settings;
-#ifdef CONFIG_CARL9170FW_PSM
+ enum carl9170_phy_state state;
struct carl9170_psm psm;
struct carl9170_psm psm;
-#endif /* CONFIG_CARL9170FW_PSM */
#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
} phy;
#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
} phy;
+ unsigned int tally_clock;
+ struct carl9170_tally_rsp tally;
+ unsigned int tx_time;
+
#ifdef CONFIG_CARL9170FW_GPIO_INTERRUPT
struct carl9170_gpio cached_gpio_state;
#endif /*CONFIG_CARL9170FW_GPIO_INTERRUPT */
#ifdef CONFIG_CARL9170FW_GPIO_INTERRUPT
struct carl9170_gpio cached_gpio_state;
#endif /*CONFIG_CARL9170FW_GPIO_INTERRUPT */