← Back to branch summary

~ubuntu-branches/ubuntu/natty/alsa-lib/natty

« back to all changes in this revision

Viewing changes to src/pcm/pcm_dmix_i386.h

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2009-11-04 19:04:11 UTC
  • mfrom: (1.1.12 upstream) (2.2.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091104190411-igse8f4bzca8dq5x
Tags: 1.0.21a-1ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/rules:
    + Don't bail when removing include/alsa
  - debian/control: Add Vcs-Bzr URI
  - Add configuration files for bluetooth/bluez-alsa and pulseaudio
  - debian/libasound2.install: Ship smixer plugins for native and bi-arch
    packages
  - drop libcxxtools-dev build dependency, its in universe
  - debian/patches/Fix-fpe-snd_pcm_mmap_begin.patch: Handle attempts to
    divide by zero

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/pcm/pcm_dmix_i386.h
400
400
                "\tmovzwl (%%esi), %%ecx\n"
401
401
                "\tmovl (%%ebx), %%edx\n"
402
402
                "\tsall $16, %%eax\n"
 
403
                "\torl %%eax, %%ecx\n"
403
404
                "\t" LOCK_PREFIX "btsw $0, (%%edi)\n"
404
 
                "\tleal (%%ecx,%%eax,1), %%ecx\n"
405
405
                "\tjc 2f\n"
406
406
                "\t" XSUB " %%edx, %%ecx\n"
407
407
                "2:"