From 93c794a94b163e3e15dab01d0fa4b6a0201803e1 Mon Sep 17 00:00:00 2001 From: thorpej Date: Wed, 19 Sep 2001 18:51:03 +0000 Subject: [PATCH] Remove pmax-specific fbio.h -- everything uses now. --- distrib/sets/lists/comp/md.pmax | 3 +- distrib/sets/lists/comp/obsolete.pmax | 3 +- sys/arch/pmax/include/Makefile | 4 +- sys/arch/pmax/include/fbio.h | 171 -------------------------- 4 files changed, 5 insertions(+), 176 deletions(-) delete mode 100644 sys/arch/pmax/include/fbio.h diff --git a/distrib/sets/lists/comp/md.pmax b/distrib/sets/lists/comp/md.pmax index 8b59ab0144bd..a1e8f1aa9e80 100644 --- a/distrib/sets/lists/comp/md.pmax +++ b/distrib/sets/lists/comp/md.pmax @@ -1,4 +1,4 @@ -# $NetBSD: md.pmax,v 1.45 2001/04/15 17:14:28 kleink Exp $ +# $NetBSD: md.pmax,v 1.46 2001/09/19 18:51:04 thorpej Exp $ ./usr/include/pmax comp-c-include ./usr/include/pmax/_G_config.h comp-c-include ./usr/include/pmax/ansi.h comp-c-include @@ -19,7 +19,6 @@ ./usr/include/pmax/elf_machdep.h comp-c-include ./usr/include/pmax/endian.h comp-c-include ./usr/include/pmax/endian_machdep.h comp-c-include -./usr/include/pmax/fbio.h comp-c-include ./usr/include/pmax/fbvar.h comp-c-include ./usr/include/pmax/float.h comp-c-include ./usr/include/pmax/ieee.h comp-c-include diff --git a/distrib/sets/lists/comp/obsolete.pmax b/distrib/sets/lists/comp/obsolete.pmax index a51d6fd1582b..a974295d9a55 100644 --- a/distrib/sets/lists/comp/obsolete.pmax +++ b/distrib/sets/lists/comp/obsolete.pmax @@ -1,3 +1,4 @@ -# $NetBSD: obsolete.pmax,v 1.3 2000/08/09 10:34:38 tv Exp $ +# $NetBSD: obsolete.pmax,v 1.4 2001/09/19 18:51:04 thorpej Exp $ /usr/include/pmax/dec_boot.h /usr/include/pmax/elf.h +/usr/include/pmax/fbio.h diff --git a/sys/arch/pmax/include/Makefile b/sys/arch/pmax/include/Makefile index a0bdf64025a7..de6fb0f7f9a1 100644 --- a/sys/arch/pmax/include/Makefile +++ b/sys/arch/pmax/include/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/04/15 17:13:15 kleink Exp $ +# $NetBSD: Makefile,v 1.23 2001/09/19 18:51:03 thorpej Exp $ KDIR= /sys/arch/pmax/include INCSDIR= /usr/include/pmax @@ -8,7 +8,7 @@ INCS= ansi.h aout_machdep.h asm.h autoconf.h \ cdefs.h clock_machdep.h conf.h cpu.h \ db_machdep.h dc7085cons.h disklabel.h \ ecoff_machdep.h elf_machdep.h endian.h endian_machdep.h \ - fbio.h fbvar.h float.h \ + fbvar.h float.h \ ieee.h ieeefp.h \ int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \ intr.h \ diff --git a/sys/arch/pmax/include/fbio.h b/sys/arch/pmax/include/fbio.h deleted file mode 100644 index 5bce38fa6387..000000000000 --- a/sys/arch/pmax/include/fbio.h +++ /dev/null @@ -1,171 +0,0 @@ -/* $NetBSD: fbio.h,v 1.4 2000/01/09 15:34:43 ad Exp $ */ - -/* - * Copyright (c) 1992 Regents of the University of California. - * All rights reserved. - * - * This code is derived from software developed by the Computer Systems - * Engineering group at Lawrence Berkeley Laboratory under DARPA - * contract BG 91-66 and contributed to Berkeley. - * - * 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 the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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. - * - * @(#)fbio.h 7.2 (Berkeley) 4/1/92 - */ - -#ifndef _PMAX_FBIO_H_ -#define _PMAX_FBIO_H_ - -/* Frame buffer board types... */ -#define PMAX_FBTYPE_PM_MONO 1 -#define PMAX_FBTYPE_PM_COLOR 2 -#define PMAX_FBTYPE_CFB 3 -#define PMAX_FBTYPE_XCFB 4 -#define PMAX_FBTYPE_MFB 5 -#define PMAX_FBTYPE_SFB 6 -#define PMAX_FBTYPE_PX 7 - -/* - * Frame buffer ioctls (from Sprite, trimmed to essentials for X11). - */ - -/* - * Frame buffer descriptor as returned by FBIOGTYPE. - */ -struct fbtype { - int fb_boardtype; /* as defined above */ - int fb_height; /* in pixels */ - int fb_width; /* in pixels */ - int fb_depth; /* bits per pixel */ - int fb_cmsize; /* size of color map (entries) */ - int fb_size; /* total size in bytes */ -}; -#define FBIOGTYPE _IOR('F', 0, struct fbtype) - -#ifdef notdef -/* - * General purpose structure for passing info in and out of frame buffers - * (used for gp1) -- unsupported. - */ -struct fbinfo { - int fb_physaddr; /* physical frame buffer address */ - int fb_hwwidth; /* fb board width */ - int fb_hwheight; /* fb board height */ - int fb_addrdelta; /* phys addr diff between boards */ - u_char *fb_ropaddr; /* fb virtual addr */ - int fb_unit; /* minor devnum of fb */ -}; -#define FBIOGINFO _IOR('F', 2, struct fbinfo) -#endif - -/* - * Color map I/O. - */ -struct fbcmap { - int index; /* first element (0 origin) */ - int count; /* number of elements */ - u_char *red; /* red color map elements */ - u_char *green; /* green color map elements */ - u_char *blue; /* blue color map elements */ -}; -#define FBIOPUTCMAP _IOW('F', 3, struct fbcmap) -#define FBIOGETCMAP _IOW('F', 4, struct fbcmap) - -/* - * Set/get attributes. - */ -#define FB_ATTR_NDEVSPECIFIC 8 /* no. of device specific values */ -#define FB_ATTR_NEMUTYPES 4 /* no. of emulation types */ - -struct fbsattr { - int flags; /* flags; see below */ - int emu_type; /* emulation type (-1 if unused) */ - int dev_specific[FB_ATTR_NDEVSPECIFIC]; /* catchall */ -}; -#define FB_ATTR_AUTOINIT 1 /* emulation auto init flag */ -#define FB_ATTR_DEVSPECIFIC 2 /* dev. specific stuff valid flag */ - -struct fbgattr { - int real_type; /* real device type */ - int owner; /* PID of owner, 0 if myself */ - struct fbtype fbtype; /* fbtype info for real device */ - struct fbsattr sattr; /* see above */ - int emu_types[FB_ATTR_NEMUTYPES]; /* possible emulations */ - /* (-1 if unused) */ -}; -/* FBIOSATTR _IOW('F', 5, struct fbsattr) -- unsupported */ -#define FBIOGATTR _IOR('F', 6, struct fbgattr) - -/* - * Video control. - */ -#define FBVIDEO_OFF 0 -#define FBVIDEO_ON 1 - -#define FBIOSVIDEO _IOW('F', 7, int) -#define FBIOGVIDEO _IOR('F', 8, int) - -/* - * hardware cursor control - */ -struct fbcurpos { - short x; - short y; -}; - -#define FB_CUR_SETCUR 0x01 -#define FB_CUR_SETPOS 0x02 -#define FB_CUR_SETHOT 0x04 -#define FB_CUR_SETCMAP 0x08 -#define FB_CUR_SETSHAPE 0x10 -#define FB_CUR_SETALL 0x1F - -struct fbcursor { - short set; /* what to set */ - short enable; /* enable/disable cursor */ - struct fbcurpos pos; /* cursor's position */ - struct fbcurpos hot; /* cursor's hot spot */ - struct fbcmap cmap; /* color map info */ - struct fbcurpos size; /* cursor's bit map size */ - char *image; /* cursor's image bits */ - char *mask; /* cursor's mask bits */ -}; - -/* set/get cursor attributes/shape */ -#define FBIOSCURSOR _IOW('F', 24, struct fbcursor) -#define FBIOGCURSOR _IOWR('F', 25, struct fbcursor) - -/* set/get cursor position */ -#define FBIOSCURPOS _IOW('F', 26, struct fbcurpos) -#define FBIOGCURPOS _IOW('F', 27, struct fbcurpos) - -/* get max cursor size */ -#define FBIOGCURMAX _IOR('F', 28, struct fbcurpos) - -#endif /* !_PMAX_FBIO_H_ */