move around ioctl definitions

6 files changed, 5 insertions, 195 deletions

diff --git a/sys/arch/sparc/dev/bppioctl.h b/sys/arch/sparc/dev/bppioctl.h
deleted file mode 100644
index 3b1e82703fe..00000000000
--- a/sys/arch/sparc/dev/bppioctl.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1998 Iain Hibbert
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name Iain Hibbert may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- * NO EVENT SHALL I BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	bppioctl.h
- */
-
-#ifndef _IOCTL_
-#include <sys/ioctl.h>
-#endif
-
-struct bpp_param {
-	int	bp_burst;	/* chars to send/recv in one call */
-	int	bp_timeout;	/* timeout: -1 blocking, 0 non blocking >0 ms */
-	int	bp_delay;	/* delay between polls (ms) */
-};
-
-#define BPP_BLOCK	-1
-#define BPP_NOBLOCK	0
-
-/* defaults */
-#define BPP_BURST	1024
-#define BPP_TIMEOUT	BPP_BLOCK
-#define BPP_DELAY	10
-
-/* limits */
-#define BPP_BURST_MIN	1
-#define BPP_BURST_MAX	1024
-#define BPP_DELAY_MIN	0
-#define BPP_DELAY_MAX	30000
-
-/* status bits */
-#define BPP_BUSY	(1<<0)
-#define BPP_PAPER	(1<<1)
-
-/* ioctl commands */
-#define BPPIOCSPARAM	_IOW('P', 0x1, struct bpp_param)
-#define BPPIOCGPARAM	_IOR('P', 0x2, struct bpp_param)
-#define BPPIOCGSTAT	_IOR('P', 0x4, int)
diff --git a/sys/arch/sparc/dev/fga.c b/sys/arch/sparc/dev/fga.c
index b6d88026ce5..e53b4a06d57 100644
--- a/sys/arch/sparc/dev/fga.c
+++ b/sys/arch/sparc/dev/fga.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fga.c,v 1.1 1999/07/23 19:11:25 jason Exp $	*/
+/*	$OpenBSD: fga.c,v 1.2 1999/07/25 23:49:37 jason Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -59,8 +59,7 @@
 
 #include <sparc/dev/fgareg.h>
 #include <sparc/dev/fgavar.h>
-#include <sparc/dev/fgaio.h>
-#include <sparc/dev/daadioreg.h>
+#include <machine/fgaio.h>
 
 int	fgamatch	__P((struct device *, void *, void *));
 void	fgaattach	__P((struct device *, struct device *, void *));
diff --git a/sys/arch/sparc/dev/fgaio.h b/sys/arch/sparc/dev/fgaio.h
deleted file mode 100644
index f139a29d450..00000000000
--- a/sys/arch/sparc/dev/fgaio.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$OpenBSD: fgaio.h,v 1.1 1999/07/23 19:11:25 jason Exp $	*/
-
-/*
- * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
- * All rights reserved.
- *
- * This software was developed by Jason L. Wright under contract with
- * RTMX Incorporated (http://www.rtmx.com).
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Jason L. Wright for
- *	RTMX Incorporated.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * ioctls and flags for FORCE Gate Array 5000
- */
-
-struct fga_sem {
-	u_int8_t	fgasem_num;	/* which semaphore/mailbox? */
-	u_int8_t	fgasem_val;	/* value of semaphore/mailbox */
-};
-
-#define	FGAIOCSEM	_IOWR('F', 0x01, struct fga_sem) /* clear semaphore */
-#define	FGAIOGSEM	_IOWR('F', 0x02, struct fga_sem) /* get semaphore */
-#define	FGAIOCMBX	_IOWR('F', 0x03, struct fga_sem) /* clear mailbox */
-#define	FGAIOGMBX	_IOWR('F', 0x04, struct fga_sem) /* get mailbox */
diff --git a/sys/arch/sparc/dev/magma.c b/sys/arch/sparc/dev/magma.c
index 58bb91018da..b83cf8a2d1a 100644
--- a/sys/arch/sparc/dev/magma.c
+++ b/sys/arch/sparc/dev/magma.c
@@ -64,7 +64,7 @@
 #include <dev/ic/cd1400reg.h>
 #include <dev/ic/cd1190reg.h>
 
