Le 17/09/2021 à 09:50, Mark Cave-Ayland a écrit :
> 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-ayl...@ilande.co.uk>
> Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> hw/nubus/nubus-device.c | 36 ++++++++++++++++++------------------
> include/hw/nubus/nubus.h | 1 +
> 2 files changed, 19 insertions(+), 18 deletions(-)
>
> diff --git a/hw/nubus/nubus-device.c b/hw/nubus/nubus-device.c
> index be01269563..36203848e5 100644
> --- a/hw/nubus/nubus-device.c
> +++ b/hw/nubus/nubus-device.c
> @@ -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 - 6) * NUBUS_SUPER_SLOT_SIZE;
> +
Is it possible to remove this patch?
The "(nd->slot - 6)" looks weird and it is removed in patch 20.
If not:
Reviewed-by: Laurent Vivier <laur...@vivier.eu>
Thanks,
Laurent
