From: Finn Thain <fthain@linux-m68k.org>
To: Jens Axboe <axboe@kernel.dk>, Laurent Vivier <laurent@vivier.eu>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
Joshua Thompson <funaho@jurai.org>,
linux-block@vger.kernel.org, linux-m68k@lists.linux-m68k.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 31/32] swim: Define symbols for constants
Date: Mon, 17 Aug 2026 11:17:10 +1000 [thread overview]
Message-ID: <8ff8fb2deceab8df1e3786105b291fdc15b7eaf3.1786929430.git.fthain@linux-m68k.org> (raw)
In-Reply-To: <cover.1786929430.git.fthain@linux-m68k.org>
Define local symbols to give some meaning to anonymous constants.
No functional change.
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Finn Thain <fthain@linux-m68k.org>
---
drivers/block/swim_asm.S | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/drivers/block/swim_asm.S b/drivers/block/swim_asm.S
index c8a89c0c4652..c78efc30082a 100644
--- a/drivers/block/swim_asm.S
+++ b/drivers/block/swim_asm.S
@@ -43,6 +43,10 @@
.equ sector_size, 512
.equ .Lmark_sequence_len, 4
+ .equ .Lmr_clear_fifo, 0x01
+ .equ .Lmr_action, 0x08
+ .equ .Lmr_write_action, 0x18
+
.equ .Lhr_crc_error, 0x02
.equ .Lhr_fifo_2bytes, 0x40
.equ .Lhr_fifo_1byte, 0x80
@@ -95,11 +99,11 @@ sector_data_mark:
lea %a3@(read_data), %a5
lea %a3@(read_mark), %a3
- moveb #0x18, %a3@(write_mode0 - read_mark)
- moveb #0x01, %a3@(write_mode1 - read_mark)
- moveb #0x01, %a3@(write_mode0 - read_mark)
+ moveb #.Lmr_write_action, %a3@(write_mode0 - read_mark)
+ moveb #.Lmr_clear_fifo, %a3@(write_mode1 - read_mark)
+ moveb #.Lmr_clear_fifo, %a3@(write_mode0 - read_mark)
tstb %a3@(read_error - read_mark)
- moveb #0x08, %a3@(write_mode1 - read_mark)
+ moveb #.Lmr_action, %a3@(write_mode1 - read_mark)
lea sector_address_mark, %a1
moveq #.Lmark_sequence_len, %d4
@@ -157,7 +161,7 @@ crc1: moveb %a2@, %d5
moveq #0, %d0
signal_nonyb:
- moveb #0x18, %a3@(write_mode0 - read_mark)
+ moveb #.Lmr_write_action, %a3@(write_mode0 - read_mark)
rts
.global swim_read_sector_data
@@ -177,11 +181,11 @@ mfm_read_data:
lea %a3@(read_data), %a5
lea %a3@(read_mark), %a3
- moveb #0x18, %a3@(write_mode0 - read_mark)
- moveb #0x01, %a3@(write_mode1 - read_mark)
- moveb #0x01, %a3@(write_mode0 - read_mark)
+ moveb #.Lmr_write_action, %a3@(write_mode0 - read_mark)
+ moveb #.Lmr_clear_fifo, %a3@(write_mode1 - read_mark)
+ moveb #.Lmr_clear_fifo, %a3@(write_mode0 - read_mark)
tstb %a3@(read_error - read_mark)
- moveb #0x08, %a3@(write_mode1 - read_mark)
+ moveb #.Lmr_action, %a3@(write_mode1 - read_mark)
lea sector_data_mark, %a1
moveq #.Lmark_sequence_len, %d4
@@ -239,7 +243,7 @@ data_crc1:
subl %d4, %d0
data_exit:
- moveb #0x18, %a3@(write_mode0 - read_mark)
+ moveb #.Lmr_write_action, %a3@(write_mode0 - read_mark)
rts
.Lmaybe_store:
--
2.52.0
next prev parent reply other threads:[~2026-08-17 1:59 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-17 1:17 [PATCH v2 00/32] block/swim: Fixes and improvements Finn Thain
2026-08-17 1:17 ` [PATCH v2 15/32] swim: Don't use the mark register to read data Finn Thain
2026-08-17 1:17 ` [PATCH v2 12/32] swim: Simplify return value initialization Finn Thain
2026-08-17 1:17 ` [PATCH v2 16/32] swim: Fix buffer overflow Finn Thain
2026-08-17 1:17 ` [PATCH v2 26/32] swim: Move swd initialization Finn Thain
2026-08-17 1:17 ` [PATCH v2 17/32] swim: Convert to blocking queue Finn Thain
2026-08-17 1:17 ` [PATCH v2 27/32] swim: Add some helpful references Finn Thain
2026-08-17 1:17 ` [PATCH v2 10/32] swim: Add track zero recalibration delay Finn Thain
2026-08-17 1:17 ` [PATCH v2 19/32] swim: Deduplicate polling loops Finn Thain
2026-08-17 1:17 ` [PATCH v2 20/32] swim: Check drive ready bit Finn Thain
2026-08-17 1:17 ` [PATCH v2 11/32] swim: Handle FIFO timeout error Finn Thain
2026-08-17 1:17 ` [PATCH v2 22/32] swim: Remove pointless mode0 register write Finn Thain
2026-08-17 1:17 ` [PATCH v2 06/32] swim: Configure parameter memory Finn Thain
2026-08-17 1:17 ` Finn Thain [this message]
2026-08-17 1:17 ` [PATCH v2 01/32] swim: Assert strobe with stable outputs Finn Thain
2026-08-17 1:17 ` [PATCH v2 29/32] swim: Clean up whitespace Finn Thain
2026-08-17 1:17 ` [PATCH v2 14/32] swim: Check error register during sector read Finn Thain
2026-08-17 1:17 ` [PATCH v2 08/32] swim: Don't start motor until medium is present Finn Thain
2026-08-17 1:17 ` [PATCH v2 09/32] swim: Recalibrate when drive is probed Finn Thain
2026-08-17 1:17 ` [PATCH v2 32/32] swim: Unexport global symbols Finn Thain
2026-08-17 1:17 ` [PATCH v2 02/32] swim: Select appropriate drive once only Finn Thain
2026-08-17 1:17 ` [PATCH v2 24/32] swim: Don't search beyond the first data mark Finn Thain
2026-08-17 1:17 ` [PATCH v2 04/32] swim: Don't disable drive after every sector Finn Thain
2026-08-17 1:17 ` [PATCH v2 18/32] swim: Remove redundant RELAX actions Finn Thain
2026-08-17 1:17 ` [PATCH v2 07/32] swim: Enable clock divider only where appropriate Finn Thain
2026-08-17 1:17 ` [PATCH v2 13/32] swim: Check for CRC errors Finn Thain
2026-08-17 1:17 ` [PATCH v2 03/32] swim: Enable the drive when probing Finn Thain
2026-08-17 1:17 ` [PATCH v2 25/32] swim: Remove pointless specifiers Finn Thain
2026-08-17 1:17 ` [PATCH v2 23/32] swim: Don't needlessly re-read sectors Finn Thain
2026-08-17 1:17 ` [PATCH v2 28/32] swim: Remove unused macro definitions Finn Thain
2026-08-17 1:17 ` [PATCH v2 21/32] swim: Revisit delays Finn Thain
2026-08-17 1:17 ` [PATCH v2 05/32] swim: Perform ISM/IWM mode switching according to specs Finn Thain
2026-08-17 1:17 ` [PATCH v2 30/32] swim: Define macros for constants Finn Thain
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=8ff8fb2deceab8df1e3786105b291fdc15b7eaf3.1786929430.git.fthain@linux-m68k.org \
--to=fthain@linux-m68k.org \
--cc=axboe@kernel.dk \
--cc=funaho@jurai.org \
--cc=geert@linux-m68k.org \
--cc=laurent@vivier.eu \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.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).