OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

adsp: Refactor machine searching 

This part should be moved to separate function,
to allow easily add another way of machine description.

Signed-off-by: Karol Trzcinski <karolx.trzcinski@linux.intel.com>
This commit is contained in:
Karol Trzcinski 2020-09-07 16:33:49 +02:00 committed by Liam Girdwood
parent 29ed0da494
commit 210009c829
1 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/rimage.c
View File

@ -13,24 +13,6 @@
#include <rimage/rimage.h>
#include <rimage/manifest.h>
static const struct adsp *machine[] = {
&machine_byt,
&machine_cht,
&machine_bsw,
&machine_hsw,
&machine_bdw,
&machine_apl,
&machine_cnl,
&machine_icl,
&machine_jsl,
&machine_tgl,
&machine_sue,
&machine_kbl,
&machine_skl,
&machine_imx8,
&machine_imx8x,
&machine_imx8m,
};
static void usage(char *name)
{
@ -47,6 +29,40 @@ static void usage(char *name)
exit(0);
}
static const struct adsp *find_adsp(const char *mach)
{
static const struct adsp *machine[] = {
&machine_byt,
&machine_cht,
&machine_bsw,
&machine_hsw,
&machine_bdw,
&machine_apl,
&machine_cnl,
&machine_icl,
&machine_jsl,
&machine_tgl,
&machine_sue,
&machine_kbl,
&machine_skl,
&machine_imx8,
&machine_imx8x,
&machine_imx8m,
};
int i;
for (i = 0; i < ARRAY_SIZE(machine); i++) {
if (!strcmp(mach, machine[i]->name))
return machine[i];
}
fprintf(stderr, "error: machine %s not found\n", mach);
fprintf(stderr, "error: available machines ");
for (i = 0; i < ARRAY_SIZE(machine); i++)
fprintf(stderr, "%s, ", machine[i]->name);
fprintf(stderr, "\n");
return NULL;
}
int main(int argc, char *argv[])
{
struct image image;
@ -141,22 +157,9 @@ int main(int argc, char *argv[])
}
}
/* find machine */
for (i = 0; i < ARRAY_SIZE(machine); i++) {
if (!strcmp(mach, machine[i]->name)) {
image.adsp = machine[i];
goto found;
}
}
fprintf(stderr, "error: machine %s not found\n", mach);
fprintf(stderr, "error: available machines ");
for (i = 0; i < ARRAY_SIZE(machine); i++)
fprintf(stderr, "%s, ", machine[i]->name);
fprintf(stderr, "\n");
return -EINVAL;
found:
image.adsp = find_adsp(mach);
if (!image.adsp)
return -EINVAL;
/* set IMR Type in found machine definition */
if (image.adsp->man_v1_8)