Previous 15994 Revisions Next

r14946 Tuesday 17th April, 2012 at 07:25:07 UTC by Barry Rodewald
x68k: fixed x68000 and x68kxvi regression. (no whatsnew)
[src/mess/drivers]x68k.c
[src/mess/includes]x68k.h

src/mess/includes/x68k.h
r14945r14946
3838   MFP_IRQ_GPIP7
3939};  // MC68901 IRQ priority levels
4040
41class x68k_state : public driver_device
41class x68k_base_state : public driver_device
4242{
4343public:
44   x68k_state(const machine_config &mconfig, device_type type, const char *tag)
44   x68k_base_state(const machine_config &mconfig, device_type type, const char *tag)
4545      : driver_device(mconfig, type, tag),
4646        m_mfpdev(*this, MC68901_TAG),
47        m_rtc(*this, RP5C15_TAG),
48        m_nvram(*this, "nvram")
47        m_rtc(*this, RP5C15_TAG)
4948   { }
5049
5150   required_device<mc68901_device> m_mfpdev;
5251   required_device<rp5c15_device> m_rtc;
53   required_shared_ptr<UINT32>   m_nvram;
5452
55   DECLARE_WRITE_LINE_MEMBER( mfp_tdo_w );
56   DECLARE_READ8_MEMBER( mfp_gpio_r );
57
5853   struct
5954   {
6055      int sram_writeprotect;
r14945r14946
243238   int m_oddscanline;
244239};
245240
241class x68k_state : public x68k_base_state
242{
243public:
244   x68k_state(const machine_config &mconfig, device_type type, const char *tag)
245      : x68k_base_state(mconfig,type,tag),
246        m_nvram(*this, "nvram")
247   { }
246248
249   required_shared_ptr<UINT16>   m_nvram;
250
251   DECLARE_WRITE_LINE_MEMBER( mfp_tdo_w );
252   DECLARE_READ8_MEMBER( mfp_gpio_r );
253};
254
255class x68030_state : public x68k_base_state
256{
257public:
258   x68030_state(const machine_config &mconfig, device_type type, const char *tag)
259      : x68k_base_state(mconfig,type,tag),
260        m_nvram(*this, "nvram")
261   { }
262
263   required_shared_ptr<UINT32>   m_nvram;
264
265   DECLARE_WRITE_LINE_MEMBER( mfp_tdo_w );
266   DECLARE_READ8_MEMBER( mfp_gpio_r );
267};
268
247269/*----------- defined in drivers/x68k.c -----------*/
248270
249271#ifdef UNUSED_FUNCTION
src/mess/drivers/x68k.c
r14945r14946
15441544
15451545   if(state->m_sysport.sram_writeprotect == 0x31)
15461546   {
1547      COMBINE_DATA(state->m_nvram + offset);
1547      state->m_nvram[offset] = data;
15481548   }
15491549}
15501550
r14945r14946
15691569
15701570static READ32_HANDLER( x68k_sram32_r )
15711571{
1572   x68k_state *state = space->machine().driver_data<x68k_state>();
1572   x68030_state *state = space->machine().driver_data<x68030_state>();
15731573   if(offset == 0x08/4)
15741574      return (space->machine().device<ram_device>(RAM_TAG)->size() & 0xffff0000);  // RAM size
15751575#if 0
r14945r14946
15851585
15861586static WRITE32_HANDLER( x68k_sram32_w )
15871587{
1588   x68k_state *state = space->machine().driver_data<x68k_state>();
1588   x68030_state *state = space->machine().driver_data<x68030_state>();
15891589   if(state->m_sysport.sram_writeprotect == 0x31)
15901590   {
15911591      COMBINE_DATA(state->m_nvram + offset);
r14945r14946
26692669static MACHINE_START( x68030 )
26702670{
26712671   address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
2672   x68k_state *state = machine.driver_data<x68k_state>();
2672   x68030_state *state = machine.driver_data<x68030_state>();
26732673   /*  Install RAM handlers  */
26742674   state->m_spriteram = (UINT16*)(*machine.region("user1"));
26752675   space->install_legacy_read_handler(0x000000,0xbffffb,0xffffffff,0,FUNC(x68k_rom0_r),0xffffffff);
26762676   space->install_legacy_write_handler(0x000000,0xbffffb,0xffffffff,0,FUNC(x68k_rom0_w),0xffffffff);
26772677   space->install_readwrite_bank(0x000000,machine.device<ram_device>(RAM_TAG)->size()-1,0xffffffff,0,"bank1");
2678   // mirror? Human68k 3.02 explicitly adds 0x3000000 to some pointers
2679   space->install_readwrite_bank(0x3000000,0x3000000+machine.device<ram_device>(RAM_TAG)->size()-1,0xffffffff,0,"bank5");
26802678   memory_set_bankptr(machine, "bank1",machine.device<ram_device>(RAM_TAG)->pointer());
2681   memory_set_bankptr(machine, "bank5",machine.device<ram_device>(RAM_TAG)->pointer());
26822679   space->install_legacy_read_handler(0xc00000,0xdfffff,0xffffffff,0,FUNC(x68k_gvram32_r));
26832680   space->install_legacy_write_handler(0xc00000,0xdfffff,0xffffffff,0,FUNC(x68k_gvram32_w));
26842681   memory_set_bankptr(machine, "bank2",state->m_gvram);  // so that code in VRAM is executable - needed for Terra Cresta
r14945r14946
27562753   state->m_sysport.cputype = 0xdc; // 68030, 25MHz
27572754}
27582755
2759static MACHINE_CONFIG_START( x68000_base, x68k_state )
2756static MACHINE_CONFIG_FRAGMENT( x68000_base )
27602757   /* basic machine hardware */
27612758   MCFG_CPU_ADD("maincpu", M68000, 10000000)  /* 10 MHz */
27622759   MCFG_CPU_PROGRAM_MAP(x68k_map)
r14945r14946
28042801   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
28052802   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
28062803
2807   MCFG_NVRAM_ADD_0FILL("nvram")
2808
28092804   MCFG_UPD72065_ADD("upd72065", fdc_interface)
28102805   MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(x68k_floppy_interface)
28112806   MCFG_SOFTWARE_LIST_ADD("flop_list","x68k_flop")
r14945r14946
28182813   MCFG_RAM_EXTRA_OPTIONS("1M,2M,3M,5M,6M,7M,8M,9M,10M,11M,12M")
28192814MACHINE_CONFIG_END
28202815
2821static MACHINE_CONFIG_DERIVED( x68000, x68000_base )
2816static MACHINE_CONFIG_START( x68000, x68k_state )
2817   MCFG_FRAGMENT_ADD(x68000_base)
28222818
2819   MCFG_NVRAM_ADD_0FILL("nvram")
2820
28232821   MCFG_X68KHDC_ADD( "x68k_hdc" )
28242822
28252823MACHINE_CONFIG_END
28262824
2827static MACHINE_CONFIG_DERIVED( x68kxvi, x68000_base )
2825static MACHINE_CONFIG_DERIVED( x68kxvi, x68000 )
28282826
28292827   MCFG_CPU_MODIFY("maincpu")
28302828   MCFG_CPU_CLOCK(16000000)  /* 16 MHz */
r14945r14946
28402838   MCFG_HARDDISK_ADD("harddisk6")
28412839MACHINE_CONFIG_END
28422840
2843static MACHINE_CONFIG_DERIVED( x68030, x68000_base )
2841static MACHINE_CONFIG_START( x68030, x68030_state )
2842   MCFG_FRAGMENT_ADD(x68000_base)
28442843
28452844   MCFG_CPU_REPLACE("maincpu", M68030, 25000000)  /* 25 MHz 68EC030 */
28462845   MCFG_CPU_PROGRAM_MAP(x68030_map)
r14945r14946
28482847   MCFG_MACHINE_START( x68030 )
28492848   MCFG_MACHINE_RESET( x68000 )
28502849
2850   MCFG_NVRAM_ADD_0FILL("nvram")
2851
28512852   MCFG_MB89352A_ADD("mb89352_int",x68k_scsi_intf)
28522853   MCFG_HARDDISK_ADD("harddisk0")
28532854   MCFG_HARDDISK_ADD("harddisk1")

Previous 15994 Revisions Next


© 1998-2018 The MESS Team