| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $NetBSD: voodoofbreg.h,v 1.3 2012/01/19 18:35:27 macallan Exp $ */ | | 1 | /* $NetBSD: voodoofbreg.h,v 1.4 2012/01/21 16:12:57 jakllsch Exp $ */ |
2 | | | 2 | |
3 | /* | | 3 | /* |
4 | * Copyright 2005, 2006 by Michael Lorenz. | | 4 | * Copyright 2005, 2006 by Michael Lorenz. |
5 | * | | 5 | * |
6 | * Permission to use, copy, modify, distribute, and sell this software and | | 6 | * Permission to use, copy, modify, distribute, and sell this software and |
7 | * its documentation for any purpose is hereby granted without fee, | | 7 | * its documentation for any purpose is hereby granted without fee, |
8 | * provided that the above copyright notice appear in all copies and that | | 8 | * provided that the above copyright notice appear in all copies and that |
9 | * both that copyright notice and this permission notice appear in | | 9 | * both that copyright notice and this permission notice appear in |
10 | * supporting documentation, and that the name of Kevin E. Martin not be | | 10 | * supporting documentation, and that the name of Kevin E. Martin not be |
11 | * used in advertising or publicity pertaining to distribution of the | | 11 | * used in advertising or publicity pertaining to distribution of the |
12 | * software without specific, written prior permission. Kevin E. Martin | | 12 | * software without specific, written prior permission. Kevin E. Martin |
13 | * makes no representations about the suitability of this software for any | | 13 | * makes no representations about the suitability of this software for any |
14 | * purpose. It is provided "as is" without express or implied warranty. | | 14 | * purpose. It is provided "as is" without express or implied warranty. |
| @@ -187,29 +187,29 @@ | | | @@ -187,29 +187,29 @@ |
187 | * start now : 0x00000100 run immediately instead of wait for launch area | | 187 | * start now : 0x00000100 run immediately instead of wait for launch area |
188 | * command : 0x0000000f | | 188 | * command : 0x0000000f |
189 | */ | | 189 | */ |
190 | | | 190 | |
191 | #define LAUNCH_2D (0x00100000 + 0x80) | | 191 | #define LAUNCH_2D (0x00100000 + 0x80) |
192 | | | 192 | |
193 | #define COMMAND_3D (0x00200000 + 0x120) | | 193 | #define COMMAND_3D (0x00200000 + 0x120) |
194 | | | 194 | |
195 | /* register bitfields (not all, only as needed) */ | | 195 | /* register bitfields (not all, only as needed) */ |
196 | | | 196 | |
197 | #define BIT(x) (1UL << (x)) | | 197 | #define BIT(x) (1UL << (x)) |
198 | | | 198 | |
199 | /* COMMAND_2D reg. values */ | | 199 | /* COMMAND_2D reg. values */ |
200 | #define ROP_COPY 0xcc // src | | 200 | #define ROP_COPY 0xccU // src |
201 | #define ROP_INVERT 0x55 // NOT dst | | 201 | #define ROP_INVERT 0x55U // NOT dst |
202 | #define ROP_XOR 0x66 // src XOR dst | | 202 | #define ROP_XOR 0x66U // src XOR dst |
203 | | | 203 | |
204 | #define AUTOINC_DSTX BIT(10) | | 204 | #define AUTOINC_DSTX BIT(10) |
205 | #define AUTOINC_DSTY BIT(11) | | 205 | #define AUTOINC_DSTY BIT(11) |
206 | #define COMMAND_2D_FILLRECT 0x05 | | 206 | #define COMMAND_2D_FILLRECT 0x05 |
207 | #define COMMAND_2D_S2S_BITBLT 0x01 // screen to screen | | 207 | #define COMMAND_2D_S2S_BITBLT 0x01 // screen to screen |
208 | #define COMMAND_2D_H2S_BITBLT 0x03 // host to screen | | 208 | #define COMMAND_2D_H2S_BITBLT 0x03 // host to screen |
209 | #define SST_2D_GO BIT(8) | | 209 | #define SST_2D_GO BIT(8) |
210 | | | 210 | |
211 | #define COMMAND_3D_NOP 0x00 | | 211 | #define COMMAND_3D_NOP 0x00 |
212 | #define STATUS_RETRACE BIT(6) | | 212 | #define STATUS_RETRACE BIT(6) |
213 | #define STATUS_BUSY BIT(9) | | 213 | #define STATUS_BUSY BIT(9) |
214 | #define MISCINIT1_CLUT_INV BIT(0) | | 214 | #define MISCINIT1_CLUT_INV BIT(0) |
215 | #define MISCINIT1_2DBLOCK_DIS BIT(15) | | 215 | #define MISCINIT1_2DBLOCK_DIS BIT(15) |