ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nubus: move slot bitmap checks from NubusDevice realize() to BusClass check_address() 

Allow Nubus to manage the slot allocations itself using the BusClass check_address()
virtual function rather than managing this during NubusDevice realize().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210924073808.1041-6-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:53 +01:00 committed by Laurent Vivier
parent 03deab9940
commit c10a576c19
2 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/nubus/nubus-bus.c
View File

@ -96,11 +96,40 @@ static void nubus_init(Object *obj)
NUBUS_SLOT_NB);
}
static bool nubus_check_address(BusState *bus, DeviceState *dev, Error **errp)
{
NubusDevice *nd = NUBUS_DEVICE(dev);
NubusBus *nubus = NUBUS_BUS(bus);
if (nd->slot == -1) {
/* No slot specified, find first available free slot */
int s = ctz32(nubus->slot_available_mask);
if (s != 32) {
nd->slot = s;
} else {
error_setg(errp, "Cannot register nubus card, no free slot "
"available");
return false;
}
} else {
/* Slot specified, make sure the slot is available */
if (!(nubus->slot_available_mask & BIT(nd->slot))) {
error_setg(errp, "Cannot register nubus card, slot %d is "
"unavailable or already occupied", nd->slot);
return false;
}
}
nubus->slot_available_mask &= ~BIT(nd->slot);
return true;
}
static void nubus_class_init(ObjectClass *oc, void *data)
{
BusClass *bc = BUS_CLASS(oc);
bc->realize = nubus_realize;
bc->check_address = nubus_check_address;
}
static const TypeInfo nubus_bus_info = {

21
hw/nubus/nubus-device.c
View File

@ -161,27 +161,6 @@ static void nubus_device_realize(DeviceState *dev, Error **errp)
char *name;
hwaddr slot_offset;
if (nd->slot == -1) {
/* No slot specified, find first available free slot */
int s = ctz32(nubus->slot_available_mask);
if (s != 32) {
nd->slot = s;
} else {
error_setg(errp, "Cannot register nubus card, no free slot "
"available");
return;
}
} else {
/* Slot specified, make sure the slot is available */
if (!(nubus->slot_available_mask & BIT(nd->slot))) {
error_setg(errp, "Cannot register nubus card, slot %d is "
"unavailable or already occupied", nd->slot);
return;
}
}
nubus->slot_available_mask &= ~BIT(nd->slot);
/* Super */
slot_offset = nd->slot * NUBUS_SUPER_SLOT_SIZE;