[src/trunk]: src/sys/dev/ic sys/dev/ic/videomode.h is almost identical to sys...

[tnn <tnn%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/546ae5e3861c
branches:  trunk
changeset: 753375:546ae5e3861c
user:      tnn <tnn%NetBSD.org@localhost>
date:      Wed Mar 24 19:33:51 2010 +0000

description:
sys/dev/ic/videomode.h is almost identical to sys/dev/videomode/videomode.h
Remove the former.

diffstat:

 sys/dev/ic/vga_raster.c |   6 ++--
 sys/dev/ic/videomode.h  |  61 -------------------------------------------------
 2 files changed, 3 insertions(+), 64 deletions(-)

diffs (92 lines):

diff -r 0e38d0e1df8d -r 546ae5e3861c sys/dev/ic/vga_raster.c
--- a/sys/dev/ic/vga_raster.c   Wed Mar 24 19:15:00 2010 +0000
+++ b/sys/dev/ic/vga_raster.c   Wed Mar 24 19:33:51 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vga_raster.c,v 1.33 2008/10/19 17:47:38 jmcneill Exp $ */
+/*     $NetBSD: vga_raster.c,v 1.34 2010/03/24 19:33:51 tnn Exp $      */
 
 /*
  * Copyright (c) 2001, 2002 Bang Jun-Young
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.33 2008/10/19 17:47:38 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.34 2010/03/24 19:33:51 tnn Exp $");
 
 #include "opt_wsmsgattrs.h" /* for WSDISPLAY_CUSTOM_OUTPUT */
 
@@ -73,7 +73,7 @@
 #include <dev/ic/pcdisplayvar.h>
 #include <dev/ic/vgareg.h>
 #include <dev/ic/vgavar.h>
-#include <dev/ic/videomode.h>
+#include <dev/videomode/videomode.h>
 
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/wscons/wsconsio.h>
diff -r 0e38d0e1df8d -r 546ae5e3861c sys/dev/ic/videomode.h
--- a/sys/dev/ic/videomode.h    Wed Mar 24 19:15:00 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*     $NetBSD: videomode.h,v 1.4 2005/12/11 12:21:29 christos Exp $   */
-
-/*
- * Copyright (c) 2001, 2002 Bang Jun-Young
- * 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 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.
- */
-
-struct videomode {
-       int dot_clock;          /* Dot clock frequency in kHz. */
-       int hdisplay;
-       int hsync_start;
-       int hsync_end;
-       int htotal;
-       int vdisplay;
-       int vsync_start;
-       int vsync_end;
-       int vtotal;
-       int flags;              /* Video mode flags; see below. */
-       void *misc_data;        /* Card-specific parameters. */
-};
-
-/*
- * Video mode flags.
- */
-
-#define VID_PHSYNC     0x0001
-#define VID_NHSYNC     0x0002
-#define VID_PVSYNC     0x0004
-#define VID_NVSYNC     0x0008
-#define VID_INTERLACE  0x0010
-#define VID_DBLSCAN    0x0020
-#define VID_CSYNC      0x0040
-#define VID_PCSYNC     0x0080
-#define VID_NCSYNC     0x0100
-#define VID_HSKEW      0x0200
-#define VID_BCAST      0x0400
-#define VID_PIXMUX     0x1000
-#define VID_DBLCLK     0x2000
-#define VID_CLKDIV2    0x4000