From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
To: qemu-devel@nongnu.org, laurent@vivier.eu
Subject: [PATCH 11/12] mac_via: rename VIA2_IRQ_SLOT_BIT to VIA2_IRQ_NUBUS_BIT
Date: Mon, 30 Aug 2021 11:24:46 +0100 [thread overview]
Message-ID: <20210830102447.10806-12-mark.cave-ayland@ilande.co.uk> (raw)
In-Reply-To: <20210830102447.10806-1-mark.cave-ayland@ilande.co.uk>
Also improve the alignment of the shifted constants.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
include/hw/misc/mac_via.h | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/hw/misc/mac_via.h b/include/hw/misc/mac_via.h
index 9a8bca056e..5168e3ce66 100644
--- a/include/hw/misc/mac_via.h
+++ b/include/hw/misc/mac_via.h
@@ -26,11 +26,11 @@
#define VIA1_IRQ_NB 8
-#define VIA1_IRQ_ONE_SECOND (1 << VIA1_IRQ_ONE_SECOND_BIT)
-#define VIA1_IRQ_60HZ (1 << VIA1_IRQ_60HZ_BIT)
-#define VIA1_IRQ_ADB_READY (1 << VIA1_IRQ_ADB_READY_BIT)
-#define VIA1_IRQ_ADB_DATA (1 << VIA1_IRQ_ADB_DATA_BIT)
-#define VIA1_IRQ_ADB_CLOCK (1 << VIA1_IRQ_ADB_CLOCK_BIT)
+#define VIA1_IRQ_ONE_SECOND (1 << VIA1_IRQ_ONE_SECOND_BIT)
+#define VIA1_IRQ_60HZ (1 << VIA1_IRQ_60HZ_BIT)
+#define VIA1_IRQ_ADB_READY (1 << VIA1_IRQ_ADB_READY_BIT)
+#define VIA1_IRQ_ADB_DATA (1 << VIA1_IRQ_ADB_DATA_BIT)
+#define VIA1_IRQ_ADB_CLOCK (1 << VIA1_IRQ_ADB_CLOCK_BIT)
#define TYPE_MOS6522_Q800_VIA1 "mos6522-q800-via1"
@@ -80,18 +80,18 @@ struct MOS6522Q800VIA1State {
/* VIA 2 */
#define VIA2_IRQ_SCSI_DATA_BIT 0
-#define VIA2_IRQ_SLOT_BIT 1
+#define VIA2_IRQ_NUBUS_BIT 1
#define VIA2_IRQ_UNUSED_BIT 2
#define VIA2_IRQ_SCSI_BIT 3
#define VIA2_IRQ_ASC_BIT 4
#define VIA2_IRQ_NB 8
-#define VIA2_IRQ_SCSI_DATA (1 << VIA2_IRQ_SCSI_DATA_BIT)
-#define VIA2_IRQ_SLOT (1 << VIA2_IRQ_SLOT_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 (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 TYPE_MOS6522_Q800_VIA2 "mos6522-q800-via2"
OBJECT_DECLARE_SIMPLE_TYPE(MOS6522Q800VIA2State, MOS6522_Q800_VIA2)
--
2.20.1
next prev parent reply other threads:[~2021-08-30 10:35 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-30 10:24 [PATCH 00/12] mac_via: remove MAC_VIA device and prepare for Nubus IRQs Mark Cave-Ayland
2021-08-30 10:24 ` [PATCH 01/12] mac_via: introduce new VMStateDescription for q800 VIA1 and VIA2 Mark Cave-Ayland
2021-09-08 6:44 ` Laurent Vivier
2021-08-30 10:24 ` [PATCH 02/12] mac_via: move last_b variable into q800 VIA1 VMStateDescription Mark Cave-Ayland
2021-09-08 6:44 ` Laurent Vivier
2021-08-30 10:24 ` [PATCH 03/12] mac_via: move PRAM contents and block backend to MOS6522Q800VIA1State Mark Cave-Ayland
2021-09-08 6:46 ` Laurent Vivier
2021-08-30 10:24 ` [PATCH 04/12] mac_via: move PRAM/RTC variables " Mark Cave-Ayland
2021-08-30 22:07 ` Philippe Mathieu-Daudé
2021-09-08 6:47 ` Laurent Vivier
2021-08-30 10:24 ` [PATCH 05/12] mac_via: move ADB " Mark Cave-Ayland
2021-08-30 22:12 ` Philippe Mathieu-Daudé
2021-09-08 6:50 ` Laurent Vivier
2021-08-30 10:24 ` [PATCH 06/12] mac_via: move q800 VIA1 timer variables to q800 VIA1 VMStateDescription Mark Cave-Ayland
2021-09-08 6:50 ` Laurent Vivier
2021-08-30 10:24 ` [PATCH 07/12] mac_via: move VIA1 reset logic from mac_via_reset() to mos6522_q800_via1_reset() Mark Cave-Ayland
2021-08-30 22:04 ` Philippe Mathieu-Daudé
2021-09-08 6:51 ` Laurent Vivier
2021-08-30 10:24 ` [PATCH 08/12] mac_via: move VIA1 realize logic from mac_via_realize() to mos6522_q800_via1_realize() Mark Cave-Ayland
2021-09-08 6:52 ` Laurent Vivier
2021-08-30 10:24 ` [PATCH 09/12] mac_via: remove mac_via device Mark Cave-Ayland
2021-09-08 6:52 ` Laurent Vivier
2021-08-30 10:24 ` [PATCH 10/12] mac_via: remove explicit viaN prefix from VIA IRQ gpios Mark Cave-Ayland
2021-08-30 22:03 ` Philippe Mathieu-Daudé
2021-09-08 6:53 ` Laurent Vivier
2021-08-30 10:24 ` Mark Cave-Ayland [this message]
2021-09-08 6:54 ` [PATCH 11/12] mac_via: rename VIA2_IRQ_SLOT_BIT to VIA2_IRQ_NUBUS_BIT Laurent Vivier
2021-08-30 10:24 ` [PATCH 12/12] mac_via: add qdev gpios for nubus slot interrupts to VIA2 Mark Cave-Ayland
2021-09-08 6:54 ` Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210830102447.10806-12-mark.cave-ayland@ilande.co.uk \
--to=mark.cave-ayland@ilande.co.uk \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).