head	1.3;
access;
symbols
	pkgsrc-2026Q1:1.3.0.162
	pkgsrc-2026Q1-base:1.3
	pkgsrc-2025Q4:1.3.0.160
	pkgsrc-2025Q4-base:1.3
	pkgsrc-2025Q3:1.3.0.158
	pkgsrc-2025Q3-base:1.3
	pkgsrc-2025Q2:1.3.0.156
	pkgsrc-2025Q2-base:1.3
	pkgsrc-2025Q1:1.3.0.154
	pkgsrc-2025Q1-base:1.3
	pkgsrc-2024Q4:1.3.0.152
	pkgsrc-2024Q4-base:1.3
	pkgsrc-2024Q3:1.3.0.150
	pkgsrc-2024Q3-base:1.3
	pkgsrc-2024Q2:1.3.0.148
	pkgsrc-2024Q2-base:1.3
	pkgsrc-2024Q1:1.3.0.146
	pkgsrc-2024Q1-base:1.3
	pkgsrc-2023Q4:1.3.0.144
	pkgsrc-2023Q4-base:1.3
	pkgsrc-2023Q3:1.3.0.142
	pkgsrc-2023Q3-base:1.3
	pkgsrc-2023Q2:1.3.0.140
	pkgsrc-2023Q2-base:1.3
	pkgsrc-2023Q1:1.3.0.138
	pkgsrc-2023Q1-base:1.3
	pkgsrc-2022Q4:1.3.0.136
	pkgsrc-2022Q4-base:1.3
	pkgsrc-2022Q3:1.3.0.134
	pkgsrc-2022Q3-base:1.3
	pkgsrc-2022Q2:1.3.0.132
	pkgsrc-2022Q2-base:1.3
	pkgsrc-2022Q1:1.3.0.130
	pkgsrc-2022Q1-base:1.3
	pkgsrc-2021Q4:1.3.0.128
	pkgsrc-2021Q4-base:1.3
	pkgsrc-2021Q3:1.3.0.126
	pkgsrc-2021Q3-base:1.3
	pkgsrc-2021Q2:1.3.0.124
	pkgsrc-2021Q2-base:1.3
	pkgsrc-2021Q1:1.3.0.122
	pkgsrc-2021Q1-base:1.3
	pkgsrc-2020Q4:1.3.0.120
	pkgsrc-2020Q4-base:1.3
	pkgsrc-2020Q3:1.3.0.118
	pkgsrc-2020Q3-base:1.3
	pkgsrc-2020Q2:1.3.0.114
	pkgsrc-2020Q2-base:1.3
	pkgsrc-2020Q1:1.3.0.94
	pkgsrc-2020Q1-base:1.3
	pkgsrc-2019Q4:1.3.0.116
	pkgsrc-2019Q4-base:1.3
	pkgsrc-2019Q3:1.3.0.112
	pkgsrc-2019Q3-base:1.3
	pkgsrc-2019Q2:1.3.0.110
	pkgsrc-2019Q2-base:1.3
	pkgsrc-2019Q1:1.3.0.108
	pkgsrc-2019Q1-base:1.3
	pkgsrc-2018Q4:1.3.0.106
	pkgsrc-2018Q4-base:1.3
	pkgsrc-2018Q3:1.3.0.104
	pkgsrc-2018Q3-base:1.3
	pkgsrc-2018Q2:1.3.0.102
	pkgsrc-2018Q2-base:1.3
	pkgsrc-2018Q1:1.3.0.100
	pkgsrc-2018Q1-base:1.3
	pkgsrc-2017Q4:1.3.0.98
	pkgsrc-2017Q4-base:1.3
	pkgsrc-2017Q3:1.3.0.96
	pkgsrc-2017Q3-base:1.3
	pkgsrc-2017Q2:1.3.0.92
	pkgsrc-2017Q2-base:1.3
	pkgsrc-2017Q1:1.3.0.90
	pkgsrc-2017Q1-base:1.3
	pkgsrc-2016Q4:1.3.0.88
	pkgsrc-2016Q4-base:1.3
	pkgsrc-2016Q3:1.3.0.86
	pkgsrc-2016Q3-base:1.3
	pkgsrc-2016Q2:1.3.0.84
	pkgsrc-2016Q2-base:1.3
	pkgsrc-2016Q1:1.3.0.82
	pkgsrc-2016Q1-base:1.3
	pkgsrc-2015Q4:1.3.0.80
	pkgsrc-2015Q4-base:1.3
	pkgsrc-2015Q3:1.3.0.78
	pkgsrc-2015Q3-base:1.3
	pkgsrc-2015Q2:1.3.0.76
	pkgsrc-2015Q2-base:1.3
	pkgsrc-2015Q1:1.3.0.74
	pkgsrc-2015Q1-base:1.3
	pkgsrc-2014Q4:1.3.0.72
	pkgsrc-2014Q4-base:1.3
	pkgsrc-2014Q3:1.3.0.70
	pkgsrc-2014Q3-base:1.3
	pkgsrc-2014Q2:1.3.0.68
	pkgsrc-2014Q2-base:1.3
	pkgsrc-2014Q1:1.3.0.66
	pkgsrc-2014Q1-base:1.3
	pkgsrc-2013Q4:1.3.0.64
	pkgsrc-2013Q4-base:1.3
	pkgsrc-2013Q3:1.3.0.62
	pkgsrc-2013Q3-base:1.3
	pkgsrc-2013Q2:1.3.0.60
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2013Q1:1.3.0.58
	pkgsrc-2013Q1-base:1.3
	pkgsrc-2012Q4:1.3.0.56
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2012Q3:1.3.0.54
	pkgsrc-2012Q3-base:1.3
	pkgsrc-2012Q2:1.3.0.52
	pkgsrc-2012Q2-base:1.3
	pkgsrc-2012Q1:1.3.0.50
	pkgsrc-2012Q1-base:1.3
	pkgsrc-2011Q4:1.3.0.48
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q3:1.3.0.46
	pkgsrc-2011Q3-base:1.3
	pkgsrc-2011Q2:1.3.0.44
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2011Q1:1.3.0.42
	pkgsrc-2011Q1-base:1.3
	pkgsrc-2010Q4:1.3.0.40
	pkgsrc-2010Q4-base:1.3
	pkgsrc-2010Q3:1.3.0.38
	pkgsrc-2010Q3-base:1.3
	pkgsrc-2010Q2:1.3.0.36
	pkgsrc-2010Q2-base:1.3
	pkgsrc-2010Q1:1.3.0.34
	pkgsrc-2010Q1-base:1.3
	pkgsrc-2009Q4:1.3.0.32
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2009Q3:1.3.0.30
	pkgsrc-2009Q3-base:1.3
	pkgsrc-2009Q2:1.3.0.28
	pkgsrc-2009Q2-base:1.3
	pkgsrc-2009Q1:1.3.0.26
	pkgsrc-2009Q1-base:1.3
	pkgsrc-2008Q4:1.3.0.24
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.22
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.20
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.18
	pkgsrc-2008Q2-base:1.3
	cwrapper:1.3.0.16
	pkgsrc-2008Q1:1.3.0.14
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.12
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.10
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.8
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.6
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.4
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.2
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.2.0.22
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.20
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.18
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.16
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.14
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.12
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.10
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.2.0.8
	pkgsrc-2004Q3-base:1.2
	pkgsrc-2004Q2:1.2.0.6
	pkgsrc-2004Q2-base:1.2
	pkgsrc-2004Q1:1.2.0.4
	pkgsrc-2004Q1-base:1.2
	pkgsrc-2003Q4:1.2.0.2
	pkgsrc-2003Q4-base:1.2
	buildlink2-base:1.2;
