Re: [PATCH v4 20/20] q800: configure nubus available slots for Quadra 800

[Laurent Vivier]

Le 17/09/2021 à 09:50, Mark Cave-Ayland a écrit :
> Slot 0x9 is reserved for use by the in-built framebuffer whilst only slots
> 0xc, 0xd and 0xe physically exist on the Quadra 800.
> 
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> ---
>  hw/m68k/q800.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
> index fbc45a301f..63f42764eb 100644
> --- a/hw/m68k/q800.c
> +++ b/hw/m68k/q800.c
> @@ -78,6 +78,13 @@
>  
>  #define MAC_CLOCK  3686418
>  
> +/*
> + * Slot 0x9 is reserved for use by the in-built framebuffer whilst only
> + * slots 0xc, 0xd and 0xe physically exist on the Quadra 800
> + */
> +#define Q800_NUBUS_SLOTS_AVAILABLE    (BIT(0x9) | BIT(0xc) | BIT(0xd) | \
> +                                       BIT(0xe))
> +
>  /*
>   * The GLUE (General Logic Unit) is an Apple custom integrated circuit chip
>   * that performs a variety of functions (RAM management, clock generation, 
> ...).
> @@ -392,6 +399,8 @@ static void q800_init(MachineState *machine)
>      /* NuBus */
>  
>      dev = qdev_new(TYPE_MAC_NUBUS_BRIDGE);
> +    qdev_prop_set_uint32(dev, "slot-available-mask",
> +                         Q800_NUBUS_SLOTS_AVAILABLE);
>      sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
>      sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 9 * NUBUS_SUPER_SLOT_SIZE);
>      sysbus_mmio_map(SYS_BUS_DEVICE(dev), 1, NUBUS_SLOT_BASE +
> 

Reviewed-by: Laurent Vivier <laurent@vivier.eu>