-#include "bppioctl.h"
+#include <sparc/bppioctl.h>
 #include "magmareg.h"
 
 /*
diff --git a/sys/arch/sparc/dev/scf.c b/sys/arch/sparc/dev/scf.c
index c7fe981784b..677839fb145 100644
--- a/sys/arch/sparc/dev/scf.c
+++ b/sys/arch/sparc/dev/scf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scf.c,v 1.1 1999/07/23 19:11:26 jason Exp $	*/
+/*	$OpenBSD: scf.c,v 1.2 1999/07/25 23:49:37 jason Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -54,7 +54,7 @@
 #include <machine/autoconf.h>
 #include <sparc/cpu.h>
 #include <sparc/sparc/cpuvar.h>
-#include <sparc/dev/scfio.h>
+#include <machine/scfio.h>
 #include <sparc/dev/scfreg.h>
 
 int	scfmatch	__P((struct device *, void *, void *));
diff --git a/sys/arch/sparc/dev/scfio.h b/sys/arch/sparc/dev/scfio.h
deleted file mode 100644
index 117c88986b0..00000000000
--- a/sys/arch/sparc/dev/scfio.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*	$OpenBSD: scfio.h,v 1.1 1999/07/23 19:11:26 jason Exp $	*/
-
-/*
- * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
- * All rights reserved.
- *
- * This software was developed by Jason L. Wright under contract with
- * RTMX Incorporated (http://www.rtmx.com).
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Jason L. Wright for
- *	RTMX Incorporated.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * ioctls and flags for sysconfig registers on Force CPU-5V boards.
- */
-
-/* led1/led2 */
-#define	SCF_LED_COLOR_MASK	0x03	/* color bits */
-#define	SCF_LED_COLOR_OFF	0x00	/* led off */
-#define	SCF_LED_COLOR_GREEN	0x01	/* green led */
-#define	SCF_LED_COLOR_RED	0x02	/* red led */
-#define	SCF_LED_COLOR_YELLOW	0x03	/* yellow led */
-#define	SCF_LED_BLINK_MASK	0x0c	/* blink bits */
-#define	SCF_LED_BLINK_NONE	0x00	/* steady led */
-#define	SCF_LED_BLINK_HALF	0x04	/* blink 1/2 hz */
-#define	SCF_LED_BLINK_ONE	0x08	/* blink 1 hz */
-#define	SCF_LED_BLINK_TWO	0x0c	/* blink 2 hz */
-
-/* 7 segment led */
-#define	SCF_7LED_A		0x01	/* Layout:	*/
-#define	SCF_7LED_B		0x02	/*	AAA	*/
-#define	SCF_7LED_C		0x04	/*     FF BB	*/
-#define	SCF_7LED_D		0x08	/*	GGG	*/
-#define	SCF_7LED_E		0x10	/*     EE CC	*/
-#define	SCF_7LED_F		0x20	/*      DDD  P	*/
-#define	SCF_7LED_G		0x40
-#define	SCF_7LED_P		0x80
-
-/* flash memory control */
-#define	SCF_FMCTRL_SELROM	0x01	/* select boot/user flash */
-#define	SCF_FMCTRL_SELBOOT	0x02	/* select 1st/2nd flash */
-#define	SCF_FMCTRL_WRITEV	0x04	/* turn on write voltage */
-#define	SCF_FMCTRL_SELADDR	0x38	/* address 21:19 bits */
-
-#define	SCFIOCSLED1	_IOW('S', 0x01, u_int8_t)	/* set led1 */
-#define	SCFIOCGLED1	_IOR('S', 0x02, u_int8_t)	/* get led1 */
-#define	SCFIOCSLED2	_IOW('S', 0x03, u_int8_t)	/* set led2 */
-#define	SCFIOCGLED2	_IOR('S', 0x04, u_int8_t)	/* get led2 */
-#define	SCFIOCSLED7	_IOW('S', 0x05, u_int8_t)	/* set 7-segment led */
-#define	SCFIOCGLED7	_IOW('S', 0x06, u_int8_t)	/* get 7-segment led */
-#define	SCFIOCGROT	_IOR('S', 0x07, u_int8_t)	/* get rotary sw */
-#define	SCFIOCSFMCTRL	_IOW('S', 0x08, u_int8_t)	/* set flash ctrl */
-#define	SCFIOCGFMCTRL	_IOR('S', 0x09, u_int8_t)	/* get flash ctrl */