Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdb0d5fa authored by Finn Thain's avatar Finn Thain Committed by Greg Kroah-Hartman
Browse files

block/swim: Rename macros to avoid inconsistent inverted logic 



commit 56a1c5ee54f69dd767fb61d301883dc919ddc259 upstream.

The Sony drive status bits use active-low logic. The swim_readbit()
function converts that to 'C' logic for readability. Hence, the
sense of the names of the status bit macros should not be inverted.

Mostly they are correct. However, the TWOMEG_DRIVE, MFM_MODE and
TWOMEG_MEDIA macros have inverted sense (like MkLinux). Fix this
inconsistency and make the following patches less confusing.

The same problem affects swim3.c so fix that too.

No functional change.

The FDHD drive status bits are documented in sonydriv.cpp from MAME
and in swimiii.h from MkLinux.

Cc: Laurent Vivier <lvivier@redhat.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Jens Axboe <axboe@kernel.dk>
Cc: stable@vger.kernel.org # v4.14+
Tested-by: default avatarStan Johnson <userm57@yahoo.com>
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Acked-by: default avatarLaurent Vivier <lvivier@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f359e87f

drivers/block/swim.c

+4 −4
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ struct iwm { 
/* Select values for swim_select and swim_readbit */



#define READ_DATA_0	0x074

#define TWOMEG_DRIVE	0x075

#define ONEMEG_DRIVE	0x075

#define SINGLE_SIDED	0x076

#define DRIVE_PRESENT	0x077

#define DISK_IN		0x170
@@ -118,9 +118,9 @@ struct iwm { 
#define TRACK_ZERO	0x172

#define TACHO		0x173

#define READ_DATA_1	0x174

#define MFM_MODE	0x175

#define GCR_MODE	0x175

#define SEEK_COMPLETE	0x176

#define ONEMEG_MEDIA	0x177

#define TWOMEG_MEDIA	0x177



/* Bits in handshake register */
@@ -612,7 +612,7 @@ static void setup_medium(struct floppy_state *fs) 
		struct floppy_struct *g;

		fs->disk_in = 1;

		fs->write_protected = swim_readbit(base, WRITE_PROT);

		fs->type = swim_readbit(base, ONEMEG_MEDIA);

		fs->type = swim_readbit(base, TWOMEG_MEDIA);



		if (swim_track00(base))

			printk(KERN_ERR

drivers/block/swim3.c

+3 −3
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ struct swim3 { 
#define MOTOR_ON	2

#define RELAX		3	/* also eject in progress */

#define READ_DATA_0	4

#define TWOMEG_DRIVE	5

#define ONEMEG_DRIVE	5

#define SINGLE_SIDED	6	/* drive or diskette is 4MB type? */

#define DRIVE_PRESENT	7

#define DISK_IN		8
@@ -156,9 +156,9 @@ struct swim3 { 
#define TRACK_ZERO	10

#define TACHO		11

#define READ_DATA_1	12

#define MFM_MODE	13

#define GCR_MODE	13

#define SEEK_COMPLETE	14

#define ONEMEG_MEDIA	15

#define TWOMEG_MEDIA	15



/* Definitions of values used in writing and formatting */

#define DATA_ESCAPE	0x99