← Back to branch summary

~vcs-imports/qemu/maemo

« back to all changes in this revision

Viewing changes to hw/serial.c

  • Committer: Riku Voipio
  • Date: 2009-06-08 15:31:58 UTC
  • mfrom: (6281.2.366)
  • mto: This revision was merged to the branch mainline in revision 6452.
  • Revision ID: git-v1:759b334a9739814df2883aa4c41b1c0f5670e90a
Merge commit 'gnu/master' into test

Epic merge

Conflicts:
        Makefile
        block.c
        block.h
        configure
        hw/boards.h
        hw/flash.h
        hw/integratorcp.c
        hw/nand.c
        hw/omap2.c
        hw/omap_i2c.c
        hw/sd.c
        hw/smc91c111.c
        hw/tsc2005.c
        hw/tusb6010.c
        hw/usb-musb.c
        linux-user/syscall.c
        target-arm/machine.c
        target-arm/translate.c

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/serial.c
586
586
static void serial_receive_break(SerialState *s)
587
587
{
588
588
    s->rbr = 0;
 
589
    /* When the LSR_DR is set a null byte is pushed into the fifo */
 
590
    fifo_put(s, RECV_FIFO, '\0');
589
591
    s->lsr |= UART_LSR_BI | UART_LSR_DR;
590
592
    serial_update_irq(s);
591
593
}
718
720
    s->fifo_timeout_timer = qemu_new_timer(vm_clock, (QEMUTimerCB *) fifo_timeout_int, s);
719
721
    s->transmit_timer = qemu_new_timer(vm_clock, (QEMUTimerCB *) serial_xmit, s);
720
722
 
721
 
    qemu_register_reset(serial_reset, s);
 
723
    qemu_register_reset(serial_reset, 0, s);
722
724
    serial_reset(s);
723
725
 
724
726
    qemu_chr_add_handlers(s->chr, serial_can_receive1, serial_receive1,