Revision c227f099 hw/escc.c

b/hw/escc.c
84 84

  
85 85
typedef enum {
86 86
    chn_a, chn_b,
87
} e_chn_id;
87
} chn_id_t;
88 88

  
89 89
#define CHN_C(s) ((s)->chn == chn_b? 'b' : 'a')
90 90

  
91 91
typedef enum {
92 92
    ser, kbd, mouse,
93
} e_chn_type;
93
} chn_type_t;
94 94

  
95 95
#define SERIO_QUEUE_SIZE 256
96 96

  
......
104 104
    qemu_irq irq;
105 105
    uint32_t reg;
106 106
    uint32_t rxint, txint, rxint_under_svc, txint_under_svc;
107
    e_chn_id chn; // this channel, A (base+4) or B (base+0)
108
    e_chn_type type;
107
    chn_id_t chn; // this channel, A (base+4) or B (base+0)
108
    chn_type_t type;
109 109
    struct ChannelState *otherchn;
110 110
    uint8_t rx, tx, wregs[SERIAL_REGS], rregs[SERIAL_REGS];
111 111
    SERIOQueue queue;
......
481 481
    qemu_chr_ioctl(s->chr, CHR_IOCTL_SERIAL_SET_PARAMS, &ssp);
482 482
}
483 483

  
484
static void escc_mem_writeb(void *opaque, a_target_phys_addr addr, uint32_t val)
484
static void escc_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val)
485 485
{
486 486
    SerialState *serial = opaque;
487 487
    ChannelState *s;
......
578 578
    }
579 579
}
580 580

  
581
static uint32_t escc_mem_readb(void *opaque, a_target_phys_addr addr)
581
static uint32_t escc_mem_readb(void *opaque, target_phys_addr_t addr)
582 582
{
583 583
    SerialState *serial = opaque;
584 584
    ChannelState *s;
......
725 725

  
726 726
}
727 727

  
728
int escc_init(a_target_phys_addr base, qemu_irq irqA, qemu_irq irqB,
728
int escc_init(target_phys_addr_t base, qemu_irq irqA, qemu_irq irqB,
729 729
              CharDriverState *chrA, CharDriverState *chrB,
730 730
              int clock, int it_shift)
731 731
{
......
890 890
    put_queue(s, 0);
891 891
}
892 892

  
893
void slavio_serial_ms_kbd_init(a_target_phys_addr base, qemu_irq irq,
893
void slavio_serial_ms_kbd_init(target_phys_addr_t base, qemu_irq irq,
894 894
                               int disabled, int clock, int it_shift)
895 895
{
896 896
    DeviceState *dev;

Also available in: Unified diff