Revision a8170e5e hw/sysbus.c
| b/hw/sysbus.c | ||
|---|---|---|
| 48 | 48 |
} |
| 49 | 49 |
} |
| 50 | 50 |
|
| 51 |
void sysbus_mmio_map(SysBusDevice *dev, int n, target_phys_addr_t addr)
|
|
| 51 |
void sysbus_mmio_map(SysBusDevice *dev, int n, hwaddr addr)
|
|
| 52 | 52 |
{
|
| 53 | 53 |
assert(n >= 0 && n < dev->num_mmio); |
| 54 | 54 |
|
| ... | ... | |
| 56 | 56 |
/* ??? region already mapped here. */ |
| 57 | 57 |
return; |
| 58 | 58 |
} |
| 59 |
if (dev->mmio[n].addr != (target_phys_addr_t)-1) {
|
|
| 59 |
if (dev->mmio[n].addr != (hwaddr)-1) {
|
|
| 60 | 60 |
/* Unregister previous mapping. */ |
| 61 | 61 |
memory_region_del_subregion(get_system_memory(), dev->mmio[n].memory); |
| 62 | 62 |
} |
| ... | ... | |
| 122 | 122 |
} |
| 123 | 123 |
|
| 124 | 124 |
DeviceState *sysbus_create_varargs(const char *name, |
| 125 |
target_phys_addr_t addr, ...)
|
|
| 125 |
hwaddr addr, ...)
|
|
| 126 | 126 |
{
|
| 127 | 127 |
DeviceState *dev; |
| 128 | 128 |
SysBusDevice *s; |
| ... | ... | |
| 133 | 133 |
dev = qdev_create(NULL, name); |
| 134 | 134 |
s = sysbus_from_qdev(dev); |
| 135 | 135 |
qdev_init_nofail(dev); |
| 136 |
if (addr != (target_phys_addr_t)-1) {
|
|
| 136 |
if (addr != (hwaddr)-1) {
|
|
| 137 | 137 |
sysbus_mmio_map(s, 0, addr); |
| 138 | 138 |
} |
| 139 | 139 |
va_start(va, addr); |
| ... | ... | |
| 151 | 151 |
} |
| 152 | 152 |
|
| 153 | 153 |
DeviceState *sysbus_try_create_varargs(const char *name, |
| 154 |
target_phys_addr_t addr, ...)
|
|
| 154 |
hwaddr addr, ...)
|
|
| 155 | 155 |
{
|
| 156 | 156 |
DeviceState *dev; |
| 157 | 157 |
SysBusDevice *s; |
| ... | ... | |
| 165 | 165 |
} |
| 166 | 166 |
s = sysbus_from_qdev(dev); |
| 167 | 167 |
qdev_init_nofail(dev); |
| 168 |
if (addr != (target_phys_addr_t)-1) {
|
|
| 168 |
if (addr != (hwaddr)-1) {
|
|
| 169 | 169 |
sysbus_mmio_map(s, 0, addr); |
| 170 | 170 |
} |
| 171 | 171 |
va_start(va, addr); |
| ... | ... | |
| 185 | 185 |
static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent) |
| 186 | 186 |
{
|
| 187 | 187 |
SysBusDevice *s = sysbus_from_qdev(dev); |
| 188 |
target_phys_addr_t size;
|
|
| 188 |
hwaddr size;
|
|
| 189 | 189 |
int i; |
| 190 | 190 |
|
| 191 | 191 |
monitor_printf(mon, "%*sirq %d\n", indent, "", s->num_irq); |
| ... | ... | |
| 214 | 214 |
return g_strdup(path); |
| 215 | 215 |
} |
| 216 | 216 |
|
| 217 |
void sysbus_add_memory(SysBusDevice *dev, target_phys_addr_t addr,
|
|
| 217 |
void sysbus_add_memory(SysBusDevice *dev, hwaddr addr,
|
|
| 218 | 218 |
MemoryRegion *mem) |
| 219 | 219 |
{
|
| 220 | 220 |
memory_region_add_subregion(get_system_memory(), addr, mem); |
| 221 | 221 |
} |
| 222 | 222 |
|
| 223 |
void sysbus_add_memory_overlap(SysBusDevice *dev, target_phys_addr_t addr,
|
|
| 223 |
void sysbus_add_memory_overlap(SysBusDevice *dev, hwaddr addr,
|
|
| 224 | 224 |
MemoryRegion *mem, unsigned priority) |
| 225 | 225 |
{
|
| 226 | 226 |
memory_region_add_subregion_overlap(get_system_memory(), addr, mem, |
| ... | ... | |
| 232 | 232 |
memory_region_del_subregion(get_system_memory(), mem); |
| 233 | 233 |
} |
| 234 | 234 |
|
| 235 |
void sysbus_add_io(SysBusDevice *dev, target_phys_addr_t addr,
|
|
| 235 |
void sysbus_add_io(SysBusDevice *dev, hwaddr addr,
|
|
| 236 | 236 |
MemoryRegion *mem) |
| 237 | 237 |
{
|
| 238 | 238 |
memory_region_add_subregion(get_system_io(), addr, mem); |
Also available in: Unified diff