Previous 15994 Revisions Next

r1401 Sunday 9th December, 2007 at 19:40:31 UTC by Nathan Woods
[X68000] Improved video timing. [Barry Rodewald]
[docs]messnew.txt
[src/mess/drivers]x68k.c
[src/mess/includes]x68k.h
[src/mess/video]x68k.c

src/mess/includes/x68k.h
r1400r1401
110110      int operation;  // operation port (0xe80481)
111111      int vblank;  // 1 if in VBlank
112112      int hblank;  // 1 if in HBlank
113      int htotal;  // Horizontal Total (in characters)
114      int vtotal;  // Vertical Total
115      int hbegin;  // Horizontal Begin
116      int vbegin;  // Vertical Begin
117      int hend;    // Horizontal End
118      int vend;    // Vertical End
119      int hsync_end;  // Horizontal Sync End
120      int vsync_end;  // Vertical Sync End
121      int hsyncadjust;  // Horizontal Sync Adjustment
122      int hmultiple;  // Horizontal pixel multiplier
123      int vmultiple;  // Vertical scanline multiplier (x2 for doublescan modes)
113124      int height;
114125      int width;
115126      int visible_height;
src/mess/video/x68k.c
r1400r1401
143143
144144void x68k_crtc_refresh_mode()
145145{
146   rectangle rect;
146//   rectangle rect;
147147//   double scantime;
148   rectangle scr,visiblescr;
149   int length;
148150
151   // Calculate data from register values
152   sys.crtc.vmultiple = 1;
153   if((sys.crtc.reg[20] & 0x10) != 0 && (sys.crtc.reg[20] & 0x0c) == 0)
154      sys.crtc.vmultiple = 2;  // 31.5kHz + 256 lines = doublescan
155   sys.crtc.htotal = (sys.crtc.reg[0] + 1) * 8;
156   sys.crtc.vtotal = (sys.crtc.reg[4] + 1) / sys.crtc.vmultiple; // default is 567 (568 scanlines)
157   sys.crtc.hbegin = (sys.crtc.reg[2] * 8) + 1;
158   sys.crtc.hend = (sys.crtc.reg[3] * 8);
159   sys.crtc.vbegin = (sys.crtc.reg[6]) / sys.crtc.vmultiple;
160   sys.crtc.vend = (sys.crtc.reg[7] - 1) / sys.crtc.vmultiple;
161   sys.crtc.hsync_end = (sys.crtc.reg[1]) * 8;
162   sys.crtc.vsync_end = (sys.crtc.reg[5]) / sys.crtc.vmultiple;
163   sys.crtc.hsyncadjust = sys.crtc.reg[8];
164   scr.min_x = scr.min_y = 0;
165   scr.max_x = sys.crtc.htotal - 8;
166   scr.max_y = sys.crtc.vtotal;
167   if(scr.max_y <= sys.crtc.vend)
168      scr.max_y = sys.crtc.vend + 1;
169   if(scr.max_x <= sys.crtc.hend)
170      scr.max_x = sys.crtc.hend + 1;
171   visiblescr.min_x = sys.crtc.hbegin;
172   visiblescr.max_x = sys.crtc.hend;
173   visiblescr.min_y = sys.crtc.vbegin;
174   visiblescr.max_y = sys.crtc.vend;
175   
176   // expand visible area to the size indicated by CRTC reg 20
177   length = sys.crtc.hend - sys.crtc.hbegin;
178   if (length < sys.crtc.width)
179   {
180      visiblescr.min_x = sys.crtc.hbegin - ((sys.crtc.width - length)/2);
181      visiblescr.max_x = sys.crtc.hend + ((sys.crtc.width - length)/2);
182   }
183   length = sys.crtc.vend - sys.crtc.vbegin;
184   if (length < sys.crtc.height)
185   {
186      visiblescr.min_y = sys.crtc.vbegin - ((sys.crtc.height - length)/2);
187      visiblescr.max_y = sys.crtc.vend + ((sys.crtc.height - length)/2);
188   }
189   
190   logerror("video_screen_configure(0,%i,%i,[%i,%i,%i,%i],55.45)\n",scr.max_x,scr.max_y,visiblescr.min_x,visiblescr.min_y,visiblescr.max_x,visiblescr.max_y);
191   video_screen_configure(0,scr.max_x,scr.max_y,&visiblescr,HZ_TO_ATTOSECONDS(55.45));
192/*   
149193   rect.min_x = rect.min_y = 0;
150194   sys.crtc.visible_width = (sys.crtc.reg[3] - sys.crtc.reg[2]) * 8;
151195   if(sys.crtc.height == 256)
r1400r1401
181225   {
182226//      scantime = ATTOTIME_IN_HZ(55.45) / sys.crtc.reg[4];
183227//      timer_adjust(scanline_timer,attotime_zero,0,scantime);
184   }
228   }*/
185229}
186230
187231TIMER_CALLBACK(x68k_hsync)
188232{
189233   int state = param;
190   attotime irq_time = video_screen_get_scan_period(0);
191   attotime hsync_time = ATTOTIME_IN_CYCLES(0,32);
192
234   attotime hsync_time;
235   
193236   sys.crtc.hblank = state;   
194237   if(state == 1)
195238   {
196//      mfp_trigger_irq(MFP_IRQ_GPIP7);  // HSync
239      int scan = video_screen_get_vpos(0);
240      if(scan > sys.crtc.vend)
241         scan = 0;
242      hsync_time = video_screen_get_time_until_pos(0,scan+1,sys.crtc.hsync_end);
197243      timer_adjust(scanline_timer,hsync_time,0,attotime_never);
198244   }
199245   if(state == 0)
200246   {
201      double time_to_irq = attotime_to_double(irq_time) - attotime_to_double(hsync_time);
202      timer_adjust(scanline_timer,double_to_attotime(time_to_irq),1,attotime_never);
203      if(!(sys.mfp.gpio & 0x40))  // if GPIP6 is active, clear it
204         sys.mfp.gpio |= 0x40;
247      hsync_time = video_screen_get_time_until_pos(0,video_screen_get_vpos(0),sys.crtc.hend);
248      timer_adjust(scanline_timer,hsync_time,1,attotime_never);
249//      if(!(sys.mfp.gpio & 0x40))  // if GPIP6 is active, clear it
250//         sys.mfp.gpio |= 0x40;
205251   }
206252}
207253
254TIMER_CALLBACK(x68k_crtc_raster_end)
255{
256   sys.mfp.gpio |= 0x40;
257}
208258
209259TIMER_CALLBACK(x68k_crtc_raster_irq)
210260{
211261   int scan = param;
212262   attotime irq_time;
213//   mfp_trigger_irq(MFP_IRQ_GPIP6);
263   attotime end_time;
264
265   if(scan > sys.crtc.vtotal)
266   {
267      timer_adjust(raster_irq,attotime_zero,0,attotime_never);  // disable timer
268      return;
269   }
214270   sys.mfp.gpio &= ~0x40;  // GPIP6
215271   if((readinputportbytag("options") & 0x01))
216272   {
r1400r1401
218274   }
219275
220276   irq_time = video_screen_get_time_until_pos(0,scan,2);
221   if(attotime_to_double(irq_time) > 0)
222      timer_adjust(raster_irq,irq_time,scan,attotime_never);
277   // end of HBlank period clears GPIP6 also?
278   end_time = video_screen_get_time_until_pos(0,scan,sys.crtc.hbegin);
279   timer_adjust(raster_irq,irq_time,scan,attotime_never);
280   timer_set(end_time,NULL,0,x68k_crtc_raster_end);
223281   logerror("GPIP6: Raster triggered at line %i (%i)\n",scan,video_screen_get_vpos(0));
224282}
225283
r1400r1401
232290   if(val == 1)  // VBlank on
233291   {
234292      sys.crtc.vblank = 1;
235      vblank_line = sys.crtc.reg[7];
236      if(vblank_line > sys.crtc.reg[4])
237         vblank_line = sys.crtc.reg[4];
238      if(sys.crtc.height == 256)
239         irq_time = video_screen_get_time_until_pos(0,vblank_line / 2,2);
240      else
241         irq_time = video_screen_get_time_until_pos(0,vblank_line,2);
293      vblank_line = sys.crtc.vend;
294      if(vblank_line > sys.crtc.vtotal)
295         vblank_line = sys.crtc.vtotal;
296      irq_time = video_screen_get_time_until_pos(0,vblank_line,2);
242297      timer_adjust(vblank_irq,irq_time,0,attotime_never);
243298      logerror("CRTC: VBlank on\n");
244299   }
245300   if(val == 0)  // VBlank off
246301   {
247302      sys.crtc.vblank = 0;
248      vblank_line = sys.crtc.reg[6];
249      if(sys.crtc.height == 256)
250         irq_time = video_screen_get_time_until_pos(0,vblank_line / 2,2);
251      else
252         irq_time = video_screen_get_time_until_pos(0,vblank_line,2);
303      vblank_line = sys.crtc.vsync_end;
304      irq_time = video_screen_get_time_until_pos(0,vblank_line,2);
253305      timer_adjust(vblank_irq,irq_time,1,attotime_never);
254306      logerror("CRTC: VBlank off\n");
255307   }
256308}
257309
310
258311// CRTC "VINAS 1+2 / VICON" at 0xe80000
312/* 0xe80000 - Registers (all are 16-bit):
313 * 0 - Horizontal Total (in characters)
314 * 1 - Horizontal Sync End
315 * 2 - Horizontal Display Begin
316 * 3 - Horizontal Display End
317 * 4 - Vertical Total (in scanlines)
318 * 5 - Vertical Sync End
319 * 6 - Vertical Display Begin
320 * 7 - Vertical Display End
321 * 8 - Fine Horizontal Sync Adjustment
322 * 9 - Raster Line (for Raster IRQ mapped to MFP GPIP6)
323 * 10/11 - Text Layer X and Y Scroll
324 * 12/13 - Graphic Layer 0 X and Y Scroll
325 * 14/15 - Graphic Layer 1 X and Y Scroll
326 * 16/17 - Graphic Layer 2 X and Y Scroll
327 * 18/19 - Graphic Layer 3 X and Y Scroll
328 * 20 - bit 12 - Text VRAM mode : 0 = display, 1 = buffer
329 *      bit 11 - Graphic VRAM mode : 0 = display, 1 = buffer
330 *      bit 10 - "Real" screen size : 0 = 512x512, 1 = 1024x1024
331 *      bits 8,9 - Colour mode :
332 *                 00 = 16 colour      01 = 256 colour
333 *                 10 = Undefined      11 = 65,536 colour
334 *      bit 4 - Horizontal Frequency : 0 = 15.98kHz, 1 = 31.50kHz
335 *      bits 2,3 - Vertical dots :
336 *                 00 = 256            01 = 512
337 *                 10 or 11 = 1024 (interlaced)
338 *      bits 0,1 - Horizontal dots :
339 *                 00 = 256            01 = 512
340 *                 10 = 768            11 = 50MHz clock mode (Compact XVI or later)
341 * 21 - bit 9 - Text Screen Access Mask Enable
342 *      bit 8 - Text Screen Simultaneous Plane Access Enable
343 *      bits 4-7 - Text Screen Simultaneous Plane Access Select
344 *      bits 0-3 - Text Screen Line Copy Plane Select
345 *                 Graphic Screen High-speed Clear Page Select
346 * 22 - Text Screen Line Copy
347 *      bits 15-8 - Source Line
348 *      bits 7-0 - Destination Line
349 * 23 - Text Screen Mask Pattern
350 *
351 * 0xe80481 - Operation Port (8-bit):
352 *      bit 3 - Text Screen Line Copy Begin
353 *      bit 1 - Graphic Screen High-speed Clear Begin
354 *      bit 0 - Image Taking Begin (?)
355 *    Operation Port bits are cleared automatically when the requested
356 *    operation is completed.
357 */
259358WRITE16_HANDLER( x68k_crtc_w )
260359{
261360   COMBINE_DATA(sys.crtc.reg+offset);
r1400r1401
273372      x68k_crtc_refresh_mode();
274373      break;
275374   case 9:  // CRTC raster IRQ (GPIP6)
276      timer_adjust(raster_irq,attotime_never,0,attotime_never);  // disable timer
277      if(sys.crtc.height == 256)  // adjust to visible area
375      if((data / sys.crtc.vmultiple) < sys.crtc.vtotal)
278376      {
279         data = data / 2;
280         data -= (sys.crtc.reg[6] / 2);
281         if(data > (sys.crtc.reg[4] / 2))  // data is unsigned
282            data += sys.crtc.reg[4] / 2;
377   //      if(data <= sys.crtc.video_height)
378         {
379            attotime irq_time;
380            irq_time = video_screen_get_time_until_pos(0,(data - 1) / sys.crtc.vmultiple,2);
381   
382            if(attotime_to_double(irq_time) > 0)
383               timer_adjust(raster_irq,irq_time,(data - 1) / sys.crtc.vmultiple,attotime_never);
384            logerror("CRTC: Time until next raster IRQ = %f\n",attotime_to_double(irq_time));
385         }
283386      }
284387      else
285388      {
286         data -= sys.crtc.reg[6];
287         if(data > sys.crtc.reg[4])
288            data += sys.crtc.reg[4];
389         timer_adjust(raster_irq,attotime_zero,0,attotime_never);  // disable timer
289390      }
290      if(data <= sys.crtc.video_height)
291      {
292         attotime irq_time;
293         irq_time = video_screen_get_time_until_pos(0,data - 1,2);
294
295         if(attotime_to_double(irq_time) > 0)
296            timer_adjust(raster_irq,irq_time,data - 1,attotime_never);
297         logerror("CRTC: Time until next raster IRQ = %f\n",attotime_to_double(irq_time));
298      }
299391      logerror("CRTC: Write to raster IRQ register - %i\n",data);
300392      break;
301393   case 20:
r1400r1401
534626   switch(offset)
535627   {
536628   case 0x400:
537      tilemap_set_scrollx(x68k_bg0_8,0,(data - sys.crtc.hshift) & 0x3ff);
538      tilemap_set_scrollx(x68k_bg0_16,0,(data - sys.crtc.hshift) & 0x3ff);
629      tilemap_set_scrollx(x68k_bg0_8,0,(data - sys.crtc.hbegin) & 0x3ff);
630      tilemap_set_scrollx(x68k_bg0_16,0,(data - sys.crtc.hbegin) & 0x3ff);
539631      break;
540632   case 0x401:
541      tilemap_set_scrolly(x68k_bg0_8,0,(data - sys.crtc.vshift) & 0x3ff);
542      tilemap_set_scrolly(x68k_bg0_16,0,(data - sys.crtc.vshift) & 0x3ff);
633      tilemap_set_scrolly(x68k_bg0_8,0,(data - sys.crtc.vbegin) & 0x3ff);
634      tilemap_set_scrolly(x68k_bg0_16,0,(data - sys.crtc.vbegin) & 0x3ff);
543635      break;
544636   case 0x402:
545      tilemap_set_scrollx(x68k_bg1_8,0,(data - sys.crtc.hshift) & 0x3ff);
546      tilemap_set_scrollx(x68k_bg1_16,0,(data - sys.crtc.hshift) & 0x3ff);
637      tilemap_set_scrollx(x68k_bg1_8,0,(data - sys.crtc.hbegin) & 0x3ff);
638      tilemap_set_scrollx(x68k_bg1_16,0,(data - sys.crtc.hbegin) & 0x3ff);
547639      break;
548640   case 0x403:
549      tilemap_set_scrolly(x68k_bg1_8,0,(data - sys.crtc.vshift) & 0x3ff);
550      tilemap_set_scrolly(x68k_bg1_16,0,(data - sys.crtc.vshift) & 0x3ff);
641      tilemap_set_scrolly(x68k_bg1_8,0,(data - sys.crtc.vbegin) & 0x3ff);
642      tilemap_set_scrolly(x68k_bg1_16,0,(data - sys.crtc.vbegin) & 0x3ff);
551643      break;
552644   case 0x405:  // BG H-DISP (like CRTC reg 2)
553645      if(data != 0x00ff)
r1400r1401
616708         rect.max_y=rect.min_y + sys.crtc.visible_height-1;
617709         if(sys.video.reg[2] & 0x0010 && priority == sys.video.gfxlayer_pri[0])
618710         {
619            xscr = sys.crtc.hshift-(sys.crtc.reg[12] & 0x1ff);
620            yscr = sys.crtc.vshift-(sys.crtc.reg[13] & 0x1ff);
711            xscr = sys.crtc.hbegin-(sys.crtc.reg[12] & 0x1ff);
712            yscr = sys.crtc.vbegin-(sys.crtc.reg[13] & 0x1ff);
621713            copyscrollbitmap(bitmap, x68k_gfx_0_bitmap_16, 1, &xscr, 1, &yscr ,&cliprect, TRANSPARENCY_PEN,0);
622714            xscr+=512;
623715            copyscrollbitmap(bitmap, x68k_gfx_1_bitmap_16, 1, &xscr, 1, &yscr ,&cliprect, TRANSPARENCY_PEN,0);
r1400r1401
639731               rect.min_y=sys.crtc.vshift;
640732               rect.max_x=rect.min_x + sys.crtc.visible_width-1;
641733               rect.max_y=rect.min_y + sys.crtc.visible_height-1;
642               xscr = sys.crtc.hshift-(sys.crtc.reg[12] & 0x1ff);
643               yscr = sys.crtc.vshift-(sys.crtc.reg[13] & 0x1ff);
734               xscr = sys.crtc.hbegin-(sys.crtc.reg[12] & 0x1ff);
735               yscr = sys.crtc.vbegin-(sys.crtc.reg[13] & 0x1ff);
644736               copyscrollbitmap(bitmap, x68k_gfx_0_bitmap_65536, 1, &xscr, 1, &yscr,&cliprect, TRANSPARENCY_PEN,0);
645737            }
646738            break;
r1400r1401
652744            rect.max_y=rect.min_y + sys.crtc.visible_height-1;
653745            if(sys.video.reg[2] & 0x0004 && sys.video.reg[2] & 0x0008 && priority == sys.video.gfxlayer_pri[2])
654746            {
655               xscr = sys.crtc.hshift-(sys.crtc.reg[16] & 0x1ff);
656               yscr = sys.crtc.vshift-(sys.crtc.reg[17] & 0x1ff);
747               xscr = sys.crtc.hbegin-(sys.crtc.reg[16] & 0x1ff);
748               yscr = sys.crtc.vbegin-(sys.crtc.reg[17] & 0x1ff);
657749               copyscrollbitmap(bitmap, x68k_gfx_1_bitmap_256, 1, &xscr, 1, &yscr, &cliprect, TRANSPARENCY_PEN,0);
658750            }
659751            if(sys.video.reg[2] & 0x0001 && sys.video.reg[2] & 0x0002 && priority == sys.video.gfxlayer_pri[0])
660752            {
661               xscr = sys.crtc.hshift-(sys.crtc.reg[12] & 0x1ff);
662               yscr = sys.crtc.vshift-(sys.crtc.reg[13] & 0x1ff);
753               xscr = sys.crtc.hbegin-(sys.crtc.reg[12] & 0x1ff);
754               yscr = sys.crtc.vbegin-(sys.crtc.reg[13] & 0x1ff);
663755               copyscrollbitmap(bitmap, x68k_gfx_0_bitmap_256, 1, &xscr, 1, &yscr, &cliprect, TRANSPARENCY_PEN,0);
664756            }
665757            break;
r1400r1401
671763            rect.max_y=rect.min_y + sys.crtc.visible_height-1;
672764            if(sys.video.reg[2] & 0x0008)  // Pri3
673765            {
674               xscr = sys.crtc.hshift-(sys.crtc.reg[18] & 0x1ff);
675               yscr = sys.crtc.vshift-(sys.crtc.reg[19] & 0x1ff);
766               xscr = sys.crtc.hbegin-(sys.crtc.reg[18] & 0x1ff);
767               yscr = sys.crtc.vbegin-(sys.crtc.reg[19] & 0x1ff);
676768               copyscrollbitmap(bitmap, x68k_get_gfx_pri(3,GFX16), 1, &xscr, 1, &yscr ,&cliprect, TRANSPARENCY_PEN,0);
677769            }
678770            if(sys.video.reg[2] & 0x0004)  // Pri2
679771            {
680               xscr = sys.crtc.hshift-(sys.crtc.reg[16] & 0x1ff);
681               yscr = sys.crtc.vshift-(sys.crtc.reg[17] & 0x1ff);
772               xscr = sys.crtc.hbegin-(sys.crtc.reg[16] & 0x1ff);
773               yscr = sys.crtc.vbegin-(sys.crtc.reg[17] & 0x1ff);
682774               copyscrollbitmap(bitmap, x68k_get_gfx_pri(2,GFX16), 1, &xscr, 1, &yscr ,&cliprect, TRANSPARENCY_PEN,0);
683775            }
684776            if(sys.video.reg[2] & 0x0002)  // Pri1
685777            {
686               xscr = sys.crtc.hshift-(sys.crtc.reg[14] & 0x1ff);
687               yscr = sys.crtc.vshift-(sys.crtc.reg[15] & 0x1ff);
778               xscr = sys.crtc.hbegin-(sys.crtc.reg[14] & 0x1ff);
779               yscr = sys.crtc.vbegin-(sys.crtc.reg[15] & 0x1ff);
688780               copyscrollbitmap(bitmap, x68k_get_gfx_pri(1,GFX16), 1, &xscr, 1, &yscr ,&cliprect, TRANSPARENCY_PEN,0);
689781            }
690782            if(sys.video.reg[2] & 0x0001)  // Pri0
691783            {
692               xscr = sys.crtc.hshift-(sys.crtc.reg[12] & 0x1ff);
693               yscr = sys.crtc.vshift-(sys.crtc.reg[13] & 0x1ff);
784               xscr = sys.crtc.hbegin-(sys.crtc.reg[12] & 0x1ff);
785               yscr = sys.crtc.vbegin-(sys.crtc.reg[13] & 0x1ff);
694786               copyscrollbitmap(bitmap, x68k_get_gfx_pri(0,GFX16), 1, &xscr, 1, &yscr ,&cliprect, TRANSPARENCY_PEN,0);
695787            }
696788            break;
r1400r1401
756848
757849         sx += sprite_shift;
758850
759         drawgfx(bitmap,Machine->gfx[1],code,colour+0x10,xflip,yflip,sys.crtc.hshift+sx,sys.crtc.vshift+sy,&cliprect,TRANSPARENCY_PEN,0x00);
851         drawgfx(bitmap,Machine->gfx[1],code,colour+0x10,xflip,yflip,sys.crtc.hbegin+sx,sys.crtc.vbegin+sy,&cliprect,TRANSPARENCY_PEN,0x00);
760852      }
761853   }
762854}
r1400r1401
859951   /* create the char set (gfx will then be updated dynamically from RAM) */
860952   Machine->gfx[gfx_index] = allocgfx(&x68k_pcg_8);
861953   decodegfx(Machine->gfx[gfx_index] , memory_region(REGION_USER1), 0, 256);
862   /* 7-Sep-2007 - After 0.118u5, you cannot change the colortable */
863   /* Machine->gfx[gfx_index]->colortable = (Machine->remapped_colortable+0x100); */
864954   Machine->gfx[gfx_index]->total_colors = 32;
865955
866956   gfx_index++;
867957
868958   Machine->gfx[gfx_index] = allocgfx(&x68k_pcg_16);
869959   decodegfx(Machine->gfx[gfx_index] , memory_region(REGION_USER1), 0, 256);
870   /* 7-Sep-2007 - After 0.118u5, you cannot change the colortable */
871   /* Machine->gfx[gfx_index]->colortable = (Machine->remapped_colortable+0x100); */
872960   Machine->gfx[gfx_index]->total_colors = 32;
873961
874962   /* Tilemaps */
r1400r1401
908996//   rect.max_y=sys.crtc.height;
909997   fillbitmap(bitmap,0,cliprect);
910998
911   rect.min_x=sys.crtc.hshift;
912   rect.min_y=sys.crtc.vshift;
913   rect.max_x=rect.min_x + sys.crtc.visible_width-1;
914   rect.max_y=rect.min_y + sys.crtc.visible_height-1;
999   rect.min_x=sys.crtc.hbegin;
1000   rect.min_y=sys.crtc.vbegin;
1001//   rect.max_x=rect.min_x + sys.crtc.visible_width-1;
1002//   rect.max_y=rect.min_y + sys.crtc.visible_height-1;
1003   rect.max_x=sys.crtc.hend + 1;
1004   rect.max_y=sys.crtc.vend + 1;
1005
9151006   if(rect.min_y < cliprect->min_y)
9161007      rect.min_y = cliprect->min_y;
9171008   if(rect.max_y > cliprect->max_y)
r1400r1401
9461037         {
9471038            if((x68k_spritereg[0x404] & 0x0030) == 0x10)  // BG1 TXSEL
9481039            {
949               tilemap_set_scrollx(x68k_bg0,0,(x68k_spritereg[0x402] - sys.crtc.hshift) & 0x3ff);
950               tilemap_set_scrolly(x68k_bg0,0,(x68k_spritereg[0x403] - sys.crtc.vshift) & 0x3ff);
1040               tilemap_set_scrollx(x68k_bg0,0,(x68k_spritereg[0x402] - sys.crtc.hbegin) & 0x3ff);
1041               tilemap_set_scrolly(x68k_bg0,0,(x68k_spritereg[0x403] - sys.crtc.vbegin) & 0x3ff);
9511042               tilemap_draw(bitmap,&rect,x68k_bg0,0,0);
9521043            }
9531044            else
9541045            {
955               tilemap_set_scrollx(x68k_bg1,0,(x68k_spritereg[0x402] - sys.crtc.hshift) & 0x3ff);
956               tilemap_set_scrolly(x68k_bg1,0,(x68k_spritereg[0x403] - sys.crtc.vshift) & 0x3ff);
1046               tilemap_set_scrollx(x68k_bg1,0,(x68k_spritereg[0x402] - sys.crtc.hbegin) & 0x3ff);
1047               tilemap_set_scrolly(x68k_bg1,0,(x68k_spritereg[0x403] - sys.crtc.vbegin) & 0x3ff);
9571048               tilemap_draw(bitmap,&rect,x68k_bg1,0,0);
9581049            }
9591050         }
r1400r1401
9621053         {
9631054            if((x68k_spritereg[0x404] & 0x0006) == 0x02)  // BG0 TXSEL
9641055            {
965               tilemap_set_scrollx(x68k_bg0,0,(x68k_spritereg[0x400] - sys.crtc.hshift) & 0x3ff);
966               tilemap_set_scrolly(x68k_bg0,0,(x68k_spritereg[0x401] - sys.crtc.vshift) & 0x3ff);
1056               tilemap_set_scrollx(x68k_bg0,0,(x68k_spritereg[0x400] - sys.crtc.hbegin) & 0x3ff);
1057               tilemap_set_scrolly(x68k_bg0,0,(x68k_spritereg[0x401] - sys.crtc.vbegin) & 0x3ff);
9671058               tilemap_draw(bitmap,&rect,x68k_bg0,0,0);
9681059            }
9691060            else
9701061            {
971               tilemap_set_scrollx(x68k_bg1,0,(x68k_spritereg[0x400] - sys.crtc.hshift) & 0x3ff);
972               tilemap_set_scrolly(x68k_bg1,0,(x68k_spritereg[0x401] - sys.crtc.vshift) & 0x3ff);
1062               tilemap_set_scrollx(x68k_bg1,0,(x68k_spritereg[0x400] - sys.crtc.hbegin) & 0x3ff);
1063               tilemap_set_scrolly(x68k_bg1,0,(x68k_spritereg[0x401] - sys.crtc.vbegin) & 0x3ff);
9731064               tilemap_draw(bitmap,&rect,x68k_bg1,0,0);
9741065            }
9751066         }
r1400r1401
9791070      // Text screen
9801071      if(sys.video.reg[2] & 0x0020 && priority == sys.video.text_pri)
9811072      {
982         xscr = sys.crtc.hshift-(sys.crtc.reg[10] & 0x3ff);
983         yscr = sys.crtc.vshift-(sys.crtc.reg[11] & 0x3ff);
1073         xscr = sys.crtc.hbegin-(sys.crtc.reg[10] & 0x3ff);
1074         yscr = sys.crtc.vbegin-(sys.crtc.reg[11] & 0x3ff);
9841075#ifdef MAME_DEBUG
9851076         if(!input_code_pressed(KEYCODE_Q))
9861077#endif
src/mess/drivers/x68k.c
r1400r1401
990990      return 0xff;
991991   }
992992}
993
993*/
994994WRITE16_HANDLER( x68k_mfp_w )
995{*/
995{
996996   /* For the Interrupt registers, the bits are set out as such:
997997      Reg A - bit 7: GPIP7 (HSync)
998998              bit 6: GPIP6 (CRTC CIRQ)
r1400r1401
10111011            bit 1: GPIP1 (EXPON)
10121012            bit 0: GPIP0 (Alarm)
10131013   */
1014/*   switch(offset)
1014   switch(offset)
10151015   {
1016   case 0:  // GPDR
1016/*   case 0:  // GPDR
10171017      // All bits are inputs generally, so no action taken.
10181018      break;
10191019   case 1:  // AER
r1400r1401
10961096         sys.mfp.usart.recv_enable = 1;
10971097      else
10981098         sys.mfp.usart.recv_enable = 0;
1099      break;
1099      break;*/
11001100   case 22:
11011101      if(data & 0x01)
11021102         sys.mfp.usart.send_enable = 1;
r1400r1401
11131113      }
11141114      break;
11151115   default:
1116      logerror("MFP: Writing 0x%04x to offset %i\n",data,offset);
1116      mfp68901_0_register_lsb_w(offset,data,mem_mask);
11171117      return;
11181118   }
11191119}
1120*/
11211120
1121
11221122WRITE16_HANDLER( x68k_ppi_w )
11231123{
11241124   ppi8255_w(0,offset & 0x03,data);
r1400r1401
11931193
11941194   if(offset >= 0x100 && offset < 0x200)
11951195   {
1196      COMBINE_DATA(sys.video.text_pal+offset);
1197      val = sys.video.text_pal[offset];
1196      COMBINE_DATA(sys.video.text_pal+(offset-0x100));
1197      val = sys.video.text_pal[offset-0x100];
11981198      palette_set_color_rgb(Machine,offset,(val & 0x07c0) >> 3,(val & 0xf800) >> 8,(val & 0x003e) << 2);
11991199      return;
12001200   }
r1400r1401
12281228      return sys.video.gfx_pal[offset];
12291229
12301230   if(offset >= 0x100 && offset < 0x200)
1231      return sys.video.text_pal[offset];
1231      return sys.video.text_pal[offset-0x100];
12321232
12331233   switch(offset)
12341234   {
r1400r1401
13851385   else
13861386   {
13871387      sys.mfp.gpio &= ~0x08;
1388      current_vector[6] = 0x43;
13891388   }
13901389   
13911390}
r1400r1401
13941393{
13951394   UINT8 data = sys.mfp.gpio;
13961395   
1397   data &= ~(video_screen_get_hblank(0) << 7);
1396   data &= ~(sys.crtc.hblank << 7);
13981397   data &= ~(sys.crtc.vblank << 4);
13991398   data |= 0x23;  // GPIP5 is unused, always 1
14001399   mfp68901_tai_w(0,sys.crtc.vblank);
r1400r1401
14831482   AM_RANGE(0xe82000, 0xe83fff) AM_READWRITE(x68k_vid_r, x68k_vid_w)
14841483   AM_RANGE(0xe84000, 0xe85fff) AM_READWRITE(x68k_dmac_r, x68k_dmac_w)
14851484   AM_RANGE(0xe86000, 0xe87fff) AM_READWRITE(x68k_areaset_r, x68k_areaset_w)
1486   AM_RANGE(0xe88000, 0xe89fff) AM_READWRITE(mfp68901_0_register_lsb_r, mfp68901_0_register_lsb_w)
1485   AM_RANGE(0xe88000, 0xe89fff) AM_READWRITE(mfp68901_0_register_lsb_r, x68k_mfp_w)
14871486   AM_RANGE(0xe8a000, 0xe8bfff) AM_READWRITE(x68k_rtc_r, x68k_rtc_w)
14881487//  AM_RANGE(0xe8c000, 0xe8dfff) AM_READWRITE(x68k_printer_r, x68k_printer_w)
14891488   AM_RANGE(0xe8e000, 0xe8ffff) AM_READWRITE(x68k_sysport_r, x68k_sysport_w)
r1400r1401
15081507static mfp68901_interface mfp_interface =
15091508{
15101509   2000000, // 4MHz clock
1511   2000000,
1510   4000000,
15121511   MFP68901_TDO_LOOPBACK,
15131512   0,
15141513   &mfp_key,  // Rx
r1400r1401
19631962   // init keyboard
19641963   sys.keyboard.delay = 500;  // 3*100+200
19651964   sys.keyboard.repeat = 110;  // 4^2*5+30
1966   kb_timer = timer_alloc(x68k_keyboard_poll, NULL);
1967   scanline_timer = timer_alloc(x68k_hsync, NULL);
1968   raster_irq = timer_alloc(x68k_crtc_raster_irq, NULL);
1969   vblank_irq = timer_alloc(x68k_crtc_vblank_irq, NULL);
1970   mouse_timer = timer_alloc(x68k_scc_ack, NULL);
1965   kb_timer = timer_alloc(x68k_keyboard_poll,NULL);
1966   scanline_timer = timer_alloc(x68k_hsync,NULL);
1967   raster_irq = timer_alloc(x68k_crtc_raster_irq,NULL);
1968   vblank_irq = timer_alloc(x68k_crtc_vblank_irq,NULL);
1969   mouse_timer = timer_alloc(x68k_scc_ack,NULL);
19711970}
19721971
19731972
docs/messnew.txt
r1400r1401
1616
1717- [SYM1] Fixed bug #1442.  [Dirk Best]
1818
19- [X68000] Improved video timing.  [Barry Rodewald]
1920
2021
22
2123User Interface Changes:
2224-----------------------
2325- [Windows] Fixed occasional crash in menu bar when multithreading is on.

Previous 15994 Revisions Next


© 1998-2018 The MESS Team