Skip to content

Commit 2ba0116

Browse files
lrgirdwolrgirdwo
committed
uapi: split ipc.h and abi.h into small files.
Split the larger ABI files into smaller more manageable chunks. Also split by end user into IPC and user space ABIs. Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
1 parent fe1c63b commit 2ba0116

90 files changed

Lines changed: 1855 additions & 1231 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎configure.ac‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,8 @@ AC_CONFIG_FILES([
577577
src/include/sof/drivers/Makefile
578578
src/include/sof/math/Makefile
579579
src/include/uapi/Makefile
580+
src/include/uapi/ipc/Makefile
581+
src/include/uapi/user/Makefile
580582
src/ipc/Makefile
581583
src/library/Makefile
582584
src/library/include/Makefile

‎rimage/file_format.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@
6363
#ifndef __INCLUDE_UAPI_SOF_FW_H__
6464
#define __INCLUDE_UAPI_SOF_FW_H__
6565

66-
/* Skip inclusion of <sof/io.h> which causes errors */
67-
#define __INCLUDE_IO__
68-
#include <uapi/ipc.h>
66+
#include <uapi/ipc/info.h>
6967

7068
#define SND_SOF_FW_SIG_SIZE 4
7169
#define SND_SOF_FW_ABI 1

‎rimage/manifest.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
#include <time.h>
2525
#include <sys/time.h>
2626

27-
#include "uapi/manifest.h"
27+
#include <uapi/user/manifest.h>
28+
2829
#include "rimage.h"
2930
#include "file_format.h"
3031
#include "css.h"

‎rimage/manifest.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#define __MANIFEST_H__
1616

1717
#include <stdint.h>
18-
#include "uapi/manifest.h"
18+
#include <uapi/user/manifest.h>
1919
#include "css.h"
2020
#include "cse.h"
2121
#include "plat_auth.h"

‎src/arch/xtensa/boot_loader.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <arch/wait.h>
3333
#include <sof/trace.h>
3434
#include <sof/io.h>
35-
#include <uapi/manifest.h>
35+
#include <uapi/user/manifest.h>
3636
#include <platform/platform.h>
3737
#include <platform/memory.h>
3838

‎src/arch/xtensa/include/arch/sof.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include <stdint.h>
3636
#include <stddef.h>
3737
#include <sof/mailbox.h>
38-
#include <uapi/ipc.h>
38+
#include <uapi/ipc/xtensa.h>
3939

4040
/* architecture specific stack frames to dump */
4141
#define ARCH_STACK_DUMP_FRAMES 32

‎src/audio/component.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include <sof/alloc.h>
3939
#include <sof/audio/component.h>
4040
#include <sof/audio/pipeline.h>
41-
#include <uapi/ipc.h>
41+
#include <uapi/ipc/topology.h>
4242

4343
struct comp_data {
4444
struct list_item list; /* list of components */

‎src/audio/eq_fir.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include <stdbool.h>
3434
#include <sof/sof.h>
3535
#include <sof/audio/component.h>
36-
#include <uapi/eq.h>
36+
#include <uapi/user/eq.h>
3737
#include "fir_config.h"
3838

3939
#if FIR_GENERIC

‎src/audio/eq_iir.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
#include <sof/audio/component.h>
4545
#include <sof/audio/pipeline.h>
4646
#include <sof/audio/format.h>
47-
#include <uapi/ipc.h>
48-
#include <uapi/eq.h>
47+
#include <uapi/ipc/control.h>
48+
#include <uapi/user/eq.h>
4949
#include "eq_iir.h"
5050
#include "iir.h"
5151

‎src/audio/fir.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include <errno.h>
3636
#include <sof/audio/component.h>
3737
#include <sof/audio/format.h>
38-
#include <uapi/eq.h>
38+
#include <uapi/user/eq.h>
3939
#include "fir_config.h"
4040

4141
#if FIR_GENERIC

0 commit comments

Comments
 (0)