Revision cb380f61 hw/mainstone.c

b/hw/mainstone.c
18 18
#include "sysemu.h"
19 19
#include "flash.h"
20 20
#include "blockdev.h"
21
#include "sysbus.h"
21 22

  
22 23
static struct keymap map[0xE0] = {
23 24
    [0 ... 0xDF] = { -1, -1 },
......
77 78
    uint32_t sector_len = 256 * 1024;
78 79
    target_phys_addr_t mainstone_flash_base[] = { MST_FLASH_0, MST_FLASH_1 };
79 80
    PXA2xxState *cpu;
80
    qemu_irq *mst_irq;
81
    DeviceState *mst_irq;
81 82
    DriveInfo *dinfo;
82 83
    int i;
83 84
    int be;
......
117 118
        }
118 119
    }
119 120

  
120
    mst_irq = mst_irq_init(MST_FPGA_PHYS, cpu->pic[PXA2XX_PIC_GPIO_0]);
121
    mst_irq = sysbus_create_simple("mainstone-fpga", MST_FPGA_PHYS,
122
                    cpu->pic[PXA2XX_PIC_GPIO_0]);
121 123

  
122 124
    /* setup keypad */
123 125
    printf("map addr %p\n", &map);
124 126
    pxa27x_register_keypad(cpu->kp, map, 0xe0);
125 127

  
126 128
    /* MMC/SD host */
127
    pxa2xx_mmci_handlers(cpu->mmc, NULL, mst_irq[MMC_IRQ]);
129
    pxa2xx_mmci_handlers(cpu->mmc, NULL, qdev_get_gpio_in(mst_irq, MMC_IRQ));
128 130

  
129
    smc91c111_init(&nd_table[0], MST_ETH_PHYS, mst_irq[ETHERNET_IRQ]);
131
    smc91c111_init(&nd_table[0], MST_ETH_PHYS,
132
                    qdev_get_gpio_in(mst_irq, ETHERNET_IRQ));
130 133

  
131 134
    mainstone_binfo.kernel_filename = kernel_filename;
132 135
    mainstone_binfo.kernel_cmdline = kernel_cmdline;

Also available in: Unified diff