Changeset 94694a4 in mainline

Timestamp:

2012-07-09T08:17:13Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

346643c

Parents:

ce047249

Message:

Add new audio-pcm category and register sb16/pcm in this categgory.

Location:

uspace

Files:

• drv/audio/sb16/sb16.c (modified) (2 diffs)
• srv/locsrv/locsrv.c (modified) (1 diff)

uspace/drv/audio/sb16/sb16.c

@@ -112 +112 @@
                 ddf_log_error("Failed to initialize SB DSP: %s.",
                     str_error(ret));
+                ddf_fun_destroy(dsp_fun);
                 return ret;
         }
@@ -122 +123 @@
         if (ret != EOK) {
                 ddf_log_error(
-                    "Failed to bind DSP function: %s.", str_error(ret));
-                dsp_fun->driver_data = NULL;
+                    "Failed to bind PCM function: %s.", str_error(ret));
+                dsp_fun->driver_data = NULL;
+                ddf_fun_destroy(dsp_fun);
+                return ret;
+        }
+
+        ret = ddf_fun_add_to_category(dsp_fun, "audio-pcm");
+        if (ret != EOK) {
+                ddf_log_error("Failed register PCM function in category: %s.",
+                    str_error(ret));
+                dsp_fun->driver_data = NULL;
+                ddf_fun_unbind(dsp_fun);
                 ddf_fun_destroy(dsp_fun);
                 return ret;

uspace/srv/locsrv/locsrv.c

@@ -1368 +1368 @@
         categ_dir_add_cat(&cdir, cat);
         
+        cat = category_new("audio-pcm");
+        categ_dir_add_cat(&cdir, cat);
+        
         return true;
 }