Re: [PATCH gnumach] com/lpr: Handle masking of interrupts in the driver

[Samuel Thibault]

applied, thanks!

Damien Zammit, le dim. 01 oct. 2023 04:58:04 +0000, a ecrit:
> ---
>  i386/i386at/autoconf.c  | 6 ++++++
>  i386/i386at/model_dep.c | 8 --------
>  2 files changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/i386/i386at/autoconf.c b/i386/i386at/autoconf.c
> index ef813d92..5c69988f 100644
> --- a/i386/i386at/autoconf.c
> +++ b/i386/i386at/autoconf.c
> @@ -29,6 +29,11 @@
>  #include <i386at/autoconf.h>
>  #include <i386/irq.h>
>  #include <i386/ipl.h>
> +#ifdef APIC
> +# include <i386/apic.h>
> +#else
> +# include <i386/pic.h>
> +#endif
>  #include <chips/busses.h>
>  
>  /* initialization typecasts */
> @@ -140,4 +145,5 @@ void take_dev_irq(
>               while (1);
>       }
>  
> +     unmask_irq(pic);
>  }
> diff --git a/i386/i386at/model_dep.c b/i386/i386at/model_dep.c
> index d835999d..d4bfe6f5 100644
> --- a/i386/i386at/model_dep.c
> +++ b/i386/i386at/model_dep.c
> @@ -169,14 +169,6 @@ void machine_init(void)
>  #endif
>       clkstart();
>  
> -#if defined(APIC)
> -#warning FIXME: Rather unmask them from their respective drivers
> -     /* com0 */
> -     unmask_irq(4);
> -     /* com1 */
> -     unmask_irq(3);
> -#endif
> -
>  #ifdef LINUX_DEV
>       /*
>        * Initialize Linux drivers.
> -- 
> 2.40.1
> 
> 
> 

-- 
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.