Changeset 6747b929 in mainline

Timestamp:

2014-08-26T11:35:23Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c67195c

Parents:

159c722d

Message:

Playback stopping and restart.

Location:

uspace/drv/audio/hdaudio

Files:

• pcm_iface.c (modified) (1 diff)
• spec/regs.h (modified) (1 diff)
• stream.c (modified) (3 diffs)
• stream.h (modified) (1 diff)

uspace/drv/audio/hdaudio/pcm_iface.c

@@ -228 +228 @@
 static int hda_stop_playback(ddf_fun_t *fun, bool immediate)
 {
+        hda_t *hda = fun_to_hda(fun);
+
         ddf_msg(LVL_NOTE, "hda_stop_playback()");
-        return ENOTSUP;
+        hda_stream_stop(hda->pcm_stream);
+        hda_stream_reset(hda->pcm_stream);
+
+        hda_pcm_event(hda, PCM_EVENT_PLAYBACK_TERMINATED);
+        return EOK;
 }
 

uspace/drv/audio/hdaudio/spec/regs.h

@@ -166 +166 @@
 
 typedef enum {
+        /** Descriptor Error Interrupt Enable */
+        sdctl1_deie = 4,
+        /** FIFO Error Interrupt Enable */
+        sdctl1_feie = 3,
+        /** Interrupt on Completion Enable */
+        sdctl1_ioce = 2,
+        /** Stream Run */
+        sdctl1_run = 1,
+        /** Stream Reset */
+        sdctl1_srst = 0
+} hda_sdesc_ctl1_bits;
+
+typedef enum {
         /** Number of Output Streams Supported (H) */
         gcap_oss_h = 15,

uspace/drv/audio/hdaudio/stream.c

@@ -177 +177 @@
 
         ctl = hda_reg8_read(&sdregs->ctl1);
-        ctl = ctl | 2 /* XXX Run */;
+        if (run)
+                ctl = ctl | BIT_V(uint8_t, sdctl1_run);
+        else
+                ctl = ctl & ~BIT_V(uint8_t, sdctl1_run);
+
         hda_reg8_write(&sdregs->ctl1, ctl);
+}
+
+static void hda_stream_reset_noinit(hda_stream_t *stream)
+{
+        uint32_t ctl;
+        hda_sdesc_regs_t *sdregs;
+
+        sdregs = &stream->hda->regs->sdesc[stream->sdid];
+
+        ctl = hda_reg8_read(&sdregs->ctl1);
+        ctl = ctl | BIT_V(uint8_t, sdctl1_srst);
+        hda_reg8_write(&sdregs->ctl1, ctl);
+
+        async_usleep(100 * 1000);
+
+//      ctl = hda_reg8_read(&sdregs->ctl1);
+//      ctl = ctl & ~BIT_V(uint8_t, sdctl1_srst);
+//      hda_reg8_write(&sdregs->ctl1, ctl);
+
+//      async_usleep(100 * 1000);
 }
 
@@ -214 +238 @@
 {
         ddf_msg(LVL_NOTE, "hda_stream_destroy()");
+        hda_stream_reset_noinit(stream);
         free(stream);
 }
@@ -223 +248 @@
 }
 
+void hda_stream_stop(hda_stream_t *stream)
+{
+        ddf_msg(LVL_NOTE, "hda_stream_stop()");
+        hda_stream_set_run(stream, false);
+}
+
+void hda_stream_reset(hda_stream_t *stream)
+{
+        ddf_msg(LVL_NOTE, "hda_stream_reset()");
+        hda_stream_reset_noinit(stream);
+        hda_stream_desc_configure(stream);
+}
+
 /** @}
  */

uspace/drv/audio/hdaudio/stream.h

@@ -73 +73 @@
 
 extern hda_stream_t *hda_stream_create(hda_t *, hda_stream_dir_t, uint32_t);
+extern void hda_stream_destroy(hda_stream_t *);
 extern void hda_stream_start(hda_stream_t *);
-extern void hda_stream_destroy(hda_stream_t *);
+extern void hda_stream_stop(hda_stream_t *);
+extern void hda_stream_reset(hda_stream_t *);
 
 #endif