head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.48
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.46
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.44
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.42
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.40
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.38
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.36
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.34
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.32
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.30
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.28
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.26
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.24
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.22
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.20
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.18
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.16
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.14
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.12
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.10
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.8
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.6
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.4
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.2.0.2
	pkgsrc-2004Q3-base:1.2;
locks; strict;
comment	@# @;


1.2
date	2004.08.31.15.53.09;	author dillo;	state dead;
branches;
next	1.1;

1.1
date	2004.07.26.17.22.40;	author dillo;	state Exp;
branches;
next	;


desc
@@


1.2
log
@update to 1.15:

** General
- Improved event recording and playback.

** C64 changes
- Fixed some CPU opcodes.
- Added support for Magic Formel cart (preliminary).
- Improved TFE cart emulation.
- Fixed Final Cartridge III freeze bug.

** VIC20 changes
- Four true drives are supported now.
- The sound code has been rewritten.

** PLUS4 changes
- Added cartridge support.

** VIC-II
- Improved IRQ timing during DMA.

** Unix Changes
- Improved ROM set support.
- Added TFE and IDE64 cart support.
- Fixed crash on 64bit archs.
- Added BSD USB joystick support.
- Complete rework of french translation. Credits to Paul (alias Kaddict)!

** Miscellaneous changes
- Made fsdevice emulation to list non-PRG files again.
- Improved REL file handling of the virtual drive emulation.
- Fixed some bugs in the petcat tokenizer.
@
text
@$NetBSD: patch-bj,v 1.1 2004/07/26 17:22:40 dillo Exp $

--- src/arch/unix/joy.c.orig	Sun Dec 28 19:08:37 2003
+++ src/arch/unix/joy.c
@@@@ -80,9 +80,9 @@@@ static const resource_t resources[] = {
 
 static const cmdline_option_t cmdline_options[] = {
     { "-joydev1", SET_RESOURCE, 1, NULL, NULL, "JoyDevice1", NULL,
-      "<0-6>", N_("Set device for joystick port 1") },
+      "<0-8>", N_("Set device for joystick port 1") },
     { "-joydev2", SET_RESOURCE, 1, NULL, NULL, "JoyDevice2", NULL,
-      "<0-6>", N_("Set device for joystick port 2") },
+      "<0-8>", N_("Set device for joystick port 2") },
     { NULL },
 };
 
@@@@ -135,7 +135,7 @@@@ static int joyxmax[2];
 static int joyymin[2];
 static int joyymax[2];
 
-static log_t joystick_log = LOG_ERR;
+log_t joystick_log = LOG_ERR;
 
 /* ------------------------------------------------------------------------- */
 
@@@@ -148,6 +148,9 @@@@ int joy_arch_init(void)
         old_joystick_init();
     else
         new_joystick_init();
+#ifdef HAS_USB_JOYSTICK
+    usb_joystick_init();
+#endif
     return 0;
 }
 
@@@@ -157,6 +160,9 @@@@ void joystick_close(void)
         old_joystick_close();
     else
         new_joystick_close();
+#ifdef HAS_USB_JOYSTICK
+    usb_joystick_close();
+#endif
 }
 
 void joystick(void)
@@@@ -165,6 +171,9 @@@@ void joystick(void)
         old_joystick();
     else
         new_joystick();
+#ifdef HAS_USB_JOYSTICK
+    usb_joystick();
+#endif
 }
 
 /**********************************************************
@


1.1
log
@various improvements:
- enable fullscreen support
- enable PNG screenshots
- only use esound if USE_ESOUND is yes
- add USB joystick support (okayed by kristerw)

PKGREVISION++
@
text
@d1 1
a1 1
$NetBSD$
@