Changeset 349 for GPL/branches/alsa-resync1/alsa-kernel/include

Timestamp:

Apr 21, 2008, 3:00:45 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merge latest trunk to alsa-resync1 branch

File:

• GPL/branches/alsa-resync1/alsa-kernel/include/sound/pcm.h (modified) (1 diff)

GPL/branches/alsa-resync1/alsa-kernel/include/sound/pcm.h

@@ -658 +658 @@
 {
         snd_pcm_sframes_t avail = runtime->status->hw_ptr + runtime->buffer_size - runtime->control->appl_ptr;
+
+#if defined TARGET_OS2 && ACPI
+       if ( runtime->buffer_size > runtime->control->appl_ptr)
+          avail = runtime->status->hw_ptr + runtime->buffer_size - runtime->control->appl_ptr;
+       else
+       {
+
+          avail = runtime->control->appl_ptr - runtime->status->hw_ptr;
+          if ( avail > runtime->buffer_size )
+             avail = 0;
+          else
+             avail = runtime->buffer_size - avail;
+       }
+#endif /* TARGET_OS2 && ACPI */
         if (avail < 0)
                 avail += runtime->boundary;