Previous 15994 Revisions Next

r13342 Tuesday 22nd November, 2011 at 19:54:00 UTC by Wilbert Pol
SMS Family: Refactored callbacks to use device callbacks. Prefixed #defines with SMS_. (nw)
[src/mess/drivers]sms.c
[src/mess/includes]sms.h
[src/mess/machine]sms.c
[src/mess/video]smsvdp.c smsvdp.h

src/mess/machine/sms.c
r13341r13342
555555 Check if the pause button is pressed.
556556 If the gamegear is in sms mode, check if the start button is pressed.
557557 */
558void sms_pause_callback( running_machine &machine )
558WRITE_LINE_DEVICE_HANDLER( sms_pause_callback )
559559{
560   sms_state *state = machine.driver_data<sms_state>();
560   sms_state *driver_state = device->machine().driver_data<sms_state>();
561561
562   if (state->m_is_gamegear && !(state->m_cartridge[state->m_current_cartridge].features & CF_GG_SMS_MODE))
562   if (driver_state->m_is_gamegear && !(driver_state->m_cartridge[driver_state->m_current_cartridge].features & CF_GG_SMS_MODE))
563563      return;
564564
565   if (!(input_port_read(machine, state->m_is_gamegear ? "START" : "PAUSE") & 0x80))
565   if (!(input_port_read(device->machine(), driver_state->m_is_gamegear ? "START" : "PAUSE") & 0x80))
566566   {
567      if (!state->m_paused)
567      if (!driver_state->m_paused)
568568      {
569         cputag_set_input_line(machine, "maincpu", INPUT_LINE_NMI, PULSE_LINE);
569         cputag_set_input_line(device->machine(), "maincpu", INPUT_LINE_NMI, PULSE_LINE);
570570      }
571      state->m_paused = 1;
571      driver_state->m_paused = 1;
572572   }
573573   else
574574   {
575      state->m_paused = 0;
575      driver_state->m_paused = 0;
576576   }
577577
578578   /* clear Light Phaser latch flags for next frame */
579   state->m_lphaser_1_latch = 0;
580   state->m_lphaser_2_latch = 0;
579   driver_state->m_lphaser_1_latch = 0;
580   driver_state->m_lphaser_2_latch = 0;
581581}
582582
583583READ8_HANDLER( sms_input_port_0_r )
r13341r13342
18401840   state->m_store_control = data;
18411841}
18421842
1843void sms_store_int_callback( running_machine &machine, int state )
1843WRITE_LINE_DEVICE_HANDLER( sms_store_int_callback )
18441844{
1845   sms_state *driver_state = machine.driver_data<sms_state>();
1845   sms_state *driver_state = device->machine().driver_data<sms_state>();
18461846   device_set_input_line(driver_state->m_store_control & 0x01 ? driver_state->m_control_cpu : driver_state->m_main_cpu, 0, state);
18471847}
18481848
src/mess/video/smsvdp.c
r13341r13342
5050#include "emu.h"
5151#include "video/smsvdp.h"
5252
53#define IS_SMS1_VDP           (smsvdp->features & MODEL_315_5124)
54#define IS_SMS2_VDP           (smsvdp->features & MODEL_315_5246)
55#define IS_GAMEGEAR_VDP       (smsvdp->features & MODEL_315_5378)
53#define IS_SMS1_VDP           (smsvdp->m_features & MODEL_315_5124)
54#define IS_SMS2_VDP           (smsvdp->m_features & MODEL_315_5246)
55#define IS_GAMEGEAR_VDP       (smsvdp->m_features & MODEL_315_5378)
5656
5757#define STATUS_VINT           0x80   /* Pending vertical interrupt flag */
5858#define STATUS_SPROVR         0x40   /* Sprite overflow flag */
r13341r13342
7474#define VRAM_SIZE             0x4000
7575
7676#define PRIORITY_BIT          0x1000
77#define BACKDROP_COLOR        ((smsvdp->vdp_mode == 4 ? 0x10 : 0x00) + (smsvdp->reg[0x07] & 0x0f))
77#define BACKDROP_COLOR        ((smsvdp->m_vdp_mode == 4 ? 0x10 : 0x00) + (smsvdp->m_reg[0x07] & 0x0f))
7878
7979#define NUM_OF_REGISTER       0x10  /* 16 registers */
8080
r13341r13342
9797typedef struct _smsvdp_t smsvdp_t;
9898struct _smsvdp_t
9999{
100   UINT32           features;
101   UINT8            reg[NUM_OF_REGISTER];     /* All the registers */
102   UINT8            status;                   /* Status register */
103   UINT8            reg9copy;                 /* Internal copy of register 9 */
104   UINT8            addrmode;                 /* Type of VDP action */
105   UINT16           addr;                     /* Contents of internal VDP address register */
106   UINT8            cram_mask;                /* Mask to switch between SMS and GG CRAM sizes */
107   int              cram_dirty;               /* Have there been any changes to the CRAM area */
108   int              pending;
109   UINT8            buffer;
110   int              gg_sms_mode;              /* Shrunk SMS screen on GG lcd mode flag */
111   int              irq_state;                /* The status of the IRQ line of the VDP */
112   int              vdp_mode;                 /* Current mode of the VDP: 0,1,2,3,4 */
113   int              y_pixels;                 /* 192, 224, 240 */
114   UINT8            line_counter;
115   UINT8            hcounter;
116   memory_region            *VRAM;                    /* Pointer to VRAM */
117   memory_region            *CRAM;                    /* Pointer to CRAM */
118   const UINT8      *sms_frame_timing;
119   bitmap_t         *tmpbitmap;
120   UINT8            *collision_buffer;
100   UINT32           m_features;
101   UINT8            m_reg[NUM_OF_REGISTER];     /* All the registers */
102   UINT8            m_status;                   /* Status register */
103   UINT8            m_reg9copy;                 /* Internal copy of register 9 */
104   UINT8            m_addrmode;                 /* Type of VDP action */
105   UINT16           m_addr;                     /* Contents of internal VDP address register */
106   UINT8            m_cram_mask;                /* Mask to switch between SMS and GG CRAM sizes */
107   int              m_cram_dirty;               /* Have there been any changes to the CRAM area */
108   int              m_pending;
109   UINT8            m_buffer;
110   int              m_gg_sms_mode;              /* Shrunk SMS screen on GG lcd mode flag */
111   int              m_irq_state;                /* The status of the IRQ line of the VDP */
112   int              m_vdp_mode;                 /* Current mode of the VDP: 0,1,2,3,4 */
113   int              m_y_pixels;                 /* 192, 224, 240 */
114   UINT8            m_line_counter;
115   UINT8            m_hcounter;
116   memory_region    *m_VRAM;                    /* Pointer to VRAM */
117   memory_region    *m_CRAM;                    /* Pointer to CRAM */
118   const UINT8      *m_sms_frame_timing;
119   bitmap_t         *m_tmpbitmap;
120   UINT8            *m_collision_buffer;
121121
122122   /* line_buffer will be used to hold 5 lines of line data. Line #0 is the regular blitting area.
123123       Lines #1-#4 will be used as a kind of cache to be used for vertical scaling in the gamegear
124124       sms compatibility mode. */
125   int              *line_buffer;
126   int              current_palette[32];
127   smsvdp_int_cb    int_callback;
128   smsvdp_pause_cb  pause_callback;
129   emu_timer        *smsvdp_display_timer;
125   int              *m_line_buffer;
126   int              m_current_palette[32];
127   devcb_resolved_write_line   m_int_callback;
128   devcb_resolved_write_line   m_pause_callback;
129   emu_timer        *m_smsvdp_display_timer;
130130};
131131
132132static TIMER_CALLBACK( smsvdp_display_callback );
r13341r13342
166166   screen_device *screen = device->machine().first_screen();
167167   int height = screen->height();
168168   int M1, M2, M3, M4;
169   M1 = smsvdp->reg[0x01] & 0x10;
170   M2 = smsvdp->reg[0x00] & 0x02;
171   M3 = smsvdp->reg[0x01] & 0x08;
172   M4 = smsvdp->reg[0x00] & 0x04;
173   smsvdp->y_pixels = 192;
169   M1 = smsvdp->m_reg[0x01] & 0x10;
170   M2 = smsvdp->m_reg[0x00] & 0x02;
171   M3 = smsvdp->m_reg[0x01] & 0x08;
172   M4 = smsvdp->m_reg[0x00] & 0x04;
173   smsvdp->m_y_pixels = 192;
174174   if (M4)
175175   {
176176      /* mode 4 */
177      smsvdp->vdp_mode = 4;
177      smsvdp->m_vdp_mode = 4;
178178      if (M2 && (IS_SMS2_VDP || IS_GAMEGEAR_VDP))
179179      {
180180         if (M1 && !M3)
181            smsvdp->y_pixels = 224;   /* 224-line display */
181            smsvdp->m_y_pixels = 224;   /* 224-line display */
182182         else if (!M1 && M3)
183            smsvdp->y_pixels = 240;   /* 240-line display */
183            smsvdp->m_y_pixels = 240;   /* 240-line display */
184184      }
185185   }
186186   else
r13341r13342
188188      /* original TMS9918 mode */
189189      if (!M1 && !M2 && !M3)
190190      {
191         smsvdp->vdp_mode = 0;
191         smsvdp->m_vdp_mode = 0;
192192      }
193193      else
194194//      if (M1 && !M2 && !M3)
195195//      {
196//          smsvdp->vdp_mode = 1;
196//          smsvdp->m_vdp_mode = 1;
197197//      }
198198//      else
199199      if (!M1 && M2 && !M3)
200200      {
201         smsvdp->vdp_mode = 2;
201         smsvdp->m_vdp_mode = 2;
202202//      }
203203//      else
204204//      if (!M1 && !M2 && M3)
205205//      {
206//          smsvdp->vdp_mode = 3;
206//          smsvdp->m_vdp_mode = 3;
207207      }
208208      else
209209      {
r13341r13342
211211      }
212212   }
213213
214   switch (smsvdp->y_pixels)
214   switch (smsvdp->m_y_pixels)
215215   {
216216   case 192:
217      smsvdp->sms_frame_timing = (height == PAL_Y_PIXELS) ? sms_pal_192 : sms_ntsc_192;
217      smsvdp->m_sms_frame_timing = (height == SMS_PAL_Y_PIXELS) ? sms_pal_192 : sms_ntsc_192;
218218      break;
219219
220220   case 224:
221      smsvdp->sms_frame_timing = (height == PAL_Y_PIXELS) ? sms_pal_224 : sms_ntsc_224;
221      smsvdp->m_sms_frame_timing = (height == SMS_PAL_Y_PIXELS) ? sms_pal_224 : sms_ntsc_224;
222222      break;
223223
224224   case 240:
225      smsvdp->sms_frame_timing = (height == PAL_Y_PIXELS) ? sms_pal_240 : sms_ntsc_240;
225      smsvdp->m_sms_frame_timing = (height == SMS_PAL_Y_PIXELS) ? sms_pal_240 : sms_ntsc_240;
226226      break;
227227   }
228   smsvdp->cram_dirty = 1;
228   smsvdp->m_cram_dirty = 1;
229229}
230230
231231
r13341r13342
241241         vpos += device->machine().primary_screen->height();
242242   }
243243
244   return (smsvdp->sms_frame_timing[INIT_VCOUNT] + vpos) & 0xff;
244   return (smsvdp->m_sms_frame_timing[INIT_VCOUNT] + vpos) & 0xff;
245245}
246246
247247
r13341r13342
249249{
250250   smsvdp_t *smsvdp = get_safe_token(device);
251251
252   return smsvdp->hcounter;
252   return smsvdp->m_hcounter;
253253}
254254
255255WRITE8_DEVICE_HANDLER( sms_vdp_hcount_latch_w )
256256{
257257   smsvdp_t *smsvdp = get_safe_token(device);
258258
259   smsvdp->hcounter = data;
259   smsvdp->m_hcounter = data;
260260}
261261
262262
r13341r13342
264264{
265265   smsvdp_t *smsvdp = get_safe_token(device);
266266
267   smsvdp->gg_sms_mode = mode;
268   smsvdp->cram_mask = (IS_GAMEGEAR_VDP && !smsvdp->gg_sms_mode) ? (GG_CRAM_SIZE - 1) : (SMS_CRAM_SIZE - 1);
267   smsvdp->m_gg_sms_mode = mode;
268   smsvdp->m_cram_mask = (IS_GAMEGEAR_VDP && !smsvdp->m_gg_sms_mode) ? (GG_CRAM_SIZE - 1) : (SMS_CRAM_SIZE - 1);
269269}
270270
271271
r13341r13342
273273{
274274   smsvdp_t *smsvdp = (smsvdp_t *) ptr;
275275
276   smsvdp->status |= (UINT8) param;
276   smsvdp->m_status |= (UINT8) param;
277277}
278278
279279
r13341r13342
281281{
282282   smsvdp_t *smsvdp = (smsvdp_t *) ptr;
283283
284   if (smsvdp->line_counter == 0x00)
284   if (smsvdp->m_line_counter == 0x00)
285285   {
286      smsvdp->line_counter = smsvdp->reg[0x0a];
287      smsvdp->status |= STATUS_HINT;
286      smsvdp->m_line_counter = smsvdp->m_reg[0x0a];
287      smsvdp->m_status |= STATUS_HINT;
288288   }
289289   else
290290   {
291      smsvdp->line_counter--;
291      smsvdp->m_line_counter--;
292292   }
293293
294   if ((smsvdp->status & STATUS_HINT) && (smsvdp->reg[0x00] & 0x10))
294   if ((smsvdp->m_status & STATUS_HINT) && (smsvdp->m_reg[0x00] & 0x10))
295295   {
296      smsvdp->irq_state = 1;
296      smsvdp->m_irq_state = 1;
297297
298      if (smsvdp->int_callback)
299         smsvdp->int_callback(machine, ASSERT_LINE);
298      smsvdp->m_int_callback(ASSERT_LINE);
300299   }
301300}
302301
r13341r13342
305304{
306305   smsvdp_t *smsvdp = (smsvdp_t *) ptr;
307306
308   if ((smsvdp->status & STATUS_VINT) && (smsvdp->reg[0x01] & 0x20))
307   if ((smsvdp->m_status & STATUS_VINT) && (smsvdp->m_reg[0x01] & 0x20))
309308   {
310      smsvdp->irq_state = 1;
309      smsvdp->m_irq_state = 1;
311310
312      if (smsvdp->int_callback)
313         smsvdp->int_callback(machine, ASSERT_LINE);
311      smsvdp->m_int_callback(ASSERT_LINE);
314312   }
315313}
316314
r13341r13342
321319
322320   rectangle rec;
323321   int vpos = machine.primary_screen->vpos();
324   int vpos_limit = smsvdp->sms_frame_timing[VERTICAL_BLANKING] + smsvdp->sms_frame_timing[TOP_BLANKING]
325                  + smsvdp->sms_frame_timing[TOP_BORDER] + smsvdp->sms_frame_timing[ACTIVE_DISPLAY_V]
326                  + smsvdp->sms_frame_timing[BOTTOM_BORDER] + smsvdp->sms_frame_timing[BOTTOM_BLANKING];
322   int vpos_limit = smsvdp->m_sms_frame_timing[VERTICAL_BLANKING] + smsvdp->m_sms_frame_timing[TOP_BLANKING]
323                  + smsvdp->m_sms_frame_timing[TOP_BORDER] + smsvdp->m_sms_frame_timing[ACTIVE_DISPLAY_V]
324                  + smsvdp->m_sms_frame_timing[BOTTOM_BORDER] + smsvdp->m_sms_frame_timing[BOTTOM_BLANKING];
327325
328326   rec.min_y = rec.max_y = vpos;
329327
330328   /* Check if we're on the last line of a frame */
331329   if (vpos == vpos_limit - 1)
332330   {
333      smsvdp->line_counter = smsvdp->reg[0x0a];
334      if (smsvdp->pause_callback)
335         smsvdp->pause_callback(machine);
331      smsvdp->m_line_counter = smsvdp->m_reg[0x0a];
332      smsvdp->m_pause_callback(0);
336333
337334      return;
338335   }
339336
340   vpos_limit -= smsvdp->sms_frame_timing[BOTTOM_BLANKING];
337   vpos_limit -= smsvdp->m_sms_frame_timing[BOTTOM_BLANKING];
341338
342339   /* Check if we're below the bottom border */
343340   if (vpos >= vpos_limit)
344341   {
345      smsvdp->line_counter = smsvdp->reg[0x0a];
342      smsvdp->m_line_counter = smsvdp->m_reg[0x0a];
346343      return;
347344   }
348345
349   vpos_limit -= smsvdp->sms_frame_timing[BOTTOM_BORDER];
346   vpos_limit -= smsvdp->m_sms_frame_timing[BOTTOM_BORDER];
350347
351348   /* Check if we're in the bottom border area */
352349   if (vpos >= vpos_limit)
r13341r13342
357354      }
358355      else
359356      {
360         smsvdp->line_counter = smsvdp->reg[0x0a];
357         smsvdp->m_line_counter = smsvdp->m_reg[0x0a];
361358      }
362359
363360      if (vpos == vpos_limit + 1)
r13341r13342
369366      sms_update_palette(smsvdp);
370367
371368      /* Draw left border */
372      rec.min_x = LBORDER_START;
373      rec.max_x = LBORDER_START + LBORDER_X_PIXELS - 1;
374      bitmap_fill(smsvdp->tmpbitmap, &rec, machine.pens[smsvdp->current_palette[BACKDROP_COLOR]]);
369      rec.min_x = SMS_LBORDER_START;
370      rec.max_x = SMS_LBORDER_START + SMS_LBORDER_X_PIXELS - 1;
371      bitmap_fill(smsvdp->m_tmpbitmap, &rec, machine.pens[smsvdp->m_current_palette[BACKDROP_COLOR]]);
375372
376373      /* Draw right border */
377      rec.min_x = LBORDER_START + LBORDER_X_PIXELS + 256;
378      rec.max_x = rec.min_x + RBORDER_X_PIXELS - 1;
379      bitmap_fill(smsvdp->tmpbitmap, &rec, machine.pens[smsvdp->current_palette[BACKDROP_COLOR]]);
374      rec.min_x = SMS_LBORDER_START + SMS_LBORDER_X_PIXELS + 256;
375      rec.max_x = rec.min_x + SMS_RBORDER_X_PIXELS - 1;
376      bitmap_fill(smsvdp->m_tmpbitmap, &rec, machine.pens[smsvdp->m_current_palette[BACKDROP_COLOR]]);
380377
381378      /* Draw middle of the border */
382379      /* We need to do this through the regular drawing function so it will */
383380      /* be included in the gamegear scaling functions */
384      sms_refresh_line(machine, smsvdp, smsvdp->tmpbitmap, LBORDER_START + LBORDER_X_PIXELS, vpos_limit - smsvdp->sms_frame_timing[ACTIVE_DISPLAY_V], vpos - (vpos_limit - smsvdp->sms_frame_timing[ACTIVE_DISPLAY_V]));
381      sms_refresh_line(machine, smsvdp, smsvdp->m_tmpbitmap, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS, vpos_limit - smsvdp->m_sms_frame_timing[ACTIVE_DISPLAY_V], vpos - (vpos_limit - smsvdp->m_sms_frame_timing[ACTIVE_DISPLAY_V]));
385382      return;
386383   }
387384
388   vpos_limit -= smsvdp->sms_frame_timing[ACTIVE_DISPLAY_V];
385   vpos_limit -= smsvdp->m_sms_frame_timing[ACTIVE_DISPLAY_V];
389386
390387   /* Check if we're in the active display area */
391388   if (vpos >= vpos_limit)
392389   {
393390      if (vpos == vpos_limit)
394391      {
395         smsvdp->reg9copy = smsvdp->reg[0x09];
392         smsvdp->m_reg9copy = smsvdp->m_reg[0x09];
396393      }
397394
398395      machine.scheduler().timer_set(machine.primary_screen->time_until_pos(vpos, HINT_HPOS), FUNC(smsvdp_check_hint),0, smsvdp);
r13341r13342
400397      sms_update_palette(smsvdp);
401398
402399      /* Draw left border */
403      rec.min_x = LBORDER_START;
404      rec.max_x = LBORDER_START + LBORDER_X_PIXELS - 1;
405      bitmap_fill(smsvdp->tmpbitmap, &rec, machine.pens[smsvdp->current_palette[BACKDROP_COLOR]]);
400      rec.min_x = SMS_LBORDER_START;
401      rec.max_x = SMS_LBORDER_START + SMS_LBORDER_X_PIXELS - 1;
402      bitmap_fill(smsvdp->m_tmpbitmap, &rec, machine.pens[smsvdp->m_current_palette[BACKDROP_COLOR]]);
406403
407404      /* Draw right border */
408      rec.min_x = LBORDER_START + LBORDER_X_PIXELS + 256;
409      rec.max_x = rec.min_x + RBORDER_X_PIXELS - 1;
410      bitmap_fill(smsvdp->tmpbitmap, &rec, machine.pens[smsvdp->current_palette[BACKDROP_COLOR]]);
405      rec.min_x = SMS_LBORDER_START + SMS_LBORDER_X_PIXELS + 256;
406      rec.max_x = rec.min_x + SMS_RBORDER_X_PIXELS - 1;
407      bitmap_fill(smsvdp->m_tmpbitmap, &rec, machine.pens[smsvdp->m_current_palette[BACKDROP_COLOR]]);
411408
412      sms_refresh_line(machine, smsvdp, smsvdp->tmpbitmap, LBORDER_START + LBORDER_X_PIXELS, vpos_limit, vpos - vpos_limit);
409      sms_refresh_line(machine, smsvdp, smsvdp->m_tmpbitmap, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS, vpos_limit, vpos - vpos_limit);
413410
414411      return;
415412   }
416413
417   vpos_limit -= smsvdp->sms_frame_timing[TOP_BORDER];
414   vpos_limit -= smsvdp->m_sms_frame_timing[TOP_BORDER];
418415
419416   /* Check if we're in the top border area */
420417   if (vpos >= vpos_limit)
421418   {
422      smsvdp->line_counter = smsvdp->reg[0x0a];
419      smsvdp->m_line_counter = smsvdp->m_reg[0x0a];
423420      sms_update_palette(smsvdp);
424421
425422      /* Draw left border */
426      rec.min_x = LBORDER_START;
427      rec.max_x = LBORDER_START + LBORDER_X_PIXELS - 1;
428      bitmap_fill(smsvdp->tmpbitmap, &rec, machine.pens[smsvdp->current_palette[BACKDROP_COLOR]]);
423      rec.min_x = SMS_LBORDER_START;
424      rec.max_x = SMS_LBORDER_START + SMS_LBORDER_X_PIXELS - 1;
425      bitmap_fill(smsvdp->m_tmpbitmap, &rec, machine.pens[smsvdp->m_current_palette[BACKDROP_COLOR]]);
429426
430427      /* Draw right border */
431      rec.min_x = LBORDER_START + LBORDER_X_PIXELS + 256;
432      rec.max_x = rec.min_x + RBORDER_X_PIXELS - 1;
433      bitmap_fill(smsvdp->tmpbitmap, &rec, machine.pens[smsvdp->current_palette[BACKDROP_COLOR]]);
428      rec.min_x = SMS_LBORDER_START + SMS_LBORDER_X_PIXELS + 256;
429      rec.max_x = rec.min_x + SMS_RBORDER_X_PIXELS - 1;
430      bitmap_fill(smsvdp->m_tmpbitmap, &rec, machine.pens[smsvdp->m_current_palette[BACKDROP_COLOR]]);
434431
435432      /* Draw middle of the border */
436433      /* We need to do this through the regular drawing function so it will */
437434      /* be included in the gamegear scaling functions */
438      sms_refresh_line(machine, smsvdp, smsvdp->tmpbitmap, LBORDER_START + LBORDER_X_PIXELS, vpos_limit + smsvdp->sms_frame_timing[TOP_BORDER], vpos - (vpos_limit + smsvdp->sms_frame_timing[TOP_BORDER]));
435      sms_refresh_line(machine, smsvdp, smsvdp->m_tmpbitmap, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS, vpos_limit + smsvdp->m_sms_frame_timing[TOP_BORDER], vpos - (vpos_limit + smsvdp->m_sms_frame_timing[TOP_BORDER]));
439436      return;
440437   }
441438
442439   /* we're in the vertical or top blanking area */
443   smsvdp->line_counter = smsvdp->reg[0x0a];
440   smsvdp->m_line_counter = smsvdp->m_reg[0x0a];
444441}
445442
446443
r13341r13342
453450   /* to the address register when in the middle of doing a command.               */
454451   /* Cosmic Spacehead needs this, among others                                    */
455452   /* Clear pending write flag */
456   smsvdp->pending = 0;
453   smsvdp->m_pending = 0;
457454
458455   /* Return read buffer contents */
459   temp = smsvdp->buffer;
456   temp = smsvdp->m_buffer;
460457
461458   /* Load read buffer */
462   smsvdp->buffer = smsvdp->VRAM->u8((smsvdp->addr & 0x3fff));
459   smsvdp->m_buffer = smsvdp->m_VRAM->u8((smsvdp->m_addr & 0x3fff));
463460
464461   /* Bump internal address register */
465   smsvdp->addr += 1;
462   smsvdp->m_addr += 1;
466463   return temp;
467464}
468465
r13341r13342
471468{
472469   smsvdp_t *smsvdp = get_safe_token(device);
473470
474   UINT8 temp = smsvdp->status;
471   UINT8 temp = smsvdp->m_status;
475472
476473   /* Clear pending write flag */
477   smsvdp->pending = 0;
474   smsvdp->m_pending = 0;
478475
479   smsvdp->status &= ~(STATUS_VINT | STATUS_SPROVR | STATUS_SPRCOL | STATUS_HINT);
476   smsvdp->m_status &= ~(STATUS_VINT | STATUS_SPROVR | STATUS_SPRCOL | STATUS_HINT);
480477
481   if (smsvdp->irq_state == 1)
478   if (smsvdp->m_irq_state == 1)
482479   {
483      smsvdp->irq_state = 0;
480      smsvdp->m_irq_state = 0;
484481
485      if (smsvdp->int_callback)
486         smsvdp->int_callback(device->machine(), CLEAR_LINE);
482      smsvdp->m_int_callback(CLEAR_LINE);
487483   }
488484
489485   /* low 5 bits return non-zero data (it fixes PGA Tour Golf course map introduction) */
r13341r13342
500496   /* to the address register when in the middle of doing a command.               */
501497   /* Cosmic Spacehead needs this, among others                                    */
502498   /* Clear pending write flag */
503   smsvdp->pending = 0;
499   smsvdp->m_pending = 0;
504500
505   switch(smsvdp->addrmode)
501   switch(smsvdp->m_addrmode)
506502   {
507503      case 0x00:
508504      case 0x01:
509505      case 0x02:
510         address = (smsvdp->addr & 0x3fff);
511         smsvdp->VRAM->u8(address) = data;
506         address = (smsvdp->m_addr & 0x3fff);
507         smsvdp->m_VRAM->u8(address) = data;
512508         break;
513509
514510      case 0x03:
515         address = smsvdp->addr & smsvdp->cram_mask;
516         if (data != smsvdp->CRAM->u8(address))
511         address = smsvdp->m_addr & smsvdp->m_cram_mask;
512         if (data != smsvdp->m_CRAM->u8(address))
517513         {
518            smsvdp->CRAM->u8(address) = data;
519            smsvdp->cram_dirty = 1;
514            smsvdp->m_CRAM->u8(address) = data;
515            smsvdp->m_cram_dirty = 1;
520516         }
521517         break;
522518   }
523519
524   smsvdp->buffer = data;
525   smsvdp->addr += 1;
520   smsvdp->m_buffer = data;
521   smsvdp->m_addr += 1;
526522}
527523
528524
r13341r13342
532528
533529   int reg_num;
534530
535   if (smsvdp->pending == 0)
531   if (smsvdp->m_pending == 0)
536532   {
537      smsvdp->addr = (smsvdp->addr & 0xff00) | data;
538      smsvdp->pending = 1;
533      smsvdp->m_addr = (smsvdp->m_addr & 0xff00) | data;
534      smsvdp->m_pending = 1;
539535   }
540536   else
541537   {
542538      /* Clear pending write flag */
543      smsvdp->pending = 0;
539      smsvdp->m_pending = 0;
544540
545      smsvdp->addrmode = (data >> 6) & 0x03;
546      smsvdp->addr = (data << 8) | (smsvdp->addr & 0xff);
547      switch (smsvdp->addrmode)
541      smsvdp->m_addrmode = (data >> 6) & 0x03;
542      smsvdp->m_addr = (data << 8) | (smsvdp->m_addr & 0xff);
543      switch (smsvdp->m_addrmode)
548544      {
549545      case 0:      /* VRAM reading mode */
550         smsvdp->buffer = smsvdp->VRAM->u8(smsvdp->addr & 0x3fff);
551         smsvdp->addr += 1;
546         smsvdp->m_buffer = smsvdp->m_VRAM->u8(smsvdp->m_addr & 0x3fff);
547         smsvdp->m_addr += 1;
552548         break;
553549
554550      case 1:      /* VRAM writing mode */
r13341r13342
556552
557553      case 2:      /* VDP register write */
558554         reg_num = data & 0x0f;
559         smsvdp->reg[reg_num] = smsvdp->addr & 0xff;
560         if (reg_num == 0 && smsvdp->addr & 0x02)
555         smsvdp->m_reg[reg_num] = smsvdp->m_addr & 0xff;
556         if (reg_num == 0 && smsvdp->m_addr & 0x02)
561557            logerror("overscan enabled.\n");
562558
563559         if (reg_num == 0 || reg_num == 1)
r13341r13342
567563         {
568564            device->machine().scheduler().timer_set(device->machine().primary_screen->time_until_pos(device->machine().primary_screen->vpos(), VINT_HPOS), FUNC(smsvdp_check_vint),0 ,smsvdp);
569565         }
570         smsvdp->addrmode = 0;
566         smsvdp->m_addrmode = 0;
571567         break;
572568
573569      case 3:      /* CRAM writing mode */
r13341r13342
587583   UINT16 name_table_address;
588584   UINT8 *name_table;
589585
590   if (smsvdp->y_pixels != 192)
586   if (smsvdp->m_y_pixels != 192)
591587   {
592      name_table_address = ((smsvdp->reg[0x02] & 0x0c) << 10) | 0x0700;
588      name_table_address = ((smsvdp->m_reg[0x02] & 0x0c) << 10) | 0x0700;
593589      scroll_mod = 256;
594590   }
595591   else
596592   {
597      name_table_address = (smsvdp->reg[0x02] << 10) & 0x3800;
593      name_table_address = (smsvdp->m_reg[0x02] << 10) & 0x3800;
598594      scroll_mod = 224;
599595   }
600596
601597   if (IS_SMS1_VDP)
602      name_table_address = name_table_address & (((smsvdp->reg[0x02] & 0x01) << 10) | 0x3bff);
598      name_table_address = name_table_address & (((smsvdp->m_reg[0x02] & 0x01) << 10) | 0x3bff);
603599
604600   /* if top 2 rows of screen not affected by horizontal scrolling, then x_scroll = 0 */
605   /* else x_scroll = reg[0x08]                                                       */
606   x_scroll = (((smsvdp->reg[0x00] & 0x40) && (line < 16)) ? 0 : 0x0100 - smsvdp->reg[0x08]);
601   /* else x_scroll = m_reg[0x08]                                                       */
602   x_scroll = (((smsvdp->m_reg[0x00] & 0x40) && (line < 16)) ? 0 : 0x0100 - smsvdp->m_reg[0x08]);
607603
608604   x_scroll_start_column = (x_scroll >> 3);          /* x starting column tile */
609605
r13341r13342
616612
617613      /* Rightmost 8 columns for SMS (or 2 columns for GG) not affected by */
618614      /* vertical scrolling when bit 7 of reg[0x00] is set */
619      y_scroll = ((smsvdp->reg[0x00] & 0x80) && (tile_column > 23)) ? 0 : smsvdp->reg9copy;
615      y_scroll = ((smsvdp->m_reg[0x00] & 0x80) && (tile_column > 23)) ? 0 : smsvdp->m_reg9copy;
620616
621      name_table = smsvdp->VRAM->base() + name_table_address + ((((line + y_scroll) % scroll_mod) >> 3) << 6);
617      name_table = smsvdp->m_VRAM->base() + name_table_address + ((((line + y_scroll) % scroll_mod) >> 3) << 6);
622618
623619      tile_line = ((tile_column + x_scroll_start_column) & 0x1f) * 2;
624620      tile_data = name_table[tile_line] | (name_table[tile_line + 1] << 8);
r13341r13342
633629      if (vert_selected)
634630         tile_line = 0x07 - tile_line;
635631
636      bit_plane_0 = smsvdp->VRAM->u8(((tile_selected << 5) + ((tile_line & 0x07) << 2)) + 0x00);
637      bit_plane_1 = smsvdp->VRAM->u8(((tile_selected << 5) + ((tile_line & 0x07) << 2)) + 0x01);
638      bit_plane_2 = smsvdp->VRAM->u8(((tile_selected << 5) + ((tile_line & 0x07) << 2)) + 0x02);
639      bit_plane_3 = smsvdp->VRAM->u8(((tile_selected << 5) + ((tile_line & 0x07) << 2)) + 0x03);
632      bit_plane_0 = smsvdp->m_VRAM->u8(((tile_selected << 5) + ((tile_line & 0x07) << 2)) + 0x00);
633      bit_plane_1 = smsvdp->m_VRAM->u8(((tile_selected << 5) + ((tile_line & 0x07) << 2)) + 0x01);
634      bit_plane_2 = smsvdp->m_VRAM->u8(((tile_selected << 5) + ((tile_line & 0x07) << 2)) + 0x02);
635      bit_plane_3 = smsvdp->m_VRAM->u8(((tile_selected << 5) + ((tile_line & 0x07) << 2)) + 0x03);
640636
641637      for (pixel_x = 0; pixel_x < 8 ; pixel_x++)
642638      {
r13341r13342
665661         if (pixel_plot_x >= 0 && pixel_plot_x < 256)
666662         {
667663//              logerror("%x %x\n", pixel_plot_x + pixel_offset_x, pixel_plot_y);
668            line_buffer[pixel_plot_x] = smsvdp->current_palette[pen_selected];
664            line_buffer[pixel_plot_x] = smsvdp->m_current_palette[pen_selected];
669665            priority_selected[pixel_plot_x] = priority_select | (pen_selected & 0x0f);
670666         }
671667      }
r13341r13342
680676   int sprite_col_occurred, sprite_col_x;
681677   int sprite_buffer[8], sprite_buffer_count, sprite_buffer_index;
682678   int bit_plane_0, bit_plane_1, bit_plane_2, bit_plane_3;
683   UINT8 *sprite_table = smsvdp->VRAM->base() + ((smsvdp->reg[0x05] << 7) & 0x3f00);
679   UINT8 *sprite_table = smsvdp->m_VRAM->base() + ((smsvdp->m_reg[0x05] << 7) & 0x3f00);
684680
685681   /* Draw sprite layer */
686   sprite_height = (smsvdp->reg[0x01] & 0x02 ? 16 : 8);
682   sprite_height = (smsvdp->m_reg[0x01] & 0x02 ? 16 : 8);
687683   sprite_zoom = 1;
688684
689   if (smsvdp->reg[0x01] & 0x01)      /* sprite doubling */
685   if (smsvdp->m_reg[0x01] & 0x01)      /* sprite doubling */
690686      sprite_zoom = 2;
691687
692688   sprite_buffer_count = 0;
693   for (sprite_index = 0; (sprite_index < 64) && (sprite_table[sprite_index] != 0xd0 || smsvdp->y_pixels != 192) && (sprite_buffer_count < 9); sprite_index++)
689   for (sprite_index = 0; (sprite_index < 64) && (sprite_table[sprite_index] != 0xd0 || smsvdp->m_y_pixels != 192) && (sprite_buffer_count < 9); sprite_index++)
694690   {
695691      sprite_y = sprite_table[sprite_index] + 1; /* sprite y position starts at line 1 */
696692
r13341r13342
703699         {
704700            sprite_buffer[sprite_buffer_count] = sprite_index;
705701         }
706         else if (line >= 0 && line < smsvdp->sms_frame_timing[ACTIVE_DISPLAY_V])
702         else if (line >= 0 && line < smsvdp->m_sms_frame_timing[ACTIVE_DISPLAY_V])
707703         {
708704            /* Too many sprites per line */
709705            machine.scheduler().timer_set(machine.primary_screen->time_until_pos(pixel_plot_y + line, SPROVR_HPOS), FUNC(smsvdp_set_status), (int)STATUS_SPROVR, smsvdp);
r13341r13342
713709   }
714710
715711   /* Check if display is disabled */
716   if (!(smsvdp->reg[0x01] & 0x40))
712   if (!(smsvdp->m_reg[0x01] & 0x40))
717713      return;
718714
719715   if (sprite_buffer_count > 8)
720716      sprite_buffer_count = 8;
721717
722   memset(smsvdp->collision_buffer, 0, SMS_X_PIXELS);
718   memset(smsvdp->m_collision_buffer, 0, SMS_X_PIXELS);
723719   sprite_buffer_count--;
724720
725721   for (sprite_buffer_index = sprite_buffer_count; sprite_buffer_index >= 0; sprite_buffer_index--)
r13341r13342
732728
733729      sprite_x = sprite_table[0x80 + (sprite_index << 1)];
734730
735      if (smsvdp->reg[0x00] & 0x08)
731      if (smsvdp->m_reg[0x00] & 0x08)
736732         sprite_x -= 0x08;    /* sprite shift */
737733
738734      sprite_tile_selected = sprite_table[0x81 + (sprite_index << 1)];
739735
740      if (smsvdp->reg[0x06] & 0x04)
736      if (smsvdp->m_reg[0x06] & 0x04)
741737         sprite_tile_selected += 256; /* pattern table select */
742738
743      if (smsvdp->reg[0x01] & 0x02)
739      if (smsvdp->m_reg[0x01] & 0x02)
744740         sprite_tile_selected &= 0x01fe; /* force even index */
745741
746742      sprite_line = (line - sprite_y) / sprite_zoom;
r13341r13342
748744      if (sprite_line > 0x07)
749745         sprite_tile_selected += 1;
750746
751      bit_plane_0 = smsvdp->VRAM->u8(((sprite_tile_selected << 5) + ((sprite_line & 0x07) << 2)) + 0x00);
752      bit_plane_1 = smsvdp->VRAM->u8(((sprite_tile_selected << 5) + ((sprite_line & 0x07) << 2)) + 0x01);
753      bit_plane_2 = smsvdp->VRAM->u8(((sprite_tile_selected << 5) + ((sprite_line & 0x07) << 2)) + 0x02);
754      bit_plane_3 = smsvdp->VRAM->u8(((sprite_tile_selected << 5) + ((sprite_line & 0x07) << 2)) + 0x03);
747      bit_plane_0 = smsvdp->m_VRAM->u8(((sprite_tile_selected << 5) + ((sprite_line & 0x07) << 2)) + 0x00);
748      bit_plane_1 = smsvdp->m_VRAM->u8(((sprite_tile_selected << 5) + ((sprite_line & 0x07) << 2)) + 0x01);
749      bit_plane_2 = smsvdp->m_VRAM->u8(((sprite_tile_selected << 5) + ((sprite_line & 0x07) << 2)) + 0x02);
750      bit_plane_3 = smsvdp->m_VRAM->u8(((sprite_tile_selected << 5) + ((sprite_line & 0x07) << 2)) + 0x03);
755751
756752      sprite_col_occurred = 0;
757753      sprite_col_x = 0;
r13341r13342
773769            continue;
774770         }
775771
776         if (smsvdp->reg[0x01] & 0x01)
772         if (smsvdp->m_reg[0x01] & 0x01)
777773         {
778774            /* sprite doubling is enabled */
779775            pixel_plot_x = sprite_x + (pixel_x << 1);
r13341r13342
786782
787783            if (!(priority_selected[pixel_plot_x] & PRIORITY_BIT))
788784            {
789               line_buffer[pixel_plot_x] = smsvdp->current_palette[pen_selected];
790               line_buffer[pixel_plot_x + 1] = smsvdp->current_palette[pen_selected];
785               line_buffer[pixel_plot_x] = smsvdp->m_current_palette[pen_selected];
786               line_buffer[pixel_plot_x + 1] = smsvdp->m_current_palette[pen_selected];
791787            }
792788            else
793789            {
794790               if (priority_selected[pixel_plot_x] == PRIORITY_BIT)
795791               {
796                  line_buffer[pixel_plot_x] = smsvdp->current_palette[pen_selected];
792                  line_buffer[pixel_plot_x] = smsvdp->m_current_palette[pen_selected];
797793               }
798794               if (priority_selected[pixel_plot_x + 1] == PRIORITY_BIT)
799795               {
800                  line_buffer[pixel_plot_x + 1] = smsvdp->current_palette[pen_selected];
796                  line_buffer[pixel_plot_x + 1] = smsvdp->m_current_palette[pen_selected];
801797               }
802798            }
803            if (smsvdp->collision_buffer[pixel_plot_x] != 1)
799            if (smsvdp->m_collision_buffer[pixel_plot_x] != 1)
804800            {
805               smsvdp->collision_buffer[pixel_plot_x] = 1;
801               smsvdp->m_collision_buffer[pixel_plot_x] = 1;
806802            }
807803            else
808804            {
r13341r13342
812808                  sprite_col_x = pixel_plot_x;
813809               }
814810            }
815            if (smsvdp->collision_buffer[pixel_plot_x + 1] != 1)
811            if (smsvdp->m_collision_buffer[pixel_plot_x + 1] != 1)
816812            {
817               smsvdp->collision_buffer[pixel_plot_x + 1] = 1;
813               smsvdp->m_collision_buffer[pixel_plot_x + 1] = 1;
818814            }
819815            else
820816            {
r13341r13342
837833
838834            if (!(priority_selected[pixel_plot_x] & PRIORITY_BIT))
839835            {
840               line_buffer[pixel_plot_x] = smsvdp->current_palette[pen_selected];
836               line_buffer[pixel_plot_x] = smsvdp->m_current_palette[pen_selected];
841837            }
842838            else
843839            {
844840               if (priority_selected[pixel_plot_x] == PRIORITY_BIT)
845841               {
846                  line_buffer[pixel_plot_x] = smsvdp->current_palette[pen_selected];
842                  line_buffer[pixel_plot_x] = smsvdp->m_current_palette[pen_selected];
847843               }
848844            }
849            if (smsvdp->collision_buffer[pixel_plot_x] != 1)
845            if (smsvdp->m_collision_buffer[pixel_plot_x] != 1)
850846            {
851               smsvdp->collision_buffer[pixel_plot_x] = 1;
847               smsvdp->m_collision_buffer[pixel_plot_x] = 1;
852848            }
853849            else
854850            {
r13341r13342
864860         machine.scheduler().timer_set(machine.primary_screen->time_until_pos(pixel_plot_y + line, SPRCOL_BASEHPOS + sprite_col_x), FUNC(smsvdp_set_status), (int)STATUS_SPRCOL, smsvdp);
865861   }
866862
867   /* Fill column 0 with overscan color from reg[0x07] */
868   if (smsvdp->reg[0x00] & 0x20)
863   /* Fill column 0 with overscan color from m_reg[0x07] */
864   if (smsvdp->m_reg[0x00] & 0x20)
869865   {
870      line_buffer[0] = smsvdp->current_palette[BACKDROP_COLOR];
871      line_buffer[1] = smsvdp->current_palette[BACKDROP_COLOR];
872      line_buffer[2] = smsvdp->current_palette[BACKDROP_COLOR];
873      line_buffer[3] = smsvdp->current_palette[BACKDROP_COLOR];
874      line_buffer[4] = smsvdp->current_palette[BACKDROP_COLOR];
875      line_buffer[5] = smsvdp->current_palette[BACKDROP_COLOR];
876      line_buffer[6] = smsvdp->current_palette[BACKDROP_COLOR];
877      line_buffer[7] = smsvdp->current_palette[BACKDROP_COLOR];
866      line_buffer[0] = smsvdp->m_current_palette[BACKDROP_COLOR];
867      line_buffer[1] = smsvdp->m_current_palette[BACKDROP_COLOR];
868      line_buffer[2] = smsvdp->m_current_palette[BACKDROP_COLOR];
869      line_buffer[3] = smsvdp->m_current_palette[BACKDROP_COLOR];
870      line_buffer[4] = smsvdp->m_current_palette[BACKDROP_COLOR];
871      line_buffer[5] = smsvdp->m_current_palette[BACKDROP_COLOR];
872      line_buffer[6] = smsvdp->m_current_palette[BACKDROP_COLOR];
873      line_buffer[7] = smsvdp->m_current_palette[BACKDROP_COLOR];
878874   }
879875}
880876
r13341r13342
887883   UINT8 *sprite_table, *sprite_pattern_table;
888884
889885   /* Draw sprite layer */
890   sprite_table = smsvdp->VRAM->base() + ((smsvdp->reg[0x05] & 0x7f) << 7);
891   sprite_pattern_table = smsvdp->VRAM->base() + ((smsvdp->reg[0x06] & 0x07) << 11);
886   sprite_table = smsvdp->m_VRAM->base() + ((smsvdp->m_reg[0x05] & 0x7f) << 7);
887   sprite_pattern_table = smsvdp->m_VRAM->base() + ((smsvdp->m_reg[0x06] & 0x07) << 11);
892888   sprite_height = 8;
893889
894   if (smsvdp->reg[0x01] & 0x02)                         /* Check if SI is set */
890   if (smsvdp->m_reg[0x01] & 0x02)                         /* Check if SI is set */
895891      sprite_height = sprite_height * 2;
896   if (smsvdp->reg[0x01] & 0x01)                         /* Check if MAG is set */
892   if (smsvdp->m_reg[0x01] & 0x01)                         /* Check if MAG is set */
897893      sprite_height = sprite_height * 2;
898894
899895   sprite_buffer_count = 0;
r13341r13342
910906         {
911907            sprite_buffer[sprite_buffer_count] = sprite_index;
912908         }
913         else if (line >= 0 && line < smsvdp->sms_frame_timing[ACTIVE_DISPLAY_V])
909         else if (line >= 0 && line < smsvdp->m_sms_frame_timing[ACTIVE_DISPLAY_V])
914910         {
915911            /* Too many sprites per line */
916912            machine.scheduler().timer_set(machine.primary_screen->time_until_pos(pixel_plot_y + line, SPROVR_HPOS), FUNC(smsvdp_set_status), (int)STATUS_SPROVR, smsvdp);
r13341r13342
920916   }
921917
922918   /* Check if display is disabled */
923   if (!(smsvdp->reg[0x01] & 0x40))
919   if (!(smsvdp->m_reg[0x01] & 0x40))
924920      return;
925921
926922   if (sprite_buffer_count > 4)
927923      sprite_buffer_count = 4;
928924
929   memset(smsvdp->collision_buffer, 0, SMS_X_PIXELS);
925   memset(smsvdp->m_collision_buffer, 0, SMS_X_PIXELS);
930926   sprite_buffer_count--;
931927
932928   for (sprite_buffer_index = sprite_buffer_count; sprite_buffer_index >= 0; sprite_buffer_index--)
r13341r13342
954950      sprite_tile_selected = sprite_table[sprite_index + 2];
955951      sprite_line = line - sprite_y;
956952
957      if (smsvdp->reg[0x01] & 0x01)
953      if (smsvdp->m_reg[0x01] & 0x01)
958954         sprite_line >>= 1;
959955
960      if (smsvdp->reg[0x01] & 0x02)
956      if (smsvdp->m_reg[0x01] & 0x02)
961957      {
962958         sprite_tile_selected &= 0xfc;
963959
r13341r13342
975971
976972      for (pixel_x = 0; pixel_x < 8; pixel_x++)
977973      {
978         if (smsvdp->reg[0x01] & 0x01)
974         if (smsvdp->m_reg[0x01] & 0x01)
979975         {
980976            pixel_plot_x = sprite_x + pixel_x * 2;
981977            if (pixel_plot_x < 0 || pixel_plot_x > 255)
r13341r13342
985981
986982            if (pen_selected && (pattern & (1 << (7 - pixel_x))))
987983            {
988               line_buffer[pixel_plot_x] = smsvdp->current_palette[pen_selected];
984               line_buffer[pixel_plot_x] = smsvdp->m_current_palette[pen_selected];
989985
990               if (smsvdp->collision_buffer[pixel_plot_x] != 1)
986               if (smsvdp->m_collision_buffer[pixel_plot_x] != 1)
991987               {
992                  smsvdp->collision_buffer[pixel_plot_x] = 1;
988                  smsvdp->m_collision_buffer[pixel_plot_x] = 1;
993989               }
994990               else
995991               {
r13341r13342
1000996                  }
1001997               }
1002998
1003               line_buffer[pixel_plot_x+1] = smsvdp->current_palette[pen_selected];
999               line_buffer[pixel_plot_x+1] = smsvdp->m_current_palette[pen_selected];
10041000
1005               if (smsvdp->collision_buffer[pixel_plot_x + 1] != 1)
1001               if (smsvdp->m_collision_buffer[pixel_plot_x + 1] != 1)
10061002               {
1007                  smsvdp->collision_buffer[pixel_plot_x + 1] = 1;
1003                  smsvdp->m_collision_buffer[pixel_plot_x + 1] = 1;
10081004               }
10091005               else
10101006               {
r13341r13342
10271023
10281024            if (pen_selected && (pattern & (1 << (7 - pixel_x))))
10291025            {
1030               line_buffer[pixel_plot_x] = smsvdp->current_palette[pen_selected];
1026               line_buffer[pixel_plot_x] = smsvdp->m_current_palette[pen_selected];
10311027
1032               if (smsvdp->collision_buffer[pixel_plot_x] != 1)
1028               if (smsvdp->m_collision_buffer[pixel_plot_x] != 1)
10331029               {
1034                  smsvdp->collision_buffer[pixel_plot_x] = 1;
1030                  smsvdp->m_collision_buffer[pixel_plot_x] = 1;
10351031               }
10361032               else
10371033               {
r13341r13342
10451041         }
10461042      }
10471043
1048      if (smsvdp->reg[0x01] & 0x02)
1044      if (smsvdp->m_reg[0x01] & 0x02)
10491045      {
10501046         sprite_tile_selected += 2;
10511047         pattern = sprite_pattern_table[sprite_tile_selected * 8 + sprite_line];
1052         sprite_x += (smsvdp->reg[0x01] & 0x01 ? 16 : 8);
1048         sprite_x += (smsvdp->m_reg[0x01] & 0x01 ? 16 : 8);
10531049
10541050         for (pixel_x = 0; pixel_x < 8; pixel_x++)
10551051         {
1056            if (smsvdp->reg[0x01] & 0x01)
1052            if (smsvdp->m_reg[0x01] & 0x01)
10571053            {
10581054               pixel_plot_x = sprite_x + pixel_x * 2;
10591055
r13341r13342
10641060
10651061               if (pen_selected && (pattern & (1 << (7 - pixel_x))))
10661062               {
1067                  line_buffer[pixel_plot_x] = smsvdp->current_palette[pen_selected];
1063                  line_buffer[pixel_plot_x] = smsvdp->m_current_palette[pen_selected];
10681064
1069                  if (smsvdp->collision_buffer[pixel_plot_x] != 1)
1065                  if (smsvdp->m_collision_buffer[pixel_plot_x] != 1)
10701066                  {
1071                     smsvdp->collision_buffer[pixel_plot_x] = 1;
1067                     smsvdp->m_collision_buffer[pixel_plot_x] = 1;
10721068                  }
10731069                  else
10741070                  {
r13341r13342
10791075                     }
10801076                  }
10811077
1082                  line_buffer[pixel_plot_x+1] = smsvdp->current_palette[pen_selected];
1078                  line_buffer[pixel_plot_x+1] = smsvdp->m_current_palette[pen_selected];
10831079
1084                  if (smsvdp->collision_buffer[pixel_plot_x + 1] != 1)
1080                  if (smsvdp->m_collision_buffer[pixel_plot_x + 1] != 1)
10851081                  {
1086                     smsvdp->collision_buffer[pixel_plot_x + 1] = 1;
1082                     smsvdp->m_collision_buffer[pixel_plot_x + 1] = 1;
10871083                  }
10881084                  else
10891085                  {
r13341r13342
11061102
11071103               if (pen_selected && (pattern & (1 << (7 - pixel_x))))
11081104               {
1109                  line_buffer[pixel_plot_x] = smsvdp->current_palette[pen_selected];
1105                  line_buffer[pixel_plot_x] = smsvdp->m_current_palette[pen_selected];
11101106
1111                  if (smsvdp->collision_buffer[pixel_plot_x] != 1)
1107                  if (smsvdp->m_collision_buffer[pixel_plot_x] != 1)
11121108                  {
1113                     smsvdp->collision_buffer[pixel_plot_x] = 1;
1109                     smsvdp->m_collision_buffer[pixel_plot_x] = 1;
11141110                  }
11151111                  else
11161112                  {
r13341r13342
11381134   int pattern_mask, color_mask, pattern_offset;
11391135
11401136   /* Draw background layer */
1141   name_table = smsvdp->VRAM->base() + ((smsvdp->reg[0x02] & 0x0f) << 10) + ((line >> 3) * 32);
1142   color_table = smsvdp->VRAM->base() + ((smsvdp->reg[0x03] & 0x80) << 6);
1143   color_mask = ((smsvdp->reg[0x03] & 0x7f) << 3) | 0x07;
1144   pattern_table = smsvdp->VRAM->base() + ((smsvdp->reg[0x04] & 0x04) << 11);
1145   pattern_mask = ((smsvdp->reg[0x04] & 0x03) << 8) | 0xff;
1137   name_table = smsvdp->m_VRAM->base() + ((smsvdp->m_reg[0x02] & 0x0f) << 10) + ((line >> 3) * 32);
1138   color_table = smsvdp->m_VRAM->base() + ((smsvdp->m_reg[0x03] & 0x80) << 6);
1139   color_mask = ((smsvdp->m_reg[0x03] & 0x7f) << 3) | 0x07;
1140   pattern_table = smsvdp->m_VRAM->base() + ((smsvdp->m_reg[0x04] & 0x04) << 11);
1141   pattern_mask = ((smsvdp->m_reg[0x04] & 0x03) << 8) | 0xff;
11461142   pattern_offset = (line & 0xc0) << 2;
11471143
11481144   for (tile_column = 0; tile_column < 32; tile_column++)
r13341r13342
11741170         if (IS_GAMEGEAR_VDP)
11751171            pen_selected |= 0x10;
11761172
1177         line_buffer[pixel_plot_x] = smsvdp->current_palette[pen_selected];
1173         line_buffer[pixel_plot_x] = smsvdp->m_current_palette[pen_selected];
11781174      }
11791175   }
11801176}
r13341r13342
11871183   UINT8 *name_table, *color_table, *pattern_table;
11881184
11891185   /* Draw background layer */
1190   name_table = smsvdp->VRAM->base() + ((smsvdp->reg[0x02] & 0x0f) << 10) + ((line >> 3) * 32);
1191   color_table = smsvdp->VRAM->base() + ((smsvdp->reg[0x03] << 6) & (VRAM_SIZE - 1));
1192   pattern_table = smsvdp->VRAM->base() + ((smsvdp->reg[0x04] << 11) & (VRAM_SIZE - 1));
1186   name_table = smsvdp->m_VRAM->base() + ((smsvdp->m_reg[0x02] & 0x0f) << 10) + ((line >> 3) * 32);
1187   color_table = smsvdp->m_VRAM->base() + ((smsvdp->m_reg[0x03] << 6) & (VRAM_SIZE - 1));
1188   pattern_table = smsvdp->m_VRAM->base() + ((smsvdp->m_reg[0x04] << 11) & (VRAM_SIZE - 1));
11931189
11941190   for (tile_column = 0; tile_column < 32; tile_column++)
11951191   {
r13341r13342
12121208            pen_selected |= 0x10;
12131209
12141210         pixel_plot_x = (tile_column << 3) + pixel_x;
1215         line_buffer[pixel_plot_x] = smsvdp->current_palette[pen_selected];
1211         line_buffer[pixel_plot_x] = smsvdp->m_current_palette[pen_selected];
12161212      }
12171213   }
12181214}
r13341r13342
12211217static void sms_refresh_line( running_machine &machine, smsvdp_t *smsvdp, bitmap_t *bitmap, int pixel_offset_x, int pixel_plot_y, int line )
12221218{
12231219   int x;
1224   int *blitline_buffer = smsvdp->line_buffer;
1220   int *blitline_buffer = smsvdp->m_line_buffer;
12251221   int priority_selected[256];
12261222
1227   switch( smsvdp->vdp_mode )
1223   switch( smsvdp->m_vdp_mode )
12281224   {
12291225   case 0:
1230      if (line >= 0 && line < smsvdp->sms_frame_timing[ACTIVE_DISPLAY_V])
1226      if (line >= 0 && line < smsvdp->m_sms_frame_timing[ACTIVE_DISPLAY_V])
12311227         sms_refresh_line_mode0(smsvdp, blitline_buffer, line);
12321228      sms_refresh_tms9918_sprites(machine, smsvdp, blitline_buffer, pixel_plot_y, line);
12331229      break;
12341230
12351231   case 2:
1236      if (line >= 0 && line < smsvdp->sms_frame_timing[ACTIVE_DISPLAY_V])
1232      if (line >= 0 && line < smsvdp->m_sms_frame_timing[ACTIVE_DISPLAY_V])
12371233         sms_refresh_line_mode2(smsvdp, blitline_buffer, line);
12381234      sms_refresh_tms9918_sprites(machine, smsvdp, blitline_buffer, pixel_plot_y, line);
12391235      break;
r13341r13342
12411237   case 4:
12421238   default:
12431239      memset(priority_selected, 0, sizeof(priority_selected));
1244      if (line >= 0 && line < smsvdp->sms_frame_timing[ACTIVE_DISPLAY_V])
1240      if (line >= 0 && line < smsvdp->m_sms_frame_timing[ACTIVE_DISPLAY_V])
12451241         sms_refresh_line_mode4(smsvdp, blitline_buffer, priority_selected, line);
12461242      sms_refresh_mode4_sprites(machine, smsvdp, blitline_buffer, priority_selected, pixel_plot_y, line);
12471243      break;
12481244   }
12491245
12501246   /* Check if display is disabled or we're below/above active area */
1251   if (!(smsvdp->reg[0x01] & 0x40) || line < 0 || line >= smsvdp->sms_frame_timing[ACTIVE_DISPLAY_V])
1247   if (!(smsvdp->m_reg[0x01] & 0x40) || line < 0 || line >= smsvdp->m_sms_frame_timing[ACTIVE_DISPLAY_V])
12521248   {
12531249      for (x = 0; x < 256; x++)
12541250      {
1255         blitline_buffer[x] = smsvdp->current_palette[BACKDROP_COLOR];
1251         blitline_buffer[x] = smsvdp->m_current_palette[BACKDROP_COLOR];
12561252      }
12571253   }
12581254
1259   if (IS_GAMEGEAR_VDP && smsvdp->gg_sms_mode)
1255   if (IS_GAMEGEAR_VDP && smsvdp->m_gg_sms_mode)
12601256   {
1261      int *combineline_buffer = smsvdp->line_buffer + ((line & 0x03) + 1) * 256;
1257      int *combineline_buffer = smsvdp->m_line_buffer + ((line & 0x03) + 1) * 256;
12621258      int plot_x = 48;
12631259
12641260      /* Do horizontal scaling */
r13341r13342
12911287        */
12921288      {
12931289         int gg_line;
1294         int my_line = pixel_plot_y + line - (TBORDER_START + NTSC_224_TBORDER_Y_PIXELS);
1290         int my_line = pixel_plot_y + line - (SMS_TBORDER_START + SMS_NTSC_224_TBORDER_Y_PIXELS);
12951291         int *line1, *line2, *line3, *line4;
12961292
12971293         /* First make sure there's enough data to draw anything */
r13341r13342
13101306         }
13111307
13121308         /* Calculate the line we will be drawing on */
1313         pixel_plot_y = TBORDER_START + NTSC_192_TBORDER_Y_PIXELS + 24 + gg_line;
1309         pixel_plot_y = SMS_TBORDER_START + SMS_NTSC_192_TBORDER_Y_PIXELS + 24 + gg_line;
13141310
13151311         /* Setup our source lines */
1316         line1 = smsvdp->line_buffer + (((my_line - 3) & 0x03) + 1) * 256;
1317         line2 = smsvdp->line_buffer + (((my_line - 2) & 0x03) + 1) * 256;
1318         line3 = smsvdp->line_buffer + (((my_line - 1) & 0x03) + 1) * 256;
1319         line4 = smsvdp->line_buffer + (((my_line - 0) & 0x03) + 1) * 256;
1312         line1 = smsvdp->m_line_buffer + (((my_line - 3) & 0x03) + 1) * 256;
1313         line2 = smsvdp->m_line_buffer + (((my_line - 2) & 0x03) + 1) * 256;
1314         line3 = smsvdp->m_line_buffer + (((my_line - 1) & 0x03) + 1) * 256;
1315         line4 = smsvdp->m_line_buffer + (((my_line - 0) & 0x03) + 1) * 256;
13201316
13211317         for (x = 0 + 48; x < 160 + 48; x++)
13221318         {
r13341r13342
13491345
13501346   /* TODO: Check how Light Phaser behaves for border areas. For Gangster Town, should */
13511347   /* a shot at right border (HC~=0x90) really appear at active scr, near to left border? */
1352   if (x < LBORDER_START + LBORDER_X_PIXELS || x >= LBORDER_START + LBORDER_X_PIXELS + 256)
1348   if (x < SMS_LBORDER_START + SMS_LBORDER_X_PIXELS || x >= SMS_LBORDER_START + SMS_LBORDER_X_PIXELS + 256)
13531349      return 0;
13541350
13551351   smsvdp_t *smsvdp = get_safe_token(device);
1356   rgb_t color = *BITMAP_ADDR32(smsvdp->tmpbitmap, y, x);
1352   rgb_t color = *BITMAP_ADDR32(smsvdp->m_tmpbitmap, y, x);
13571353
13581354   /* reference: http://www.w3.org/TR/AERT#color-contrast */
13591355   UINT8 brightness = (RGB_RED(color) * 0.299) + (RGB_GREEN(color) * 0.587) + (RGB_BLUE(color) * 0.114);
r13341r13342
13681364   int i;
13691365
13701366   /* Exit if palette is has no changes */
1371   if (smsvdp->cram_dirty == 0)
1367   if (smsvdp->m_cram_dirty == 0)
13721368   {
13731369      return;
13741370   }
1375   smsvdp->cram_dirty = 0;
1371   smsvdp->m_cram_dirty = 0;
13761372
1377   if (smsvdp->vdp_mode != 4 && ! IS_GAMEGEAR_VDP)
1373   if (smsvdp->m_vdp_mode != 4 && ! IS_GAMEGEAR_VDP)
13781374   {
13791375      for(i = 0; i < 16; i++)
13801376      {
1381         smsvdp->current_palette[i] = 64 + i;
1377         smsvdp->m_current_palette[i] = 64 + i;
13821378      }
13831379      return;
13841380   }
13851381
13861382   if (IS_GAMEGEAR_VDP)
13871383   {
1388      if (smsvdp->gg_sms_mode)
1384      if (smsvdp->m_gg_sms_mode)
13891385      {
13901386         for (i = 0; i < 32; i++)
13911387         {
1392            smsvdp->current_palette[i] = ((smsvdp->CRAM->u8(i) & 0x30) << 6) | ((smsvdp->CRAM->u8(i) & 0x0c ) << 4) | ((smsvdp->CRAM->u8(i) & 0x03) << 2);
1388            smsvdp->m_current_palette[i] = ((smsvdp->m_CRAM->u8(i) & 0x30) << 6) | ((smsvdp->m_CRAM->u8(i) & 0x0c ) << 4) | ((smsvdp->m_CRAM->u8(i) & 0x03) << 2);
13931389         }
13941390      }
13951391      else
13961392      {
13971393         for (i = 0; i < 32; i++)
13981394         {
1399            smsvdp->current_palette[i] = ((smsvdp->CRAM->u8(i * 2 + 1) << 8) | smsvdp->CRAM->u8(i * 2)) & 0x0fff;
1395            smsvdp->m_current_palette[i] = ((smsvdp->m_CRAM->u8(i * 2 + 1) << 8) | smsvdp->m_CRAM->u8(i * 2)) & 0x0fff;
14001396         }
14011397      }
14021398   }
r13341r13342
14041400   {
14051401      for (i = 0; i < 32; i++)
14061402      {
1407         smsvdp->current_palette[i] = smsvdp->CRAM->u8(i) & 0x3f;
1403         smsvdp->m_current_palette[i] = smsvdp->m_CRAM->u8(i) & 0x3f;
14081404      }
14091405   }
14101406}
r13341r13342
14131409UINT32 sms_vdp_update( device_t *device, bitmap_t *bitmap, const rectangle *cliprect )
14141410{
14151411   smsvdp_t *smsvdp = get_safe_token(device);
1416   copybitmap(bitmap, smsvdp->tmpbitmap, 0, 0, 0, 0, cliprect);
1412   copybitmap(bitmap, smsvdp->m_tmpbitmap, 0, 0, 0, 0, cliprect);
14171413   return 0;
14181414}
14191415
r13341r13342
14311427   int width = screen->width();
14321428   int height = screen->height();
14331429
1434   smsvdp->features = intf->model;
1435   smsvdp->int_callback = intf->int_callback;
1436   smsvdp->pause_callback = intf->pause_callback;
1430   smsvdp->m_features = intf->model;
14371431
1432   /* Resolve callbacks */
1433   smsvdp->m_int_callback.resolve( intf->int_callback, *device );
1434   smsvdp->m_pause_callback.resolve( intf->pause_callback, *device );
1435
14381436   /* Allocate video RAM */
1439   smsvdp->VRAM = device->machine().region_alloc("vdp_vram", VRAM_SIZE, 1, ENDIANNESS_LITTLE);
1440   smsvdp->CRAM = device->machine().region_alloc("vdp_cram", MAX_CRAM_SIZE, 1, ENDIANNESS_LITTLE);
1441   smsvdp->line_buffer = auto_alloc_array(device->machine(), int, 256 * 5);
1437   smsvdp->m_VRAM = device->machine().region_alloc("vdp_vram", VRAM_SIZE, 1, ENDIANNESS_LITTLE);
1438   smsvdp->m_CRAM = device->machine().region_alloc("vdp_cram", MAX_CRAM_SIZE, 1, ENDIANNESS_LITTLE);
1439   smsvdp->m_line_buffer = auto_alloc_array(device->machine(), int, 256 * 5);
14421440
1443   smsvdp->collision_buffer = auto_alloc_array(device->machine(), UINT8, SMS_X_PIXELS);
1444   smsvdp->sms_frame_timing = auto_alloc_array(device->machine(), UINT8, 7);
1441   smsvdp->m_collision_buffer = auto_alloc_array(device->machine(), UINT8, SMS_X_PIXELS);
1442   smsvdp->m_sms_frame_timing = auto_alloc_array(device->machine(), UINT8, 7);
14451443
14461444   /* Make temp bitmap for rendering */
1447   smsvdp->tmpbitmap = auto_bitmap_alloc(device->machine(), width, height, BITMAP_FORMAT_INDEXED32);
1445   smsvdp->m_tmpbitmap = auto_bitmap_alloc(device->machine(), width, height, BITMAP_FORMAT_INDEXED32);
14481446
1449   smsvdp->smsvdp_display_timer = device->machine().scheduler().timer_alloc(FUNC(smsvdp_display_callback), smsvdp);
1450   smsvdp->smsvdp_display_timer->adjust(screen->time_until_pos(0, DISPLAY_CB_HPOS), 0, screen->scan_period());
1447   smsvdp->m_smsvdp_display_timer = device->machine().scheduler().timer_alloc(FUNC(smsvdp_display_callback), smsvdp);
1448   smsvdp->m_smsvdp_display_timer->adjust(screen->time_until_pos(0, DISPLAY_CB_HPOS), 0, screen->scan_period());
14511449
1452   device->save_item(NAME(smsvdp->status));
1453   device->save_item(NAME(smsvdp->reg9copy));
1454   device->save_item(NAME(smsvdp->addrmode));
1455   device->save_item(NAME(smsvdp->addr));
1456   device->save_item(NAME(smsvdp->cram_mask));
1457   device->save_item(NAME(smsvdp->cram_dirty));
1458   device->save_item(NAME(smsvdp->pending));
1459   device->save_item(NAME(smsvdp->buffer));
1460   device->save_item(NAME(smsvdp->gg_sms_mode));
1461   device->save_item(NAME(smsvdp->irq_state));
1462   device->save_item(NAME(smsvdp->vdp_mode));
1463   device->save_item(NAME(smsvdp->y_pixels));
1464   device->save_item(NAME(smsvdp->line_counter));
1465   device->save_item(NAME(smsvdp->hcounter));
1466   device->save_item(NAME(smsvdp->reg));
1467   device->save_item(NAME(smsvdp->current_palette));
1468   device->save_pointer(NAME(smsvdp->line_buffer), 256 * 5);
1469   device->save_pointer(NAME(smsvdp->collision_buffer), SMS_X_PIXELS);
1470   device->save_item(NAME(*smsvdp->tmpbitmap));
1450   device->save_item(NAME(smsvdp->m_status));
1451   device->save_item(NAME(smsvdp->m_reg9copy));
1452   device->save_item(NAME(smsvdp->m_addrmode));
1453   device->save_item(NAME(smsvdp->m_addr));
1454   device->save_item(NAME(smsvdp->m_cram_mask));
1455   device->save_item(NAME(smsvdp->m_cram_dirty));
1456   device->save_item(NAME(smsvdp->m_pending));
1457   device->save_item(NAME(smsvdp->m_buffer));
1458   device->save_item(NAME(smsvdp->m_gg_sms_mode));
1459   device->save_item(NAME(smsvdp->m_irq_state));
1460   device->save_item(NAME(smsvdp->m_vdp_mode));
1461   device->save_item(NAME(smsvdp->m_y_pixels));
1462   device->save_item(NAME(smsvdp->m_line_counter));
1463   device->save_item(NAME(smsvdp->m_hcounter));
1464   device->save_item(NAME(smsvdp->m_reg));
1465   device->save_item(NAME(smsvdp->m_current_palette));
1466   device->save_pointer(NAME(smsvdp->m_line_buffer), 256 * 5);
1467   device->save_pointer(NAME(smsvdp->m_collision_buffer), SMS_X_PIXELS);
1468   device->save_item(NAME(*smsvdp->m_tmpbitmap));
14711469}
14721470
14731471static DEVICE_RESET( smsvdp )
r13341r13342
14771475
14781476   /* Most register are 0x00 at power-up */
14791477   for (i = 0; i < NUM_OF_REGISTER; i++)
1480      smsvdp->reg[i] = 0x00;
1478      smsvdp->m_reg[i] = 0x00;
14811479
1482   smsvdp->reg[0x02] = 0x0e;
1483   smsvdp->reg[0x0a] = 0xff;
1480   smsvdp->m_reg[0x02] = 0x0e;
1481   smsvdp->m_reg[0x0a] = 0xff;
14841482
1485   smsvdp->status = 0;
1486   smsvdp->reg9copy = 0;
1487   smsvdp->addrmode = 0;
1488   smsvdp->addr = 0;
1489   smsvdp->gg_sms_mode = 0;
1490   smsvdp->cram_mask = (IS_GAMEGEAR_VDP && !smsvdp->gg_sms_mode) ? (GG_CRAM_SIZE - 1) : (SMS_CRAM_SIZE - 1);
1491   smsvdp->cram_dirty = 1;
1492   smsvdp->pending = 0;
1493   smsvdp->buffer = 0;
1494   smsvdp->irq_state = 0;
1495   smsvdp->line_counter = 0;
1496   smsvdp->hcounter = 0;
1483   smsvdp->m_status = 0;
1484   smsvdp->m_reg9copy = 0;
1485   smsvdp->m_addrmode = 0;
1486   smsvdp->m_addr = 0;
1487   smsvdp->m_gg_sms_mode = 0;
1488   smsvdp->m_cram_mask = (IS_GAMEGEAR_VDP && !smsvdp->m_gg_sms_mode) ? (GG_CRAM_SIZE - 1) : (SMS_CRAM_SIZE - 1);
1489   smsvdp->m_cram_dirty = 1;
1490   smsvdp->m_pending = 0;
1491   smsvdp->m_buffer = 0;
1492   smsvdp->m_irq_state = 0;
1493   smsvdp->m_line_counter = 0;
1494   smsvdp->m_hcounter = 0;
14971495
14981496   for (i = 0; i < 0x20; i++)
1499      smsvdp->current_palette[i] = 0;
1497      smsvdp->m_current_palette[i] = 0;
15001498
15011499   set_display_settings(device);
15021500
15031501   /* Clear RAM */
1504   memset(smsvdp->VRAM->base(), 0, VRAM_SIZE);
1505   memset(smsvdp->CRAM->base(), 0, MAX_CRAM_SIZE);
1506   memset(smsvdp->line_buffer, 0, 256 * 5 * sizeof(int));
1502   memset(smsvdp->m_VRAM->base(), 0, VRAM_SIZE);
1503   memset(smsvdp->m_CRAM->base(), 0, MAX_CRAM_SIZE);
1504   memset(smsvdp->m_line_buffer, 0, 256 * 5 * sizeof(int));
15071505}
15081506
15091507DEVICE_GET_INFO( smsvdp )
src/mess/video/smsvdp.h
r13341r13342
2222#define MODEL_315_5378         0x0004
2323
2424#define SMS_X_PIXELS         342      /* 342 pixels */
25#define NTSC_Y_PIXELS         262      /* 262 lines */
26#define PAL_Y_PIXELS         313      /* 313 lines */
27#define LBORDER_START         (1 + 2 + 14 + 8)
28#define LBORDER_X_PIXELS      (0x0d)      /* 13 pixels */
29#define RBORDER_X_PIXELS      (0x0f)      /* 15 pixels */
30#define TBORDER_START         (3 + 13)
31#define NTSC_192_TBORDER_Y_PIXELS   (0x1b)      /* 27 lines */
32#define NTSC_192_BBORDER_Y_PIXELS   (0x18)      /* 24 lines */
33#define NTSC_224_TBORDER_Y_PIXELS   (0x0b)      /* 11 lines */
34#define NTSC_224_BBORDER_Y_PIXELS   (0x08)      /* 8 lines */
35#define PAL_192_TBORDER_Y_PIXELS   (0x36)      /* 54 lines */
36#define PAL_192_BBORDER_Y_PIXELS   (0x30)      /* 48 lines */
37#define PAL_224_TBORDER_Y_PIXELS   (0x26)      /* 38 lines */
38#define PAL_224_BBORDER_Y_PIXELS   (0x20)      /* 32 lines */
39#define PAL_240_TBORDER_Y_PIXELS   (0x1e)      /* 30 lines */
40#define PAL_240_BBORDER_Y_PIXELS   (0x18)      /* 24 lines */
25#define SMS_NTSC_Y_PIXELS         262      /* 262 lines */
26#define SMS_PAL_Y_PIXELS         313      /* 313 lines */
27#define SMS_LBORDER_START         (1 + 2 + 14 + 8)
28#define SMS_LBORDER_X_PIXELS      (0x0d)      /* 13 pixels */
29#define SMS_RBORDER_X_PIXELS      (0x0f)      /* 15 pixels */
30#define SMS_TBORDER_START         (3 + 13)
31#define SMS_NTSC_192_TBORDER_Y_PIXELS   (0x1b)      /* 27 lines */
32//#define NTSC_192_BBORDER_Y_PIXELS   (0x18)      /* 24 lines */
33#define SMS_NTSC_224_TBORDER_Y_PIXELS   (0x0b)      /* 11 lines */
34//#define NTSC_224_BBORDER_Y_PIXELS   (0x08)      /* 8 lines */
35//#define PAL_192_TBORDER_Y_PIXELS   (0x36)      /* 54 lines */
36//#define PAL_192_BBORDER_Y_PIXELS   (0x30)      /* 48 lines */
37//#define PAL_224_TBORDER_Y_PIXELS   (0x26)      /* 38 lines */
38//#define PAL_224_BBORDER_Y_PIXELS   (0x20)      /* 32 lines */
39#define SMS_PAL_240_TBORDER_Y_PIXELS   (0x1e)      /* 30 lines */
40//#define PAL_240_BBORDER_Y_PIXELS   (0x18)      /* 24 lines */
4141
4242
4343/***************************************************************************
4444    TYPE DEFINITIONS
4545***************************************************************************/
4646
47typedef void (*smsvdp_int_cb)( running_machine &machine, int state );
48typedef void (*smsvdp_pause_cb)( running_machine &machine );
49
5047typedef struct _smsvdp_interface smsvdp_interface;
5148struct _smsvdp_interface
5249{
5350   UINT32             model;                /* Select model/features for the emulation */
54   smsvdp_int_cb      int_callback;         /* Interrupt callback function */
55   smsvdp_pause_cb    pause_callback;       /* Pause callback function */
51   devcb_write_line   int_callback;         /* Interrupt callback function */
52   devcb_write_line   pause_callback;       /* Pause callback function */
5653};
5754
5855/***************************************************************************
src/mess/includes/sms.h
r13341r13342
142142INPUT_CHANGED( lgun1_changed );
143143INPUT_CHANGED( lgun2_changed );
144144
145void sms_pause_callback( running_machine &machine );
146void sms_store_int_callback( running_machine &machine, int state );
145WRITE_LINE_DEVICE_HANDLER( sms_pause_callback );
146WRITE_LINE_DEVICE_HANDLER( sms_store_int_callback );
147147
148148DEVICE_START( sms_cart );
149149DEVICE_IMAGE_LOAD( sms_cart );
src/mess/drivers/sms.c
r13341r13342
345345
346346
347347
348static void sms_int_callback( running_machine &machine, int state )
348static WRITE_LINE_DEVICE_HANDLER( sms_int_callback )
349349{
350   cputag_set_input_line(machine, "maincpu", 0, state);
350   cputag_set_input_line(device->machine(), "maincpu", 0, state);
351351}
352352
353353static const smsvdp_interface _315_5124_intf =
354354{
355355   MODEL_315_5124,
356   sms_int_callback,
357   sms_pause_callback
356   DEVCB_LINE(sms_int_callback),
357   DEVCB_LINE(sms_pause_callback)
358358};
359359
360360static const smsvdp_interface _315_5246_intf =
361361{
362362   MODEL_315_5246,
363   sms_int_callback,
364   sms_pause_callback
363   DEVCB_LINE(sms_int_callback),
364   DEVCB_LINE(sms_pause_callback)
365365};
366366
367367static const smsvdp_interface _315_5378_intf =
368368{
369369   MODEL_315_5378,
370   sms_int_callback,
371   sms_pause_callback
370   DEVCB_LINE(sms_int_callback),
371   DEVCB_LINE(sms_pause_callback)
372372};
373373
374374static const smsvdp_interface sms_store_intf =
375375{
376376   MODEL_315_5124,
377   sms_store_int_callback,
378   sms_pause_callback
377   DEVCB_LINE(sms_store_int_callback),
378   DEVCB_LINE(sms_pause_callback)
379379};
380380
381381static MACHINE_CONFIG_FRAGMENT( sms_cartslot )
r13341r13342
423423   /* video hardware */
424424   MCFG_SCREEN_ADD("screen", RASTER)
425425   MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
426   MCFG_SCREEN_RAW_PARAMS(XTAL_53_693175MHz/10, SMS_X_PIXELS, LBORDER_START + LBORDER_X_PIXELS - 2, LBORDER_START + LBORDER_X_PIXELS + 256 + 10, NTSC_Y_PIXELS, TBORDER_START + NTSC_224_TBORDER_Y_PIXELS, TBORDER_START + NTSC_224_TBORDER_Y_PIXELS + 224)
426   MCFG_SCREEN_RAW_PARAMS(XTAL_53_693175MHz/10, SMS_X_PIXELS, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS - 2, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS + 256 + 10, SMS_NTSC_Y_PIXELS, SMS_TBORDER_START + SMS_NTSC_224_TBORDER_Y_PIXELS, SMS_TBORDER_START + SMS_NTSC_224_TBORDER_Y_PIXELS + 224)
427427   MCFG_SCREEN_UPDATE(sms)
428428
429429   MCFG_PALETTE_LENGTH(64+16)
r13341r13342
441441   /* video hardware */
442442   MCFG_SCREEN_ADD("screen", RASTER)
443443   MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
444   MCFG_SCREEN_RAW_PARAMS(XTAL_53_693175MHz/10, SMS_X_PIXELS, LBORDER_START + LBORDER_X_PIXELS - 2, LBORDER_START + LBORDER_X_PIXELS + 256 + 10, NTSC_Y_PIXELS, TBORDER_START + NTSC_224_TBORDER_Y_PIXELS, TBORDER_START + NTSC_224_TBORDER_Y_PIXELS + 224)
444   MCFG_SCREEN_RAW_PARAMS(XTAL_53_693175MHz/10, SMS_X_PIXELS, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS - 2, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS + 256 + 10, SMS_NTSC_Y_PIXELS, SMS_TBORDER_START + SMS_NTSC_224_TBORDER_Y_PIXELS, SMS_TBORDER_START + SMS_NTSC_224_TBORDER_Y_PIXELS + 224)
445445   MCFG_SCREEN_UPDATE(sms1)
446446
447447   MCFG_SCREEN_ADD("left_lcd", LCD)   // This is needed for SegaScope Left LCD
448448   MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
449   MCFG_SCREEN_RAW_PARAMS(XTAL_53_693175MHz/10, SMS_X_PIXELS, LBORDER_START + LBORDER_X_PIXELS - 2, LBORDER_START + LBORDER_X_PIXELS + 256 + 10, NTSC_Y_PIXELS, TBORDER_START + NTSC_224_TBORDER_Y_PIXELS, TBORDER_START + NTSC_224_TBORDER_Y_PIXELS + 224)
449   MCFG_SCREEN_RAW_PARAMS(XTAL_53_693175MHz/10, SMS_X_PIXELS, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS - 2, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS + 256 + 10, SMS_NTSC_Y_PIXELS, SMS_TBORDER_START + SMS_NTSC_224_TBORDER_Y_PIXELS, SMS_TBORDER_START + SMS_NTSC_224_TBORDER_Y_PIXELS + 224)
450450   MCFG_SCREEN_UPDATE(sms1)
451451
452452   MCFG_SCREEN_ADD("right_lcd", LCD)   // This is needed for SegaScope Right LCD
453453   MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
454   MCFG_SCREEN_RAW_PARAMS(XTAL_53_693175MHz/10, SMS_X_PIXELS, LBORDER_START + LBORDER_X_PIXELS - 2, LBORDER_START + LBORDER_X_PIXELS + 256 + 10, NTSC_Y_PIXELS, TBORDER_START + NTSC_224_TBORDER_Y_PIXELS, TBORDER_START + NTSC_224_TBORDER_Y_PIXELS + 224)
454   MCFG_SCREEN_RAW_PARAMS(XTAL_53_693175MHz/10, SMS_X_PIXELS, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS - 2, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS + 256 + 10, SMS_NTSC_Y_PIXELS, SMS_TBORDER_START + SMS_NTSC_224_TBORDER_Y_PIXELS, SMS_TBORDER_START + SMS_NTSC_224_TBORDER_Y_PIXELS + 224)
455455   MCFG_SCREEN_UPDATE(sms1)
456456
457457   MCFG_DEFAULT_LAYOUT(layout_sms1)
r13341r13342
530530   /* video hardware */
531531   MCFG_SCREEN_ADD("screen", RASTER)
532532   MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
533   MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK_PAL/10, SMS_X_PIXELS, LBORDER_START + LBORDER_X_PIXELS - 2, LBORDER_START + LBORDER_X_PIXELS + 256 + 10, PAL_Y_PIXELS, TBORDER_START + PAL_240_TBORDER_Y_PIXELS, TBORDER_START + PAL_240_TBORDER_Y_PIXELS + 240)
533   MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK_PAL/10, SMS_X_PIXELS, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS - 2, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS + 256 + 10, SMS_PAL_Y_PIXELS, SMS_TBORDER_START + SMS_PAL_240_TBORDER_Y_PIXELS, SMS_TBORDER_START + SMS_PAL_240_TBORDER_Y_PIXELS + 240)
534534   MCFG_SCREEN_UPDATE(sms)
535535
536536   MCFG_PALETTE_LENGTH(64+16)
r13341r13342
548548   /* video hardware */
549549   MCFG_SCREEN_ADD("screen", RASTER)
550550   MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
551   MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK_PAL/10, SMS_X_PIXELS, LBORDER_START + LBORDER_X_PIXELS - 2, LBORDER_START + LBORDER_X_PIXELS + 256 + 10, PAL_Y_PIXELS, TBORDER_START + PAL_240_TBORDER_Y_PIXELS, TBORDER_START + PAL_240_TBORDER_Y_PIXELS + 240)
551   MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK_PAL/10, SMS_X_PIXELS, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS - 2, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS + 256 + 10, SMS_PAL_Y_PIXELS, SMS_TBORDER_START + SMS_PAL_240_TBORDER_Y_PIXELS, SMS_TBORDER_START + SMS_PAL_240_TBORDER_Y_PIXELS + 240)
552552   MCFG_SCREEN_UPDATE(sms1)
553553
554554   MCFG_SCREEN_ADD("left_lcd", LCD)   // This is needed for SegaScope Left LCD
555555   MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
556   MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK_PAL/10, SMS_X_PIXELS, LBORDER_START + LBORDER_X_PIXELS - 2, LBORDER_START + LBORDER_X_PIXELS + 256 + 10, PAL_Y_PIXELS, TBORDER_START + PAL_240_TBORDER_Y_PIXELS, TBORDER_START + PAL_240_TBORDER_Y_PIXELS + 240)
556   MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK_PAL/10, SMS_X_PIXELS, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS - 2, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS + 256 + 10, SMS_PAL_Y_PIXELS, SMS_TBORDER_START + SMS_PAL_240_TBORDER_Y_PIXELS, SMS_TBORDER_START + SMS_PAL_240_TBORDER_Y_PIXELS + 240)
557557   MCFG_SCREEN_UPDATE(sms1)
558558
559559   MCFG_SCREEN_ADD("right_lcd", LCD)   // This is needed for SegaScope Right LCD
560560   MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
561   MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK_PAL/10, SMS_X_PIXELS, LBORDER_START + LBORDER_X_PIXELS - 2, LBORDER_START + LBORDER_X_PIXELS + 256 + 10, PAL_Y_PIXELS, TBORDER_START + PAL_240_TBORDER_Y_PIXELS, TBORDER_START + PAL_240_TBORDER_Y_PIXELS + 240)
561   MCFG_SCREEN_RAW_PARAMS(MASTER_CLOCK_PAL/10, SMS_X_PIXELS, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS - 2, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS + 256 + 10, SMS_PAL_Y_PIXELS, SMS_TBORDER_START + SMS_PAL_240_TBORDER_Y_PIXELS, SMS_TBORDER_START + SMS_PAL_240_TBORDER_Y_PIXELS + 240)
562562   MCFG_SCREEN_UPDATE(sms1)
563563
564564   MCFG_PALETTE_LENGTH(64+16)
r13341r13342
604604   /* video hardware */
605605   MCFG_SCREEN_ADD("screen", LCD)
606606   MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
607   MCFG_SCREEN_RAW_PARAMS(XTAL_53_693175MHz/10, SMS_X_PIXELS, LBORDER_START + LBORDER_X_PIXELS + 6*8, LBORDER_START + LBORDER_X_PIXELS + 26*8, NTSC_Y_PIXELS, TBORDER_START + NTSC_192_TBORDER_Y_PIXELS + 3*8, TBORDER_START + NTSC_192_TBORDER_Y_PIXELS + 21*8 )
607   MCFG_SCREEN_RAW_PARAMS(XTAL_53_693175MHz/10, SMS_X_PIXELS, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS + 6*8, SMS_LBORDER_START + SMS_LBORDER_X_PIXELS + 26*8, SMS_NTSC_Y_PIXELS, SMS_TBORDER_START + SMS_NTSC_192_TBORDER_Y_PIXELS + 3*8, SMS_TBORDER_START + SMS_NTSC_192_TBORDER_Y_PIXELS + 21*8 )
608608   MCFG_SCREEN_UPDATE(gamegear)
609609
610610   MCFG_PALETTE_LENGTH(4096)

Previous 15994 Revisions Next


© 1998-2018 The MESS Team