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 pram size comment
[carl9170fw.git]
/
include
/
shared
/
fwdesc.h
diff --git
a/include/shared/fwdesc.h
b/include/shared/fwdesc.h
index 03b9ef24c5b91cc2731da34f5daf888a212d3f36..71f3821f60581d721bd203cea46ed31245e26679 100644
(file)
--- a/
include/shared/fwdesc.h
+++ b/
include/shared/fwdesc.h
@@
-1,5
+1,7
@@
/*
/*
- * Firmware Descriptor definitions
+ * Shared CARL9170 Header
+ *
+ * Firmware descriptor format
*
* Copyright 2009, 2010, Christian Lamparter <chunkeey@googlemail.com>
*
*
* Copyright 2009, 2010, Christian Lamparter <chunkeey@googlemail.com>
*
@@
-43,9
+45,6
@@
enum carl9170fw_feature_list {
/* usb upload (fw -> app) stream */
CARL9170FW_USB_UP_STREAM,
/* usb upload (fw -> app) stream */
CARL9170FW_USB_UP_STREAM,
- /* USB Watchdog */
- CARL9170FW_USB_WATCHDOG,
-
/* unusable - reserved to flag non-functional debug firmwares */
CARL9170FW_UNUSABLE,
/* unusable - reserved to flag non-functional debug firmwares */
CARL9170FW_UNUSABLE,
@@
-67,6
+66,9
@@
enum carl9170fw_feature_list {
/* Firmware PSM support | CARL9170_CMD_PSM */
CARL9170FW_PSM,
/* Firmware PSM support | CARL9170_CMD_PSM */
CARL9170FW_PSM,
+ /* Firmware RX filter | CARL9170_CMD_RX_FILTER */
+ CARL9170FW_RX_FILTER,
+
/* KEEP LAST */
__CARL9170FW_FEATURE_NUM
};
/* KEEP LAST */
__CARL9170FW_FEATURE_NUM
};
@@
-95,8
+97,8
@@
struct carl9170fw_desc_head {
#define CARL9170FW_DESC_HEAD_SIZE \
(sizeof(struct carl9170fw_desc_head))
#define CARL9170FW_DESC_HEAD_SIZE \
(sizeof(struct carl9170fw_desc_head))
-#define CARL9170FW_OTUS_DESC_MIN_VER
3
-#define CARL9170FW_OTUS_DESC_CUR_VER
3
+#define CARL9170FW_OTUS_DESC_MIN_VER
6
+#define CARL9170FW_OTUS_DESC_CUR_VER
6
struct carl9170fw_otus_desc {
struct carl9170fw_desc_head head;
__le32 feature_set;
struct carl9170fw_otus_desc {
struct carl9170fw_desc_head head;
__le32 feature_set;
@@
-143,7
+145,7
@@
struct carl9170fw_fix_desc {
(sizeof(struct carl9170fw_fix_desc))
#define CARL9170FW_DBG_DESC_MIN_VER 1
(sizeof(struct carl9170fw_fix_desc))
#define CARL9170FW_DBG_DESC_MIN_VER 1
-#define CARL9170FW_DBG_DESC_CUR_VER
2
+#define CARL9170FW_DBG_DESC_CUR_VER
3
struct carl9170fw_dbg_desc {
struct carl9170fw_desc_head head;
struct carl9170fw_dbg_desc {
struct carl9170fw_desc_head head;
@@
-151,6
+153,7
@@
struct carl9170fw_dbg_desc {
__le32 counter_addr;
__le32 rx_total_addr;
__le32 rx_overrun_addr;
__le32 counter_addr;
__le32 rx_total_addr;
__le32 rx_overrun_addr;
+ __le32 rx_filter;
/* Put your debugging definitions here */
} __packed;
/* Put your debugging definitions here */
} __packed;