[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 01/20] nubus-device: rename slot_nb variable to slot
From: |
Mark Cave-Ayland |
Subject: |
[PATCH v3 01/20] nubus-device: rename slot_nb variable to slot |
Date: |
Thu, 16 Sep 2021 11:05:35 +0100 |
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>
---
hw/nubus/nubus-device.c | 14 +++++++-------
include/hw/nubus/nubus.h | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/nubus/nubus-device.c b/hw/nubus/nubus-device.c
index ffe78a8823..be01269563 100644
--- a/hw/nubus/nubus-device.c
+++ b/hw/nubus/nubus-device.c
@@ -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,
diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h
index e2b5cf260b..424309dd73 100644
--- a/include/hw/nubus/nubus.h
+++ b/include/hw/nubus/nubus.h
@@ -42,7 +42,7 @@ struct NubusBus {
struct NubusDevice {
DeviceState qdev;
- int slot_nb;
+ int slot;
MemoryRegion slot_mem;
/* Format Block */
--
2.20.1
- [PATCH v3 00/20] nubus: bus, device, bridge, IRQ and address space improvements, Mark Cave-Ayland, 2021/09/16
- [PATCH v3 01/20] nubus-device: rename slot_nb variable to slot,
Mark Cave-Ayland <=
- [PATCH v3 02/20] nubus-device: expose separate super slot memory region, Mark Cave-Ayland, 2021/09/16
- [PATCH v3 04/20] nubus: use bitmap to manage available slots, Mark Cave-Ayland, 2021/09/16
- [PATCH v3 03/20] nubus-device: add device slot parameter, Mark Cave-Ayland, 2021/09/16
- [PATCH v3 05/20] nubus: move slot bitmap checks from NubusDevice realize() to BusClass check_address(), Mark Cave-Ayland, 2021/09/16
- [PATCH v3 06/20] nubus: implement BusClass get_dev_path(), Mark Cave-Ayland, 2021/09/16
- [PATCH v3 07/20] nubus: add trace-events for empty slot accesses, Mark Cave-Ayland, 2021/09/16
- [PATCH v3 09/20] macfb: don't register declaration ROM, Mark Cave-Ayland, 2021/09/16
- [PATCH v3 08/20] nubus: generate bus error when attempting to access empty slots, Mark Cave-Ayland, 2021/09/16