From 7ecb4d3c9278b41c9e097e87ea159596ee31af4d Mon Sep 17 00:00:00 2001
From: Marcus Glocker <mglocker@cvs.openbsd.org>
Date: Sun, 3 Jul 2016 20:05:45 +0000
Subject: Move videovar.h in to video.c since it isn't used anywhere else.

Suggested by mpi@ diff from Patrick Keshishian.

ok mpi
---
 sys/dev/video.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'sys/dev/video.c')

diff --git a/sys/dev/video.c b/sys/dev/video.c
index ab61b2098b4..09211d28ad8 100644
--- a/sys/dev/video.c
+++ b/sys/dev/video.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: video.c,v 1.39 2016/06/01 09:48:20 mglocker Exp $	*/
+/*	$OpenBSD: video.c,v 1.40 2016/07/03 20:05:44 mglocker Exp $	*/
 
 /*
  * Copyright (c) 2008 Robert Nagy <robert@openbsd.org>
@@ -31,7 +31,6 @@
 #include <sys/videoio.h>
 
 #include <dev/video_if.h>
-#include <dev/videovar.h>
 
 #include <uvm/uvm_extern.h>
 
@@ -41,6 +40,27 @@
 #define DPRINTF(x)
 #endif
 
+struct video_softc {
+	struct device		 dev;
+	void			*hw_hdl;	/* hardware driver handle */
+	struct device		*sc_dev;	/* hardware device struct */
+	struct video_hw_if	*hw_if;		/* hardware interface */
+	char			 sc_dying;	/* device detached */
+#define VIDEO_OPEN	0x01
+	char			 sc_open;
+
+	int			 sc_fsize;
+	uint8_t			*sc_fbuffer;
+	size_t			 sc_fbufferlen;
+	int			 sc_vidmode;	/* access mode */
+#define		VIDMODE_NONE	0
+#define		VIDMODE_MMAP	1
+#define		VIDMODE_READ	2
+	int			 sc_frames_ready;
+
+	struct selinfo		 sc_rsel;	/* read selector */
+};
+
 int	videoprobe(struct device *, void *, void *);
 void	videoattach(struct device *, struct device *, void *);
 int	videodetach(struct device *, int);
-- 
cgit v1.2.3