summaryrefslogtreecommitdiffstats
path: root/sound/firewire/lib.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2013-12-10 07:22:40 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-12-10 07:22:40 +0100
commit5d43889c07bb38694742936aa70d1187c012e198 (patch)
tree73809dddae39ae3b746396e9779142dbd1973f33 /sound/firewire/lib.h
parentInput: ALPS - add support for DualPoint device on Dell XT2 model (diff)
parentLinux 3.13-rc3 (diff)
downloadlinux-5d43889c07bb38694742936aa70d1187c012e198.tar.xz
linux-5d43889c07bb38694742936aa70d1187c012e198.zip
Merge tag 'v3.13-rc3' into for-linus
Merging with the mainline to sync up on changes to serio core.
Diffstat (limited to 'sound/firewire/lib.h')
-rw-r--r--sound/firewire/lib.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/firewire/lib.h b/sound/firewire/lib.h
index aef301476ea9..02cfabc9c3c4 100644
--- a/sound/firewire/lib.h
+++ b/sound/firewire/lib.h
@@ -6,8 +6,13 @@
struct fw_unit;
+#define FW_GENERATION_MASK 0x00ff
+#define FW_FIXED_GENERATION 0x0100
+#define FW_QUIET 0x0200
+
int snd_fw_transaction(struct fw_unit *unit, int tcode,
- u64 offset, void *buffer, size_t length);
+ u64 offset, void *buffer, size_t length,
+ unsigned int flags);
/* returns true if retrying the transaction would not make sense */
static inline bool rcode_is_permanent_error(int rcode)