Revision bc24a225 hw/tosa.c

b/hw/tosa.c
45 45
#define DAC_CH1		0
46 46
#define DAC_CH2		1
47 47

  
48
static void tosa_microdrive_attach(struct pxa2xx_state_s *cpu)
48
static void tosa_microdrive_attach(PXA2xxState *cpu)
49 49
{
50
    struct pcmcia_card_s *md;
50
    PCMCIACardState *md;
51 51
    int index;
52 52
    BlockDriverState *bs;
53 53

  
......
83 83
}
84 84

  
85 85

  
86
static void tosa_gpio_setup(struct pxa2xx_state_s *cpu,
87
                struct scoop_info_s *scp0,
88
                struct scoop_info_s *scp1,
89
                struct tc6393xb_s *tmio)
86
static void tosa_gpio_setup(PXA2xxState *cpu,
87
                ScoopInfo *scp0,
88
                ScoopInfo *scp1,
89
                TC6393xbState *tmio)
90 90
{
91 91
    qemu_irq *outsignals = qemu_allocate_irqs(tosa_out_switch, cpu, 4);
92 92
    /* MMC/SD host */
......
178 178
    return -1;
179 179
}
180 180

  
181
static void tosa_tg_init(struct pxa2xx_state_s *cpu)
181
static void tosa_tg_init(PXA2xxState *cpu)
182 182
{
183 183
    struct i2c_bus *bus = pxa2xx_i2c_bus(cpu->i2c[0]);
184 184
    struct i2c_slave *dac = i2c_slave_init(bus, 0, sizeof(struct tosa_dac_i2c));
......
201 201
                const char *kernel_filename, const char *kernel_cmdline,
202 202
                const char *initrd_filename, const char *cpu_model)
203 203
{
204
    struct pxa2xx_state_s *cpu;
205
    struct tc6393xb_s *tmio;
206
    struct scoop_info_s *scp0, *scp1;
204
    PXA2xxState *cpu;
205
    TC6393xbState *tmio;
206
    ScoopInfo *scp0, *scp1;
207 207

  
208 208
    if (!cpu_model)
209 209
        cpu_model = "pxa255";

Also available in: Unified diff