locks; strict;
comment	@# @;


1.3
date	2006.07.02.15.47.16;	author tron;	state Exp;
branches;
next	1.2;

1.2
date	2002.02.26.03.20.00;	author kristerw;	state dead;
branches;
next	1.1;

1.1
date	2001.05.31.21.38.52;	author kristerw;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Fix various inconsistent "static" vs. "extern" declarations which
broke the build with GCC 4.x.
@
text
@$NetBSD$

--- src/custom.c.orig	2005-07-02 17:24:06.000000000 +0100
+++ src/custom.c	2006-07-02 16:38:58.000000000 +0100
@@@@ -111,7 +111,8 @@@@
 static uae_u16 sprdata[MAX_SPRITES][4], sprdatb[MAX_SPRITES][4];
 static int sprite_last_drawn_at[MAX_SPRITES];
 static int last_sprite_point, nr_armed;
-static int sprite_width, sprres, sprite_buffer_res;
+int sprite_width;
+static int sprres, sprite_buffer_res;
 
 static uae_u32 bpl1dat, bpl2dat, bpl3dat, bpl4dat, bpl5dat, bpl6dat, bpl7dat, bpl8dat;
 static uae_s16 bpl1mod, bpl2mod;
@@@@ -234,9 +235,9 @@@@
 struct draw_info line_drawinfo[2][2 * (MAXVPOS + 1) + 1];
 struct color_entry color_tables[2][(MAXVPOS + 1) * 2];
 
-static int next_sprite_entry = 0;
-static int prev_next_sprite_entry;
-static int next_sprite_forced = 1;
+int next_sprite_entry = 0;
+int prev_next_sprite_entry;
+int next_sprite_forced = 1;
 
 struct sprite_entry *curr_sprite_entries, *prev_sprite_entries;
 struct color_change *curr_color_changes, *prev_color_changes;
@


1.2
log
@Update uae to 0.8.21.

Changes since 0.8.20:
- Several bug fixes, including some serious filesystem emulation bugs.
- Support for A1000 boot ROMs.
@
text
@d1 24
a24 6
$NetBSD: patch-ad,v 1.1 2001/05/31 21:38:52 kristerw Exp $
--- src/od-linux/joystick.c.bak	Wed Apr 15 21:30:16 1998
+++ src/od-linux/joystick.c	Thu May 31 23:19:06 2001
@@@@ -17,12 +17,12 @@@@
 #include "custom.h"
 #include "joystick.h"
d26 2
a27 24
-#ifdef HAVE_MACHINE_SOUNDCARD_H
+#ifdef HAVE_MACHINE_JOYSTICK_H
 
 /* The BSD way.  */
 
-# include <machine/soundcard.h>
-typedef struct joystick uae_joystick_t
+# include <machine/joystick.h>
+typedef struct joystick uae_joystick_t;
 
 #define JS_DEVNAME_PREFIX "joy"
 
@@@@ -84,7 +84,11 @@@@
     if (left) top = !top;
     if (right) bot = !bot;
     *dir = bot | (right << 1) | (top << 8) | (left << 9);
+#ifdef HAVE_MACHINE_JOYSTICK_H
+    *button = buffer.b1 || buffer.b2;
+#else
     *button = buffer.buttons & 3;
+#endif
 }
 
 void init_joystick(void)
@


1.1
log
@Updated the version to uae-0.8.16nb1 after fixing some bugs:
* Handle zipped disk files
* Disable a floppy speed hack that breaks some versions of Kickstart
* Made joysticks work
@
text
@d1 1
a1 1
$NetBSD$
@