Rename 'oss_drv' to 'audio_out_drv'

Fixes #829.
This commit is contained in:
Christian Prochaska 2013-08-09 16:48:03 +02:00 committed by Norman Feske
parent a125f7179e
commit f0b5c5eca5
22 changed files with 31 additions and 28 deletions

View File

@ -11,7 +11,7 @@ if {![have_spec x86_32]} {
set build_components { set build_components {
core init core init
drivers/timer drivers/timer
drivers/oss drivers/audio_out
drivers/pci drivers/pci
drivers/acpi drivers/acpi
test/audio_out test/audio_out
@ -61,7 +61,7 @@ append config {
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
</start> </start>
<start name="oss_drv"> <start name="audio_out_drv">
<resource name="RAM" quantum="6M"/> <resource name="RAM" quantum="6M"/>
<route> <route>
<service name="IRQ"><child name="acpi" /></service> <service name="IRQ"><child name="acpi" /></service>
@ -78,7 +78,7 @@ append config {
<filename>sample.raw</filename> <filename>sample.raw</filename>
</config> </config>
<route> <route>
<service name="Audio_out"> <child name="oss_drv"/> </service> <service name="Audio_out"> <child name="audio_out_drv"/> </service>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</route> </route>
</start> </start>
@ -91,7 +91,7 @@ install_config $config
# #
set boot_modules { set boot_modules {
core init timer pci_drv oss_drv acpi_drv sample.raw test-audio_out } core init timer pci_drv audio_out_drv acpi_drv sample.raw test-audio_out }
lappend_if [have_spec nova] boot_modules pci_device_pd lappend_if [have_spec nova] boot_modules pci_device_pd

View File

@ -1,4 +1,4 @@
TARGET = oss_drv TARGET = audio_out_drv
REQUIRES = x86_32 REQUIRES = x86_32
LIBS = dde_kit LIBS = dde_kit
CONTRIB_DIR = $(REP_DIR)/contrib CONTRIB_DIR = $(REP_DIR)/contrib

View File

@ -5,7 +5,7 @@
build { build {
core init core init
drivers/timer drivers/timer
drivers/framebuffer drivers/pci drivers/input drivers/oss drivers/framebuffer drivers/pci drivers/input drivers/audio_out
server/mixer server/mixer
app/avplay drivers/acpi app/avplay drivers/acpi
} }

View File

@ -9,7 +9,7 @@ build {
drivers/pci drivers/pci
drivers/framebuffer drivers/framebuffer
drivers/timer drivers/timer
drivers/oss drivers/audio_out
server/nitpicker server/nitpicker
server/liquid_framebuffer server/liquid_framebuffer
app/avplay app/avplay
@ -83,7 +83,7 @@ append config {
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
</start> </start>
<start name="oss_drv"> <start name="audio_out_drv">
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="Audio_out"/></provides> <provides><service name="Audio_out"/></provides>
</start> </start>
@ -111,7 +111,7 @@ set boot_modules {
core core
init init
timer timer
oss_drv audio_out_drv
nitpicker nitpicker
liquid_fb liquid_fb
qt_avplay qt_avplay

View File

@ -6,17 +6,15 @@
set build_components { set build_components {
core init core init
drivers/timer drivers/timer
drivers/audio_out
server/mixer server/mixer
test/audio_out test/audio_out
} }
# platform-specific components # platform-specific components
if {[have_spec linux]} { if {![have_spec linux]} {
lappend build_components drivers/audio_out
} else {
lappend build_components drivers/pci lappend build_components drivers/pci
lappend build_components drivers/acpi lappend build_components drivers/acpi
lappend build_components drivers/oss
} }
build $build_components build $build_components
@ -63,21 +61,11 @@ if {![have_spec linux]} {
</route> </route>
</start> </start>
<start name="audio_out_drv"> <start name="audio_out_drv">
<binary name="oss_drv" />
<resource name="RAM" quantum="6M"/> <resource name="RAM" quantum="6M"/>
<route> <route>
<service name="IRQ"><child name="acpi" /></service> <service name="IRQ"><child name="acpi" /></service>
<any-service> <parent /> <any-child /></any-service> <any-service> <parent /> <any-child /></any-service>
</route> </route>
<provides>
<service name="Audio_out"/>
</provides>
</start>
}
} else {
append config {
<start name="audio_out_drv">
<resource name="RAM" quantum="1M" />
<provides> <provides>
<service name="Audio_out" /> <service name="Audio_out" />
</provides> </provides>
@ -86,6 +74,23 @@ if {![have_spec linux]} {
} }
append config { append config {
<start name="audio_out_drv">
<resource name="RAM" quantum="6M"/>
}
append_if [expr ![have_spec linux]] config {
<route>
<service name="IRQ"><child name="acpi" /></service>
<any-service> <parent /> <any-child /></any-service>
</route>
}
append config {
<provides>
<service name="Audio_out"/>
</provides>
</start>
<start name="timer"> <start name="timer">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
@ -124,6 +129,7 @@ install_config $config
set boot_modules { set boot_modules {
core init core init
timer timer
audio_out_drv
test-audio_out test-audio_out
sample.raw sample.raw
vogel.f32 vogel.f32
@ -131,10 +137,7 @@ set boot_modules {
} }
# platform-specific components # platform-specific components
if {[have_spec linux]} { if {![have_spec linux]} {
lappend boot_modules audio_out_drv
} else {
lappend boot_modules oss_drv
lappend boot_modules acpi_drv lappend boot_modules acpi_drv
lappend boot_modules pci_drv lappend boot_modules pci_drv
} }

View File

@ -83,7 +83,7 @@ append config {
<provides><service name="Timer"/></provides> <provides><service name="Timer"/></provides>
</start> </start>
<start name="audio_out_drv"> <start name="audio_out_drv">
<resource name="RAM" quantum="2M"/> <resource name="RAM" quantum="6M"/>
<provides><service name="Audio_out"/></provides> <provides><service name="Audio_out"/></provides>
</start> </start>
<start name="nitpicker"> <start name="nitpicker">