← Back to branch summary

~vcs-imports/qemu/maemo

« back to all changes in this revision

Viewing changes to hw/sun4c_intctl.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/sun4c_intctl.c
28
28
//#define DEBUG_IRQ
29
29
 
30
30
#ifdef DEBUG_IRQ
31
 
#define DPRINTF(fmt, args...) \
32
 
do { printf("IRQ: " fmt , ##args); } while (0)
 
31
#define DPRINTF(fmt, ...)                                       \
 
32
    do { printf("IRQ: " fmt , ## __VA_ARGS__); } while (0)
33
33
#else
34
 
#define DPRINTF(fmt, args...)
 
34
#define DPRINTF(fmt, ...)
35
35
#endif
36
36
 
37
37
/*
213
213
    register_savevm("sun4c_intctl", addr, 1, sun4c_intctl_save,
214
214
                    sun4c_intctl_load, s);
215
215
 
216
 
    qemu_register_reset(sun4c_intctl_reset, s);
 
216
    qemu_register_reset(sun4c_intctl_reset, 0, s);
217
217
    *irq = qemu_allocate_irqs(sun4c_set_irq, s, 8);
218
218
 
219
219
    sun4c_intctl_reset(s);