uapi: fw: Add snd_ prefix to types

This aligns uapi/user/fw.h with the fw.h file used by Linux
and also prepares this header to be directly used by rimage.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
This commit is contained in:
Daniel Baluta 2019-01-28 14:03:09 +02:00 committed by Liam Girdwood
parent cf7bfd929a
commit 663fe669a9
1 changed files with 5 additions and 5 deletions

View File

@ -45,7 +45,7 @@
* Block header is used to determine where and how block is to be copied in the * Block header is used to determine where and how block is to be copied in the
* DSP/host memory space. * DSP/host memory space.
*/ */
enum sof_fw_blk_type { enum snd_sof_fw_blk_type {
SOF_BLK_IMAGE = 0, /* whole image - parsed by ROMs */ SOF_BLK_IMAGE = 0, /* whole image - parsed by ROMs */
SOF_BLK_TEXT = 1, SOF_BLK_TEXT = 1,
SOF_BLK_DATA = 2, SOF_BLK_DATA = 2,
@ -56,7 +56,7 @@ enum sof_fw_blk_type {
/* add new block types here */ /* add new block types here */
}; };
struct sof_blk_hdr { struct snd_sof_blk_hdr {
enum snd_sof_fw_blk_type type; enum snd_sof_fw_blk_type type;
uint32_t size; /* bytes minus this header */ uint32_t size; /* bytes minus this header */
uint32_t offset; /* offset from base */ uint32_t offset; /* offset from base */
@ -66,12 +66,12 @@ struct sof_blk_hdr {
* Firmware file is made up of 1 .. N different modules types. The module * Firmware file is made up of 1 .. N different modules types. The module
* type is used to determine how to load and parse the module. * type is used to determine how to load and parse the module.
*/ */
enum sof_fw_mod_type { enum snd_sof_fw_mod_type {
SOF_FW_BASE = 0, /* base firmware image */ SOF_FW_BASE = 0, /* base firmware image */
SOF_FW_MODULE = 1, /* firmware module */ SOF_FW_MODULE = 1, /* firmware module */
}; };
struct sof_mod_hdr { struct snd_sof_mod_hdr {
enum snd_sof_fw_mod_type type; enum snd_sof_fw_mod_type type;
uint32_t size; /* bytes minus this header */ uint32_t size; /* bytes minus this header */
uint32_t num_blocks; /* number of blocks */ uint32_t num_blocks; /* number of blocks */
@ -80,7 +80,7 @@ struct sof_mod_hdr {
/* /*
* Firmware file header. * Firmware file header.
*/ */
struct sof_fw_header { struct snd_sof_fw_header {
unsigned char sig[SND_SOF_FW_SIG_SIZE]; /* "Reef" */ unsigned char sig[SND_SOF_FW_SIG_SIZE]; /* "Reef" */
uint32_t file_size; /* size of file minus this header */ uint32_t file_size; /* size of file minus this header */
uint32_t num_modules; /* number of modules */ uint32_t num_modules; /* number of modules */