← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to sound/drivers/pcm-indirect2.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
sound/drivers/pcm-indirect2.c
264
264
                if (diff < -(snd_pcm_sframes_t) (runtime->boundary / 2))
265
265
                        diff += runtime->boundary;
266
266
                /* number of bytes "added" by ALSA increases the number of
267
 
                 * bytes which are ready to "be transfered to HW"/"played"
 
267
                 * bytes which are ready to "be transferred to HW"/"played"
268
268
                 * Then, set rec->appl_ptr to not count bytes twice next time.
269
269
                 */
270
270
                rec->sw_ready += (int)frames_to_bytes(runtime, diff);
330
330
                /* copy bytes from intermediate buffer position sw_data to the
331
331
                 * HW and return number of bytes actually written
332
332
                 * Furthermore, set hw_ready to 0, if the fifo isn't empty
333
 
                 * now => more could be transfered to fifo
 
333
                 * now => more could be transferred to fifo
334
334
                 */
335
335
                bytes = copy(substream, rec, bytes);
336
336
                rec->bytes2hw += bytes;