Revision c227f099 hw/r2d.c

b/hw/r2d.c
73 73

  
74 74
/* output pin */
75 75
    qemu_irq irl;
76
} a_r2d_fpga;
76
} r2d_fpga_t;
77 77

  
78 78
enum r2d_fpga_irq {
79 79
    PCI_INTD, CF_IDE, CF_CD, PCI_INTC, SM501, KEY, RTC_A, RTC_T,
......
97 97
    [TP]	= { 12, 1<<15 },
98 98
};
99 99

  
100
static void update_irl(a_r2d_fpga *fpga)
100
static void update_irl(r2d_fpga_t *fpga)
101 101
{
102 102
    int i, irl = 15;
103 103
    for (i = 0; i < NR_IRQS; i++)
......
109 109

  
110 110
static void r2d_fpga_irq_set(void *opaque, int n, int level)
111 111
{
112
    a_r2d_fpga *fpga = opaque;
112
    r2d_fpga_t *fpga = opaque;
113 113
    if (level)
114 114
        fpga->irlmon |= irqtab[n].msk;
115 115
    else
......
117 117
    update_irl(fpga);
118 118
}
119 119

  
120
static uint32_t r2d_fpga_read(void *opaque, a_target_phys_addr addr)
120
static uint32_t r2d_fpga_read(void *opaque, target_phys_addr_t addr)
121 121
{
122
    a_r2d_fpga *s = opaque;
122
    r2d_fpga_t *s = opaque;
123 123

  
124 124
    switch (addr) {
125 125
    case PA_IRLMSK:
......
136 136
}
137 137

  
138 138
static void
139
r2d_fpga_write(void *opaque, a_target_phys_addr addr, uint32_t value)
139
r2d_fpga_write(void *opaque, target_phys_addr_t addr, uint32_t value)
140 140
{
141
    a_r2d_fpga *s = opaque;
141
    r2d_fpga_t *s = opaque;
142 142

  
143 143
    switch (addr) {
144 144
    case PA_IRLMSK:
......
169 169
    NULL,
170 170
};
171 171

  
172
static qemu_irq *r2d_fpga_init(a_target_phys_addr base, qemu_irq irl)
172
static qemu_irq *r2d_fpga_init(target_phys_addr_t base, qemu_irq irl)
173 173
{
174 174
    int iomemtype;
175
    a_r2d_fpga *s;
175
    r2d_fpga_t *s;
176 176

  
177
    s = qemu_mallocz(sizeof(a_r2d_fpga));
177
    s = qemu_mallocz(sizeof(r2d_fpga_t));
178 178

  
179 179
    s->irl = irl;
180 180

  
......
197 197
    return intx[d->devfn >> 3];
198 198
}
199 199

  
200
static void r2d_init(a_ram_addr ram_size,
200
static void r2d_init(ram_addr_t ram_size,
201 201
              const char *boot_device,
202 202
	      const char *kernel_filename, const char *kernel_cmdline,
203 203
	      const char *initrd_filename, const char *cpu_model)
204 204
{
205 205
    CPUState *env;
206 206
    struct SH7750State *s;
207
    a_ram_addr sdram_addr;
207
    ram_addr_t sdram_addr;
208 208
    qemu_irq *irq;
209 209
    PCIBus *pci;
210 210
    DriveInfo *dinfo;

Also available in: Unified diff