diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-01-21 16:24:13 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-01-21 16:24:13 +0000 |
| commit | 1df4c703e39363bec334e809d0a39a297ceceec2 (patch) | |
| tree | 0bfc1d015919d713bf2187ecf95b176d42680ff7 | |
| parent | 6405d08b800a0b4df1a326899f3fac2c24649acb (diff) | |
Oops, revert changes not intended to be commited in previous commit.
| -rw-r--r-- | sys/arch/hp300/dev/dvbox.c | 4 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/gbox.c | 4 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/hyper.c | 4 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/rbox.c | 4 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/topcat.c | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/hp300/dev/dvbox.c b/sys/arch/hp300/dev/dvbox.c index a9a7888820b..7d6e524b33a 100644 --- a/sys/arch/hp300/dev/dvbox.c +++ b/sys/arch/hp300/dev/dvbox.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dvbox.c,v 1.5 2005/01/21 16:22:34 miod Exp $ */ +/* $OpenBSD: dvbox.c,v 1.6 2005/01/21 16:24:12 miod Exp $ */ /* * Copyright (c) 2005, Miodrag Vallat @@ -356,7 +356,7 @@ dvbox_ioctl(void *v, u_long cmd, caddr_t data, int flags, struct proc *p) wdf->cmsize = 8; /* XXX 16 because of overlay? */ break; case WSDISPLAYIO_LINEBYTES: - *(u_int *)data = fb->fbwidth; + *(u_int *)data = (fb->fbwidth * fb->planes) >> 3; break; case WSDISPLAYIO_GETCMAP: case WSDISPLAYIO_PUTCMAP: diff --git a/sys/arch/hp300/dev/gbox.c b/sys/arch/hp300/dev/gbox.c index 061b60eb627..b438c19231d 100644 --- a/sys/arch/hp300/dev/gbox.c +++ b/sys/arch/hp300/dev/gbox.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gbox.c,v 1.6 2005/01/21 16:22:34 miod Exp $ */ +/* $OpenBSD: gbox.c,v 1.7 2005/01/21 16:24:12 miod Exp $ */ /* * Copyright (c) 2005, Miodrag Vallat @@ -337,7 +337,7 @@ gbox_ioctl(void *v, u_long cmd, caddr_t data, int flags, struct proc *p) wdf->cmsize = 1 << fb->planes; break; case WSDISPLAYIO_LINEBYTES: - *(u_int *)data = fb->fbwidth; + *(u_int *)data = (fb->fbwidth * fb->planes) >> 3; break; case WSDISPLAYIO_GETCMAP: case WSDISPLAYIO_PUTCMAP: diff --git a/sys/arch/hp300/dev/hyper.c b/sys/arch/hp300/dev/hyper.c index 5f5f1de6264..eaf798490fb 100644 --- a/sys/arch/hp300/dev/hyper.c +++ b/sys/arch/hp300/dev/hyper.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hyper.c,v 1.6 2005/01/21 16:22:34 miod Exp $ */ +/* $OpenBSD: hyper.c,v 1.7 2005/01/21 16:24:12 miod Exp $ */ /* * Copyright (c) 2005, Miodrag Vallat. @@ -220,7 +220,7 @@ hyper_ioctl(void *v, u_long cmd, caddr_t data, int flags, struct proc *p) wdf->cmsize = 0; break; case WSDISPLAYIO_LINEBYTES: - *(u_int *)data = fb->fbwidth; + *(u_int *)data = (fb->fbwidth * fb->planes) >> 3; break; case WSDISPLAYIO_GVIDEO: case WSDISPLAYIO_SVIDEO: diff --git a/sys/arch/hp300/dev/rbox.c b/sys/arch/hp300/dev/rbox.c index 6945b853777..a144c96297b 100644 --- a/sys/arch/hp300/dev/rbox.c +++ b/sys/arch/hp300/dev/rbox.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rbox.c,v 1.5 2005/01/21 16:22:34 miod Exp $ */ +/* $OpenBSD: rbox.c,v 1.6 2005/01/21 16:24:12 miod Exp $ */ /* * Copyright (c) 2005, Miodrag Vallat @@ -317,7 +317,7 @@ rbox_ioctl(void *v, u_long cmd, caddr_t data, int flags, struct proc *p) wdf->cmsize = 1 << fb->planes; break; case WSDISPLAYIO_LINEBYTES: - *(u_int *)data = fb->fbwidth; + *(u_int *)data = (fb->fbwidth * fb->planes) >> 3; break; case WSDISPLAYIO_GETCMAP: case WSDISPLAYIO_PUTCMAP: diff --git a/sys/arch/hp300/dev/topcat.c b/sys/arch/hp300/dev/topcat.c index d9b918fde31..acd6756350d 100644 --- a/sys/arch/hp300/dev/topcat.c +++ b/sys/arch/hp300/dev/topcat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: topcat.c,v 1.7 2005/01/21 16:22:34 miod Exp $ */ +/* $OpenBSD: topcat.c,v 1.8 2005/01/21 16:24:12 miod Exp $ */ /* * Copyright (c) 2005, Miodrag Vallat. @@ -387,7 +387,7 @@ topcat_ioctl(void *v, u_long cmd, caddr_t data, int flags, struct proc *p) wdf->cmsize = 1 << fb->planes; break; case WSDISPLAYIO_LINEBYTES: - *(u_int *)data = fb->fbwidth; + *(u_int *)data = (fb->fbwidth * fb->planes) >> 3; break; case WSDISPLAYIO_GETCMAP: return (topcat_getcmap(fb, (struct wsdisplay_cmap *)data)); |