diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-05-12 16:26:12 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-05-12 16:26:12 +0000 |
| commit | dceb2e5e9e20f348c4c303e8556ad4a7e498075a (patch) | |
| tree | 7a7c75247d2d1188a5973d8ca7a4ac3fbe12f7d6 /sys/arch/sparc/dev | |
| parent | dd60b1e887b7438ec7576119dd6fe4dd8a87b33c (diff) | |
if tctrl not there, still let this compile; miod ok
Diffstat (limited to 'sys/arch/sparc/dev')
| -rw-r--r-- | sys/arch/sparc/dev/p9000.c | 5 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/p9100.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/sparc/dev/p9000.c b/sys/arch/sparc/dev/p9000.c index 5b95402a206..e1ef60ce705 100644 --- a/sys/arch/sparc/dev/p9000.c +++ b/sys/arch/sparc/dev/p9000.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p9000.c,v 1.7 2004/05/10 09:05:52 miod Exp $ */ +/* $OpenBSD: p9000.c,v 1.8 2004/05/12 16:26:11 deraadt Exp $ */ /* * Copyright (c) 2003, Miodrag Vallat. @@ -554,12 +554,13 @@ p9000_ras_init(struct p9000_softc *sc) { sc->sc_sunfb.sf_ro.ri_ops.copycols = p9000_ras_copycols; sc->sc_sunfb.sf_ro.ri_ops.copyrows = p9000_ras_copyrows; +#if NTCTRL > 0 if (tadpole_get_video() & TV_ACCEL) { sc->sc_sunfb.sf_ro.ri_ops.erasecols = p9000_ras_erasecols; sc->sc_sunfb.sf_ro.ri_ops.eraserows = p9000_ras_eraserows; sc->sc_sunfb.sf_ro.ri_do_cursor = p9000_ras_do_cursor; } - +#endif /* * Setup safe defaults for the parameter and drawing engines, in * order to minimize the operations to do for ri_ops. diff --git a/sys/arch/sparc/dev/p9100.c b/sys/arch/sparc/dev/p9100.c index 622bd7eca2e..bc5973b40db 100644 --- a/sys/arch/sparc/dev/p9100.c +++ b/sys/arch/sparc/dev/p9100.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p9100.c,v 1.28 2004/05/10 09:05:52 miod Exp $ */ +/* $OpenBSD: p9100.c,v 1.29 2004/05/12 16:26:11 deraadt Exp $ */ /* * Copyright (c) 2003, Miodrag Vallat. @@ -608,12 +608,13 @@ p9100_ras_init(struct p9100_softc *sc) { sc->sc_sunfb.sf_ro.ri_ops.copycols = p9100_ras_copycols; sc->sc_sunfb.sf_ro.ri_ops.copyrows = p9100_ras_copyrows; +#if NTCTRL > 0 if (tadpole_get_video() & TV_ACCEL) { sc->sc_sunfb.sf_ro.ri_ops.erasecols = p9100_ras_erasecols; sc->sc_sunfb.sf_ro.ri_ops.eraserows = p9100_ras_eraserows; sc->sc_sunfb.sf_ro.ri_do_cursor = p9100_ras_do_cursor; } - +#endif /* * Setup safe defaults for the parameter and drawing engines, in * order to minimize the operations to do for ri_ops. |