The-Homebrew-Cloud/frodo-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/frodo-wii.git synced 2024-11-26 05:24:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

CIA_SC.cpp: Fix warnings

Browse Source
This commit is contained in:
simon.kagstrom 2010-01-31 09:01:17 +00:00
parent 1be728134b
commit 959483352c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Src/CIA_SC.cpp
View File

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