[PATCH v2 03/12] mac_via: use IFR bit flag constants for VIA2 IRQs

[Mark Cave-Ayland]

This allows us to easily see how the physical control lines are mapped to the
IFR bit flags.

Signed-off-by: Mark Cave-Ayland 
---
 include/hw/misc/mac_via.h | 19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/include/hw/misc/mac_via.h b/include/hw/misc/mac_via.h
index b0535c84da..0af346366e 100644
--- a/include/hw/misc/mac_via.h
+++ b/include/hw/misc/mac_via.h
@@ -80,19 +80,18 @@ struct MOS6522Q800VIA1State {
 
 
 /* VIA 2 */
-#define VIA2_IRQ_SCSI_DATA_BIT  0
-#define VIA2_IRQ_NUBUS_BIT  1
-#define VIA2_IRQ_UNUSED_BIT 2
-#define VIA2_IRQ_SCSI_BIT   3
-#define VIA2_IRQ_ASC_BIT4
+#define VIA2_IRQ_SCSI_DATA_BIT  CA2_INT_BIT
+#define VIA2_IRQ_NUBUS_BIT  CA1_INT_BIT
+#define VIA2_IRQ_SCSI_BIT   CB2_INT_BIT
+#define VIA2_IRQ_ASC_BITCB1_INT_BIT
 
 #define VIA2_IRQ_NB 8
 
-#define VIA2_IRQ_SCSI_DATA  (1 << VIA2_IRQ_SCSI_DATA_BIT)
-#define VIA2_IRQ_NUBUS  (1 << VIA2_IRQ_NUBUS_BIT)
-#define VIA2_IRQ_UNUSED (1 << VIA2_IRQ_SCSI_BIT)
-#define VIA2_IRQ_SCSI   (1 << VIA2_IRQ_UNUSED_BIT)
-#define VIA2_IRQ_ASC(1 << VIA2_IRQ_ASC_BIT)
+#define VIA2_IRQ_SCSI_DATA  BIT(VIA2_IRQ_SCSI_DATA_BIT)
+#define VIA2_IRQ_NUBUS  BIT(VIA2_IRQ_NUBUS_BIT)
+#define VIA2_IRQ_UNUSED BIT(VIA2_IRQ_SCSI_BIT)
+#define VIA2_IRQ_SCSI   BIT(VIA2_IRQ_UNUSED_BIT)
+#define VIA2_IRQ_ASCBIT(VIA2_IRQ_ASC_BIT)
 
 #define VIA2_NUBUS_IRQ_NB   7
 
-- 
2.20.1

Re: [PATCH v2 03/12] mac_via: use IFR bit flag constants for VIA2 IRQs

[Philippe Mathieu-Daudé]

On 24/2/22 12:59, Mark Cave-Ayland wrote:

This allows us to easily see how the physical control lines are mapped to the
IFR bit flags.

Signed-off-by: Mark Cave-Ayland 
---
  include/hw/misc/mac_via.h | 19 +--
  1 file changed, 9 insertions(+), 10 deletions(-)


Reviewed-by: Philippe Mathieu-Daudé 

Re: [PATCH v2 03/12] mac_via: use IFR bit flag constants for VIA2 IRQs

[Laurent Vivier]

Le 24/02/2022 à 12:59, Mark Cave-Ayland a écrit :

This allows us to easily see how the physical control lines are mapped to the
IFR bit flags.

Signed-off-by: Mark Cave-Ayland 
---
  include/hw/misc/mac_via.h | 19 +--
  1 file changed, 9 insertions(+), 10 deletions(-)



Reviewed-by: Laurent Vivier