src/mess/video/vic4567.c
| r3199 | r3200 | |
| 211 | 211 | if (!SCREENON) |
| 212 | 212 | { |
| 213 | 213 | for (line = first; (line < last) && (line < vic2.bitmap->height); line++) |
| 214 | { |
| 214 | 215 | memset16 (BITMAP_ADDR16(vic2.bitmap, line + FIRSTLINE, 0), 0, vic2.bitmap->width); |
| 216 | } |
| 215 | 217 | return; |
| 216 | 218 | } |
| 217 | 219 | if (COLUMNS40) |
| r3199 | r3200 | |
| 827 | 829 | VIC2_STARTVISIBLELINES + 34 + raws + 16 - 1); |
| 828 | 830 | else |
| 829 | 831 | video_screen_set_visarea( machine->primary_screen, |
| 830 | | VIC2_STARTVISIBLECOLUMNS + 32, |
| 831 | | VIC2_STARTVISIBLECOLUMNS + 32 + columns + 16 - 1, |
| 832 | | VIC2_STARTVISIBLELINES + 34, |
| 833 | | VIC2_STARTVISIBLELINES + 34 + raws + 16 - 1); |
| 832 | VIC2_STARTVISIBLECOLUMNS + 34, |
| 833 | VIC2_STARTVISIBLECOLUMNS + 34 + columns + 16 - 1, |
| 834 | VIC2_STARTVISIBLELINES + 10, |
| 835 | VIC2_STARTVISIBLELINES + 10 + raws + 16 - 1); |
| 834 | 836 | } |
| 835 | 837 | if (VIC3_BITPLANES) { |
| 836 | 838 | if (!video_skip_this_frame ()) vic3_draw_bitplanes(machine); |
| r3199 | r3200 | |
| 849 | 851 | } |
| 850 | 852 | if (vic2.rasterline == C64_2_RASTERLINE (RASTERLINE)) |
| 851 | 853 | { |
| 852 | | if (vic2.on) |
| 853 | | vic2_drawlines (vic2.lastline, vic2.rasterline); |
| 854 | 854 | vic2_set_interrupt (1); |
| 855 | 855 | } |
| 856 | if (vic2.on) |
| 857 | if ((vic2.rasterline >= VIC2_FIRSTRASTERLINE) && (vic2.rasterline < (VIC2_FIRSTRASTERLINE + VIC2_VISIBLELINES))) |
| 858 | vic2_drawlines (vic2.rasterline-1, vic2.rasterline); |
| 856 | 859 | } |
| 857 | 860 | |
| 861 | |
src/mess/video/vic6567.c
| r3199 | r3200 | |
| 65 | 65 | /* lightpen values */ |
| 66 | 66 | #include "includes/c64.h" |
| 67 | 67 | |
| 68 | | |
| 69 | 68 | #define VERBOSE_LEVEL 0 |
| 70 | 69 | #define DBG_LOG(N,M,A) \ |
| 71 | 70 | { \ |
| r3199 | r3200 | |
| 1253 | 1252 | /* sprite priority, sprite overwrites lowerprior pixels */ |
| 1254 | 1253 | for (i = 7; i >= 0; i--) |
| 1255 | 1254 | { |
| 1256 | | if (vic2.sprites[i].line || vic2.sprites[i].repeat) |
| 1257 | | { |
| 1258 | | syend = yend; |
| 1259 | | if (SPRITE_Y_EXPAND (i)) |
| 1260 | | { |
| 1261 | | if ((21 - vic2.sprites[i].line) * 2 - vic2.sprites[i].repeat < yend - ybegin + 1) |
| 1262 | | syend = ybegin + (21 - vic2.sprites[i].line) * 2 - vic2.sprites[i].repeat - 1; |
| 1263 | | } |
| 1264 | | else |
| 1265 | | { |
| 1266 | | if (vic2.sprites[i].line + yend - ybegin + 1 > 20) |
| 1267 | | syend = ybegin + 20 - vic2.sprites[i].line; |
| 1268 | | } |
| 1269 | | if (yoff + syend > YPOS + 200) |
| 1270 | | syend = YPOS + 200 - yoff - 1; |
| 1271 | | if (yoff + ybegin < 0) |
| 1272 | | { |
| 1273 | | ybegin = -yoff; |
| 1274 | | yend = - yoff; |
| 1275 | | } |
| 1276 | | |
| 1277 | | if (SPRITE_MULTICOLOR (i)) |
| 1278 | | vic2_draw_sprite_multi (i, yoff, ybegin, syend); |
| 1279 | | else |
| 1280 | | vic2_draw_sprite (i, yoff, ybegin, syend); |
| 1281 | | if ((syend != yend) || (vic2.sprites[i].line > 20)) |
| 1282 | | { |
| 1283 | | vic2.sprites[i].line = vic2.sprites[i].repeat = 0; |
| 1284 | | for (j = syend; j <= yend; j++) |
| 1285 | | vic2.sprites[i].paintedline[j] = 0; |
| 1286 | | } |
| 1287 | | } |
| 1288 | | // wrap at the top of the screen |
| 1289 | | else if (SPRITEON (i) && |
| 1255 | if (SPRITEON (i) && |
| 1290 | 1256 | (yoff + ybegin >= SPRITE_Y_POS (i)) && |
| 1291 | 1257 | (yoff + ybegin - SPRITE_Y_POS (i) < (SPRITE_Y_EXPAND (i)? 21 * 2 : 21 )) && |
| 1292 | 1258 | (SPRITE_Y_POS (i) < 0)) |
| r3199 | r3200 | |
| 1322 | 1288 | vic2.sprites[i].line = vic2.sprites[i].repeat = 0; |
| 1323 | 1289 | } |
| 1324 | 1290 | } |
| 1325 | | else if (SPRITEON (i) && (yoff + ybegin <= SPRITE_Y_POS (i)) |
| 1326 | | && (yoff + yend >= SPRITE_Y_POS (i)) && (SPRITE_Y_POS (i) >= 0) ) |
| 1291 | else if (SPRITEON (i) && |
| 1292 | (yoff + ybegin >= SPRITE_Y_POS (i)) && |
| 1293 | (yoff + ybegin - SPRITE_Y_POS (i) < (SPRITE_Y_EXPAND (i)? 21 * 2 : 21 )) && |
| 1294 | (SPRITE_Y_POS (i) >= 0)) |
| 1327 | 1295 | { |
| 1296 | int wrapped = yoff + ybegin - SPRITE_Y_POS (i); |
| 1297 | |
| 1328 | 1298 | syend = yend; |
| 1299 | |
| 1329 | 1300 | if (SPRITE_Y_EXPAND (i)) |
| 1330 | 1301 | { |
| 1331 | | if (21 * 2 < yend - ybegin + 1) |
| 1332 | | syend = ybegin + 21 * 2 - 1; |
| 1302 | if (wrapped & 1) vic2.sprites[i].repeat = 1; |
| 1303 | wrapped >>= 1; |
| 1304 | syend = 21 * 2 - 1 - wrapped * 2; |
| 1305 | if (syend > (yend - ybegin)) syend = yend - ybegin; |
| 1333 | 1306 | } |
| 1334 | 1307 | else |
| 1335 | 1308 | { |
| 1336 | | if (yend - ybegin + 1 > 21) |
| 1337 | | syend = ybegin + 21 - 1; |
| 1309 | syend = 21 - 1 - wrapped; |
| 1310 | if (syend > (yend - ybegin)) syend = yend - ybegin; |
| 1338 | 1311 | } |
| 1339 | | if (yoff + syend >= YPOS + 200) |
| 1340 | | syend = YPOS + 200 - yoff - 1; |
| 1341 | | for (j = 0; j < SPRITE_Y_POS (i) - yoff; j++) |
| 1312 | |
| 1313 | vic2.sprites[i].line = wrapped; |
| 1314 | |
| 1315 | for (j = 0; j < SPRITE_Y_POS (i) - yoff; j++) |
| 1342 | 1316 | vic2.sprites[i].paintedline[j] = 0; |
| 1317 | |
| 1343 | 1318 | if (SPRITE_MULTICOLOR (i)) |
| 1344 | | vic2_draw_sprite_multi (i, yoff, SPRITE_Y_POS (i) - yoff, syend); |
| 1319 | vic2_draw_sprite_multi (i, yoff + ybegin, 0, 0); |
| 1345 | 1320 | else |
| 1346 | | vic2_draw_sprite (i, yoff, SPRITE_Y_POS (i) - yoff, syend); |
| 1321 | vic2_draw_sprite (i, yoff + ybegin, 0, 0); |
| 1347 | 1322 | |
| 1348 | 1323 | if ((syend != yend) || (vic2.sprites[i].line > 20)) |
| 1349 | 1324 | { |
| r3199 | r3200 | |
| 1380 | 1355 | |
| 1381 | 1356 | vic2.rasterline++; |
| 1382 | 1357 | |
| 1383 | | if (vic2.rasterline >= vic2.lines) |
| 1358 | if (vic2.rasterline == vic2.lines) |
| 1384 | 1359 | { |
| 1385 | 1360 | if (!c64_pal) // FIX ME |
| 1386 | 1361 | for (i = vic2.lines; i < (VIC2_FIRSTRASTERLINE + VIC2_VISIBLELINES); i++) |
| r3199 | r3200 | |
| 1403 | 1378 | vic2_set_interrupt (1); |
| 1404 | 1379 | } |
| 1405 | 1380 | |
| 1406 | | // printf("%08x ",(int)activecpu_gettotalcycles()); |
| 1407 | 1381 | if (vic2.on) |
| 1408 | 1382 | if ((vic2.rasterline >= VIC2_FIRSTRASTERLINE) && (vic2.rasterline < (VIC2_FIRSTRASTERLINE + VIC2_VISIBLELINES))) |
| 1409 | 1383 | vic2_drawlines (vic2.rasterline-1, vic2.rasterline); |
| 1384 | |
| 1385 | // printf("%08x ",(int)activecpu_gettotalcycles()); |
| 1410 | 1386 | } |
| 1411 | 1387 | |
| 1412 | 1388 | VIDEO_UPDATE( vic2 ) |
src/mess/video/vic6567.h
| r3199 | r3200 | |
| 17 | 17 | #define VIC6567_VRETRACERATE 60 |
| 18 | 18 | #define VIC6569_VRETRACERATE 50 |
| 19 | 19 | #define VIC2_VRETRACERATE (vic2.pal?VIC6569_VRETRACERATE:VIC6567_VRETRACERATE) |
| 20 | | #define VIC2_HRETRACERATE 15625 |
| 21 | 20 | |
| 22 | 21 | /* to be inserted in MachineDriver-Structure */ |
| 23 | 22 | /* the following values depend on the VIC clock, |
| r3199 | r3200 | |
| 29 | 28 | /* video timing */ |
| 30 | 29 | #define VIC6567_CLOCK 1022730 |
| 31 | 30 | /* (8180000/8) old value */ |
| 32 | | #define VIC6569_CLOCK 985250 |
| 33 | | /* (7880000/8) old value */ |
| 31 | #define VIC6569_CLOCK 985248 |
| 32 | /* (7880000/8) old value */ |
| 33 | |
| 34 | 34 | /* pixel clock 8 mhz */ |
| 35 | 35 | /* accesses to memory with 2 megahertz */ |
| 36 | 36 | /* needs 2 memory accesses for 8 pixel */ |
| r3199 | r3200 | |
| 39 | 39 | /* cpu driven with one (visible screen area) */ |
| 40 | 40 | #define VIC2_CLOCK ((vic2.pal?VIC6569_CLOCK:VIC6567_CLOCK)) |
| 41 | 41 | |
| 42 | #define VIC6567_HRETRACERATE 15734 |
| 43 | #define VIC6569_HRETRACERATE 15639 |
| 44 | #define VIC2_HRETRACERATE (vic2.pal?VIC6569_VRETRACERATE:VIC6567_VRETRACERATE) |
| 45 | |
| 42 | 46 | /* pal 50 Hz vertical screen refresh, screen consists of 312 lines |
| 43 | 47 | * ntsc 60 Hz vertical screen refresh, screen consists of 262 lines */ |
| 44 | 48 | #define VIC6567_LINES 262 |
| 45 | 49 | #define VIC6569_LINES 312 |
| 46 | 50 | #define VIC2_LINES (vic2.pal?VIC6569_LINES:VIC6567_LINES) |
| 51 | |
| 47 | 52 | #define VIC6567_VISIBLELINES 234 |
| 48 | 53 | #define VIC6569_VISIBLELINES 284 |
| 49 | 54 | #define VIC2_VISIBLELINES (vic2.pal?VIC6569_VISIBLELINES:VIC6567_VISIBLELINES) |
| 55 | |
| 50 | 56 | #define VIC6567_STARTVISIBLELINES ((VIC6567_LINES - VIC6567_VISIBLELINES)/2) |
| 51 | 57 | #define VIC6569_STARTVISIBLELINES ((VIC6569_LINES - VIC6569_VISIBLELINES)/2) |
| 52 | 58 | #define VIC2_STARTVISIBLELINES ((VIC2_LINES - VIC2_VISIBLELINES)/2) |
| 59 | |
| 53 | 60 | #define VIC6567_FIRSTRASTERLINE 34 |
| 54 | 61 | #define VIC6569_FIRSTRASTERLINE 9 |
| 55 | 62 | #define VIC2_FIRSTRASTERLINE (vic2.pal?VIC6569_FIRSTRASTERLINE:VIC6567_FIRSTRASTERLINE) |
| r3199 | r3200 | |
| 57 | 64 | #define VIC6567_COLUMNS 512 |
| 58 | 65 | #define VIC6569_COLUMNS 504 |
| 59 | 66 | #define VIC2_COLUMNS (vic2.pal?VIC6569_COLUMNS:VIC6567_COLUMNS) |
| 67 | |
| 60 | 68 | #define VIC6567_VISIBLECOLUMNS 411 |
| 61 | 69 | #define VIC6569_VISIBLECOLUMNS 403 |
| 62 | 70 | #define VIC2_VISIBLECOLUMNS (vic2.pal?VIC6569_VISIBLECOLUMNS:VIC6567_VISIBLECOLUMNS) |
| 71 | |
| 63 | 72 | #define VIC6567_STARTVISIBLECOLUMNS ((VIC6567_COLUMNS - VIC6567_VISIBLECOLUMNS)/2) |
| 64 | 73 | #define VIC6569_STARTVISIBLECOLUMNS ((VIC6569_COLUMNS - VIC6569_VISIBLECOLUMNS)/2) |
| 65 | 74 | #define VIC2_STARTVISIBLECOLUMNS ((VIC2_COLUMNS - VIC2_VISIBLECOLUMNS)/2) |
src/mess/drivers/c65.c
| r3199 | r3200 | |
| 210 | 210 | MDRV_CPU_ADD("main", M4510, 3500000) /* or VIC6567_CLOCK, */ |
| 211 | 211 | MDRV_CPU_PROGRAM_MAP(c65_mem, 0) |
| 212 | 212 | MDRV_CPU_VBLANK_INT("main", c64_frame_interrupt) |
| 213 | | MDRV_CPU_PERIODIC_INT(vic3_raster_irq, VIC2_HRETRACERATE) |
| 213 | MDRV_CPU_PERIODIC_INT(vic3_raster_irq, VIC6567_HRETRACERATE) |
| 214 | 214 | MDRV_INTERLEAVE(0) |
| 215 | 215 | |
| 216 | 216 | MDRV_MACHINE_START( c65 ) |
| r3199 | r3200 | |
| 220 | 220 | MDRV_SCREEN_MODIFY("main") |
| 221 | 221 | MDRV_SCREEN_REFRESH_RATE(VIC6567_VRETRACERATE) |
| 222 | 222 | MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ |
| 223 | | MDRV_SCREEN_SIZE(VIC6567_COLUMNS * 3, VIC6567_LINES * 3) |
| 224 | | // MDRV_SCREEN_VISIBLE_AREA(VIC6567_STARTVISIBLECOLUMNS ,(VIC6567_STARTVISIBLECOLUMNS + VIC6567_VISIBLECOLUMNS - 1) * 2, VIC6567_STARTVISIBLELINES, VIC6567_STARTVISIBLELINES + VIC6567_VISIBLELINES - 1) |
| 225 | | MDRV_SCREEN_VISIBLE_AREA(0, VIC6567_COLUMNS * 3 - 1, 0, VIC6567_LINES * 3 - 1) |
| 223 | MDRV_SCREEN_SIZE(VIC6567_COLUMNS * 2, VIC6567_LINES * 2) |
| 224 | MDRV_SCREEN_VISIBLE_AREA(VIC6567_STARTVISIBLECOLUMNS ,(VIC6567_STARTVISIBLECOLUMNS + VIC6567_VISIBLECOLUMNS - 1) * 2, VIC6567_STARTVISIBLELINES, VIC6567_STARTVISIBLELINES + VIC6567_VISIBLELINES - 1) |
| 226 | 225 | MDRV_PALETTE_LENGTH(sizeof(vic3_palette) / sizeof(vic3_palette[0]) / 3) |
| 227 | 226 | MDRV_PALETTE_INIT( c65 ) |
| 228 | 227 | |
| r3199 | r3200 | |
| 242 | 241 | MDRV_IMPORT_FROM( c65 ) |
| 243 | 242 | MDRV_SCREEN_MODIFY("main") |
| 244 | 243 | MDRV_SCREEN_REFRESH_RATE(VIC6569_VRETRACERATE) |
| 245 | | MDRV_SCREEN_SIZE(VIC6569_COLUMNS * 3, VIC6569_LINES * 3) |
| 246 | | // MDRV_SCREEN_VISIBLE_AREA(VIC6569_STARTVISIBLECOLUMNS, (VIC6569_STARTVISIBLECOLUMNS + VIC6569_VISIBLECOLUMNS - 1) * 2, VIC6569_STARTVISIBLELINES, VIC6569_STARTVISIBLELINES + VIC6569_VISIBLELINES - 1) |
| 247 | | MDRV_SCREEN_VISIBLE_AREA(0, VIC6569_COLUMNS * 3 - 1, 0, VIC6569_LINES * 3 - 1) |
| 244 | MDRV_SCREEN_SIZE(VIC6569_COLUMNS * 2, VIC6569_LINES * 2) |
| 245 | MDRV_SCREEN_VISIBLE_AREA(VIC6569_STARTVISIBLECOLUMNS, (VIC6569_STARTVISIBLECOLUMNS + VIC6569_VISIBLECOLUMNS - 1) * 2, VIC6569_STARTVISIBLELINES, VIC6569_STARTVISIBLELINES + VIC6569_VISIBLELINES - 1) |
| 248 | 246 | |
| 249 | 247 | MDRV_SOUND_REPLACE("sid_r", SID8580, 1022727) |
| 250 | 248 | MDRV_SOUND_CONFIG(c65_sound_interface) |
src/mess/drivers/c128.c
| r3199 | r3200 | |
| 561 | 561 | MDRV_CPU_PROGRAM_MAP( c128_z80_mem, 0 ) |
| 562 | 562 | MDRV_CPU_IO_MAP( c128_z80_io, 0 ) |
| 563 | 563 | MDRV_CPU_VBLANK_INT("main", c64_frame_interrupt) |
| 564 | | MDRV_CPU_PERIODIC_INT(vic2_raster_irq, VIC2_HRETRACERATE) |
| 564 | MDRV_CPU_PERIODIC_INT(vic2_raster_irq, VIC6567_HRETRACERATE) |
| 565 | 565 | |
| 566 | 566 | MDRV_CPU_ADD("m8502", M8502, VIC6567_CLOCK) |
| 567 | 567 | MDRV_CPU_PROGRAM_MAP( c128_mem, 0 ) |
| 568 | 568 | MDRV_CPU_VBLANK_INT("main", c64_frame_interrupt) |
| 569 | | MDRV_CPU_PERIODIC_INT(vic2_raster_irq, VIC2_HRETRACERATE) |
| 569 | MDRV_CPU_PERIODIC_INT(vic2_raster_irq, VIC6567_HRETRACERATE) |
| 570 | 570 | |
| 571 | 571 | MDRV_INTERLEAVE(0) |
| 572 | 572 | |
src/mess/drivers/c64.c
| r3199 | r3200 | |
| 500 | 500 | MDRV_CPU_ADD("main", M6510, VIC6567_CLOCK) |
| 501 | 501 | MDRV_CPU_PROGRAM_MAP(c64_mem, 0) |
| 502 | 502 | MDRV_CPU_VBLANK_INT("main", c64_frame_interrupt) |
| 503 | | MDRV_CPU_PERIODIC_INT(vic2_raster_irq, VIC2_HRETRACERATE) |
| 503 | MDRV_CPU_PERIODIC_INT(vic2_raster_irq, VIC6567_HRETRACERATE) |
| 504 | 504 | MDRV_INTERLEAVE(1) |
| 505 | 505 | |
| 506 | 506 | MDRV_MACHINE_START( c64 ) |
| r3199 | r3200 | |
| 528 | 528 | MDRV_CPU_PROGRAM_MAP(c64_mem, 0) |
| 529 | 529 | MDRV_CPU_VBLANK_INT("main", c64_frame_interrupt) |
| 530 | 530 | MDRV_CPU_VBLANK_INT("main", c64_frame_interrupt) |
| 531 | | MDRV_CPU_PERIODIC_INT(vic2_raster_irq, VIC2_HRETRACERATE) |
| 531 | MDRV_CPU_PERIODIC_INT(vic2_raster_irq, VIC6569_HRETRACERATE) |
| 532 | 532 | MDRV_INTERLEAVE(1) |
| 533 | 533 | |
| 534 | 534 | MDRV_MACHINE_START( c64 ) |