diff options
| author | Takashi Iwai | 2019-07-01 17:01:00 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2019-07-01 17:01:55 +0200 |
| commit | b5c21c84705dbd96a0fff930d33022a17910b4f4 (patch) | |
| tree | a080aa4383c8f4ffb91225d234ac9b530b2ff0fa /include/sound/sof/info.h | |
| parent | ALSA: hda: Fix a headphone detection issue when using SOF (diff) | |
| parent | ALSA: firewire-lib/fireworks: fix miss detection of received MIDI messages (diff) | |
| download | kernel-qcow2-linux-b5c21c84705dbd96a0fff930d33022a17910b4f4.tar.gz kernel-qcow2-linux-b5c21c84705dbd96a0fff930d33022a17910b4f4.tar.xz kernel-qcow2-linux-b5c21c84705dbd96a0fff930d33022a17910b4f4.zip | |
Merge branch 'for-linus' into for-next
This back-merge is necessary for adjusting the latest FireWire fix
with the recent refactoring in 5.3 development branch.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/sof/info.h')
| -rw-r--r-- | include/sound/sof/info.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/sound/sof/info.h b/include/sound/sof/info.h index 21dae04d8183..16528d2b4a50 100644 --- a/include/sound/sof/info.h +++ b/include/sound/sof/info.h @@ -18,6 +18,14 @@ #define SOF_IPC_MAX_ELEMS 16 +/* + * Firmware boot info flag bits (64-bit) + */ +#define SOF_IPC_INFO_BUILD BIT(0) +#define SOF_IPC_INFO_LOCKS BIT(1) +#define SOF_IPC_INFO_LOCKSV BIT(2) +#define SOF_IPC_INFO_GDB BIT(3) + /* extended data types that can be appended onto end of sof_ipc_fw_ready */ enum sof_ipc_ext_data { SOF_IPC_EXT_DMA_BUFFER = 0, @@ -49,16 +57,8 @@ struct sof_ipc_fw_ready { uint32_t hostbox_size; struct sof_ipc_fw_version version; - /* Miscellaneous debug flags showing build/debug features enabled */ - union { - uint64_t reserved; - struct { - uint64_t build:1; - uint64_t locks:1; - uint64_t locks_verbose:1; - uint64_t gdb:1; - } bits; - } debug; + /* Miscellaneous flags */ + uint64_t flags; /* reserved for future use */ uint32_t reserved[4]; |