summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2013-05-17 12:03:43 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2013-05-17 12:03:43 +0000
commit4bbe467ea7e1c8bbd7c7b4c7d4fb9b2da49b237d (patch)
tree09913f68e580c04a52802adb51ca92b923b2b4b3 /sys/dev/pci
parente3709976806c58359bce68ed327316c622a3fe3d (diff)
wsmoused support
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/drm/i915/i915_drv.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/i915/i915_drv.c b/sys/dev/pci/drm/i915/i915_drv.c
index a8e8bc98ce8..85e3824c2e3 100644
--- a/sys/dev/pci/drm/i915/i915_drv.c
+++ b/sys/dev/pci/drm/i915/i915_drv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i915_drv.c,v 1.29 2013/05/16 21:14:11 kettenis Exp $ */
+/* $OpenBSD: i915_drv.c,v 1.30 2013/05/17 12:03:42 kettenis Exp $ */
/*
* Copyright (c) 2008-2009 Owain G. Ainsworth <oga@openbsd.org>
*
@@ -631,6 +631,7 @@ void inteldrm_free_screen(void *, void *);
int inteldrm_show_screen(void *, void *, int,
void (*)(void *, int, int), void *);
void inteldrm_doswitch(void *, void *);
+int inteldrm_getchar(void *, int, int, struct wsdisplay_charcell *);
void inteldrm_burner(void *, u_int, u_int);
struct wsscreen_descr inteldrm_stdscreen = {
@@ -658,7 +659,7 @@ struct wsdisplay_accessops inteldrm_accessops = {
inteldrm_show_screen,
NULL,
NULL,
- NULL,
+ inteldrm_getchar,
inteldrm_burner
};
@@ -763,6 +764,15 @@ inteldrm_doswitch(void *v, void *cookie)
(*dev_priv->switchcb)(dev_priv->switchcbarg, 0, 0);
}
+int
+inteldrm_getchar(void *v, int row, int col, struct wsdisplay_charcell *cell)
+{
+ struct inteldrm_softc *dev_priv = v;
+ struct rasops_info *ri = &dev_priv->ro;
+
+ return rasops_getchar(ri, row, col, cell);
+}
+
void
inteldrm_burner(void *v, u_int on, u_int flags)
{