diff options
| author | Simon Glass <sjg@chromium.org> | 2018-12-10 10:37:47 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2018-12-13 16:36:41 -0700 |
| commit | f2b25c9bf8212139f43ded090c78d604babc4337 (patch) | |
| tree | 8da5a8bcb40cf982708cfb9af886f94c9f6364c1 /arch/sandbox/include/asm | |
| parent | 1e224fef9446e8c0cde57636dd8a36d0ebc85437 (diff) | |
| download | u-boot-f2b25c9bf8212139f43ded090c78d604babc4337.tar.gz | |
dm: sound: Complete migration to driver model
All users of sound are converted to use driver model. Drop the old code
and the CONFIG_DM_SOUND option.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/sandbox/include/asm')
| -rw-r--r-- | arch/sandbox/include/asm/sdl.h | 21 | ||||
| -rw-r--r-- | arch/sandbox/include/asm/sound.h | 13 |
2 files changed, 9 insertions, 25 deletions
diff --git a/arch/sandbox/include/asm/sdl.h b/arch/sandbox/include/asm/sdl.h index 0143ed9e62..2799a8bee0 100644 --- a/arch/sandbox/include/asm/sdl.h +++ b/arch/sandbox/include/asm/sdl.h @@ -54,12 +54,12 @@ int sandbox_sdl_scan_keys(int key[], int max_keys); int sandbox_sdl_key_pressed(int keycode); /** - * sandbox_sdl_sound_start() - start playing a sound + * sandbox_sdl_sound_play() - Play a sound * - * @frequency: Frequency of sounds in Hertz - * @return 0 if OK, -ENODEV if no sound is available + * @data: Data to play (typically 16-bit) + * @count: Number of bytes in data */ -int sandbox_sdl_sound_start(uint frequency); +int sandbox_sdl_sound_play(const void *data, uint count); /** * sandbox_sdl_sound_stop() - stop playing a sound @@ -69,14 +69,6 @@ int sandbox_sdl_sound_start(uint frequency); int sandbox_sdl_sound_stop(void); /** - * sandbox_sdl_sound_play() - Play a sound - * - * @data: Data to play (typically 16-bit) - * @count: Number of bytes in data - */ -int sandbox_sdl_sound_play(const void *data, uint count); - -/** * sandbox_sdl_sound_init() - set up the sound system * * @return 0 if OK, -ENODEV if no sound is available @@ -110,6 +102,11 @@ static inline int sandbox_sdl_sound_start(uint frequency) return -ENODEV; } +int sandbox_sdl_sound_play(const void *data, uint count) +{ + return -ENODEV; +} + static inline int sandbox_sdl_sound_stop(void) { return -ENODEV; diff --git a/arch/sandbox/include/asm/sound.h b/arch/sandbox/include/asm/sound.h deleted file mode 100644 index a6015b0f60..0000000000 --- a/arch/sandbox/include/asm/sound.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (c) 2013 Google, Inc - */ - -#ifndef __SANDBOX_SOUND_H -#define __SANDBOX_SOUND_H - -int sound_play(unsigned int msec, unsigned int frequency); - -int sound_init(const void *blob); - -#endif |