From c05190780b17f0a4a75cfe06b2252d5461481cde Mon Sep 17 00:00:00 2001 From: Seth Morabito Date: Thu, 15 Feb 2018 07:10:44 -0800 Subject: [PATCH] 3b2: Fix windows build --- 3B2/3b2_iu.c | 8 ++++---- 3B2/3b2_iu.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/3B2/3b2_iu.c b/3B2/3b2_iu.c index f14ad431..5511dd81 100644 --- a/3B2/3b2_iu.c +++ b/3B2/3b2_iu.c @@ -325,7 +325,7 @@ t_stat contty_reset(DEVICE *dtpr) memset(&iu_contty, 0, sizeof(IU_PORT)); brg_reg = 0; brg_clk = BRG_DEFAULT; - parity_sel = PARITY_EVEN; + parity_sel = IU_PARITY_EVEN; bits_per_char = 7; sprintf(line_config, "%s-%d%s1", @@ -644,13 +644,13 @@ void iu_write(uint32 pa, uint32 val, size_t size) if (modep == 0) { if ((bval >> 4) & 1) { /* No parity */ - parity_sel = PARITY_NONE; + parity_sel = IU_PARITY_NONE; } else { /* Parity enabled */ if (bval & 4) { - parity_sel = PARITY_ODD; + parity_sel = IU_PARITY_ODD; } else { - parity_sel = PARITY_EVEN; + parity_sel = IU_PARITY_EVEN; } } diff --git a/3B2/3b2_iu.h b/3B2/3b2_iu.h index e07ac1c7..191897f0 100644 --- a/3B2/3b2_iu.h +++ b/3B2/3b2_iu.h @@ -44,9 +44,9 @@ #define IU_SPEED_REGS 2 /* Two speed select registers, */ #define IU_SPEEDS 16 /* with 16 speeds each */ -#define PARITY_ODD 0 -#define PARITY_EVEN 1 -#define PARITY_NONE 2 +#define IU_PARITY_ODD 0 +#define IU_PARITY_EVEN 1 +#define IU_PARITY_NONE 2 #define STS_RXR 0x01 /* Receiver ready */ #define STS_FFL 0x02 /* FIFO full */