diff options
| author |   miod <miod@openbsd.org> | 2014-03-09 10:01:25 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2014-03-09 10:01:25 +0000 |
| commit | 564b0849793be4ef454043de21dedca4cfb66649 (patch) | |
| tree | 41af32eb6aedba6a9cf4367393f8d4e93945273a | |
| parent | record errors, and only crash at the end. much less painful to synch (diff) | |
| download | wireguard-openbsd-564b0849793be4ef454043de21dedca4cfb66649.tar.xz wireguard-openbsd-564b0849793be4ef454043de21dedca4cfb66649.zip | |
Replace more magic numbers with OPENGL_xxx constants. No functional change.
| -rw-r--r-- | sys/arch/sgi/xbow/odyssey.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/sgi/xbow/odyssey.c b/sys/arch/sgi/xbow/odyssey.c index a786b0ce01a..0f1bfebfe9c 100644 --- a/sys/arch/sgi/xbow/odyssey.c +++ b/sys/arch/sgi/xbow/odyssey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: odyssey.c,v 1.10 2013/12/23 21:32:30 miod Exp $ */ +/* $OpenBSD: odyssey.c,v 1.11 2014/03/09 10:01:25 miod Exp $ */ /* * Copyright (c) 2009, 2010 Joel Sing <jsing@openbsd.org> * @@ -834,10 +834,10 @@ odyssey_putchar(void *cookie, int row, int col, u_int uc, long attr) /* Setup pixel painting. */ bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x00010405); bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x00002400); - bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0xc580cc08); - bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x00000000); - bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x00000000); - bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x00000000); + bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, OPENGL_COLOR_3UB); + bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x00); + bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x00); + bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x00); bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x00011453); bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x00000002); bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x00000000); @@ -847,7 +847,7 @@ odyssey_putchar(void *cookie, int row, int col, u_int uc, long attr) odyssey_cmd_flush(sc, 0); bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x2900812f); - bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x00014400); + bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, OPENGL_BEGIN); bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x0000000a); bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0xcf80a92f); bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x00000000); @@ -862,9 +862,9 @@ odyssey_putchar(void *cookie, int row, int col, u_int uc, long attr) bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, ieee754_sp(y + font->fontheight)); bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x00000000); - bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x8080c800); - bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x00000000); - bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x00000000); + bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, OPENGL_VERTEX_2I); + bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0); + bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0); bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x00004570); bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x0f00104c); bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x00000071); @@ -919,7 +919,7 @@ odyssey_putchar(void *cookie, int row, int col, u_int uc, long attr) } } - bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x00014001); + bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, OPENGL_END); odyssey_cmd_flush(sc, 1); bus_space_write_4(sc->iot, sc->ioh, ODYSSEY_CMD_FIFO, 0x290080d6); |