Previous 199869 Revisions Next

r20001 Wednesday 2nd January, 2013 at 02:14:55 UTC by R. Belmont
(MESS) Mac: get the 6805s away from knowing mac_state internals, fixes Pippin error [R. Belmont]
[src/mess/drivers]mac.c macpci.c
[src/mess/includes]mac.h macpci.h
[src/mess/machine]macadb.c macpci.c

trunk/src/mess/drivers/macpci.c
r20000r20001
100100
101101static const cuda_interface mac_cuda_interface =
102102{
103    DEVCB_DRIVER_LINE_MEMBER(macpci_state, cuda_reset_w)
103    DEVCB_DRIVER_LINE_MEMBER(macpci_state, cuda_reset_w),
104    DEVCB_DRIVER_LINE_MEMBER(macpci_state, cuda_adb_linechange_w)
104105};
105106
106107static MACHINE_CONFIG_START( pippin, macpci_state )
r20000r20001
136137   MCFG_RAM_DEFAULT_SIZE("32M")
137138
138139   MCFG_VIA6522_ADD("via6522_0", C7M/10, pcimac_via6522_intf)
139//  MCFG_SCC8530_ADD("scc", C7M, line_cb_t(FUNC(mac_state::set_scc_interrupt), static_cast<mac_state *>(owner)))
140//  MCFG_SCC8530_ADD("scc", C7M, line_cb_t(FUNC(macpci_state::set_scc_interrupt), static_cast<macpci_state *>(owner)))
140141    MCFG_CUDA_ADD(CUDA_341S0060, mac_cuda_interface)
141142   MCFG_QUANTUM_PERFECT_CPU("maincpu")
142143MACHINE_CONFIG_END
trunk/src/mess/drivers/mac.c
r20000r20001
896896
897897static const cuda_interface mac_cuda_interface =
898898{
899    DEVCB_DRIVER_LINE_MEMBER(mac_state, cuda_reset_w)
899    DEVCB_DRIVER_LINE_MEMBER(mac_state, cuda_reset_w),
900    DEVCB_DRIVER_LINE_MEMBER(mac_state, adb_linechange_w)
900901};
901902
903static const cuda_interface mac_egret_interface =
904{
905    DEVCB_DRIVER_LINE_MEMBER(mac_state, cuda_reset_w),
906    DEVCB_DRIVER_LINE_MEMBER(mac_state, adb_linechange_w)
907};
908
902909static MACHINE_CONFIG_START( mac512ke, mac_state )
903910
904911   /* basic machine hardware */
r20000r20001
11621169   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
11631170   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
11641171
1165   MCFG_EGRET_ADD(EGRET_341S0850)
1172   MCFG_EGRET_ADD(EGRET_341S0850, mac_egret_interface)
11661173   MCFG_QUANTUM_PERFECT_CPU("maincpu")
11671174MACHINE_CONFIG_END
11681175
r20000r20001
12031210   MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
12041211   MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
12051212
1206   MCFG_EGRET_REPLACE(EGRET_341S0851)
1213   MCFG_EGRET_REPLACE(EGRET_341S0851, mac_egret_interface)
12071214MACHINE_CONFIG_END
12081215
12091216static MACHINE_CONFIG_DERIVED( maclc520, maclc3 )
r20000r20001
12331240   MCFG_RAM_DEFAULT_SIZE("4M")
12341241   MCFG_RAM_EXTRA_OPTIONS("8M,12M,16M,20M,24M,28M,32M,36M,40M,44M,48M,52M,56M,60M,64M")
12351242
1236   MCFG_EGRET_REPLACE(EGRET_341S0851)
1243   MCFG_EGRET_REPLACE(EGRET_341S0851, mac_egret_interface)
12371244MACHINE_CONFIG_END
12381245
12391246static MACHINE_CONFIG_DERIVED( maciivi, maclc )
r20000r20001
12571264   MCFG_RAM_DEFAULT_SIZE("4M")
12581265   MCFG_RAM_EXTRA_OPTIONS("8M,12M,16M,20M,24M,28M,32M,36M,40M,44M,48M,52M,56M,60M,64M")
12591266
1260   MCFG_EGRET_REPLACE(EGRET_341S0851)
1267   MCFG_EGRET_REPLACE(EGRET_341S0851, mac_egret_interface)
12611268MACHINE_CONFIG_END
12621269
12631270static MACHINE_CONFIG_DERIVED( maciix, macii )
r20000r20001
14971504   MCFG_RAM_DEFAULT_SIZE("10M")
14981505   MCFG_RAM_EXTRA_OPTIONS("2M,4M,6M,8M,10M")
14991506
1500   MCFG_EGRET_REPLACE(EGRET_341S0851)
1507   MCFG_EGRET_REPLACE(EGRET_341S0851, mac_egret_interface)
15011508MACHINE_CONFIG_END
15021509
15031510static MACHINE_CONFIG_DERIVED( maciici, macii )
r20000r20001
15601567   MCFG_RAM_DEFAULT_SIZE("2M")
15611568   MCFG_RAM_EXTRA_OPTIONS("4M,8M,16M,32M,48M,64M,128M")
15621569
1563    MCFG_EGRET_ADD(EGRET_344S0100)
1570    MCFG_EGRET_ADD(EGRET_344S0100, mac_egret_interface)
15641571   MCFG_QUANTUM_PERFECT_CPU("maincpu")
15651572MACHINE_CONFIG_END
15661573
trunk/src/mess/machine/macadb.c
r20000r20001
11831183   }
11841184}
11851185
1186void mac_state::adb_linechange(int state, int dtime)
1186WRITE_LINE_MEMBER(mac_state::adb_linechange_w)
11871187{
1188   int dtime = 0;
11881189/*    static const char *states[] =
11891190    {
11901191        "idle",
r20000r20001
12031204        "srqnodata"
12041205    };*/
12051206
1207    if (ADB_IS_EGRET)
1208    {
1209        dtime = m_egret->get_adb_dtime();
1210    }
1211    else if (ADB_IS_CUDA)
1212    {
1213      dtime = m_cuda->get_adb_dtime();
1214    }
1215
12061216/*    if (m_adb_linestate <= 12)
12071217    {
12081218        printf("linechange: %d -> %d, time %d (state %d = %s)\n", state^1, state, dtime, m_adb_linestate, states[m_adb_linestate]);
trunk/src/mess/machine/macpci.c
r20000r20001
144144    machine().device("maincpu")->execute().set_input_line(INPUT_LINE_RESET, state);
145145}
146146
147WRITE_LINE_MEMBER(macpci_state::cuda_adb_linechange_w)
148{
149}
150
147151static void mac_driver_init(running_machine &machine, model_t model)
148152{
149153   macpci_state *mac = machine.driver_data<macpci_state>();
trunk/src/mess/includes/mac.h
r20000r20001
230230   UINT32 m_se30_vbl_enable;
231231   UINT8 m_nubus_irq_state;
232232
233   void adb_linechange(int state, int dtime);
234
235233   /* used to store the reply to most keyboard commands */
236234   int m_keyboard_reply;
237235
r20000r20001
385383    DECLARE_WRITE_LINE_MEMBER(drq_539x_1_w);
386384
387385    DECLARE_WRITE_LINE_MEMBER(cuda_reset_w);
386   DECLARE_WRITE_LINE_MEMBER(adb_linechange_w);
388387
389388   DECLARE_DIRECT_UPDATE_MEMBER(overlay_opbaseoverride);
390389private:
r20000r20001
482481   TIMER_CALLBACK_MEMBER(mac_scanline_tick);
483482   TIMER_CALLBACK_MEMBER(dafb_vbl_tick);
484483   TIMER_CALLBACK_MEMBER(dafb_cursor_tick);
484   DECLARE_READ8_MEMBER(mac_via_in_cb2);
485485   DECLARE_WRITE8_MEMBER(mac_via_out_cb2);
486486   DECLARE_READ8_MEMBER(mac_adb_via_in_cb2);
487487   DECLARE_WRITE8_MEMBER(mac_adb_via_out_cb2);
r20000r20001
493493   DECLARE_READ8_MEMBER(mac_via2_in_b);
494494   DECLARE_WRITE8_MEMBER(mac_via2_out_a);
495495   DECLARE_WRITE8_MEMBER(mac_via2_out_b);
496   DECLARE_WRITE_LINE_MEMBER(mac_kbd_clk_in);
496497};
497498
498499#endif /* MAC_H_ */
trunk/src/mess/includes/macpci.h
r20000r20001
142142    DECLARE_WRITE_LINE_MEMBER(drq_539x_1_w);
143143
144144    DECLARE_WRITE_LINE_MEMBER(cuda_reset_w);
145    DECLARE_WRITE_LINE_MEMBER(cuda_adb_linechange_w);
145146
146147    // hack functions
147148   DECLARE_READ64_MEMBER ( unk1_r );

Previous 199869 Revisions Next

© 1997-2024 The MAME Team