Previous 15994 Revisions Next

r2772 Friday 30th May, 2008 at 11:38:31 UTC by Nathan Woods
More running_machine* parameter passing
[src/mess/drivers]a2600.c
[src/mess/includes]pet.h
[src/mess/machine]apple2gs.c bbc.c i82439tx.c mac.c pet.c vc20.c
[src/mess/video]atarist.c pet.c

src/mess/includes/pet.h
r2771r2772
1212/*----------- defined in video/pet.c -----------*/
1313
1414/* call to init videodriver */
15void pet_vh_init (void);
16void pet80_vh_init (void);
17void superpet_vh_init (void);
15void pet_vh_init (running_machine *machine);
16void pet80_vh_init (running_machine *machine);
17void superpet_vh_init (running_machine *machine);
1818VIDEO_UPDATE( pet );
1919MC6845_UPDATE_ROW( pet40_update_row );
2020MC6845_UPDATE_ROW( pet80_update_row );
src/mess/video/atarist.c
r2771r2772
130130   *BITMAP_ADDR32(tmpbitmap, y, x) = pen;
131131}
132132
133INLINE void atarist_shifter_load(void)
133INLINE void atarist_shifter_load(running_machine *machine)
134134{
135135   UINT8 *RAM = memory_region(REGION_CPU1) + shifter.ofs;
136136
r2771r2772
167167
168168   if (de)
169169   {
170      atarist_shifter_load();
170      atarist_shifter_load(machine);
171171   }
172172
173173   if ((y == shifter.vblank_start) && (x == 0))
r2771r2772
400400   UINT32 srcbuf;
401401} blitter;
402402
403static void atarist_blitter_source(void)
403static void atarist_blitter_source(running_machine *machine)
404404{
405405   UINT8 *RAM = memory_region(REGION_CPU1) + blitter.src;
406406
r2771r2772
439439   return 0;
440440}
441441
442static void atarist_blitter_op(UINT16 s, UINT32 dstaddr, UINT16 mask)
442static void atarist_blitter_op(running_machine *machine, UINT16 s, UINT32 dstaddr, UINT16 mask)
443443{
444444   UINT8 *dst = memory_region(REGION_CPU1) + dstaddr;
445445   UINT16 d = (dst[1] << 8) + dst[0];
r2771r2772
460460   {
461461      if (blitter.skew & ATARIST_BLITTER_SKEW_FXSR)
462462      {
463         atarist_blitter_source();
463         atarist_blitter_source(machine);
464464         blitter.src += blitter.src_inc_x;
465465      }
466466
467      atarist_blitter_source();
468      atarist_blitter_op(atarist_blitter_hop(), blitter.dst, blitter.endmask1);
467      atarist_blitter_source(machine);
468      atarist_blitter_op(machine, atarist_blitter_hop(), blitter.dst, blitter.endmask1);
469469      blitter.xcount--;
470470
471471      while (blitter.xcount > 0)
r2771r2772
477477         {
478478            if (!(blitter.skew & ATARIST_BLITTER_SKEW_NFSR))
479479            {
480               atarist_blitter_source();
480               atarist_blitter_source(machine);
481481            }
482482
483            atarist_blitter_op(atarist_blitter_hop(), blitter.dst, blitter.endmask3);
483            atarist_blitter_op(machine, atarist_blitter_hop(), blitter.dst, blitter.endmask3);
484484         }
485485         else
486486         {
487            atarist_blitter_source();
488            atarist_blitter_op(atarist_blitter_hop(), blitter.dst, blitter.endmask2);
487            atarist_blitter_source(machine);
488            atarist_blitter_op(machine, atarist_blitter_hop(), blitter.dst, blitter.endmask2);
489489         }
490490
491491         blitter.xcount--;
src/mess/video/pet.c
r2771r2772
1010#include "includes/pet.h"
1111
1212
13void pet_vh_init (void)
13void pet_vh_init (running_machine *machine)
1414{
1515   UINT8 *gfx = memory_region(REGION_GFX1);
1616   int i;
1717
1818   /* inversion logic on board */
19    for (i = 0; i < 0x400; i++)
19   for (i = 0; i < 0x400; i++)
2020   {
2121      gfx[0x800+i] = gfx[0x400+i];
2222      gfx[0x400+i] = gfx[i]^0xff;
r2771r2772
2424   }
2525}
2626
27void pet80_vh_init (void)
27void pet80_vh_init (running_machine *machine)
2828{
2929   UINT8 *gfx = memory_region(REGION_GFX1);
3030   int i;
3131
3232   /* inversion logic on board */
33    for (i = 0; i < 0x400; i++) {
33   for (i = 0; i < 0x400; i++) {
3434      gfx[0x800+i] = gfx[0x400+i];
3535      gfx[0x400+i] = gfx[i]^0xff;
3636      gfx[0x0c00+i] = gfx[0x800+i]^0xff;
r2771r2772
4343   }
4444}
4545
46void superpet_vh_init (void)
46void superpet_vh_init (running_machine *machine)
4747{
4848   UINT8 *gfx = memory_region(REGION_GFX1);
4949   int i;
src/mess/machine/pet.c
r2771r2772
515515{
516516   pet_common_driver_init(machine);
517517   pia_config(0, &pet_pia0);
518   pet_vh_init();
518   pet_vh_init(machine);
519519}
520520
521521DRIVER_INIT( petb )
522522{
523523   pet_common_driver_init(machine);
524524   pia_config(0, &petb_pia0);
525   pet_vh_init();
525   pet_vh_init(machine);
526526}
527527
528528DRIVER_INIT( pet1 )
r2771r2772
530530   pet_basic1 = 1;
531531   pet_common_driver_init(machine);
532532   pia_config(0, &pet_pia0);
533   pet_vh_init();
533   pet_vh_init(machine);
534534}
535535
536536DRIVER_INIT( pet40 )
537537{
538538   pet_common_driver_init(machine);
539539   pia_config(0, &pet_pia0);
540   pet_vh_init();
540   pet_vh_init(machine);
541541}
542542
543543DRIVER_INIT( cbm80 )
r2771r2772
549549   pia_config(0, &petb_pia0);
550550   videoram = &pet_memory[0x8000];
551551   videoram_size = 0x800;
552   pet80_vh_init();
552   pet80_vh_init(machine);
553553}
554554
555555DRIVER_INIT( superpet )
r2771r2772
563563   memory_configure_bank(1, 0, 16, superpet_memory, 0x1000);
564564   memory_set_bank(1, 0);
565565
566   superpet_vh_init();
566   superpet_vh_init(machine);
567567}
568568
569569MACHINE_RESET( pet )
src/mess/machine/apple2gs.c
r2771r2772
573573
574574
575575
576static void adb_write_datareg(UINT8 data)
576static void adb_write_datareg(running_machine *machine, UINT8 data)
577577{
578578   if (LOG_ADB)
579579      logerror("adb_write_datareg(): data=0x%02x\n", data);
r2771r2772
11271127         break;
11281128
11291129      case 0x26:   /* C026 - DATAREG */
1130         adb_write_datareg(data);
1130         adb_write_datareg(machine, data);
11311131         break;
11321132
11331133      case 0x27:   /* C027 - KMSTATUS */
r2771r2772
15111511
15121512
15131513
1514static UINT8 *apple2gs_getslotmem(offs_t address)
1514static UINT8 *apple2gs_getslotmem(running_machine *machine, offs_t address)
15151515{
15161516   UINT8 *rom;
15171517
r2771r2772
15441544      slot = (address & 0x000F00) / 0x100;
15451545
15461546      if ((slot > 7) || ((apple2gs_sltromsel & (1 << slot)) == 0))
1547         result = *apple2gs_getslotmem(address);
1547         result = *apple2gs_getslotmem(machine, address);
15481548      else
15491549         result = apple2_getfloatingbusvalue();
15501550   }
r2771r2772
15701570      slot = (address & 0x000F00) / 0x100;
15711571
15721572      if ((slot > 7) || ((apple2gs_sltromsel & (1 << slot)) == 0))
1573         *apple2gs_getslotmem(address) = data;
1573         *apple2gs_getslotmem(machine, address) = data;
15741574   }
15751575}
15761576
r2771r2772
15901590      else if ((address & 0x000F00) == 0x000000)
15911591      {
15921592         if (((address & 0xFF) >= 0x71) && ((address & 0xFF) <= 0x7F))
1593            opptr = apple2gs_getslotmem(address);
1593            opptr = apple2gs_getslotmem(machine, address);
15941594      }
15951595      else
15961596      {
15971597         slot = (address & 0x000F00) / 0x100;
15981598
15991599         if ((slot > 7) || ((apple2gs_sltromsel & (1 << slot)) == 0))
1600            opptr = apple2gs_getslotmem(address);
1600            opptr = apple2gs_getslotmem(machine, address);
16011601      }
16021602
16031603      if (opptr != NULL)
src/mess/machine/mac.c
r2771r2772
196196
197197
198198
199static void set_memory_overlay(int overlay)
199static void set_memory_overlay(running_machine *machine, int overlay)
200200{
201201   offs_t memory_size;
202202   UINT8 *memory_data;
r2771r2772
12371237    * possibly later models), overlay was set on reset, but cleared on the
12381238    * first access to the ROM. */
12391239   if (mac_model < MODEL_MAC_SE)
1240      set_memory_overlay((data & 0x10) >> 4);
1240      set_memory_overlay(machine, (data & 0x10) >> 4);
12411241}
12421242
12431243static WRITE8_HANDLER(mac_via_out_b)
r2771r2772
12961296
12971297static TIMER_CALLBACK(set_memory_overlay_callback)
12981298{
1299   set_memory_overlay(param);
1299   set_memory_overlay(machine, param);
13001300}
13011301
13021302MACHINE_RESET(mac)
r2771r2772
13081308   scc_init(&mac_scc8530_interface);
13091309
13101310   /* setup the memory overlay */
1311   set_memory_overlay(1);
1311   set_memory_overlay(machine, 1);
13121312
13131313   /* reset the via */
13141314   via_reset();
r2771r2772
13321332{
13331333   int overlay = mac_overlay;
13341334   mac_overlay = -1;
1335   set_memory_overlay(overlay);
1335   set_memory_overlay(machine, overlay);
13361336}
13371337
13381338
13391339
1340static void mac_driver_init(mac_model_t model)
1340static void mac_driver_init(running_machine *machine, mac_model_t model)
13411341{
13421342   mac_overlay = -1;
13431343   mac_model = model;
r2771r2772
13491349   mac_install_memory(0x400000, (model >= MODEL_MAC_PLUS) ? 0x43ffff : 0x5fffff,
13501350      memory_region_length(REGION_USER1), memory_region(REGION_USER1), TRUE, 3);
13511351
1352   set_memory_overlay(1);
1352   set_memory_overlay(machine, 1);
13531353
13541354   /* configure via */
13551355   via_config(0, &mac_via6522_intf);
r2771r2772
13711371
13721372DRIVER_INIT(mac128k512k)
13731373{
1374   mac_driver_init(MODEL_MAC_128K512K);
1374   mac_driver_init(machine, MODEL_MAC_128K512K);
13751375}
13761376
13771377DRIVER_INIT(mac512ke)
13781378{
1379   mac_driver_init(MODEL_MAC_512KE);
1379   mac_driver_init(machine, MODEL_MAC_512KE);
13801380}
13811381
13821382static const SCSIConfigTable dev_table =
r2771r2772
14011401
14021402DRIVER_INIT(macplus)
14031403{
1404   mac_driver_init(MODEL_MAC_PLUS);
1404   mac_driver_init(machine, MODEL_MAC_PLUS);
14051405}
14061406
14071407DRIVER_INIT(macse)
14081408{
1409   mac_driver_init(MODEL_MAC_SE);
1409   mac_driver_init(machine, MODEL_MAC_SE);
14101410}
14111411
14121412DRIVER_INIT(macclassic)
14131413{
1414   mac_driver_init(MODEL_MAC_CLASSIC);
1414   mac_driver_init(machine, MODEL_MAC_CLASSIC);
14151415}
14161416
14171417static void mac_vblank_irq(running_machine *machine)
src/mess/machine/i82439tx.c
r2771r2772
102102
103103
104104
105static void intel82439tx_configure_memory(UINT8 val, offs_t begin, offs_t end, int read_bank, write32_machine_func wh)
105static void intel82439tx_configure_memory(running_machine *machine, UINT8 val, offs_t begin, offs_t end, int read_bank, write32_machine_func wh)
106106{
107   memory_install_read_handler(Machine, 0, ADDRESS_SPACE_PROGRAM, begin, end, 0, 0, read_bank);
107   memory_install_read_handler(machine, 0, ADDRESS_SPACE_PROGRAM, begin, end, 0, 0, read_bank);
108108   if (val & 0x01)
109109      memory_set_bankptr(read_bank, i82439tx->bios_ram + (begin - 0xC0000) / 4);
110110   else
111111      memory_set_bankptr(read_bank, memory_region(REGION_USER1) + (begin - 0xC0000));
112112
113113   if (val & 0x02)
114      memory_install_write32_handler(Machine, 0, ADDRESS_SPACE_PROGRAM, begin, end, 0, 0, wh);
114      memory_install_write32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, begin, end, 0, 0, wh);
115115   else
116      memory_install_write32_handler(Machine, 0, ADDRESS_SPACE_PROGRAM, begin, end, 0, 0, SMH_NOP);
116      memory_install_write32_handler(machine, 0, ADDRESS_SPACE_PROGRAM, begin, end, 0, 0, SMH_NOP);
117117}
118118
119119
120120
121121static void intel82439tx_pci_write(int function, int offset, UINT32 data, UINT32 mem_mask)
122122{
123   running_machine *machine = Machine;
124
123125   if (function != 0)
124126      return;
125127
r2771r2772
157159         {
158160            case 0x58:
159161               if (!(mem_mask & 0x0000f000))
160                  intel82439tx_configure_memory(data >> 12, 0xF0000, 0xFFFFF, BANK_F0000_R, bank_f0000_w);
162                  intel82439tx_configure_memory(machine, data >> 12, 0xF0000, 0xFFFFF, BANK_F0000_R, bank_f0000_w);
161163               if (!(mem_mask & 0x000f0000))
162                  intel82439tx_configure_memory(data >> 16, 0xC0000, 0xC3FFF, BANK_C0000_R, bank_c0000_w);
164                  intel82439tx_configure_memory(machine, data >> 16, 0xC0000, 0xC3FFF, BANK_C0000_R, bank_c0000_w);
163165               if (!(mem_mask & 0x00f00000))
164                  intel82439tx_configure_memory(data >> 20, 0xC4000, 0xC7FFF, BANK_C4000_R, bank_c4000_w);
166                  intel82439tx_configure_memory(machine, data >> 20, 0xC4000, 0xC7FFF, BANK_C4000_R, bank_c4000_w);
165167               if (!(mem_mask & 0x0f000000))
166                  intel82439tx_configure_memory(data >> 24, 0xC8000, 0xCCFFF, BANK_C8000_R, bank_c8000_w);
168                  intel82439tx_configure_memory(machine, data >> 24, 0xC8000, 0xCCFFF, BANK_C8000_R, bank_c8000_w);
167169               if (!(mem_mask & 0xf0000000))
168                  intel82439tx_configure_memory(data >> 28, 0xCC000, 0xCFFFF, BANK_CC000_R, bank_cc000_w);
170                  intel82439tx_configure_memory(machine, data >> 28, 0xCC000, 0xCFFFF, BANK_CC000_R, bank_cc000_w);
169171               break;
170172
171173            case 0x5C:
172174               if (!(mem_mask & 0x0000000f))
173                  intel82439tx_configure_memory(data >>  0, 0xD0000, 0xD3FFF, BANK_D0000_R, bank_d0000_w);
175                  intel82439tx_configure_memory(machine, data >>  0, 0xD0000, 0xD3FFF, BANK_D0000_R, bank_d0000_w);
174176               if (!(mem_mask & 0x000000f0))
175                  intel82439tx_configure_memory(data >>  4, 0xD4000, 0xD7FFF, BANK_D4000_R, bank_d4000_w);
177                  intel82439tx_configure_memory(machine, data >>  4, 0xD4000, 0xD7FFF, BANK_D4000_R, bank_d4000_w);
176178               if (!(mem_mask & 0x00000f00))
177                  intel82439tx_configure_memory(data >>  8, 0xD8000, 0xDBFFF, BANK_D8000_R, bank_d8000_w);
179                  intel82439tx_configure_memory(machine, data >>  8, 0xD8000, 0xDBFFF, BANK_D8000_R, bank_d8000_w);
178180               if (!(mem_mask & 0x0000f000))
179                  intel82439tx_configure_memory(data >> 12, 0xDC000, 0xDFFFF, BANK_DC000_R, bank_dc000_w);
181                  intel82439tx_configure_memory(machine, data >> 12, 0xDC000, 0xDFFFF, BANK_DC000_R, bank_dc000_w);
180182               if (!(mem_mask & 0x000f0000))
181                  intel82439tx_configure_memory(data >> 16, 0xE0000, 0xE3FFF, BANK_E0000_R, bank_e0000_w);
183                  intel82439tx_configure_memory(machine, data >> 16, 0xE0000, 0xE3FFF, BANK_E0000_R, bank_e0000_w);
182184               if (!(mem_mask & 0x00f00000))
183                  intel82439tx_configure_memory(data >> 20, 0xE4000, 0xE7FFF, BANK_E4000_R, bank_e4000_w);
185                  intel82439tx_configure_memory(machine, data >> 20, 0xE4000, 0xE7FFF, BANK_E4000_R, bank_e4000_w);
184186               if (!(mem_mask & 0x0f000000))
185                  intel82439tx_configure_memory(data >> 24, 0xE8000, 0xECFFF, BANK_E8000_R, bank_e8000_w);
187                  intel82439tx_configure_memory(machine, data >> 24, 0xE8000, 0xECFFF, BANK_E8000_R, bank_e8000_w);
186188               if (!(mem_mask & 0xf0000000))
187                  intel82439tx_configure_memory(data >> 28, 0xEC000, 0xEFFFF, BANK_EC000_R, bank_ec000_w);
189                  intel82439tx_configure_memory(machine, data >> 28, 0xEC000, 0xEFFFF, BANK_EC000_R, bank_ec000_w);
188190               break;
189191         }
190192
r2771r2772
230232   i82439tx->regs[0x04] = 0x02020202;
231233   i82439tx->regs[0x05] = 0x00000002;
232234
233   intel82439tx_configure_memory(0, 0xF0000, 0xFFFFF, BANK_F0000_R, bank_f0000_w);
234   intel82439tx_configure_memory(0, 0xC0000, 0xC3FFF, BANK_C0000_R, bank_c0000_w);
235   intel82439tx_configure_memory(0, 0xC4000, 0xC7FFF, BANK_C4000_R, bank_c4000_w);
236   intel82439tx_configure_memory(0, 0xC8000, 0xCCFFF, BANK_C8000_R, bank_c8000_w);
237   intel82439tx_configure_memory(0, 0xCC000, 0xCFFFF, BANK_CC000_R, bank_cc000_w);
238   intel82439tx_configure_memory(0, 0xD0000, 0xD3FFF, BANK_D0000_R, bank_d0000_w);
239   intel82439tx_configure_memory(0, 0xD4000, 0xD7FFF, BANK_D4000_R, bank_d4000_w);
240   intel82439tx_configure_memory(0, 0xD8000, 0xDBFFF, BANK_D8000_R, bank_d8000_w);
241   intel82439tx_configure_memory(0, 0xDC000, 0xDFFFF, BANK_DC000_R, bank_dc000_w);
242   intel82439tx_configure_memory(0, 0xE0000, 0xE3FFF, BANK_E0000_R, bank_e0000_w);
243   intel82439tx_configure_memory(0, 0xE4000, 0xE7FFF, BANK_E4000_R, bank_e4000_w);
244   intel82439tx_configure_memory(0, 0xE8000, 0xECFFF, BANK_E8000_R, bank_e8000_w);
245   intel82439tx_configure_memory(0, 0xEC000, 0xEFFFF, BANK_EC000_R, bank_ec000_w);
235   intel82439tx_configure_memory(Machine, 0, 0xF0000, 0xFFFFF, BANK_F0000_R, bank_f0000_w);
236   intel82439tx_configure_memory(Machine, 0, 0xC0000, 0xC3FFF, BANK_C0000_R, bank_c0000_w);
237   intel82439tx_configure_memory(Machine, 0, 0xC4000, 0xC7FFF, BANK_C4000_R, bank_c4000_w);
238   intel82439tx_configure_memory(Machine, 0, 0xC8000, 0xCCFFF, BANK_C8000_R, bank_c8000_w);
239   intel82439tx_configure_memory(Machine, 0, 0xCC000, 0xCFFFF, BANK_CC000_R, bank_cc000_w);
240   intel82439tx_configure_memory(Machine, 0, 0xD0000, 0xD3FFF, BANK_D0000_R, bank_d0000_w);
241   intel82439tx_configure_memory(Machine, 0, 0xD4000, 0xD7FFF, BANK_D4000_R, bank_d4000_w);
242   intel82439tx_configure_memory(Machine, 0, 0xD8000, 0xDBFFF, BANK_D8000_R, bank_d8000_w);
243   intel82439tx_configure_memory(Machine, 0, 0xDC000, 0xDFFFF, BANK_DC000_R, bank_dc000_w);
244   intel82439tx_configure_memory(Machine, 0, 0xE0000, 0xE3FFF, BANK_E0000_R, bank_e0000_w);
245   intel82439tx_configure_memory(Machine, 0, 0xE4000, 0xE7FFF, BANK_E4000_R, bank_e4000_w);
246   intel82439tx_configure_memory(Machine, 0, 0xE8000, 0xECFFF, BANK_E8000_R, bank_e8000_w);
247   intel82439tx_configure_memory(Machine, 0, 0xEC000, 0xEFFFF, BANK_EC000_R, bank_ec000_w);
246248}
247249
src/mess/machine/vc20.c
r2771r2772
481481   }
482482}
483483
484static void vc20_memory_init(void)
484static void vc20_memory_init(running_machine *machine)
485485{
486486   static int inited=0;
487487   UINT8 *memory = memory_region (REGION_CPU1);
r2771r2772
517517   inited=1;
518518}
519519
520static void vc20_common_driver_init (void)
520static void vc20_common_driver_init (running_machine *machine)
521521{
522522#ifdef VC1541
523523   VC1541_CONFIG vc1541= { 1, 8 };
524524#endif
525   vc20_memory_init();
525   vc20_memory_init(machine);
526526
527527   vc20_tape_open (via_1_ca1_w);
528528
r2771r2772
548548
549549DRIVER_INIT( vc20 )
550550{
551   vc20_common_driver_init ();
551   vc20_common_driver_init (machine);
552552   vic6561_init (vic6560_dma_read, vic6560_dma_read_color);
553553}
554554
555555DRIVER_INIT( vic20 )
556556{
557   vc20_common_driver_init ();
557   vc20_common_driver_init (machine);
558558   vic6560_init (vic6560_dma_read, vic6560_dma_read_color);
559559}
560560
r2771r2772
566566DRIVER_INIT( vic20i )
567567{
568568   ieee=1;
569   vc20_common_driver_init ();
569   vc20_common_driver_init (machine);
570570   vic6560_init (vic6560_dma_read, vic6560_dma_read_color);
571571   via_config (4, &via4);
572572   via_config (5, &via5);
r2771r2772
631631
632632DEVICE_START(vc20_rom)
633633{
634   vc20_memory_init();
634   vc20_memory_init(device->machine);
635635   vc20_rom_2000 = NULL;
636636   vc20_rom_4000 = NULL;
637637   vc20_rom_6000 = NULL;
src/mess/machine/bbc.c
r2771r2772
20612061
20622062   size = image_length (image);
20632063
2064    addr = 0x8000 + (0x4000 * image_index_in_device(image));
2064   addr = 0x8000 + (0x4000 * image_index_in_device(image));
20652065
20662066
20672067   logerror("loading rom %s at %.4x size:%.4x\n",image_filename(image), addr, size);
src/mess/drivers/a2600.c
r2771r2772
132132
133133// try to detect 2600 controller setup. returns 32bits with left/right controller info
134134
135static unsigned long detect_2600controllers(void)
135static unsigned long detect_2600controllers(running_machine *machine)
136136{
137137#define JOYS 0x001
138138#define PADD 0x002
r2771r2772
206206   return (left << 16) + right;
207207}
208208
209static int detect_modeDC(void)
209static int detect_modeDC(running_machine *machine)
210210{
211211   int i,numfound = 0;
212212   // signature is also in 'video reflex'.. maybe figure out that controller port someday...
r2771r2772
225225   return 0;
226226}
227227
228static int detect_modef6(void)
228static int detect_modef6(running_machine *machine)
229229{
230230   int i,numfound = 0;
231231   static const unsigned char signature[3] = { 0x8d, 0xf6, 0xff };
r2771r2772
243243   return 0;
244244}
245245
246static int detect_mode3E(void)
246static int detect_mode3E(running_machine *machine)
247247{
248248   // this one is a little hacky.. looks for STY $3e, which is unique to
249249   // 'not boulderdash', but is the only example i have (cow)
r2771r2772
265265   return 0;
266266}
267267
268static int detect_modeSS(void)
268static int detect_modeSS(running_machine *machine)
269269{
270270   int i,numfound = 0;
271271   static const unsigned char signature[5] = { 0xbd, 0xe5, 0xff, 0x95, 0x81 };
r2771r2772
283283   return 0;
284284}
285285
286static int detect_modeFE(void)
286static int detect_modeFE(running_machine *machine)
287287{
288288   int i,j,numfound = 0;
289289   static const unsigned char signatures[][5] =  {
r2771r2772
308308   return 0;
309309}
310310
311static int detect_modeE0(void)
311static int detect_modeE0(running_machine *machine)
312312{
313313   int i,j,numfound = 0;
314314   static const unsigned char signatures[][3] =  {
r2771r2772
335335   return 0;
336336}
337337
338static int detect_modeCV(void)
338static int detect_modeCV(running_machine *machine)
339339{
340340   int i,j,numfound = 0;
341341   static const unsigned char signatures[][3] = {
r2771r2772
358358   return 0;
359359}
360360
361static int detect_modeFV(void)
361static int detect_modeFV(running_machine *machine)
362362{
363363   int i,j,numfound = 0;
364364   static const unsigned char signatures[][3] = {
r2771r2772
381381   return 0;
382382}
383383
384static int detect_modeJVP(void)
384static int detect_modeJVP(running_machine *machine)
385385{
386386   int i,j,numfound = 0;
387387   static const unsigned char signatures[][4] = {
r2771r2772
404404   return 0;
405405}
406406
407static int detect_modeE7(void)
407static int detect_modeE7(running_machine *machine)
408408{
409409   int i,j,numfound = 0;
410410   static const unsigned char signatures[][3] = {
r2771r2772
427427   return 0;
428428}
429429
430static int detect_modeUA(void)
430static int detect_modeUA(running_machine *machine)
431431{
432432   int i,numfound = 0;
433433   static const unsigned char signature[3] = { 0x8d, 0x40, 0x02 };
r2771r2772
445445   return 0;
446446}
447447
448static int detect_8K_mode3F(void)
448static int detect_8K_mode3F(running_machine *machine)
449449{
450450   int i,numfound = 0;
451451   static const unsigned char signature1[4] = { 0xa9, 0x01, 0x85, 0x3f };
r2771r2772
469469   return 0;
470470}
471471
472static int detect_32K_mode3F(void)
472static int detect_32K_mode3F(running_machine *machine)
473473{
474474   int i,numfound = 0;
475475   static const unsigned char signature[4] = { 0xa9, 0x0e, 0x85, 0x3f };
r2771r2772
487487   return 0;
488488}
489489
490static int detect_super_chip(void)
490static int detect_super_chip(running_machine *machine)
491491{
492492   int i,j;
493493   static const unsigned char signatures[][5] = {
r2771r2772
559559
560560   image_fread(image, CART, cart_size);
561561
562   if (!(cart_size == 0x4000 && detect_modef6())) {
562   if (!(cart_size == 0x4000 && detect_modef6(image->machine))) {
563563      while (cart_size > 0x00800) {
564564         if (!memcmp(CART, &CART[cart_size/2],cart_size/2)) cart_size /= 2;
565565         else break;
r2771r2772
585585}
586586
587587
588static void modeF8_switch(UINT16 offset, UINT8 data)
588static void modeF8_switch(running_machine *machine, UINT16 offset, UINT8 data)
589589{
590590   bank_base[1] = CART + 0x1000 * offset;
591591   memory_set_bankptr(1, bank_base[1]);
592592}
593static void modeFA_switch(UINT16 offset, UINT8 data)
593static void modeFA_switch(running_machine *machine, UINT16 offset, UINT8 data)
594594{
595595   bank_base[1] = CART + 0x1000 * offset;
596596   memory_set_bankptr(1, bank_base[1]);
597597}
598static void modeF6_switch(UINT16 offset, UINT8 data)
598static void modeF6_switch(running_machine *machine, UINT16 offset, UINT8 data)
599599{
600600   bank_base[1] = CART + 0x1000 * offset;
601601   memory_set_bankptr(1, bank_base[1]);
602602}
603static void modeF4_switch(UINT16 offset, UINT8 data)
603static void modeF4_switch(running_machine *machine, UINT16 offset, UINT8 data)
604604{
605605   bank_base[1] = CART + 0x1000 * offset;
606606   memory_set_bankptr(1, bank_base[1]);
607607}
608static void mode3F_switch(UINT16 offset, UINT8 data)
608static void mode3F_switch(running_machine *machine, UINT16 offset, UINT8 data)
609609{
610610   bank_base[1] = CART + 0x800 * (data & (number_banks - 1));
611611   memory_set_bankptr(1, bank_base[1]);
612612}
613static void modeUA_switch(UINT16 offset, UINT8 data)
613static void modeUA_switch(running_machine *machine, UINT16 offset, UINT8 data)
614614{
615615   bank_base[1] = CART + (offset >> 6) * 0x1000;
616616   memory_set_bankptr(1, bank_base[1]);
617617}
618static void modeE0_switch(UINT16 offset, UINT8 data)
618static void modeE0_switch(running_machine *machine, UINT16 offset, UINT8 data)
619619{
620620   int bank = 1 + (offset >> 3);
621621   bank_base[bank] = CART + 0x400 * (offset & 7);
622622   memory_set_bankptr(bank, bank_base[bank]);
623623}
624static void modeE7_switch(UINT16 offset, UINT8 data)
624static void modeE7_switch(running_machine *machine, UINT16 offset, UINT8 data)
625625{
626626   bank_base[1] = CART + 0x800 * offset;
627627   memory_set_bankptr(1, bank_base[1]);
628628}
629static void modeE7_RAM_switch(UINT16 offset, UINT8 data)
629static void modeE7_RAM_switch(running_machine *machine, UINT16 offset, UINT8 data)
630630{
631631   memory_set_bankptr(9, extra_RAM + (4 + offset) * 256 );
632632}
633static void modeDC_switch(UINT16 offset, UINT8 data)
633static void modeDC_switch(running_machine *machine, UINT16 offset, UINT8 data)
634634{
635635   bank_base[1] = CART + 0x1000 * next_bank();
636636   memory_set_bankptr(1, bank_base[1]);
637637}
638static void mode3E_switch(UINT16 offset, UINT8 data)
638static void mode3E_switch(running_machine *machine, UINT16 offset, UINT8 data)
639639{
640640   bank_base[1] = CART + 0x800 * (data & (number_banks - 1));
641641   memory_set_bankptr(1, bank_base[1]);
642642   mode3E_ram_enabled = 0;
643643}
644static void mode3E_RAM_switch(UINT16 offset, UINT8 data)
644static void mode3E_RAM_switch(running_machine *machine, UINT16 offset, UINT8 data)
645645{
646646   ram_base = extra_RAM + 0x200 * ( data & 0x3F );
647647   memory_set_bankptr(1, ram_base );
648648   mode3E_ram_enabled = 1;
649649}
650static void modeFV_switch(UINT16 offset, UINT8 data)
650static void modeFV_switch(running_machine *machine, UINT16 offset, UINT8 data)
651651{
652652   //printf("ModeFV %04x\n",offset);
653653   if (!FVlocked && ( activecpu_get_pc() & 0x1F00 ) == 0x1F00 ) {
r2771r2772
657657      memory_set_bankptr(1, bank_base[1]);
658658   }
659659}
660static void modeJVP_switch(UINT16 offset, UINT8 data)
660static void modeJVP_switch(running_machine *machine, UINT16 offset, UINT8 data)
661661{
662662   switch( offset ) {
663663   case 0x00:
r2771r2772
674674
675675
676676/* These read handlers will return the byte from the new bank */
677static  READ8_HANDLER(modeF8_switch_r) { modeF8_switch(offset, 0); return bank_base[1][0xff8 + offset]; }
678static  READ8_HANDLER(modeFA_switch_r) { modeFA_switch(offset, 0); return bank_base[1][0xff8 + offset]; }
679static  READ8_HANDLER(modeF6_switch_r) { modeF6_switch(offset, 0); return bank_base[1][0xff6 + offset]; }
680static  READ8_HANDLER(modeF4_switch_r) { modeF4_switch(offset, 0); return bank_base[1][0xff4 + offset]; }
681static  READ8_HANDLER(modeE0_switch_r) { modeE0_switch(offset, 0); return bank_base[4][0x3e0 + offset]; }
682static  READ8_HANDLER(modeE7_switch_r) { modeE7_switch(offset, 0); return bank_base[1][0xfe0 + offset]; }
683static  READ8_HANDLER(modeE7_RAM_switch_r) { modeE7_RAM_switch(offset, 0); return 0; }
684static  READ8_HANDLER(modeUA_switch_r) { modeUA_switch(offset, 0); return 0; }
685static  READ8_HANDLER(modeDC_switch_r) { modeDC_switch(offset, 0); return bank_base[1][0xff0 + offset]; }
686static  READ8_HANDLER(modeFV_switch_r) { modeFV_switch(offset, 0); return bank_base[1][0xfd0 + offset]; }
687static  READ8_HANDLER(modeJVP_switch_r) { modeJVP_switch(offset, 0); return riot_ram[ 0x20 + offset ]; }
677static  READ8_HANDLER(modeF8_switch_r) { modeF8_switch(machine, offset, 0); return bank_base[1][0xff8 + offset]; }
678static  READ8_HANDLER(modeFA_switch_r) { modeFA_switch(machine, offset, 0); return bank_base[1][0xff8 + offset]; }
679static  READ8_HANDLER(modeF6_switch_r) { modeF6_switch(machine, offset, 0); return bank_base[1][0xff6 + offset]; }
680static  READ8_HANDLER(modeF4_switch_r) { modeF4_switch(machine, offset, 0); return bank_base[1][0xff4 + offset]; }
681static  READ8_HANDLER(modeE0_switch_r) { modeE0_switch(machine, offset, 0); return bank_base[4][0x3e0 + offset]; }
682static  READ8_HANDLER(modeE7_switch_r) { modeE7_switch(machine, offset, 0); return bank_base[1][0xfe0 + offset]; }
683static  READ8_HANDLER(modeE7_RAM_switch_r) { modeE7_RAM_switch(machine, offset, 0); return 0; }
684static  READ8_HANDLER(modeUA_switch_r) { modeUA_switch(machine, offset, 0); return 0; }
685static  READ8_HANDLER(modeDC_switch_r) { modeDC_switch(machine, offset, 0); return bank_base[1][0xff0 + offset]; }
686static  READ8_HANDLER(modeFV_switch_r) { modeFV_switch(machine, offset, 0); return bank_base[1][0xfd0 + offset]; }
687static  READ8_HANDLER(modeJVP_switch_r) { modeJVP_switch(machine, offset, 0); return riot_ram[ 0x20 + offset ]; }
688688
689689
690static WRITE8_HANDLER(modeF8_switch_w) { modeF8_switch(offset, data); }
691static WRITE8_HANDLER(modeFA_switch_w) { modeFA_switch(offset, data); }
692static WRITE8_HANDLER(modeF6_switch_w) { modeF6_switch(offset, data); }
693static WRITE8_HANDLER(modeF4_switch_w) { modeF4_switch(offset, data); }
694static WRITE8_HANDLER(modeE0_switch_w) { modeE0_switch(offset, data); }
695static WRITE8_HANDLER(modeE7_switch_w) { modeE7_switch(offset, data); }
696static WRITE8_HANDLER(modeE7_RAM_switch_w) { modeE7_RAM_switch(offset, data); }
697static WRITE8_HANDLER(mode3F_switch_w) { mode3F_switch(offset, data); }
698static WRITE8_HANDLER(modeUA_switch_w) { modeUA_switch(offset, data); }
699static WRITE8_HANDLER(modeDC_switch_w) { modeDC_switch(offset, data); }
700static WRITE8_HANDLER(mode3E_switch_w) { mode3E_switch(offset, data); }
701static WRITE8_HANDLER(mode3E_RAM_switch_w) { mode3E_RAM_switch(offset, data); }
690static WRITE8_HANDLER(modeF8_switch_w) { modeF8_switch(machine, offset, data); }
691static WRITE8_HANDLER(modeFA_switch_w) { modeFA_switch(machine, offset, data); }
692static WRITE8_HANDLER(modeF6_switch_w) { modeF6_switch(machine, offset, data); }
693static WRITE8_HANDLER(modeF4_switch_w) { modeF4_switch(machine, offset, data); }
694static WRITE8_HANDLER(modeE0_switch_w) { modeE0_switch(machine, offset, data); }
695static WRITE8_HANDLER(modeE7_switch_w) { modeE7_switch(machine, offset, data); }
696static WRITE8_HANDLER(modeE7_RAM_switch_w) { modeE7_RAM_switch(machine, offset, data); }
697static WRITE8_HANDLER(mode3F_switch_w) { mode3F_switch(machine, offset, data); }
698static WRITE8_HANDLER(modeUA_switch_w) { modeUA_switch(machine, offset, data); }
699static WRITE8_HANDLER(modeDC_switch_w) { modeDC_switch(machine, offset, data); }
700static WRITE8_HANDLER(mode3E_switch_w) { mode3E_switch(machine, offset, data); }
701static WRITE8_HANDLER(mode3E_RAM_switch_w) { mode3E_RAM_switch(machine, offset, data); }
702702static WRITE8_HANDLER(mode3E_RAM_w) {
703703   if ( mode3E_ram_enabled ) {
704704      ram_base[offset] = data;
705705   }
706706}
707static WRITE8_HANDLER(modeFV_switch_w) { modeFV_switch(offset, data); }
708static WRITE8_HANDLER(modeJVP_switch_w) { modeJVP_switch(offset, data); riot_ram[ 0x20 + offset ] = data; }
707static WRITE8_HANDLER(modeFV_switch_w) { modeFV_switch(machine, offset, data); }
708static WRITE8_HANDLER(modeJVP_switch_w) { modeJVP_switch(machine, offset, data); riot_ram[ 0x20 + offset ] = data; }
709709
710710
711711static OPBASE_HANDLER( modeF6_opbase )
r2771r2772
14791479   current_reset_bank_counter++;
14801480
14811481   /* auto-detect special controllers */
1482   controltemp = detect_2600controllers();
1482   controltemp = detect_2600controllers(machine);
14831483   set_controller( machine, STR_LEFT_CONTROLLER, controltemp >> 16 );
14841484   set_controller( machine, STR_RIGHT_CONTROLLER, controltemp & 0xFFFF );
14851485
14861486   /* auto-detect bank mode */
14871487
1488   if (banking_mode == 0xff) if (detect_modeDC()) banking_mode = modeDC;
1489   if (banking_mode == 0xff) if (detect_mode3E()) banking_mode = mode3E;
1490   if (banking_mode == 0xff) if (detect_modeFE()) banking_mode = modeFE;
1491   if (banking_mode == 0xff) if (detect_modeSS()) banking_mode = modeSS;
1492   if (banking_mode == 0xff) if (detect_modeE0()) banking_mode = modeE0;
1493   if (banking_mode == 0xff) if (detect_modeCV()) banking_mode = modeCV;
1494   if (banking_mode == 0xff) if (detect_modeFV()) banking_mode = modeFV;
1495   if (banking_mode == 0xff) if (detect_modeJVP()) banking_mode = modeJVP;
1496   if (banking_mode == 0xff) if (detect_modeUA()) banking_mode = modeUA;
1497   if (banking_mode == 0xff) if (detect_8K_mode3F()) banking_mode = mode3F;
1498   if (banking_mode == 0xff) if (detect_32K_mode3F()) banking_mode = mode3F;
1499   if (banking_mode == 0xff) if (detect_modeE7()) banking_mode = modeE7;
1488   if (banking_mode == 0xff) if (detect_modeDC(machine)) banking_mode = modeDC;
1489   if (banking_mode == 0xff) if (detect_mode3E(machine)) banking_mode = mode3E;
1490   if (banking_mode == 0xff) if (detect_modeFE(machine)) banking_mode = modeFE;
1491   if (banking_mode == 0xff) if (detect_modeSS(machine)) banking_mode = modeSS;
1492   if (banking_mode == 0xff) if (detect_modeE0(machine)) banking_mode = modeE0;
1493   if (banking_mode == 0xff) if (detect_modeCV(machine)) banking_mode = modeCV;
1494   if (banking_mode == 0xff) if (detect_modeFV(machine)) banking_mode = modeFV;
1495   if (banking_mode == 0xff) if (detect_modeJVP(machine)) banking_mode = modeJVP;
1496   if (banking_mode == 0xff) if (detect_modeUA(machine)) banking_mode = modeUA;
1497   if (banking_mode == 0xff) if (detect_8K_mode3F(machine)) banking_mode = mode3F;
1498   if (banking_mode == 0xff) if (detect_32K_mode3F(machine)) banking_mode = mode3F;
1499   if (banking_mode == 0xff) if (detect_modeE7(machine)) banking_mode = modeE7;
15001500
15011501   if (banking_mode == 0xff) {
15021502      switch (cart_size)
r2771r2772
15381538
15391539   if (cart_size == 0x2000 || cart_size == 0x4000 || cart_size == 0x8000)
15401540   {
1541      chip = detect_super_chip();
1541      chip = detect_super_chip(machine);
15421542   }
15431543
15441544   /* Super chip games:

Previous 15994 Revisions Next


© 1998-2018 The MESS Team