← Back to branch summary

~fboudra/qemu-linaro/new-upstream-release-1.2.0-2012.09-0ubuntu1

« back to all changes in this revision

Viewing changes to hw/exynos4210_uart.c

  • Committer: Fathi Boudra
  • Author(s): Fathi Boudra
  • Date: 2012-08-21 06:47:11 UTC
  • mfrom: (0.1.16)
  • Revision ID: fathi.boudra@linaro.org-20120821064711-7yxmubp2v8a44xce
Tags: 1.1.50-2012.08-0ubuntu1
https://launchpad.net/bugs/1030588
https://launchpad.net/bugs/1030594
* New upstream release.
  - support emulated systems with more than 2G of memory. (LP: #1030588)
* Drop powerpc-missing-include.patch - merged upstream.
* Update debian/control: 
  - drop perl build dependency.
  - add libfdt-dev build dependency.
* Update debian/qemu-keymaps.install file.
* Update debian/rules:
  - update QEMU_CPU for ARM architecture: armv4l -> armv7l.
  - update conf_audio_drv: default to PulseAudio since PA is the default on
    Ubuntu.
  - enable KVM on ARM architecture.
  - enable flat device tree support (--enable-fdt). (LP: #1030594)

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/exynos4210_uart.c
246
246
    uint32_t level = 0;
247
247
    uint32_t reg;
248
248
 
249
 
    reg = (s->reg[I_(UFCON)] && UFCON_Tx_FIFO_TRIGGER_LEVEL) >>
 
249
    reg = (s->reg[I_(UFCON)] & UFCON_Tx_FIFO_TRIGGER_LEVEL) >>
250
250
            UFCON_Tx_FIFO_TRIGGER_LEVEL_SHIFT;
251
251
 
252
252
    switch (s->channel) {
275
275
     * The Tx interrupt is always requested if the number of data in the
276
276
     * transmit FIFO is smaller than the trigger level.
277
277
     */
278
 
    if (s->reg[I_(UFCON)] && UFCON_FIFO_ENABLE) {
 
278
    if (s->reg[I_(UFCON)] & UFCON_FIFO_ENABLE) {
279
279
 
280
 
        uint32_t count = (s->reg[I_(UFSTAT)] && UFSTAT_Tx_FIFO_COUNT) >>
 
280
        uint32_t count = (s->reg[I_(UFSTAT)] & UFSTAT_Tx_FIFO_COUNT) >>
281
281
                UFSTAT_Tx_FIFO_COUNT_SHIFT;
282
282
 
283
283
        if (count <= exynos4210_uart_Tx_FIFO_trigger_level(s)) {