projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
carl9170 toolchain: update binutils, gcc
[carl9170fw.git]
/
carlfw
/
include
/
carl9170.h
diff --git
a/carlfw/include/carl9170.h
b/carlfw/include/carl9170.h
index ab8e9ff696d723c7328fe4fb53fbd124486fa7d0..0a52a67523c58e608ea7c40d28a9ced217725024 100644
(file)
--- a/
carlfw/include/carl9170.h
+++ b/
carlfw/include/carl9170.h
@@
-16,8
+16,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __CARL9170FW_CARL9170_H
*/
#ifndef __CARL9170FW_CARL9170_H
@@
-28,6
+27,7
@@
#include "config.h"
#include "types.h"
#include "compiler.h"
#include "config.h"
#include "types.h"
#include "compiler.h"
+#include "unaligned.h"
#include "fwcmd.h"
#include "hw.h"
#include "dma.h"
#include "fwcmd.h"
#include "hw.h"
#include "dma.h"
@@
-39,16
+39,13
@@
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
enum carl9170_cab_trigger {
CARL9170_CAB_TRIGGER_EMPTY = 0,
CARL9170_CAB_TRIGGER_ARMED = BIT(0),
CARL9170_CAB_TRIGGER_DEFER = BIT(1),
};
enum carl9170_cab_trigger {
CARL9170_CAB_TRIGGER_EMPTY = 0,
CARL9170_CAB_TRIGGER_ARMED = BIT(0),
CARL9170_CAB_TRIGGER_DEFER = BIT(1),
};
-#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
enum carl9170_ep0_action {
CARL9170_EP0_NO_ACTION = 0,
enum carl9170_ep0_action {
CARL9170_EP0_NO_ACTION = 0,
@@
-118,13
+115,11
@@
struct firmware_context_struct {
/* tx sequence control counters */
unsigned int sequence[CARL9170_INTF_NUM];
/* tx sequence control counters */
unsigned int sequence[CARL9170_INTF_NUM];
-#ifdef CONFIG_CARL9170FW_CAB_QUEUE
/* CAB */
struct dma_queue cab_queue[CARL9170_INTF_NUM];
unsigned int cab_queue_len[CARL9170_INTF_NUM];
unsigned int cab_flush_time;
enum carl9170_cab_trigger cab_flush_trigger[CARL9170_INTF_NUM];
/* CAB */
struct dma_queue cab_queue[CARL9170_INTF_NUM];
unsigned int cab_queue_len[CARL9170_INTF_NUM];
unsigned int cab_flush_time;
enum carl9170_cab_trigger cab_flush_trigger[CARL9170_INTF_NUM];
-#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
/* tx status */
unsigned int tx_status_pending,
/* tx status */
unsigned int tx_status_pending,
@@
-141,17
+136,10
@@
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;
+ ba_head_idx,
+ queued_ba;
-#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 */
+ unsigned int queued_bar;
} wlan;
struct {
} wlan;
struct {
@@
-206,6
+194,16
@@
struct firmware_context_struct {
struct carl9170_tally_rsp tally;
unsigned int tx_time;
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;
#endif /*CONFIG_CARL9170FW_GPIO_INTERRUPT */
#ifdef CONFIG_CARL9170FW_GPIO_INTERRUPT
struct carl9170_gpio cached_gpio_state;
#endif /*CONFIG_CARL9170FW_GPIO_INTERRUPT */