Previous 15994 Revisions Next

r3173 Friday 5th September, 2008 at 10:39:52 UTC by Roberto Zandonà
--
[src/mess/drivers]c64.c
[src/mess/video]vic6567.c vic6567.h

src/mess/video/vic6567.c
r3172r3173
8686#define VIC2_YPOS 50
8787#define RASTERLINE_2_C64(a) (a)
8888#define C64_2_RASTERLINE(a) (a)
89#define XPOS 8
90#define YPOS 8
89#define XPOS (VIC2_STARTVISIBLECOLUMNS + (VIC2_VISIBLECOLUMNS - VIC2_HSIZE)/2)
90#define YPOS (VIC2_STARTVISIBLELINES /* + (VIC2_VISIBLELINES - VIC2_VSIZE)/2 */)
9191
9292/* 2008-05 FP: lightpen code needs to read input port from c64.c and cbmb.c */
9393
r3172r3173
822822{
823823   register int x, mask, shift;
824824
825   if ((y < YPOS) || (y >= 208) || (xbegin <= 1) || (xbegin >= 328))
825   if ((y < YPOS) || (y >= (VIC2_STARTVISIBLELINES + VIC2_VISIBLELINES)) || (xbegin <= 1) || (xbegin >= (VIC2_STARTVISIBLECOLUMNS + VIC2_VISIBLECOLUMNS)))
826826      return;
827827
828828   for (x = 0, mask = 0xc0, shift = 6; x < 8; x += 2, mask >>= 2, shift -= 2)
r3172r3173
850850{
851851   register int mask, x;
852852
853   if ((y < YPOS) || (y >= 208) || (xbegin <= 1) || (xbegin >= 328))
853   if ((y < YPOS) || (y >= (VIC2_STARTVISIBLELINES + VIC2_VISIBLELINES)) || (xbegin <= 1) || (xbegin >= (VIC2_STARTVISIBLECOLUMNS + VIC2_VISIBLECOLUMNS)))
854854      return;
855855
856856   for (x = 0, mask = 0x80; x < 8; x++, mask >>= 1)
r3172r3173
11551155   else
11561156      end = vic2.y_begin + YPOS;
11571157
1158   line=first;
1159   if (line<end) {
1160      plot_box(vic2.bitmap, 0, line, vic2.bitmap->width, end-line,
1161             FRAMECOLOR);
1158   line = first;
1159   if (line < end) {
1160      plot_box(vic2.bitmap, 0, line, vic2.bitmap->width, end-line, FRAMECOLOR);
11621161      line=end;
11631162   }
11641163
r3172r3173
12561255            }
12571256         }
12581257         // sprite wrap y at the top of the screen
1259         else if (SPRITEON (i) && (SPRITE_Y_POS (i) < yoff) && (yoff == 8))
1258         else if (SPRITEON (i) && (SPRITE_Y_POS (i) < yoff) && (yoff == YPOS))
12601259         {
1261            int wrapped = yoff - SPRITE_Y_POS (i);
1260            int wrapped = YPOS - SPRITE_Y_POS (i);
12621261            syend = yend;
12631262
12641263            if (SPRITE_Y_EXPAND (i))
r3172r3173
12771276            vic2.sprites[i].line = wrapped;
12781277
12791278            if (SPRITE_MULTICOLOR (i))
1280               vic2_draw_sprite_multi (i, yoff, 0 , syend);
1279               vic2_draw_sprite_multi (i, YPOS, 0 , syend);
12811280            else
1282               vic2_draw_sprite (i, yoff, 0 , syend);
1281               vic2_draw_sprite (i, YPOS, 0 , syend);
12831282
12841283            if ((syend != yend) || (vic2.sprites[i].line > 20))
12851284            {
r3172r3173
13621361   {
13631362      vic2_set_interrupt (1);
13641363   }
1365
1364// printf("%08x  ",(int)activecpu_gettotalcycles());
13661365   if (vic2.on) vic2_drawlines (vic2.lastline, vic2.rasterline);
13671366}
13681367
r3172r3173
13851384MACHINE_DRIVER_START( vh_vic2 )
13861385   MDRV_SCREEN_ADD("main", RASTER)
13871386   MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
1388   MDRV_SCREEN_SIZE(336, 216)
1389   MDRV_SCREEN_VISIBLE_AREA(0, 336 - 1, 0, 216 - 1)
1387   MDRV_SCREEN_SIZE(VIC6567_COLUMNS, VIC6567_LINES)
1388   MDRV_SCREEN_VISIBLE_AREA(VIC6567_STARTVISIBLECOLUMNS ,VIC6567_STARTVISIBLECOLUMNS + VIC6567_VISIBLECOLUMNS - 1, VIC6567_STARTVISIBLELINES, VIC6567_STARTVISIBLELINES + VIC6567_VISIBLELINES - 1)
13901389   MDRV_PALETTE_INIT( vic2 )
13911390   MDRV_PALETTE_LENGTH(sizeof (vic2_palette) / sizeof (vic2_palette[0]) / 3)
13921391   MDRV_VIDEO_START( vic2 )
13931392   MDRV_VIDEO_UPDATE( vic2 )
13941393MACHINE_DRIVER_END
13951394
1395MACHINE_DRIVER_START( vh_vic2_pal )
1396   MDRV_SCREEN_ADD("main", RASTER)
1397   MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
1398   MDRV_SCREEN_SIZE(VIC6569_COLUMNS, VIC6569_LINES)
1399   MDRV_SCREEN_VISIBLE_AREA(VIC6569_STARTVISIBLECOLUMNS, VIC6569_STARTVISIBLECOLUMNS + VIC6569_VISIBLECOLUMNS - 1, VIC6569_STARTVISIBLELINES, VIC6569_STARTVISIBLELINES + VIC6569_VISIBLELINES - 1)
1400   MDRV_PALETTE_INIT( vic2 )
1401   MDRV_PALETTE_LENGTH(sizeof (vic2_palette) / sizeof (vic2_palette[0]) / 3)
1402   MDRV_VIDEO_START( vic2 )
1403   MDRV_VIDEO_UPDATE( vic2 )
1404MACHINE_DRIVER_END
src/mess/video/vic6567.h
r3172r3173
1414#ifndef VIC6567_H_
1515#define VIC6567_H_
1616
17
1817#define VIC6567_VRETRACERATE 60
1918#define VIC6569_VRETRACERATE 50
2019#define VIC2_VRETRACERATE (vic2.pal?VIC6569_VRETRACERATE:VIC6567_VRETRACERATE)
r3172r3173
2524 * but to achieve TV-frequency the clock must have a fix frequency */
2625#define VIC2_HSIZE   320
2726#define VIC2_VSIZE   200
27
2828/* of course you clock select an other clock, but for accurate */
2929/* video timing */
3030#define VIC6567_CLOCK   1022730
r3172r3173
4444#define VIC6567_LINES 262
4545#define VIC6569_LINES 312
4646#define VIC2_LINES (vic2.pal?VIC6569_LINES:VIC6567_LINES)
47#define VIC6567_VISIBLELINES 234
48#define VIC6569_VISIBLELINES 284
49#define VIC2_VISIBLELINES (vic2.pal?VIC6569_VISIBLELINES:VIC6567_VISIBLELINES)
50#define VIC6567_STARTVISIBLELINES ((VIC6567_LINES - VIC6567_VISIBLELINES)/2)
51#define VIC6569_STARTVISIBLELINES ((VIC6569_LINES - VIC6569_VISIBLELINES)/2)
52#define VIC2_STARTVISIBLELINES ((VIC2_LINES - VIC2_VISIBLELINES)/2)
4753
54#define VIC6567_COLUMNS 512
55#define VIC6569_COLUMNS 504
56#define VIC2_COLUMNS (vic2.pal?VIC6569_COLUMNS:VIC6567_COLUMNS)
57#define VIC6567_VISIBLECOLUMNS 411
58#define VIC6569_VISIBLECOLUMNS 403
59#define VIC2_VISIBLECOLUMNS (vic2.pal?VIC6569_VISIBLECOLUMNS:VIC6567_VISIBLECOLUMNS)
60#define VIC6567_STARTVISIBLECOLUMNS ((VIC6567_COLUMNS - VIC6567_VISIBLECOLUMNS)/2)
61#define VIC6569_STARTVISIBLECOLUMNS ((VIC6569_COLUMNS - VIC6569_VISIBLECOLUMNS)/2)
62#define VIC2_STARTVISIBLECOLUMNS ((VIC2_COLUMNS - VIC2_VISIBLECOLUMNS)/2)
4863
64
4965/*----------- defined in video/vic6567.c -----------*/
5066
5167/* call to init videodriver */
r3172r3173
5672extern void vic2_set_rastering(int onoff);
5773
5874MACHINE_DRIVER_EXTERN( vh_vic2 );
75MACHINE_DRIVER_EXTERN( vh_vic2_pal );
5976extern VIDEO_START( vic2 );
6077extern VIDEO_UPDATE( vic2 );
6178extern INTERRUPT_GEN( vic2_raster_irq );
r3172r3173
8299/*extern UINT8 vic2[]; */
83100/*extern int vic2_pal; */
84101
85
86102#endif /* VIC6567_H_ */
src/mess/drivers/c64.c
r3172r3173
516516   MDRV_QUICKLOAD_ADD(cbm_c64, "p00,prg,t64", CBM_QUICKLOAD_DELAY_SECONDS)
517517MACHINE_DRIVER_END
518518
519static MACHINE_DRIVER_START( c64pal )
520   MDRV_CPU_ADD( "main", M6510, VIC6569_CLOCK)
521   MDRV_CPU_PROGRAM_MAP(c64_mem, 0)
522   MDRV_CPU_VBLANK_INT("main", c64_frame_interrupt)
523   MDRV_CPU_VBLANK_INT("main", c64_frame_interrupt)
524   MDRV_CPU_PERIODIC_INT(vic2_raster_irq, VIC2_HRETRACERATE)
525   MDRV_INTERLEAVE(1)
519526
527   MDRV_MACHINE_START( c64 )
528
529   /* video hardware */
530   MDRV_IMPORT_FROM( vh_vic2_pal )
531   MDRV_SCREEN_MODIFY("main")
532   MDRV_SCREEN_REFRESH_RATE(VIC6569_VRETRACERATE)
533   MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
534
535   /* sound hardware */
536   MDRV_SPEAKER_STANDARD_MONO("mono")
537   MDRV_SOUND_ADD("sid", SID6581, VIC6569_CLOCK)
538   MDRV_SOUND_CONFIG(c64_sound_interface)
539   MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
540   MDRV_SOUND_ADD("dac", DAC, 0)
541   MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
542
543   /* devices */
544   MDRV_QUICKLOAD_ADD(cbm_c64, "p00,prg,t64", CBM_QUICKLOAD_DELAY_SECONDS)
545MACHINE_DRIVER_END
546
520547static MACHINE_DRIVER_START( ultimax )
521548   MDRV_IMPORT_FROM( c64 )
522549   MDRV_CPU_REPLACE( "main", M6510, 1000000)
r3172r3173
533560   MDRV_PALETTE_INIT( pet64 )
534561MACHINE_DRIVER_END
535562
536
537static MACHINE_DRIVER_START( c64pal )
538   MDRV_IMPORT_FROM( c64 )
539   MDRV_CPU_REPLACE( "main", M6510, VIC6569_CLOCK)
540
541   MDRV_SCREEN_MODIFY("main")
542   MDRV_SCREEN_REFRESH_RATE(VIC6569_VRETRACERATE)
543
544   MDRV_SOUND_REPLACE("sid", SID6581, VIC6569_CLOCK)
545   MDRV_SOUND_CONFIG(c64_sound_interface)
546   MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
547MACHINE_DRIVER_END
548
549
550563static MACHINE_DRIVER_START( c64gs )
551564   MDRV_IMPORT_FROM( c64pal )
552565   MDRV_SOUND_REMOVE( "dac" )

Previous 15994 Revisions Next


© 1998-2018 The MESS Team