~vcs-imports/qemu/maemo

« back to all changes in this revision

Viewing changes to hw/xilinx.h

  • 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:
 
1
 
 
2
/* OPB Interrupt Controller.  */
 
3
qemu_irq *microblaze_pic_init_cpu(CPUState *env);
 
4
 
 
5
static inline DeviceState *
 
6
xilinx_intc_create(target_phys_addr_t base, qemu_irq irq, int kind_of_intr)
 
7
{
 
8
    DeviceState *dev;
 
9
 
 
10
    dev = qdev_create(NULL, "xilinx,intc");
 
11
    qdev_set_prop_int(dev, "kind-of-intr", kind_of_intr);
 
12
    qdev_init(dev);
 
13
    sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);
 
14
    sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq);
 
15
    return dev;
 
16
}
 
17
 
 
18
/* OPB Timer/Counter.  */
 
19
static inline DeviceState *
 
20
xilinx_timer_create(target_phys_addr_t base, qemu_irq irq, int nr, int freq)
 
21
{
 
22
    DeviceState *dev;
 
23
 
 
24
    dev = qdev_create(NULL, "xilinx,timer");
 
25
    qdev_set_prop_int(dev, "nr-timers", nr);
 
26
    qdev_set_prop_int(dev, "frequency", freq);
 
27
    qdev_init(dev);
 
28
    sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);
 
29
    sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq);
 
30
    return dev;
 
31
}
 
32
 
 
33
/* XPS Ethernet Lite MAC.  */
 
34
static inline DeviceState *
 
35
xilinx_ethlite_create(NICInfo *nd, target_phys_addr_t base, qemu_irq irq,
 
36
                      int txpingpong, int rxpingpong)
 
37
{
 
38
    DeviceState *dev;
 
39
 
 
40
    qemu_check_nic_model(nd, "xilinx-ethlite");
 
41
 
 
42
    dev = qdev_create(NULL, "xilinx,ethlite");
 
43
    qdev_set_netdev(dev, nd);
 
44
    qdev_set_prop_int(dev, "txpingpong", txpingpong);
 
45
    qdev_set_prop_int(dev, "rxpingpong", rxpingpong);
 
46
    qdev_init(dev);
 
47
    sysbus_mmio_map(sysbus_from_qdev(dev), 0, base);
 
48
    sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq);
 
49
    return dev;
 
50
}