| [PATCH 1/2] Remove define obfuscating bAcsiEmuOn variable name |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/hatari-devel Archives
]
- Subject: [PATCH 1/2] Remove define obfuscating bAcsiEmuOn variable name
- From: Eero Tamminen <oak@xxxxxxxxxxxxxx>
- Date: Sun, 30 Aug 2020 23:47:45 +0300
---
src/floppy.c | 2 +-
src/includes/hdc.h | 1 -
src/tos.c | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/floppy.c b/src/floppy.c
index acbfdac9..1c6c54a6 100644
--- a/src/floppy.c
+++ b/src/floppy.c
@@ -174,7 +174,7 @@ void Floppy_GetBootDrive(void)
if (!ConfigureParams.HardDisk.bBootFromHardDisk)
return;
- if (ACSI_EMU_ON || ConfigureParams.Ide[0].bUseDevice)
+ if (bAcsiEmuOn || ConfigureParams.Ide[0].bUseDevice)
{
nBootDrive = 2; /* Drive C */
}
diff --git a/src/includes/hdc.h b/src/includes/hdc.h
index 5e25edf5..98498f03 100644
--- a/src/includes/hdc.h
+++ b/src/includes/hdc.h
@@ -84,7 +84,6 @@ typedef struct {
SCSI_DEV devs[8];
} SCSI_CTRLR;
-#define ACSI_EMU_ON bAcsiEmuOn /* Do we have HDC emulation? */
extern int nAcsiPartitions;
extern bool bAcsiEmuOn;
diff --git a/src/tos.c b/src/tos.c
index 8d7be0ac..78d26baf 100644
--- a/src/tos.c
+++ b/src/tos.c
@@ -757,7 +757,7 @@ static void TOS_FixRom(Uint32 *logopatch_addr)
#endif
/* Only apply the patch if it is really needed: */
if (pPatch->Flags == TP_ALWAYS
- || (pPatch->Flags == TP_HDIMAGE_OFF && !ACSI_EMU_ON
+ || (pPatch->Flags == TP_HDIMAGE_OFF && !bAcsiEmuOn
&& !ConfigureParams.Ide[0].bUseDevice
&& ConfigureParams.System.bFastBoot)
|| (pPatch->Flags == TP_ANTI_STE && Config_IsMachineST())
--
2.20.1
--------------D68940423E139D2DEF4AEC03--