]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
sandbox: Enable sound
authorSimon Glass <sjg@chromium.org>
Fri, 16 Nov 2018 02:56:15 +0000 (19:56 -0700)
committerSimon Glass <sjg@chromium.org>
Thu, 29 Nov 2018 16:30:05 +0000 (09:30 -0700)
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>
arch/sandbox/cpu/sdl.c

index c940a473d7c03e31c96d8556fe8852e2af26b567..c7a8d9454924897ed41c084ccd69e75609de3dc2 100644 (file)
@@ -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;