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

nubus-device: expose separate super slot memory region

Browse source 
According to "Designing Cards and Drivers for the Macintosh Family" each physical
nubus slot can access 2 separate address ranges: a super slot memory region which
is 256MB and a standard slot memory region which is 16MB.

Currently a Nubus device uses the physical slot number to determine whether it is
using a standard slot memory region or a super slot memory region rather than
exposing both memory regions for use as required.

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-4-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:51 +01:00 committed by Laurent Vivier
parent e2c49c0515
commit 90be1dea50
2 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -168,26 +168,26 @@ static void nubus_device_realize(DeviceState *dev, Error **errp)
}
nd->slot = nubus->current_slot++;
name = g_strdup_printf("nubus-slot-%d", nd->slot);
if (nd->slot < NUBUS_FIRST_SLOT) {
/* Super */
slot_offset = (nd->slot - 6) * NUBUS_SUPER_SLOT_SIZE;
memory_region_init(&nd->slot_mem, OBJECT(dev), name,
NUBUS_SUPER_SLOT_SIZE);
memory_region_add_subregion(&nubus->super_slot_io, slot_offset,
&nd->slot_mem);
} else {
/* Normal */
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,
&nd->slot_mem);
}
/* Super */
slot_offset = nd->slot * NUBUS_SUPER_SLOT_SIZE;
name = g_strdup_printf("nubus-super-slot-%x", nd->slot);
memory_region_init(&nd->super_slot_mem, OBJECT(dev), name,
NUBUS_SUPER_SLOT_SIZE);
memory_region_add_subregion(&nubus->super_slot_io, slot_offset,
&nd->super_slot_mem);
g_free(name);
/* Normal */
slot_offset = nd->slot * NUBUS_SLOT_SIZE;
name = g_strdup_printf("nubus-slot-%x", nd->slot);
memory_region_init(&nd->slot_mem, OBJECT(dev), name, NUBUS_SLOT_SIZE);
memory_region_add_subregion(&nubus->slot_io, slot_offset,
&nd->slot_mem);
g_free(name);
nubus_register_format_block(nd);
}

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

@ -43,6 +43,7 @@ struct NubusDevice {
DeviceState qdev;
int slot;
MemoryRegion super_slot_mem;
MemoryRegion slot_mem;
/* Format Block */