diff options
Diffstat (limited to 'sound/firewire/bebob/bebob_focusrite.c')
-rw-r--r-- | sound/firewire/bebob/bebob_focusrite.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/firewire/bebob/bebob_focusrite.c b/sound/firewire/bebob/bebob_focusrite.c index cd29dbc4b691..e71066d6f7cb 100644 --- a/sound/firewire/bebob/bebob_focusrite.c +++ b/sound/firewire/bebob/bebob_focusrite.c | |||
@@ -14,15 +14,15 @@ | |||
14 | #define DIG_OUT "Digital Out" | 14 | #define DIG_OUT "Digital Out" |
15 | #define STM_IN "Stream In" | 15 | #define STM_IN "Stream In" |
16 | 16 | ||
17 | #define SAFFIRE_ADDRESS_BASE 0x000100000000 | 17 | #define SAFFIRE_ADDRESS_BASE 0x000100000000ULL |
18 | 18 | ||
19 | #define SAFFIRE_OFFSET_CLOCK_SOURCE 0x0000000000f8 | 19 | #define SAFFIRE_OFFSET_CLOCK_SOURCE 0x00f8 |
20 | #define SAFFIREPRO_OFFSET_CLOCK_SOURCE 0x000000000174 | 20 | #define SAFFIREPRO_OFFSET_CLOCK_SOURCE 0x0174 |
21 | 21 | ||
22 | /* whether sync to external device or not */ | 22 | /* whether sync to external device or not */ |
23 | #define SAFFIRE_OFFSET_CLOCK_SYNC_EXT 0x00000000013c | 23 | #define SAFFIRE_OFFSET_CLOCK_SYNC_EXT 0x013c |
24 | #define SAFFIRE_LE_OFFSET_CLOCK_SYNC_EXT 0x000000000432 | 24 | #define SAFFIRE_LE_OFFSET_CLOCK_SYNC_EXT 0x0432 |
25 | #define SAFFIREPRO_OFFSET_CLOCK_SYNC_EXT 0x000000000164 | 25 | #define SAFFIREPRO_OFFSET_CLOCK_SYNC_EXT 0x0164 |
26 | 26 | ||
27 | #define SAFFIRE_CLOCK_SOURCE_INTERNAL 0 | 27 | #define SAFFIRE_CLOCK_SOURCE_INTERNAL 0 |
28 | #define SAFFIRE_CLOCK_SOURCE_SPDIF 1 | 28 | #define SAFFIRE_CLOCK_SOURCE_SPDIF 1 |
@@ -35,10 +35,10 @@ | |||
35 | #define SAFFIREPRO_CLOCK_SOURCE_WORDCLOCK 5 | 35 | #define SAFFIREPRO_CLOCK_SOURCE_WORDCLOCK 5 |
36 | 36 | ||
37 | /* S/PDIF, ADAT1, ADAT2 is enabled or not. three quadlets */ | 37 | /* S/PDIF, ADAT1, ADAT2 is enabled or not. three quadlets */ |
38 | #define SAFFIREPRO_ENABLE_DIG_IFACES 0x0000000001a4 | 38 | #define SAFFIREPRO_ENABLE_DIG_IFACES 0x01a4 |
39 | 39 | ||
40 | /* saffirepro has its own parameter for sampling frequency */ | 40 | /* saffirepro has its own parameter for sampling frequency */ |
41 | #define SAFFIREPRO_RATE_NOREBOOT 0x0000000001cc | 41 | #define SAFFIREPRO_RATE_NOREBOOT 0x01cc |
42 | /* index is the value for this register */ | 42 | /* index is the value for this register */ |
43 | static const unsigned int rates[] = { | 43 | static const unsigned int rates[] = { |
44 | [0] = 0, | 44 | [0] = 0, |
@@ -51,8 +51,8 @@ static const unsigned int rates[] = { | |||
51 | }; | 51 | }; |
52 | 52 | ||
53 | /* saffire(no label)/saffire LE has metering */ | 53 | /* saffire(no label)/saffire LE has metering */ |
54 | #define SAFFIRE_OFFSET_METER 0x000000000100 | 54 | #define SAFFIRE_OFFSET_METER 0x0100 |
55 | #define SAFFIRE_LE_OFFSET_METER 0x000000000168 | 55 | #define SAFFIRE_LE_OFFSET_METER 0x0168 |
56 | 56 | ||
57 | static inline int | 57 | static inline int |
58 | saffire_read_block(struct snd_bebob *bebob, u64 offset, | 58 | saffire_read_block(struct snd_bebob *bebob, u64 offset, |