Revision f08b32fe hw/unin_pci.c

b/hw/unin_pci.c
84 84
    /* Uninorth main bus */
85 85
    s = FROM_SYSBUS(UNINState, dev);
86 86

  
87
    pci_mem_config = pci_host_config_register_io_memory(&s->host_state);
88
    pci_mem_data = pci_host_data_register_io_memory(&s->host_state);
87
    pci_mem_config = pci_host_conf_register_mmio(&s->host_state);
88
    pci_mem_data = pci_host_data_register_mmio(&s->host_state);
89 89
    sysbus_init_mmio(dev, 0x1000, pci_mem_config);
90 90
    sysbus_init_mmio(dev, 0x1000, pci_mem_data);
91 91

  
......
103 103
    s = FROM_SYSBUS(UNINState, dev);
104 104

  
105 105
    // XXX: s = &pci_bridge[2];
106
    pci_mem_config = pci_host_config_register_io_memory_noswap(&s->host_state);
107
    pci_mem_data = pci_host_data_register_io_memory(&s->host_state);
106
    pci_mem_config = pci_host_conf_register_mmio_noswap(&s->host_state);
107
    pci_mem_data = pci_host_data_register_mmio(&s->host_state);
108 108
    sysbus_init_mmio(dev, 0x1000, pci_mem_config);
109 109
    sysbus_init_mmio(dev, 0x1000, pci_mem_data);
110 110
    return 0;
......
118 118
    /* Uninorth AGP bus */
119 119
    s = FROM_SYSBUS(UNINState, dev);
120 120

  
121
    pci_mem_config = pci_host_config_register_io_memory_noswap(&s->host_state);
122
    pci_mem_data = pci_host_data_register_io_memory(&s->host_state);
121
    pci_mem_config = pci_host_conf_register_mmio_noswap(&s->host_state);
122
    pci_mem_data = pci_host_data_register_mmio(&s->host_state);
123 123
    sysbus_init_mmio(dev, 0x1000, pci_mem_config);
124 124
    sysbus_init_mmio(dev, 0x1000, pci_mem_data);
125 125
    return 0;
......
133 133
    /* Uninorth internal bus */
134 134
    s = FROM_SYSBUS(UNINState, dev);
135 135

  
136
    pci_mem_config = pci_host_config_register_io_memory_noswap(&s->host_state);
137
    pci_mem_data = pci_host_data_register_io_memory(&s->host_state);
136
    pci_mem_config = pci_host_conf_register_mmio_noswap(&s->host_state);
137
    pci_mem_data = pci_host_data_register_mmio(&s->host_state);
138 138
    sysbus_init_mmio(dev, 0x1000, pci_mem_config);
139 139
    sysbus_init_mmio(dev, 0x1000, pci_mem_data);
140 140
    return 0;

Also available in: Unified diff