ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-17 18:29:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename Linux audio driver to linux_audio_drv

Browse Source 
Related to #2190
Fixes #2278
This commit is contained in:
Christian Helmuth 2017-03-09 17:08:26 +01:00
parent 43e7cc56a3
commit b9834bc388
8 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
repos/base/run/platform_drv.inc
View File

@ -40,6 +40,15 @@ proc nic_drv_binary { } {
} }
##
# Return name of the audio driver binary
#
proc audio_drv_binary { } {
if {[have_spec linux]} { return linux_audio_drv }
if {[have_spec x86]} { return audio_drv }
}
proc platform_drv_build_components {} { proc platform_drv_build_components {} {
set drv_build_components "" set drv_build_components ""
lappend_if [have_platform_drv] drv_build_components drivers/platform lappend_if [have_platform_drv] drv_build_components drivers/platform

7
repos/dde_bsd/run/audio_out.run
View File

@ -71,6 +71,7 @@ append_if $use_mixer config {
append config { append config {
<start name="audio_drv"> <start name="audio_drv">
<binary name="} [audio_drv_binary] {"/>
<resource name="RAM" quantum="8M"/> <resource name="RAM" quantum="8M"/>
<provides> <service name="Audio_out"/> </provides> <provides> <service name="Audio_out"/> </provides>
<config /> <config />
@ -113,8 +114,10 @@ if {![file exists bin/sample.raw]} {
# Boot modules # Boot modules
# #
set boot_modules { append boot_modules {
core ld.lib.so init timer audio_drv test-audio_out sample.raw } core ld.lib.so init timer } [audio_drv_binary] {
test-audio_out sample.raw
}
lappend_if $use_mixer boot_modules mixer lappend_if $use_mixer boot_modules mixer

5
repos/libports/run/avplay.run
View File

@ -78,6 +78,7 @@ append config {
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
</start> </start>
<start name="audio_drv"> <start name="audio_drv">
<binary name="} [audio_drv_binary] {"/>
<resource name="RAM" quantum="8M"/> <resource name="RAM" quantum="8M"/>
<route> <route>
<any-service> <any-child /> <parent /></any-service> <any-service> <any-child /> <parent /></any-service>
@ -114,8 +115,8 @@ install_config $config
# Boot modules # Boot modules
# #
set boot_modules { append boot_modules {
core init timer audio_drv avplay core init timer } [audio_drv_binary] { avplay
ld.lib.so libc.lib.so libm.lib.so pthread.lib.so zlib.lib.so sdl.lib.so ld.lib.so libc.lib.so libm.lib.so pthread.lib.so zlib.lib.so sdl.lib.so
avfilter.lib.so avutil.lib.so avcodec.lib.so avformat.lib.so swscale.lib.so avfilter.lib.so avutil.lib.so avcodec.lib.so avformat.lib.so swscale.lib.so
avresample.lib.so avresample.lib.so

3
repos/libports/run/qt5_drivers.inc
View File

@ -152,6 +152,7 @@ proc drivers_start_nodes { feature_arg } {
append_if [use_audio_drv feature] start_nodes { append_if [use_audio_drv feature] start_nodes {
<start name="audio_drv"> <start name="audio_drv">
<binary name="} [audio_drv_binary] {"/>
<resource name="RAM" quantum="8M"/> <resource name="RAM" quantum="8M"/>
<provides><service name="Audio_out"/></provides> <provides><service name="Audio_out"/></provides>
<config/> <config/>
@ -305,7 +306,7 @@ proc drivers_boot_modules { feature_arg } {
# local version defined above. # local version defined above.
append_platform_drv_boot_modules append_platform_drv_boot_modules
lappend_if [use_audio_drv feature] boot_modules audio_drv lappend_if [use_audio_drv feature] boot_modules [audio_drv_binary]
lappend_if [use_fb_drv feature] boot_modules fb_drv lappend_if [use_fb_drv feature] boot_modules fb_drv
lappend_if [use_fb_sdl feature] boot_modules fb_sdl lappend_if [use_fb_sdl feature] boot_modules fb_sdl
lappend_if [use_gpio_drv feature] boot_modules [gpio_drv] lappend_if [use_gpio_drv feature] boot_modules [gpio_drv]

5
repos/os/run/audio_out_click.run
View File

@ -62,6 +62,7 @@ append config {
<provides><service name="Input"/></provides> <provides><service name="Input"/></provides>
</start> </start>
<start name="audio_drv"> <start name="audio_drv">
<binary name="} [audio_drv_binary] {"/>
<resource name="RAM" quantum="8M"/> <resource name="RAM" quantum="8M"/>
<provides> <provides>
<service name="Audio_out"/> <service name="Audio_out"/>
@ -102,8 +103,8 @@ if {[expr ![file exists bin/sample.raw] || ![file exists bin/click.raw]]} {
# Boot modules # Boot modules
# #
set boot_modules { append boot_modules {
core ld.lib.so init timer mixer ps2_drv audio_drv core ld.lib.so init timer mixer ps2_drv } [audio_drv_binary] {
test-audio_out test-audio_out_click test-audio_out test-audio_out_click
sample.raw click.raw } sample.raw click.raw }

5
repos/os/run/mixer.run
View File

@ -51,6 +51,7 @@ append config {
</start> </start>
<start name="audio_drv"> <start name="audio_drv">
<binary name="} [audio_drv_binary] {"/>
<resource name="RAM" quantum="8M"/> <resource name="RAM" quantum="8M"/>
<provides><service name="Audio_out"/></provides> <provides><service name="Audio_out"/></provides>
<config/> <config/>
@ -171,10 +172,10 @@ if {[expr ![file exists bin/client1.f32] || ![file exists bin/client2.f32]]} {
# #
# generic modules # generic modules
set boot_modules { append boot_modules {
core ld.lib.so init timer core ld.lib.so init timer
report_rom dynamic_rom report_rom dynamic_rom
audio_drv test-audio_out } [audio_drv_binary] { test-audio_out
mixer client1.f32 client2.f32 mixer client1.f32 client2.f32
} }

2
repos/os/src/drivers/audio/spec/linux/target.mk
View File

@ -1,5 +1,5 @@
TARGET = linux_audio_drv
REQUIRES = linux REQUIRES = linux
TARGET = audio_drv
LIBS = lx_hybrid LIBS = lx_hybrid
SRC_CC = main.cc SRC_CC = main.cc
SRC_C = alsa.c SRC_C = alsa.c

5
repos/ports/run/dosbox.run
View File

@ -80,6 +80,7 @@ append_if [have_spec ps2] config {
append config { append config {
<start name="audio_drv"> <start name="audio_drv">
<binary name="} [audio_drv_binary] {"/>
<resource name="RAM" quantum="6M"/> <resource name="RAM" quantum="6M"/>
<provides><service name="Audio_out"/></provides> <provides><service name="Audio_out"/></provides>
</start> </start>
@ -117,8 +118,8 @@ if {![file exists bin/dosbox.tar]} {
# #
# generic modules # generic modules
set boot_modules { append boot_modules {
core init timer audio_drv core init timer } [audio_drv_binary] {
ld.lib.so ld.lib.so
libc.lib.so libc.lib.so
libm.lib.so lwip.lib.so libpng.lib.so libm.lib.so lwip.lib.so libpng.lib.so