Revision 556cd098 hw/unin_pci.c

b/hw/unin_pci.c
148 148

  
149 149
    /* Use values found on a real PowerMac */
150 150
    /* Uninorth main bus */
151
    dev = qdev_create(NULL, "Uni-north main");
151
    dev = qdev_create(NULL, "uni-north-main");
152 152
    qdev_init_nofail(dev);
153 153
    s = sysbus_from_qdev(dev);
154 154
    d = FROM_SYSBUS(UNINState, s);
......
157 157
                                         pic, 11 << 3, 4);
158 158

  
159 159
#if 0
160
    pci_create_simple(d->host_state.bus, 11 << 3, "Uni-north main");
160
    pci_create_simple(d->host_state.bus, 11 << 3, "uni-north-main");
161 161
#endif
162 162

  
163 163
    sysbus_mmio_map(s, 0, 0xf2800000);
......
166 166
    /* DEC 21154 bridge */
167 167
#if 0
168 168
    /* XXX: not activated as PPC BIOS doesn't handle multiple buses properly */
169
    pci_create_simple(d->host_state.bus, 12 << 3, "DEC 21154");
169
    pci_create_simple(d->host_state.bus, 12 << 3, "dec-21154");
170 170
#endif
171 171

  
172 172
    /* Uninorth AGP bus */
173
    pci_create_simple(d->host_state.bus, 11 << 3, "Uni-north AGP");
174
    dev = qdev_create(NULL, "Uni-north AGP");
173
    pci_create_simple(d->host_state.bus, 11 << 3, "uni-north-AGP");
174
    dev = qdev_create(NULL, "uni-north-AGP");
175 175
    qdev_init_nofail(dev);
176 176
    s = sysbus_from_qdev(dev);
177 177
    sysbus_mmio_map(s, 0, 0xf0800000);
......
180 180
    /* Uninorth internal bus */
181 181
#if 0
182 182
    /* XXX: not needed for now */
183
    pci_create_simple(d->host_state.bus, 14 << 3, "Uni-north internal");
184
    dev = qdev_create(NULL, "Uni-north internal");
183
    pci_create_simple(d->host_state.bus, 14 << 3, "uni-north-internal");
184
    dev = qdev_create(NULL, "uni-north-internal");
185 185
    qdev_init_nofail(dev);
186 186
    s = sysbus_from_qdev(dev);
187 187
    sysbus_mmio_map(s, 0, 0xf4800000);
......
260 260
}
261 261

  
262 262
static PCIDeviceInfo unin_main_pci_host_info = {
263
    .qdev.name = "Uni-north main",
263
    .qdev.name = "uni-north-main",
264 264
    .qdev.size = sizeof(PCIDevice),
265 265
    .init      = unin_main_pci_host_init,
266 266
};
267 267

  
268 268
static PCIDeviceInfo dec_21154_pci_host_info = {
269
    .qdev.name = "DEC 21154",
269
    .qdev.name = "dec-21154",
270 270
    .qdev.size = sizeof(PCIDevice),
271 271
    .init      = dec_21154_pci_host_init,
272 272
};
273 273

  
274 274
static PCIDeviceInfo unin_agp_pci_host_info = {
275
    .qdev.name = "Uni-north AGP",
275
    .qdev.name = "uni-north-AGP",
276 276
    .qdev.size = sizeof(PCIDevice),
277 277
    .init      = unin_agp_pci_host_init,
278 278
};
279 279

  
280 280
static PCIDeviceInfo unin_internal_pci_host_info = {
281
    .qdev.name = "Uni-north internal",
281
    .qdev.name = "uni-north-internal",
282 282
    .qdev.size = sizeof(PCIDevice),
283 283
    .init      = unin_internal_pci_host_init,
284 284
};
285 285

  
286 286
static void unin_register_devices(void)
287 287
{
288
    sysbus_register_dev("Uni-north main", sizeof(UNINState),
288
    sysbus_register_dev("uni-north-main", sizeof(UNINState),
289 289
                        pci_unin_main_init_device);
290 290
    pci_qdev_register(&unin_main_pci_host_info);
291
    sysbus_register_dev("DEC 21154", sizeof(UNINState),
291
    sysbus_register_dev("dec-21154", sizeof(UNINState),
292 292
                        pci_dec_21154_init_device);
293 293
    pci_qdev_register(&dec_21154_pci_host_info);
294
    sysbus_register_dev("Uni-north AGP", sizeof(UNINState),
294
    sysbus_register_dev("uni-north-AGP", sizeof(UNINState),
295 295
                        pci_unin_agp_init_device);
296 296
    pci_qdev_register(&unin_agp_pci_host_info);
297
    sysbus_register_dev("Uni-north internal", sizeof(UNINState),
297
    sysbus_register_dev("uni-north-internal", sizeof(UNINState),
298 298
                        pci_unin_internal_init_device);
299 299
    pci_qdev_register(&unin_internal_pci_host_info);
300 300
}

Also available in: Unified diff