Re: FDT without audio

[Jared McNeill <jmcneill%invisible.ca@localhost>]

On Mon, 14 May 2018, Robert Swindells wrote:
> I'm trying to convert a port over to use FDT and am getting an
> error because it doesn't include any audio devices:
>
> In file included from ../../../../dev/audio_dai.h:32:0,
>                 from ../../../../dev/fdt/fdtvar.h:39,
>                 from ../../../../arch/arm/fdt/arm_fdt.c:41:
> ../../../../dev/audio_if.h:49:2: error: #error "No 'audio* at audiobus?' or 'midi* at midibus?' or similar configured"
> #error "No 'audio* at audiobus?' or 'midi* at midibus?' or similar configured"
>  ^~~~~

Yuck. Does this help?

Index: fdtvar.h
===================================================================
RCS file: /cvsroot/src/sys/dev/fdt/fdtvar.h,v
retrieving revision 1.31
diff -u -p -r1.31 fdtvar.h
--- fdtvar.h	9 May 2018 23:59:05 -0000	1.31
+++ fdtvar.h	14 May 2018 20:46:10 -0000
@@ -36,7 +36,13 @@
 #include <dev/i2c/i2cvar.h>
 #include <dev/pwm/pwmvar.h>
 #include <dev/clk/clk.h>
+
+#include "audio.h"
+#if NAUDIO > 0
 #include <dev/audio_dai.h>
+#else
+typedef void *audio_dai_tag_t;
+#endif

 #include <dev/clock_subr.h>