[fuse-emulator-cvs] fuse tc2068.c,1.15,1.15.2.1

[<pa...@pr...>]

Update of /cvsroot/fuse-emulator/fuse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15543

Modified Files:
      Tag: Release-0_6_2-branch
	tc2068.c 
Log Message:
Return the correct value when both joystick ports are read from
simultaneously (patch #883637) (Fred).


Index: tc2068.c
===================================================================
RCS file: /cvsroot/fuse-emulator/fuse/tc2068.c,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -d -r1.15 -r1.15.2.1
*** tc2068.c	27 Dec 2003 12:40:06 -0000	1.15
--- tc2068.c	26 Jan 2004 13:02:07 -0000	1.15.2.1
***************
*** 1,5 ****
  /* tc2068.c: Timex TC2068 specific routines
     Copyright (c) 1999-2003 Philip Kendall
!    Copyright (c) 2002 Fredrick Meunier
     Copyright (c) 2003 Witold Filipczyk
     Copyright (c) 2003 Darren Salt
--- 1,5 ----
  /* tc2068.c: Timex TC2068 specific routines
     Copyright (c) 1999-2003 Philip Kendall
!    Copyright (c) 2002-2004 Fredrick Meunier
     Copyright (c) 2003 Witold Filipczyk
     Copyright (c) 2003 Darren Salt
***************
*** 88,102 ****
  			   : 0xff;
  
!     switch( port & 0x0300 ) {
!     case 0x0100:
!       ret &= ~joystick_timex_read( port, 0 );
!       break;
!     case 0x0200:
!       ret &= ~joystick_timex_read( port, 1 );
!       break;
!     case 0x0300:
!       ret &= ~joystick_timex_read( port, 0 ) | ~joystick_timex_read( port, 1 );
!       break;
!     }
  
      return ret;
--- 88,93 ----
  			   : 0xff;
  
!     if( port & 0x0100 ) ret &= ~joystick_timex_read( port, 0 );
!     if( port & 0x0200 ) ret &= ~joystick_timex_read( port, 1 );
  
      return ret;