Previous 199869 Revisions Next

r20794 Thursday 7th February, 2013 at 09:55:57 UTC by O. Galibert
misc fixes.  Hint: read_safe can't work anymore (nw)
[src/mess/drivers]atarist.c mac.c newbrain.c
[src/mess/includes]z80ne.h
[src/mess/machine]apple2.c c2040.c

trunk/src/mess/machine/c2040.c
r20793r20794
15911591   // install image callbacks
15921592   m_unit[0].m_image = m_image0;
15931593
1594   floppy_install_unload_proc(m_image0, c2040_device::on_disk0_change);
15951594   floppy_install_load_proc(m_image0, c2040_device::on_disk0_change);
15961595
15971596   if (m_image1)
15981597   {
15991598      m_unit[1].m_image = m_image1;
16001599
1601      floppy_install_unload_proc(m_image1, c2040_device::on_disk1_change);
16021600      floppy_install_load_proc(m_image1, c2040_device::on_disk1_change);
16031601   }
16041602
trunk/src/mess/machine/apple2.c
r20793r20794
19231923
19241924int apple2_state::apple2_pressed_specialkey(UINT8 key)
19251925{
1926   return (m_kbspecial->read() & key)
1927      || (m_joybuttons->read_safe(0x00) & key);
1926   return ((m_kbspecial ? m_kbspecial->read() : 0) & key)
1927      || ((m_joybuttons ? m_joybuttons->read() : 0) & key);
19281928}
19291929
19301930void apple2_state::apple2_refresh_delegates()
trunk/src/mess/includes/z80ne.h
r20793r20794
149149   required_device<cassette_image_device> m_cassette2;
150150   optional_device<device_t> m_wd1771;
151151   required_memory_region m_region_z80ne;
152   required_memory_bank m_bank1;
153   required_memory_bank m_bank2;
152   optional_memory_bank m_bank1;
153   optional_memory_bank m_bank2;
154154   optional_memory_bank m_bank3;
155155   optional_memory_bank m_bank4;
156156   required_ioport m_io_row0;
trunk/src/mess/drivers/newbrain.c
r20793r20794
133133         else if (bank == 5)
134134         {
135135            /* 0x8000-0x9fff */
136            if (m_eim_rom->base())
136            if (m_eim_rom)
137137            {
138138               /* expansion interface ROM */
139139               memory_install_rom_helper(program, bank_name, bank_start, bank_end);
trunk/src/mess/drivers/atarist.c
r20793r20794
428428
429429   */
430430
431   UINT8 x = m_mousex->read_safe(0x00);
432   UINT8 y = m_mousey->read_safe(0x00);
431   UINT8 x = m_mousex->read();
432   UINT8 y = m_mousey->read();
433433
434434   if (m_ikbd_mouse_pc == 0)
435435   {
r20793r20794
547547
548548   */
549549
550   UINT8 data = m_joy1->read_safe(0xff) & 0x06;
550   UINT8 data = m_joy1 ? m_joy1->read() & 0x06 : 0x06;
551551
552552   // serial receive
553553   data |= m_ikbd_tx << 3;
r20793r20794
634634
635635   if (m_ikbd_joy) return 0xff;
636636
637   UINT8 data = m_joy0->read_safe(0xff);
637   UINT8 data = m_joy0 ? m_joy0->read() : 0xff;
638638
639639   if ((m_config->read() & 0x01) == 0)
640640   {
r20793r20794
22002200   m_maincpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(st_state::atarist_int_ack),this));
22012201
22022202   // allocate timers
2203   m_mouse_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(st_state::st_mouse_tick),this));
2204   m_mouse_timer->adjust(attotime::zero, 0, attotime::from_hz(500));
2203   if(m_mousex) {
2204      m_mouse_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(st_state::st_mouse_tick),this));
2205      m_mouse_timer->adjust(attotime::zero, 0, attotime::from_hz(500));
2206   }
22052207
22062208   // register for state saving
22072209   state_save();
trunk/src/mess/drivers/mac.c
r20793r20794
126126         // for portrait display, force monochrome by using the blue channel
127127         if (m_model != MODEL_MAC_CLASSIC_II)
128128         {
129            // Color Classic has no MONTYPE so the safe read gets us 512x384, which is right
130            if (m_montype->read_safe(2) == 1)
129            // Color Classic has no MONTYPE so the default gets us 512x384, which is right
130            if ((m_montype ? m_montype->read() : 2) == 1)
131131            {
132132               palette_set_color(space.machine(), m_rbv_clutoffs, MAKE_RGB(m_rbv_colors[2], m_rbv_colors[2], m_rbv_colors[2]));
133133               m_rbv_palette[m_rbv_clutoffs] = MAKE_RGB(m_rbv_colors[2], m_rbv_colors[2], m_rbv_colors[2]);
r20793r20794
162162         // for portrait display, force monochrome by using the blue channel
163163         if (m_model != MODEL_MAC_CLASSIC_II)
164164         {
165            // Color Classic has no MONTYPE so the safe read gets us 512x384, which is right
166            if (m_montype->read_safe(2) == 1)
165            // Color Classic has no MONTYPE so the default gets us 512x384, which is right
166            if ((m_montype ? m_montype->read() : 2) == 1)
167167            {
168168               palette_set_color(space.machine(), m_rbv_clutoffs, MAKE_RGB(m_rbv_colors[2], m_rbv_colors[2], m_rbv_colors[2]));
169169               m_rbv_palette[m_rbv_clutoffs] = MAKE_RGB(m_rbv_colors[2], m_rbv_colors[2], m_rbv_colors[2]);
r20793r20794
251251      if (offset == 0x10)
252252      {
253253         data &= ~0x38;
254         data |= (m_montype->read_safe(2)<<3);
254         data |= ((m_montype ? m_montype->read() : 2)<<3);
255255//            printf("rbv_r montype: %02x (PC %x)\n", data, space.cpu->safe_pc());
256256      }
257257

Previous 199869 Revisions Next

© 1997-2024 The MAME Team