← Back to branch summary

~ubuntu-branches/ubuntu/lucid/xenomai/lucid

« back to all changes in this revision

Viewing changes to include/asm-blackfin/hal.h

  • Committer: Bazaar Package Importer
  • Author(s): Andres Rodriguez
  • Date: 2009-06-24 22:17:01 UTC
  • mfrom: (3.1.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090624221701-mwnah8aj90zmp6uj
Tags: 2.4.8-2ubuntu1
https://launchpad.net/bugs/391918
* Merge from debian unstable (LP: #391918), remaining changes:
  - Add lpia to supported architectures.
  - debian/rules: Create file for debhelper to pick up, use debhelper to
    install it.
  - debian/libxenomai1.dirs: Do not create directory.
  - debian/libxenomai1.preinst: Remove symlink on upgrade, remove old udev.
    rule unless modified in which case move to new name.
  - debian/libxenomai1.postinst: Do not create symlink.
  - debian/libxenomai1.postrm: No symlink to remove.
  - Bump build-depend on debhelper to install udev rules into
    /lib/udev/rules.d, add Breaks on udev to get correct version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/asm-blackfin/hal.h
46
46
#include <linux/irq.h>
47
47
#endif
48
48
#include <asm/system.h>
49
 
#include <asm/mach/blackfin.h>
 
49
#include <asm/blackfin.h>
50
50
#include <asm/processor.h>
51
51
#include <asm/xenomai/atomic.h>
52
52
 
72
72
                rthal_trigger_irq(RTHAL_TIMER_IRQ);
73
73
        else {
74
74
                bfin_write_TCOUNT(delay - 1);
75
 
                __builtin_bfin_csync();
 
75
                CSYNC();
76
76
                bfin_write_TCNTL(3);    /* Oneshot mode, no auto-reload. */
77
 
                __builtin_bfin_csync();
 
77
                CSYNC();
78
78
        }
79
79
}
80
80