Changeset 1ba95ba in mainline

Timestamp:

2012-08-19T16:10:48Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

86fe9d1

Parents:

fa91c0f

Message:

sb16: Implement and enable buffer position capability.

Location:

uspace/drv/audio/sb16

Files:

• dsp.c (modified) (2 diffs)
• dsp.h (modified) (1 diff)
• pcm_iface.c (modified) (2 diffs)

uspace/drv/audio/sb16/dsp.c

@@ -250 +250 @@
 unsigned sb_dsp_query_cap(sb_dsp_t *dsp, audio_cap_t cap)
 {
+        ddf_log_verbose("Querying cap %u", cap);
         switch(cap) {
         case AUDIO_CAP_CAPTURE:
         case AUDIO_CAP_PLAYBACK:
         case AUDIO_CAP_INTERRUPT:
+        case AUDIO_CAP_BUFFER_POS:
                 return 1;
         case AUDIO_CAP_MAX_BUFFER:
@@ -261 +263 @@
         case AUDIO_CAP_INTERRUPT_MAX_FRAMES:
                 return 16535;
-        case AUDIO_CAP_BUFFER_POS:
         default:
                 return 0;
         }
+}
+
+int sb_dsp_get_buffer_position(sb_dsp_t *dsp, size_t *pos)
+{
+        if (!dsp->buffer.data)
+                return ENOENT;
+
+        async_sess_t *sess = devman_parent_device_connect(EXCHANGE_ATOMIC,
+            dsp->sb_dev->handle, IPC_FLAG_BLOCKING);
+
+        // TODO: Assumes DMA 16
+        const int remain = hw_res_dma_channel_remain(sess, dsp->dma16_channel);
+        async_hangup(sess);
+        if (remain >= 0) {
+                *pos = dsp->buffer.size - remain;
+                return EOK;
+        }
+        return remain;
 }
 

uspace/drv/audio/sb16/dsp.h

@@ -75 +75 @@
 void sb_dsp_interrupt(sb_dsp_t *dsp);
 unsigned sb_dsp_query_cap(sb_dsp_t *dsp, audio_cap_t cap);
+int sb_dsp_get_buffer_position(sb_dsp_t *dsp, size_t *size);
 int sb_dsp_test_format(sb_dsp_t *dsp, unsigned *channels, unsigned *rate,
   pcm_sample_format_t *format);

uspace/drv/audio/sb16/pcm_iface.c

@@ -70 +70 @@
         return sb_dsp_get_buffer(dsp, buffer, size);
 }
+
+static int sb_get_buffer_position(ddf_fun_t *fun, size_t *size)
+{
+        assert(fun);
+        assert(fun->driver_data);
+        sb_dsp_t *dsp = fun->driver_data;
+        return sb_dsp_get_buffer_position(dsp, size);
+}
+
 static int sb_set_event_session(ddf_fun_t *fun, async_sess_t *sess)
 {
@@ -130 +139 @@
         .release_buffer = sb_release_buffer,
         .set_event_session = sb_set_event_session,
+        .get_buffer_pos = sb_get_buffer_position,
 
         .start_playback = sb_start_playback,