return correct parameters in ioctl(WSDISPLAYIO_GINFO), from lausgans
while there, support WSDISPLAYIO_GET_FBINFO
This commit is contained in:
parent
e0a6926ea4
commit
34337aa92f
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cgsix.c,v 1.65 2014/07/25 08:10:39 dholland Exp $ */
|
||||
/* $NetBSD: cgsix.c,v 1.66 2016/04/13 17:26:08 macallan Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
@ -78,7 +78,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.65 2014/07/25 08:10:39 dholland Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.66 2016/04/13 17:26:08 macallan Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
@ -1178,7 +1178,6 @@ cgsix_ioctl(void *v, void *vs, u_long cmd, void *data, int flag,
|
||||
struct vcons_data *vd = v;
|
||||
struct cgsix_softc *sc = vd->cookie;
|
||||
struct wsdisplay_fbinfo *wdf;
|
||||
struct rasops_info *ri = &sc->sc_fb.fb_rinfo;
|
||||
struct vcons_screen *ms = sc->vd.active;
|
||||
|
||||
#ifdef CGSIX_DEBUG
|
||||
@ -1190,9 +1189,9 @@ cgsix_ioctl(void *v, void *vs, u_long cmd, void *data, int flag,
|
||||
return 0;
|
||||
case WSDISPLAYIO_GINFO:
|
||||
wdf = (void *)data;
|
||||
wdf->height = ri->ri_height;
|
||||
wdf->width = ri->ri_width;
|
||||
wdf->depth = ri->ri_depth;
|
||||
wdf->height = sc->sc_height;
|
||||
wdf->width = sc->sc_width;
|
||||
wdf->depth = 8;
|
||||
wdf->cmsize = 256;
|
||||
return 0;
|
||||
|
||||
@ -1222,6 +1221,13 @@ cgsix_ioctl(void *v, void *vs, u_long cmd, void *data, int flag,
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
case WSDISPLAYIO_GET_FBINFO:
|
||||
{
|
||||
struct wsdisplayio_fbinfo *fbi = data;
|
||||
|
||||
return wsdisplayio_get_fbinfo(&ms->scr_ri, fbi);
|
||||
}
|
||||
}
|
||||
return EPASSTHROUGH;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user