public/qemu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nubus-device: rename slot_nb variable to slot

Browse source 
This is in preparation for creating a qdev property of the same name.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210924073808.1041-3-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Mark Cave-Ayland 2021-09-24 08:37:50 +01:00 committed by Laurent Vivier
parent 5d1fa7e412
commit e2c49c0515
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
hw/nubus/nubus-device.c
View file

@ -87,7 +87,7 @@ static void nubus_register_format_block(NubusDevice *dev)
char *fblock_name;
fblock_name = g_strdup_printf("nubus-slot-%d-format-block",
dev->slot_nb);
dev->slot);
hwaddr fblock_offset = memory_region_size(&dev->slot_mem) - FBLOCK_SIZE;
memory_region_init_io(&dev->fblock_io, NULL, &nubus_format_block_ops,
@ -142,7 +142,7 @@ void nubus_register_rom(NubusDevice *dev, const uint8_t *rom, uint32_t size,
/* ROM */
dev->rom = rom;
rom_name = g_strdup_printf("nubus-slot-%d-rom", dev->slot_nb);
rom_name = g_strdup_printf("nubus-slot-%d-rom", dev->slot);
memory_region_init_io(&dev->rom_io, NULL, &mac_nubus_rom_ops,
dev, rom_name, size);
memory_region_set_readonly(&dev->rom_io, true);
@ -167,12 +167,12 @@ static void nubus_device_realize(DeviceState *dev, Error **errp)
return;
}
nd->slot_nb = nubus->current_slot++;
name = g_strdup_printf("nubus-slot-%d", nd->slot_nb);
nd->slot = nubus->current_slot++;
name = g_strdup_printf("nubus-slot-%d", nd->slot);
if (nd->slot_nb < NUBUS_FIRST_SLOT) {
if (nd->slot < NUBUS_FIRST_SLOT) {
/* Super */
slot_offset = (nd->slot_nb - 6) * NUBUS_SUPER_SLOT_SIZE;
slot_offset = (nd->slot - 6) * NUBUS_SUPER_SLOT_SIZE;
memory_region_init(&nd->slot_mem, OBJECT(dev), name,
NUBUS_SUPER_SLOT_SIZE);
@ -180,7 +180,7 @@ static void nubus_device_realize(DeviceState *dev, Error **errp)
&nd->slot_mem);
} else {
/* Normal */
slot_offset = nd->slot_nb * NUBUS_SLOT_SIZE;
slot_offset = nd->slot * NUBUS_SLOT_SIZE;
memory_region_init(&nd->slot_mem, OBJECT(dev), name, NUBUS_SLOT_SIZE);
memory_region_add_subregion(&nubus->slot_io, slot_offset,

2
include/hw/nubus/nubus.h
View file

@ -42,7 +42,7 @@ struct NubusBus {
struct NubusDevice {
DeviceState qdev;
int slot_nb;
int slot;
MemoryRegion slot_mem;
/* Format Block */