diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-01-06 16:50:46 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-01-06 16:50:46 +0000 |
| commit | c511518e27387a5a81b39ef175d43ebbc5255cf1 (patch) | |
| tree | 53fd39a1ea98f2f2d2f99a8c84180f9a9abaf7e3 /sys/arch/arm/xscale/pxa2x0_lcd.h | |
| parent | e0f2d9a633adc92193f1166a99b31046e250dde9 (diff) | |
Bring back the code simplifications after debug and testing by drahn@
Diffstat (limited to 'sys/arch/arm/xscale/pxa2x0_lcd.h')
| -rw-r--r-- | sys/arch/arm/xscale/pxa2x0_lcd.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/arch/arm/xscale/pxa2x0_lcd.h b/sys/arch/arm/xscale/pxa2x0_lcd.h index 12200d87af3..94f7c38a840 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.4 2005/01/05 19:12:47 miod Exp $ */ +/* $OpenBSD: pxa2x0_lcd.h,v 1.5 2005/01/06 16:50:44 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. @@ -85,6 +85,8 @@ struct pxa2x0_lcd_softc { int n_screens; LIST_HEAD(, pxa2x0_lcd_screen) screens; struct pxa2x0_lcd_screen *active; + struct wsdisplay_emulops emulops; /* master emulops copy */ + void *ih; /* interrupt handler */ }; @@ -134,8 +136,9 @@ struct pxa2x0_wsscreen_descr { int depth; /* bits per pixel */ }; -int pxa2x0_lcd_setup_wsscreen(struct pxa2x0_wsscreen_descr *, - const struct lcd_panel_geometry *, const char * ); +int pxa2x0_lcd_setup_wsscreen(struct pxa2x0_lcd_softc *, + struct pxa2x0_wsscreen_descr *, const struct lcd_panel_geometry *, + const char * ); int pxa2x0_lcd_show_screen(void *, void *, int, void (*)(void *, int, int), void *); @@ -145,6 +148,4 @@ int pxa2x0_lcd_alloc_screen(void *, const struct wsscreen_descr *, void **, int *, int *, long *); void pxa2x0_lcd_free_screen(void *, void *); -extern const struct wsdisplay_emulops pxa2x0_lcd_emulops; - #endif /* _ARM_XSCALE_PXA2X0_LCD_H */ |