Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 109372
b: refs/heads/master
c: 1136cf1
h: refs/heads/master
v: v3
  • Loading branch information
Michael Schmitz authored and Linus Torvalds committed Sep 2, 2008
1 parent 23b9fd3 commit 19c5702
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2ecbf813d5e6361eb7c7520a6f5e6afa168df39a
refs/heads/master: 1136cf11066a32d4ac2a476dac302858d763703d
9 changes: 6 additions & 3 deletions trunk/arch/m68k/atari/atakeyb.c
Original file line number Diff line number Diff line change
Expand Up @@ -580,13 +580,15 @@ int atari_keyb_init(void)
do {
/* reset IKBD ACIA */
acia.key_ctrl = ACIA_RESET |
(atari_switches & ATARI_SWITCH_IKBD) ? ACIA_RHTID : 0;
((atari_switches & ATARI_SWITCH_IKBD) ?
ACIA_RHTID : 0);
(void)acia.key_ctrl;
(void)acia.key_data;

/* reset MIDI ACIA */
acia.mid_ctrl = ACIA_RESET |
(atari_switches & ATARI_SWITCH_MIDI) ? ACIA_RHTID : 0;
((atari_switches & ATARI_SWITCH_MIDI) ?
ACIA_RHTID : 0);
(void)acia.mid_ctrl;
(void)acia.mid_data;

Expand All @@ -599,7 +601,8 @@ int atari_keyb_init(void)
ACIA_RHTID : ACIA_RLTID);

acia.mid_ctrl = ACIA_DIV16 | ACIA_D8N1S |
(atari_switches & ATARI_SWITCH_MIDI) ? ACIA_RHTID : 0;
((atari_switches & ATARI_SWITCH_MIDI) ?
ACIA_RHTID : 0);

/* make sure the interrupt line is up */
} while ((mfp.par_dt_reg & 0x10) == 0);
Expand Down

0 comments on commit 19c5702

Please sign in to comment.