diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-01-21 16:22:35 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-01-21 16:22:35 +0000 |
| commit | 6405d08b800a0b4df1a326899f3fac2c24649acb (patch) | |
| tree | 0e82d443e5f01328416142c48bc5172dd92d4cc4 /sys/arch/hp300/dev/dvbox.c | |
| parent | a682022fdcaf037e0749c3d29b5b238237ef6ea9 (diff) | |
Overhaul of the pxa2x0_lcd code, to allow early (before autoconf) attachment,
and collateral changes.
Because this driver requires us_dma (and as such, vm services) to work, it
can not be selected in consinit(). Instead, add a hook to the arm
cpu_startup() which will, on zaurus, switch console from serial (selected
in consinit()) to lcd.
This also makes the zaurus-specific early pxa2x0_clkman() substitute code
cleaner.
While there, move boot -c handling later, after the glass console is set up.
Tested by drahn@ and uwe@
Diffstat (limited to 'sys/arch/hp300/dev/dvbox.c')
| -rw-r--r-- | sys/arch/hp300/dev/dvbox.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/hp300/dev/dvbox.c b/sys/arch/hp300/dev/dvbox.c index fd81b222804..a9a7888820b 100644 --- a/sys/arch/hp300/dev/dvbox.c +++ b/sys/arch/hp300/dev/dvbox.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dvbox.c,v 1.4 2005/01/19 10:51:23 miod Exp $ */ +/* $OpenBSD: dvbox.c,v 1.5 2005/01/21 16:22:34 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 * fb->planes) >> 3; + *(u_int *)data = fb->fbwidth; break; case WSDISPLAYIO_GETCMAP: case WSDISPLAYIO_PUTCMAP: |