diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-09-15 20:23:11 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-09-15 20:23:11 +0000 |
| commit | 6759b09d281d276d3b3d54ffbef1c9980df9d67f (patch) | |
| tree | 4a4c5917557819414a798bb184a102c0bf525cef /sys/arch/arm | |
| parent | 64393cf110217509a46347626cda13bdde46cf22 (diff) | |
Stop compiling the texte console rotation code #ifdef __zaurus__, but use
a flag in the rasops_info structure; drivers which may use it shall declare
a specific attribute for the config(8) machinery, so that the necessary code
is compiled in.
In addition to this, rotated font computation is now done on-demand, and a
list of unrotated-rotated font cookie pairs is kept, rather than rotating all
built-in wsfonts at initialization time.
No user-perceptible functional change.
Tested matthieu@ uwe@, ok uwe@
Diffstat (limited to 'sys/arch/arm')
| -rw-r--r-- | sys/arch/arm/xscale/files.pxa2x0 | 4 | ||||
| -rw-r--r-- | sys/arch/arm/xscale/pxa2x0_lcd.c | 4 | ||||
| -rw-r--r-- | sys/arch/arm/xscale/pxa2x0_lcd.h | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/sys/arch/arm/xscale/files.pxa2x0 b/sys/arch/arm/xscale/files.pxa2x0 index b416567cead..4ef2574ee58 100644 --- a/sys/arch/arm/xscale/files.pxa2x0 +++ b/sys/arch/arm/xscale/files.pxa2x0 @@ -1,4 +1,4 @@ -# $OpenBSD: files.pxa2x0,v 1.16 2005/07/01 23:51:55 uwe Exp $ +# $OpenBSD: files.pxa2x0,v 1.17 2005/09/15 20:23:10 miod Exp $ # $NetBSD: files.pxa2x0,v 1.6 2004/05/01 19:09:14 thorpej Exp $ # # Configuration info for Intel PXA2[51]0 CPU support @@ -56,7 +56,7 @@ attach ohci at pxaip with pxaohci file arch/arm/xscale/pxa2x0_ohci.c pxaohci # LCD controller -device lcd: wsemuldisplaydev, rasops16, rasops8, rasops4 +device lcd: wsemuldisplaydev, rasops16, rasops8, rasops4, rasops_rotation file arch/arm/xscale/pxa2x0_lcd.c lcd needs-flag # Inter-Integrated Circuit controller diff --git a/sys/arch/arm/xscale/pxa2x0_lcd.c b/sys/arch/arm/xscale/pxa2x0_lcd.c index d8854c58f81..fd2d2b2d0bd 100644 --- a/sys/arch/arm/xscale/pxa2x0_lcd.c +++ b/sys/arch/arm/xscale/pxa2x0_lcd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pxa2x0_lcd.c,v 1.19 2005/05/23 23:59:19 uwe Exp $ */ +/* $OpenBSD: pxa2x0_lcd.c,v 1.20 2005/09/15 20:23:10 miod Exp $ */ /* $NetBSD: pxa2x0_lcd.c,v 1.8 2003/10/03 07:24:05 bsh Exp $ */ /* @@ -563,7 +563,7 @@ pxa2x0_lcd_setup_rasops(struct rasops_info *rinfo, const struct lcd_panel_geometry *geom) { - rinfo->ri_flg = 0; + rinfo->ri_flg = descr->flags; rinfo->ri_depth = descr->depth; rinfo->ri_width = geom->panel_width; rinfo->ri_height = geom->panel_height; diff --git a/sys/arch/arm/xscale/pxa2x0_lcd.h b/sys/arch/arm/xscale/pxa2x0_lcd.h index 1e44f46cd6d..221769c0238 100644 --- a/sys/arch/arm/xscale/pxa2x0_lcd.h +++ b/sys/arch/arm/xscale/pxa2x0_lcd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pxa2x0_lcd.h,v 1.9 2005/04/11 03:32:48 uwe Exp $ */ +/* $OpenBSD: pxa2x0_lcd.h,v 1.10 2005/09/15 20:23:10 miod Exp $ */ /* $NetBSD: pxa2x0_lcd.h,v 1.2 2003/06/17 09:43:14 bsh Exp $ */ /* * Copyright (c) 2002 Genetec Corporation. All rights reserved. @@ -125,6 +125,7 @@ struct lcd_panel_geometry { struct pxa2x0_wsscreen_descr { struct wsscreen_descr c; /* standard descriptor */ int depth; /* bits per pixel */ + int flags; /* rasops flags */ }; void pxa2x0_lcd_attach_sub(struct pxa2x0_lcd_softc *, |