Revision 84108e12 hw/isa_mmio.c

b/hw/isa_mmio.c
31 31
    cpu_outb(addr & IOPORTS_MASK, val);
32 32
}
33 33

  
34
static void isa_mmio_writew (void *opaque, target_phys_addr_t addr,
35
                                  uint32_t val)
34
static void isa_mmio_writew_be(void *opaque, target_phys_addr_t addr,
35
                               uint32_t val)
36 36
{
37
#ifdef TARGET_WORDS_BIGENDIAN
38 37
    val = bswap16(val);
39
#endif
40 38
    cpu_outw(addr & IOPORTS_MASK, val);
41 39
}
42 40

  
43
static void isa_mmio_writel (void *opaque, target_phys_addr_t addr,
44
                                uint32_t val)
41
static void isa_mmio_writew_le(void *opaque, target_phys_addr_t addr,
42
                               uint32_t val)
43
{
44
    cpu_outw(addr & IOPORTS_MASK, val);
45
}
46

  
47
static void isa_mmio_writel_be(void *opaque, target_phys_addr_t addr,
48
                               uint32_t val)
45 49
{
46
#ifdef TARGET_WORDS_BIGENDIAN
47 50
    val = bswap32(val);
48
#endif
51
    cpu_outl(addr & IOPORTS_MASK, val);
52
}
53

  
54
static void isa_mmio_writel_le(void *opaque, target_phys_addr_t addr,
55
                               uint32_t val)
56
{
49 57
    cpu_outl(addr & IOPORTS_MASK, val);
50 58
}
51 59

  
......
57 65
    return val;
58 66
}
59 67

  
60
static uint32_t isa_mmio_readw (void *opaque, target_phys_addr_t addr)
68
static uint32_t isa_mmio_readw_be(void *opaque, target_phys_addr_t addr)
61 69
{
62 70
    uint32_t val;
63 71

  
64 72
    val = cpu_inw(addr & IOPORTS_MASK);
65
#ifdef TARGET_WORDS_BIGENDIAN
66 73
    val = bswap16(val);
67
#endif
68 74
    return val;
69 75
}
70 76

  
71
static uint32_t isa_mmio_readl (void *opaque, target_phys_addr_t addr)
77
static uint32_t isa_mmio_readw_le(void *opaque, target_phys_addr_t addr)
78
{
79
    uint32_t val;
80

  
81
    val = cpu_inw(addr & IOPORTS_MASK);
82
    return val;
83
}
84

  
85
static uint32_t isa_mmio_readl_be(void *opaque, target_phys_addr_t addr)
72 86
{
73 87
    uint32_t val;
74 88

  
75 89
    val = cpu_inl(addr & IOPORTS_MASK);
76
#ifdef TARGET_WORDS_BIGENDIAN
77 90
    val = bswap32(val);
78
#endif
79 91
    return val;
80 92
}
81 93

  
82
static CPUWriteMemoryFunc * const isa_mmio_write[] = {
94
static uint32_t isa_mmio_readl_le(void *opaque, target_phys_addr_t addr)
95
{
96
    uint32_t val;
97

  
98
    val = cpu_inl(addr & IOPORTS_MASK);
99
    return val;
100
}
101

  
102
static CPUWriteMemoryFunc * const isa_mmio_write_be[] = {
103
    &isa_mmio_writeb,
104
    &isa_mmio_writew_be,
105
    &isa_mmio_writel_be,
106
};
107

  
108
static CPUReadMemoryFunc * const isa_mmio_read_be[] = {
109
    &isa_mmio_readb,
110
    &isa_mmio_readw_be,
111
    &isa_mmio_readl_be,
112
};
113

  
114
static CPUWriteMemoryFunc * const isa_mmio_write_le[] = {
83 115
    &isa_mmio_writeb,
84
    &isa_mmio_writew,
85
    &isa_mmio_writel,
116
    &isa_mmio_writew_le,
117
    &isa_mmio_writel_le,
86 118
};
87 119

  
88
static CPUReadMemoryFunc * const isa_mmio_read[] = {
120
static CPUReadMemoryFunc * const isa_mmio_read_le[] = {
89 121
    &isa_mmio_readb,
90
    &isa_mmio_readw,
91
    &isa_mmio_readl,
122
    &isa_mmio_readw_le,
123
    &isa_mmio_readl_le,
92 124
};
93 125

  
94 126
static int isa_mmio_iomemtype = 0;
95 127

  
96
void isa_mmio_init(target_phys_addr_t base, target_phys_addr_t size)
128
void isa_mmio_init(target_phys_addr_t base, target_phys_addr_t size, int be)
97 129
{
98 130
    if (!isa_mmio_iomemtype) {
99
        isa_mmio_iomemtype = cpu_register_io_memory(isa_mmio_read,
100
                                                    isa_mmio_write, NULL);
131
        if (be) {
132
            isa_mmio_iomemtype = cpu_register_io_memory(isa_mmio_read_be,
133
                                                        isa_mmio_write_be,
134
                                                        NULL);
135
        } else {
136
            isa_mmio_iomemtype = cpu_register_io_memory(isa_mmio_read_le,
137
                                                        isa_mmio_write_le,
138
                                                        NULL);
139
        }
101 140
    }
102 141
    cpu_register_physical_memory(base, size, isa_mmio_iomemtype);
103 142
}

Also available in: Unified diff