Revision 6ebf5905 hw/pci_host.c

b/hw/pci_host.c
78 78
    return val;
79 79
}
80 80

  
81
static void pci_host_config_write_swap(ReadWriteHandler *handler,
82
                                       pcibus_t addr, uint32_t val, int len)
81
static void pci_host_config_write(ReadWriteHandler *handler,
82
                                  pcibus_t addr, uint32_t val, int len)
83 83
{
84 84
    PCIHostState *s = container_of(handler, PCIHostState, conf_handler);
85 85

  
86 86
    PCI_DPRINTF("%s addr %" FMT_PCIBUS " %d val %"PRIx32"\n",
87 87
                __func__, addr, len, val);
88
    val = qemu_bswap_len(val, len);
89 88
    s->config_reg = val;
90 89
}
91 90

  
92
static uint32_t pci_host_config_read_swap(ReadWriteHandler *handler,
93
                                          pcibus_t addr, int len)
91
static uint32_t pci_host_config_read(ReadWriteHandler *handler,
92
                                     pcibus_t addr, int len)
94 93
{
95 94
    PCIHostState *s = container_of(handler, PCIHostState, conf_handler);
96 95
    uint32_t val = s->config_reg;
97 96

  
98
    val = qemu_bswap_len(val, len);
99 97
    PCI_DPRINTF("%s addr %" FMT_PCIBUS " len %d val %"PRIx32"\n",
100 98
                __func__, addr, len, val);
101 99
    return val;
102 100
}
103 101

  
104
static void pci_host_config_write_noswap(ReadWriteHandler *handler,
105
                                         pcibus_t addr, uint32_t val, int len)
106
{
107
    PCIHostState *s = container_of(handler, PCIHostState, conf_noswap_handler);
108

  
109
    PCI_DPRINTF("%s addr %" FMT_PCIBUS " %d val %"PRIx32"\n",
110
                __func__, addr, len, val);
111
    s->config_reg = val;
112
}
113

  
114
static uint32_t pci_host_config_read_noswap(ReadWriteHandler *handler,
115
                                            pcibus_t addr, int len)
116
{
117
    PCIHostState *s = container_of(handler, PCIHostState, conf_noswap_handler);
118
    uint32_t val = s->config_reg;
119

  
120
    PCI_DPRINTF("%s addr %" FMT_PCIBUS " len %d val %"PRIx32"\n",
121
                __func__, addr, len, val);
122
    return val;
123
}
124

  
125
static void pci_host_data_write_swap(ReadWriteHandler *handler,
126
                                     pcibus_t addr, uint32_t val, int len)
102
static void pci_host_data_write(ReadWriteHandler *handler,
103
                                pcibus_t addr, uint32_t val, int len)
127 104
{
128 105
    PCIHostState *s = container_of(handler, PCIHostState, data_handler);
129

  
130
    val = qemu_bswap_len(val, len);
131 106
    PCI_DPRINTF("write addr %" FMT_PCIBUS " len %d val %x\n",
132 107
                addr, len, val);
133 108
    if (s->config_reg & (1u << 31))
134 109
        pci_data_write(s->bus, s->config_reg | (addr & 3), val, len);
135 110
}
136 111

  
137
static uint32_t pci_host_data_read_swap(ReadWriteHandler *handler,
138
                                        pcibus_t addr, int len)
112
static uint32_t pci_host_data_read(ReadWriteHandler *handler,
113
                                   pcibus_t addr, int len)
139 114
{
140 115
    PCIHostState *s = container_of(handler, PCIHostState, data_handler);
141 116
    uint32_t val;
......
144 119
    val = pci_data_read(s->bus, s->config_reg | (addr & 3), len);
145 120
    PCI_DPRINTF("read addr %" FMT_PCIBUS " len %d val %x\n",
146 121
                addr, len, val);
147
    val = qemu_bswap_len(val, len);
148
    return val;
149
}
150

  
151
static void pci_host_data_write_noswap(ReadWriteHandler *handler,
152
                                       pcibus_t addr, uint32_t val, int len)
