diff --git a/dde_oss/run/oss.run b/dde_oss/run/oss.run
index edee5d587..b7ca014c9 100644
--- a/dde_oss/run/oss.run
+++ b/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 {
-
+
@@ -78,7 +78,7 @@ append config {
sample.raw
-
+
@@ -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
diff --git a/dde_oss/src/drivers/oss/driver.cc b/dde_oss/src/drivers/audio_out/driver.cc
similarity index 100%
rename from dde_oss/src/drivers/oss/driver.cc
rename to dde_oss/src/drivers/audio_out/driver.cc
diff --git a/dde_oss/src/drivers/oss/dummies.c b/dde_oss/src/drivers/audio_out/dummies.c
similarity index 100%
rename from dde_oss/src/drivers/oss/dummies.c
rename to dde_oss/src/drivers/audio_out/dummies.c
diff --git a/dde_oss/src/drivers/oss/include/audio.h b/dde_oss/src/drivers/audio_out/include/audio.h
similarity index 100%
rename from dde_oss/src/drivers/oss/include/audio.h
rename to dde_oss/src/drivers/audio_out/include/audio.h
diff --git a/dde_oss/src/drivers/oss/include/buildid.h b/dde_oss/src/drivers/audio_out/include/buildid.h
similarity index 100%
rename from dde_oss/src/drivers/oss/include/buildid.h
rename to dde_oss/src/drivers/audio_out/include/buildid.h
diff --git a/dde_oss/src/drivers/oss/include/devid.h b/dde_oss/src/drivers/audio_out/include/devid.h
similarity index 100%
rename from dde_oss/src/drivers/oss/include/devid.h
rename to dde_oss/src/drivers/audio_out/include/devid.h
diff --git a/dde_oss/src/drivers/oss/include/inttypes.h b/dde_oss/src/drivers/audio_out/include/inttypes.h
similarity index 100%
rename from dde_oss/src/drivers/oss/include/inttypes.h
rename to dde_oss/src/drivers/audio_out/include/inttypes.h
diff --git a/dde_oss/src/drivers/oss/include/os.h b/dde_oss/src/drivers/audio_out/include/os.h
similarity index 100%
rename from dde_oss/src/drivers/oss/include/os.h
rename to dde_oss/src/drivers/audio_out/include/os.h
diff --git a/dde_oss/src/drivers/oss/include/quirks.h b/dde_oss/src/drivers/audio_out/include/quirks.h
similarity index 100%
rename from dde_oss/src/drivers/oss/include/quirks.h
rename to dde_oss/src/drivers/audio_out/include/quirks.h
diff --git a/dde_oss/src/drivers/oss/include/signal.h b/dde_oss/src/drivers/audio_out/include/signal.h
similarity index 100%
rename from dde_oss/src/drivers/oss/include/signal.h
rename to dde_oss/src/drivers/audio_out/include/signal.h
diff --git a/dde_oss/src/drivers/oss/include/sys/ioctl.h b/dde_oss/src/drivers/audio_out/include/sys/ioctl.h
similarity index 100%
rename from dde_oss/src/drivers/oss/include/sys/ioctl.h
rename to dde_oss/src/drivers/audio_out/include/sys/ioctl.h
diff --git a/dde_oss/src/drivers/oss/include/timestamp.h b/dde_oss/src/drivers/audio_out/include/timestamp.h
similarity index 100%
rename from dde_oss/src/drivers/oss/include/timestamp.h
rename to dde_oss/src/drivers/audio_out/include/timestamp.h
diff --git a/dde_oss/src/drivers/oss/main.cc b/dde_oss/src/drivers/audio_out/main.cc
similarity index 100%
rename from dde_oss/src/drivers/oss/main.cc
rename to dde_oss/src/drivers/audio_out/main.cc
diff --git a/dde_oss/src/drivers/oss/module.inc b/dde_oss/src/drivers/audio_out/module.inc
similarity index 100%
rename from dde_oss/src/drivers/oss/module.inc
rename to dde_oss/src/drivers/audio_out/module.inc
diff --git a/dde_oss/src/drivers/oss/os.cc b/dde_oss/src/drivers/audio_out/os.cc
similarity index 100%
rename from dde_oss/src/drivers/oss/os.cc
rename to dde_oss/src/drivers/audio_out/os.cc
diff --git a/dde_oss/src/drivers/oss/quirks.cc b/dde_oss/src/drivers/audio_out/quirks.cc
similarity index 100%
rename from dde_oss/src/drivers/oss/quirks.cc
rename to dde_oss/src/drivers/audio_out/quirks.cc
diff --git a/dde_oss/src/drivers/oss/signal/irq.cc b/dde_oss/src/drivers/audio_out/signal/irq.cc
similarity index 100%
rename from dde_oss/src/drivers/oss/signal/irq.cc
rename to dde_oss/src/drivers/audio_out/signal/irq.cc
diff --git a/dde_oss/src/drivers/oss/target.mk b/dde_oss/src/drivers/audio_out/target.mk
similarity index 97%
rename from dde_oss/src/drivers/oss/target.mk
rename to dde_oss/src/drivers/audio_out/target.mk
index 189fd52ec..60eabd8be 100644
--- a/dde_oss/src/drivers/oss/target.mk
+++ b/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
diff --git a/libports/run/avplay.run b/libports/run/avplay.run
index 1af7b32b1..6f1419108 100644
--- a/libports/run/avplay.run
+++ b/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
}
diff --git a/libports/run/qt5_avplay.run b/libports/run/qt5_avplay.run
index 4619c8636..d9e42d143 100644
--- a/libports/run/qt5_avplay.run
+++ b/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 {
-
+
@@ -111,7 +111,7 @@ set boot_modules {
core
init
timer
- oss_drv
+ audio_out_drv
nitpicker
liquid_fb
qt_avplay
diff --git a/os/run/mixer.run b/os/run/mixer.run
index e25dee346..a7338998a 100644
--- a/os/run/mixer.run
+++ b/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,21 +61,11 @@ if {![have_spec linux]} {
-
-
-
-
-
- }
-} else {
- append config {
-
-
@@ -86,6 +74,23 @@ if {![have_spec linux]} {
}
append config {
+
+
+}
+
+append_if [expr ![have_spec linux]] config {
+
+
+
+
+}
+
+append config {
+
+
+
+
+
@@ -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
}
diff --git a/qt4/run/qt_avplay.run b/qt4/run/qt_avplay.run
index b647b2a00..e37acfbc2 100644
--- a/qt4/run/qt_avplay.run
+++ b/qt4/run/qt_avplay.run
@@ -83,7 +83,7 @@ append config {
-
+