filename | src/pvr2/tacore.c |
changeset | 429:e581b90c3fb3 |
prev | 340:5ae1c80a68fb |
next | 561:533f6b478071 |
author | nkeynes |
date | Thu Nov 22 11:10:15 2007 +0000 (16 years ago) |
permissions | -rw-r--r-- |
last change | Re-add "Load Binary" menu item (misplaced in GUI rewrite) Prevent running with no code loaded |
file | annotate | diff | log | raw |
1.1 --- a/src/pvr2/tacore.c Wed Jan 31 10:31:53 2007 +00001.2 +++ b/src/pvr2/tacore.c Thu Nov 22 11:10:15 2007 +00001.3 @@ -1,5 +1,5 @@1.4 /**1.5 - * $Id: tacore.c,v 1.11 2007-01-31 10:31:53 nkeynes Exp $1.6 + * $Id: tacore.c,v 1.12 2007-10-08 11:52:13 nkeynes Exp $1.7 *1.8 * PVR2 Tile Accelerator implementation1.9 *1.10 @@ -261,7 +261,7 @@1.11 (((((base & 0xFF) * i) & 0xFF00) |1.12 (((base & 0xFF00) * i) & 0xFF0000) |1.13 (((base & 0xFF0000) * i) & 0xFF000000)) >> 8) |1.14 - base & 0xFF000000;1.15 + (base & 0xFF000000);1.16 }1.18 /**1.19 @@ -369,7 +369,6 @@1.20 uint32_t posn = MMIO_READ( PVR2, TA_LISTPOS );1.21 uint32_t limit = MMIO_READ( PVR2, TA_LISTEND ) >> 2;1.22 uint32_t newposn;1.23 - uint32_t result;1.24 if( ta_status.tilelist_dir == TA_GROW_DOWN ) {1.25 newposn = posn - ta_status.tilelist_size;1.26 if( posn == limit ) {1.27 @@ -412,18 +411,18 @@1.28 /**1.29 * Write a tile entry out to the matrix.1.30 */1.31 -static int ta_write_tile_entry( int x, int y, uint32_t tile_entry ) {1.32 +static void ta_write_tile_entry( int x, int y, uint32_t tile_entry ) {1.33 uint32_t tile = TILESLOT(x,y);1.34 uint32_t tilestart = tile;1.35 uint32_t value;1.36 uint32_t lasttri = 0;1.37 - int i,l;1.38 + int i;1.40 if( ta_status.clip_mode == TA_POLYCMD_CLIP_OUTSIDE &&1.41 x >= ta_status.clip.x1 && x <= ta_status.clip.x2 &&1.42 y >= ta_status.clip.y1 && y <= ta_status.clip.y2 ) {1.43 /* Tile clipped out */1.44 - return 0;1.45 + return;1.46 }1.48 if( (tile_entry & 0x80000000) &&1.49 @@ -475,11 +474,11 @@1.50 } else if( (value & 0xFF000000) == 0xE0000000 ) {1.51 value &= 0x00FFFFFF;1.52 if( value == tilestart )1.53 - return 0; /* Loop */1.54 + return; /* Loop */1.55 tilestart = tile = value;1.56 } else {1.57 /* This should never happen */1.58 - return 0;1.59 + return;1.60 }1.61 }1.62 }1.63 @@ -1035,7 +1034,7 @@1.64 /**1.65 * Process 1 32-byte block of ta data1.66 */1.67 -void pvr2_ta_process_block( char *input ) {1.68 +void pvr2_ta_process_block( unsigned char *input ) {1.69 union ta_data *data = (union ta_data *)input;1.71 switch( ta_status.state ) {1.72 @@ -1169,7 +1168,7 @@1.73 * far enough to generate the correct end-of-list events. Tile buffer is1.74 * entirely ignored.1.75 */1.76 -void pvr2_ta_write( char *buf, uint32_t length )1.77 +void pvr2_ta_write( unsigned char *buf, uint32_t length )1.78 {1.79 if( ta_status.debug_output ) {1.80 fwrite_dump32( (uint32_t *)buf, length, stderr );
.