153
{
154
    PCIHostState *s = container_of(handler, PCIHostState, data_noswap_handler);
155
    PCI_DPRINTF("write addr %" FMT_PCIBUS " len %d val %x\n",
156
                addr, len, val);
157
    if (s->config_reg & (1u << 31))
158
        pci_data_write(s->bus, s->config_reg | (addr & 3), val, len);
159
}
160

  
161
static uint32_t pci_host_data_read_noswap(ReadWriteHandler *handler,
162
                                          pcibus_t addr, int len)
163
{
164
    PCIHostState *s = container_of(handler, PCIHostState, data_noswap_handler);
165
    uint32_t val;
166
    if (!(s->config_reg & (1 << 31)))
167
        return 0xffffffff;
168
    val = pci_data_read(s->bus, s->config_reg | (addr & 3), len);
169
    PCI_DPRINTF("read addr %" FMT_PCIBUS " len %d val %x\n",
170
                addr, len, val);
171 122
    return val;
172 123
}
173 124

  
174 125
static void pci_host_init(PCIHostState *s)
175 126
{
176
    s->conf_handler.write = pci_host_config_write_swap;
177
    s->conf_handler.read = pci_host_config_read_swap;
178
    s->conf_noswap_handler.write = pci_host_config_write_noswap;
179
    s->conf_noswap_handler.read = pci_host_config_read_noswap;
180
    s->data_handler.write = pci_host_data_write_swap;
181
    s->data_handler.read = pci_host_data_read_swap;
182
    s->data_noswap_handler.write = pci_host_data_write_noswap;
183
    s->data_noswap_handler.read = pci_host_data_read_noswap;
127
    s->conf_handler.write = pci_host_config_write;
128
    s->conf_handler.read = pci_host_config_read;
129
    s->data_handler.write = pci_host_data_write;
130
    s->data_handler.read = pci_host_data_read;
184 131
}
185 132

  
186
int pci_host_conf_register_mmio(PCIHostState *s, int swap)
133
int pci_host_conf_register_mmio(PCIHostState *s, int endian)
187 134
{
188 135
    pci_host_init(s);
189
    if (swap) {
190
        return cpu_register_io_memory_simple(&s->conf_handler,
191
                                             DEVICE_NATIVE_ENDIAN);
192
    } else {
193
        return cpu_register_io_memory_simple(&s->conf_noswap_handler,
194
                                             DEVICE_NATIVE_ENDIAN);
195
    }
136
    return cpu_register_io_memory_simple(&s->conf_handler, endian);
196 137
}
197 138

  
198 139
void pci_host_conf_register_ioport(pio_addr_t ioport, PCIHostState *s)
199 140
{
200 141
    pci_host_init(s);
201
    register_ioport_simple(&s->conf_noswap_handler, ioport, 4, 4);
142
    register_ioport_simple(&s->conf_handler, ioport, 4, 4);
202 143
}
203 144

  
204
int pci_host_data_register_mmio(PCIHostState *s, int swap)
145
int pci_host_data_register_mmio(PCIHostState *s, int endian)
205 146
{
206 147
    pci_host_init(s);
207
    if (swap) {
208
        return cpu_register_io_memory_simple(&s->data_handler,
209
                                             DEVICE_NATIVE_ENDIAN);
210
    } else {
211
        return cpu_register_io_memory_simple(&s->data_noswap_handler,
212
                                             DEVICE_NATIVE_ENDIAN);
213
    }
148
    return cpu_register_io_memory_simple(&s->data_handler, endian);
214 149
}
215 150

  
216 151
void pci_host_data_register_ioport(pio_addr_t ioport, PCIHostState *s)
217 152
{
218 153
    pci_host_init(s);
219
    register_ioport_simple(&s->data_noswap_handler, ioport, 4, 1);
220
    register_ioport_simple(&s->data_noswap_handler, ioport, 4, 2);
221
    register_ioport_simple(&s->data_noswap_handler, ioport, 4, 4);
154
    register_ioport_simple(&s->data_handler, ioport, 4, 1);
155
    register_ioport_simple(&s->data_handler, ioport, 4, 2);
156
    register_ioport_simple(&s->data_handler, ioport, 4, 4);
222 157
}

Also available in: Unified diff