head	1.4;
access;
symbols
	pkgsrc-2013Q2:1.4.0.54
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2012Q4:1.4.0.52
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2011Q4:1.4.0.50
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q2:1.4.0.48
	pkgsrc-2011Q2-base:1.4
	pkgsrc-2009Q4:1.4.0.46
	pkgsrc-2009Q4-base:1.4
	pkgsrc-2008Q4:1.4.0.44
	pkgsrc-2008Q4-base:1.4
	pkgsrc-2008Q3:1.4.0.42
	pkgsrc-2008Q3-base:1.4
	cube-native-xorg:1.4.0.40
	cube-native-xorg-base:1.4
	pkgsrc-2008Q2:1.4.0.38
	pkgsrc-2008Q2-base:1.4
	pkgsrc-2008Q1:1.4.0.36
	pkgsrc-2008Q1-base:1.4
	pkgsrc-2007Q4:1.4.0.34
	pkgsrc-2007Q4-base:1.4
	pkgsrc-2007Q3:1.4.0.32
	pkgsrc-2007Q3-base:1.4
	pkgsrc-2007Q2:1.4.0.30
	pkgsrc-2007Q2-base:1.4
	pkgsrc-2007Q1:1.4.0.28
	pkgsrc-2007Q1-base:1.4
	pkgsrc-2006Q4:1.4.0.26
	pkgsrc-2006Q4-base:1.4
	pkgsrc-2006Q3:1.4.0.24
	pkgsrc-2006Q3-base:1.4
	pkgsrc-2006Q2:1.4.0.22
	pkgsrc-2006Q2-base:1.4
	pkgsrc-2006Q1:1.4.0.20
	pkgsrc-2006Q1-base:1.4
	pkgsrc-2005Q4:1.4.0.18
	pkgsrc-2005Q4-base:1.4
	pkgsrc-2005Q3:1.4.0.16
	pkgsrc-2005Q3-base:1.4
	pkgsrc-2005Q2:1.4.0.14
	pkgsrc-2005Q2-base:1.4
	pkgsrc-2005Q1:1.4.0.12
	pkgsrc-2005Q1-base:1.4
	pkgsrc-2004Q4:1.4.0.10
	pkgsrc-2004Q4-base:1.4
	pkgsrc-2004Q3:1.4.0.8
	pkgsrc-2004Q3-base:1.4
	pkgsrc-2004Q2:1.4.0.6
	pkgsrc-2004Q2-base:1.4
	pkgsrc-2004Q1:1.4.0.4
	pkgsrc-2004Q1-base:1.4
	pkgsrc-2003Q4:1.4.0.2
	pkgsrc-2003Q4-base:1.4
	buildlink2-base:1.4
	netbsd-1-4-PATCH002:1.3
	comdex-fall-1999:1.2
	netbsd-1-4-PATCH001:1.2
	netbsd-1-4-RELEASE:1.2;
locks; strict;
comment	@# @;


1.4
date	2000.03.16.15.40.18;	author soren;	state dead;
branches;
next	1.3;

1.3
date	99.11.10.08.01.29;	author soren;	state Exp;
branches;
next	1.2;

1.2
date	99.04.03.21.45.17;	author mycroft;	state Exp;
branches;
next	1.1;

1.1
date	98.12.15.10.34.35;	author mycroft;	state Exp;
branches;
next	;


desc
@@


1.4
log
@These patches are no longer necessary.
@
text
@$NetBSD: patch-ah,v 1.3 1999/11/10 08:01:29 soren Exp $

--- src/unix/joystick-drivers/joy_i386.c.orig	Sat Oct  9 23:52:00 1999
+++ src/unix/joystick-drivers/joy_i386.c	Wed Nov 10 07:28:02 1999
@@@@ -5,7 +5,7 @@@@
 #include <sys/ioctl.h>
 
 /* specific joystick for PC clones */
-#ifdef netbsd_i386
+#ifdef NETBSD
 
 #include <machine/joystick.h>
 typedef struct joystick joy_struct;
@@@@ -20,7 +20,7 @@@@
 #endif
 
 #else
-#error "i386 style joystick only supported under linux & netbsd-i386, "
+#error "i386 style joystick only supported under linux & NetBSD, "
 "patches to support other arch's should be easy and are welcome ;)"
 #endif
 
@@@@ -92,7 +92,7 @@@@
                joytype = JOY_I386;
             case JOY_I386:
                joy_data[i].num_axis = 2;
-#ifdef netbsd_i386
+#ifdef NETBSD
                joy_data[i].num_buttons = 2;
 #else
                joy_data[i].num_buttons = JOY_BUTTONS;
@@@@ -168,7 +168,7 @@@@
          continue;
       
       /* get value of buttons */
-#ifdef netbsd_i386
+#ifdef NETBSD
       joy_data[i].buttons[0] = my_joy_data.b1;
       joy_data[i].buttons[1] = my_joy_data.b2;
 #else
@


1.3
log
@Changed patches.
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
log
@0.35b8.1
@
text
@d3 2
a4 2
--- src/unix/joystick-drivers/joy_i386.c.orig	Fri Mar 26 17:00:50 1999
+++ src/unix/joystick-drivers/joy_i386.c	Sat Apr  3 14:03:42 1999
d14 19
a32 1
@@@@ -183,7 +183,7 @@@@
d38 2
a39 2
       joydata[i].buttons[0] = joy_data.b1;
       joydata[i].buttons[1] = joy_data.b2;
@


1.1
log
@0.34b8.1
@
text
@d3 4
a6 4
--- src/unix/joy_i386.c.orig	Sun Dec  6 07:52:18 1998
+++ src/unix/joy_i386.c	Tue Dec 15 04:11:10 1998
@@@@ -4,7 +4,7 @@@@
 #include "devices.h"
d11 1
d13 5
a17 15
 static struct joystick joy_data;
 #else
@@@@ -77,7 +77,7 @@@@
         for(i=0;i<MAX_JOY;i++)
         {
 	   if (joydata[i].fd < 0) continue;
-#ifdef netbsd_i386
+#ifdef NETBSD
 	   res = read(joydata[i].fd,&joy_data,sizeof(struct joystick) );
 	   if (res != sizeof(struct joystick )) continue;
 #else
@@@@ -85,7 +85,7 @@@@
 	   if (res != sizeof(struct JS_DATA_TYPE )) continue;
 #endif
 	   /* get value of buttons */
d20 2
a21 2
 	   joydata[i].buttons[0] = joy_data.b1;
 	   joydata[i].buttons[1] = joy_data.b2;
@