Changeset ce047249 in mainline

Timestamp:

2012-07-09T07:59:03Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

94694a4

Parents:

68d1313

Message:

Rename audio nodes: (mixer, dsp) ⇒ (control, pcm).

Location:

uspace

Files:

• app/dplay/dplay.c (modified) (2 diffs)
• app/drec/drec.c (modified) (2 diffs)
• app/mixerctl/mixerctl.c (modified) (1 diff)
• drv/audio/sb16/sb16.c (modified) (2 diffs)

uspace/app/dplay/dplay.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jan Vesely
+ * Copyright (c) 2012 Jan Vesely
  * All rights reserved.
  *
@@ -50 +50 @@
 #include "wave.h"
 
-#define DEFAULT_DEVICE "/hw/pci0/00:01.0/sb16/dsp"
+#define DEFAULT_DEVICE "/hw/pci0/00:01.0/sb16/pcm"
 #define SUBBUFFERS 2
 

uspace/app/drec/drec.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jan Vesely
+ * Copyright (c) 2012 Jan Vesely
  * All rights reserved.
  *
@@ -50 +50 @@
 #include "wave.h"
 
-#define DEFAULT_DEVICE "/hw/pci0/00:01.0/sb16/dsp"
+#define DEFAULT_DEVICE "/hw/pci0/00:01.0/sb16/pcm"
 #define SUBBUFFERS 2
 

uspace/app/mixerctl/mixerctl.c

@@ -41 +41 @@
 #include <stdio.h>
 
-#define DEFAULT_DEVICE "/hw/pci0/00:01.0/sb16/mixer"
+#define DEFAULT_DEVICE "/hw/pci0/00:01.0/sb16/control"
 
 static void print_levels(async_exch_t *exch)

uspace/drv/audio/sb16/sb16.c

@@ -102 +102 @@
 
         /* Initialize DSP */
-        ddf_fun_t *dsp_fun = ddf_fun_create(dev, fun_exposed, "dsp");
+        ddf_fun_t *dsp_fun = ddf_fun_create(dev, fun_exposed, "pcm");
         if (!dsp_fun) {
                 ddf_log_error("Failed to create dsp function.");
@@ -132 +132 @@
             sb->dsp.version.major, sb->dsp.version.minor);
 
-        ddf_fun_t *mixer_fun = ddf_fun_create(dev, fun_exposed, "mixer");
+        ddf_fun_t *mixer_fun = ddf_fun_create(dev, fun_exposed, "control");
         if (!mixer_fun) {
                 ddf_log_error("Failed to create mixer function.");