From 959483352cc7b8faf0dbe300f4c1ab4d9e5b7f6d Mon Sep 17 00:00:00 2001
From: "simon.kagstrom" <simon.kagstrom@feb19cf6-d755-11dd-8179-53c65a4d6d95>
Date: Sun, 31 Jan 2010 09:01:17 +0000
Subject: [PATCH] CIA_SC.cpp: Fix warnings

---
 Src/CIA_SC.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Src/CIA_SC.cpp b/Src/CIA_SC.cpp
index 556da04..6a1dace 100644
--- a/Src/CIA_SC.cpp
+++ b/Src/CIA_SC.cpp
@@ -261,8 +261,8 @@ uint8 MOS6526_2::ReadRegister(uint16 adr)
 {
 	switch (adr) {
 		case 0x00:
-			return (pra | ~ddra) & 0x3f
-				| IECLines & the_cpu_1541->IECLines;
+			return ((pra | ~ddra) & 0x3f)
+				| (IECLines & the_cpu_1541->IECLines);
 		case 0x01: return prb | ~ddrb;
 		case 0x02: return ddra;
 		case 0x03: return ddrb;
@@ -295,7 +295,7 @@ uint8 MOS6526_2::ReadRegister(uint16 adr)
 // Write to port B, check for lightpen interrupt
 inline void MOS6526_1::check_lp(void)
 {
-	if ((prb | ~ddrb) & 0x10 != prev_lp)
+	if ( ((prb | ~ddrb) & 0x10) != prev_lp)
 		the_vic->TriggerLightpen();
 	prev_lp = (prb | ~ddrb) & 0x10;
 }
@@ -396,9 +396,9 @@ void MOS6526_2::WriteRegister(uint16 adr, uint8 byte)
 			pra = byte;
 			the_vic->ChangedVA(~(pra | ~ddra) & 3);
 			uint8 old_lines = IECLines;
-			IECLines = (~byte << 2) & 0x80	// DATA
-				| (~byte << 2) & 0x40		// CLK
-				| (~byte << 1) & 0x10;		// ATN
+			IECLines = ((~byte << 2) & 0x80)	// DATA
+				| ((~byte << 2) & 0x40)		// CLK
+				| ((~byte << 1) & 0x10);		// ATN
 			if ((IECLines ^ old_lines) & 0x10) {	// ATN changed
 				the_cpu_1541->NewATNState();
 				if (old_lines & 0x10)				// ATN 1->0
@@ -734,7 +734,7 @@ void MOS6526::CountTOD(void)
 					}
 					tod_hr |= (hi << 4) | lo;
 					if ((tod_hr & 0x1f) > 0x11)
-						tod_hr = tod_hr & 0x80 ^ 0x80;
+						tod_hr = (tod_hr & 0x80) ^ 0x80;
 				} else
 					tod_min = (hi << 4) | lo;
 			} else