Rename 'oss_drv' to 'audio_out_drv'

Fixes #829.

dde_oss/run/oss.run

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

dde_oss/src/drivers/audio_out/target.mk

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

libports/run/avplay.run

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

libports/run/qt5_avplay.run

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

os/run/mixer.run

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

qt4/run/qt_avplay.run

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