Changeset 93c3163 in mainline

Timestamp:

2014-08-25T22:11:12Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

99cb9bf

Parents:

31ccd42a

Message:

Dummy pcm_iface.

Location:

uspace/drv/audio/hdaudio

Files:

• Makefile (modified) (2 diffs)
• hdaudio.c (modified) (6 diffs)
• hdaudio.h (modified) (1 diff)
• pcm_iface.c (added)
• pcm_iface.h (added)

uspace/drv/audio/hdaudio/Makefile

@@ -29 +29 @@
 USPACE_PREFIX = ../../..
 LIBS = $(LIBDRV_PREFIX)/libdrv.a
-EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include
+EXTRA_CFLAGS += -I$(LIBDRV_PREFIX)/include -I$(LIBPCM_PREFIX)/include
 BINARY = hdaudio
 
@@ -37 +37 @@
         hdactl.c \
         hdaudio.c \
+        pcm_iface.c \
         stream.c
 

uspace/drv/audio/hdaudio/hdaudio.c

@@ -46 +46 @@
 #include "hdactl.h"
 #include "hdaudio.h"
+#include "pcm_iface.h"
 #include "spec/regs.h"
 
@@ -71 +72 @@
 };
 
+ddf_dev_ops_t hda_pcm_ops = {
+        .interfaces[AUDIO_PCM_BUFFER_IFACE] = &hda_pcm_iface
+};
+
 irq_pio_range_t hdaudio_irq_pio_ranges[] = {
         {
@@ -144 +149 @@
 static int hda_dev_add(ddf_dev_t *dev)
 {
-        ddf_fun_t *fun_a;
+        ddf_fun_t *fun_pcm;
         hda_t *hda = NULL;
         hw_res_list_parsed_t res;
@@ -264 +269 @@
 
         ddf_msg(LVL_NOTE, "create function");
-        fun_a = ddf_fun_create(dev, fun_exposed, "a");
-        if (fun_a == NULL) {
-                ddf_msg(LVL_ERROR, "Failed creating function 'a'.");
+        fun_pcm = ddf_fun_create(dev, fun_exposed, "pcm");
+        if (fun_pcm == NULL) {
+                ddf_msg(LVL_ERROR, "Failed creating function 'pcm'.");
                 rc = ENOMEM;
                 goto error;
         }
 
-        hda->fun_a = fun_a;
-
-        rc = ddf_fun_bind(fun_a);
+        hda->fun_pcm = fun_pcm;
+
+        ddf_fun_set_ops(fun_pcm, &hda_pcm_ops);
+
+        rc = ddf_fun_bind(fun_pcm);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed binding function 'a'.");
-                ddf_fun_destroy(fun_a);
-                goto error;
-        }
-
-        ddf_fun_add_to_category(fun_a, "virtual");
+                ddf_msg(LVL_ERROR, "Failed binding function 'pcm'.");
+                ddf_fun_destroy(fun_pcm);
+                goto error;
+        }
+
+        ddf_fun_add_to_category(fun_pcm, "audio-pcm");
         return EOK;
 error:
@@ -299 +306 @@
         ddf_msg(LVL_DEBUG, "hda_dev_remove(%p)", dev);
 
-        if (hda->fun_a != NULL) {
-                rc = ddf_fun_offline(hda->fun_a);
+        if (hda->fun_pcm != NULL) {
+                rc = ddf_fun_offline(hda->fun_pcm);
                 if (rc != EOK)
                         return rc;
 
-                rc = ddf_fun_unbind(hda->fun_a);
+                rc = ddf_fun_unbind(hda->fun_pcm);
                 if (rc != EOK)
                         return rc;
@@ -319 +326 @@
         ddf_msg(LVL_DEBUG, "hda_dev_remove(%p)", dev);
 
-        if (hda->fun_a != NULL) {
-                rc = ddf_fun_unbind(hda->fun_a);
+        if (hda->fun_pcm != NULL) {
+                rc = ddf_fun_unbind(hda->fun_pcm);
                 if (rc != EOK)
                         return rc;

uspace/drv/audio/hdaudio/hdaudio.h

@@ -45 +45 @@
 typedef struct hda {
         async_sess_t *parent_sess;
-        ddf_fun_t *fun_a;
+        ddf_fun_t *fun_pcm;
         uint64_t rwbase;
         size_t rwsize;