From: Simon Glass <sjg@chromium.org>
Date: Fri, 16 Nov 2018 02:56:15 +0000 (-0700)
Subject: sandbox: Enable sound
X-Git-Tag: v2019.01-rc1~16^2~7
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1180030d12e0c4f03522fa99f730e724845210fc;p=oweals%2Fu-boot.git

sandbox: Enable sound

Now that the buffer-overflow bug is fixed, we can enable sound on sandbox.
Drop the code which exits early.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/sandbox/cpu/sdl.c b/arch/sandbox/cpu/sdl.c
index c940a473d7..c7a8d94549 100644
--- a/arch/sandbox/cpu/sdl.c
+++ b/arch/sandbox/cpu/sdl.c
@@ -268,25 +268,6 @@ int sandbox_sdl_sound_init(void)
 	if (sdl.audio_active)
 		return 0;
 
-	/*
-	 * At present all sandbox sounds crash. This is probably due to
-	 * symbol name conflicts with U-Boot. We can remove the malloc()
-	 * probles with:
-	 *
-	 * #define USE_DL_PREFIX
-	 *
-	 * and get this:
-	 *
-	 * Assertion 'e->pollfd->fd == e->fd' failed at pulse/mainloop.c:676,
-	 *		function dispatch_pollfds(). Aborting.
-	 *
-	 * The right solution is probably to make U-Boot's names private or
-	 * link os.c and sdl.c against their libraries before liking with
-	 * U-Boot. TBD. For now sound is disabled.
-	 */
-	printf("(Warning: sandbox sound disabled)\n");
-	return 0;
-
 	/* Set the audio format */
 	wanted.freq = SAMPLE_RATE;
 	wanted.format = AUDIO_S16;