diff options
| author | Marcus Glocker <mglocker@cvs.openbsd.org> | 2016-07-03 20:05:45 +0000 |
|---|---|---|
| committer | Marcus Glocker <mglocker@cvs.openbsd.org> | 2016-07-03 20:05:45 +0000 |
| commit | 7ecb4d3c9278b41c9e097e87ea159596ee31af4d (patch) | |
| tree | 0d083ea8e679ba4449f4f73e6d949ab6548d3bd4 /sys/dev | |
| parent | daf5336fd5a2b047e990287bd3dc1e41bcfffc41 (diff) | |
Move videovar.h in to video.c since it isn't used anywhere else.
Suggested by mpi@ diff from Patrick Keshishian.
ok mpi
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/video.c | 24 | ||||
| -rw-r--r-- | sys/dev/videovar.h | 43 |
2 files changed, 22 insertions, 45 deletions
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); diff --git a/sys/dev/videovar.h b/sys/dev/videovar.h deleted file mode 100644 index c263631faf3..00000000000 --- a/sys/dev/videovar.h +++ /dev/null @@ -1,43 +0,0 @@ -/* $OpenBSD: videovar.h,v 1.8 2015/08/29 20:51:46 deraadt Exp $ */ -/* - * Copyright (c) 2008 Robert Nagy <robert@openbsd.org> - * Copyright (c) 2008 Marcus Glocker <mglocker@openbsd.org> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef _SYS_DEV_VIDEOVAR_H -#define _SYS_DEV_VIDEOVAR_H - -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 */ -}; - -#endif /* _SYS_DEV_VIDEOVAR_H */ |