Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-17 19:24:59 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

hp9845: fixed a race condition in 45T. A little cleanup.

Browse Source
This commit is contained in:
fulivi 2017-04-13 14:07:29 +02:00
parent 4e8e8167ed
commit 4068512b0e
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/mame/drivers/hp9845.cpp
View File

@ -12,7 +12,7 @@
// ******************************* // *******************************
// //
// What's in: // What's in:
// - Emulation of 45B and 45C systems // - Emulation of 45B, 45C and 45T systems
// - Emulation of both 5061-3001 CPUs // - Emulation of both 5061-3001 CPUs
// - LPU & PPU ROMs // - LPU & PPU ROMs
// - LPU & PPU RAMs // - LPU & PPU RAMs
@ -23,16 +23,16 @@
// - Software list to load optional ROMs // - Software list to load optional ROMs
// - Beeper // - Beeper
// - Correct character generator ROMs (a huge "thank you" to Ansgar Kueckes for the dumps!) // - Correct character generator ROMs (a huge "thank you" to Ansgar Kueckes for the dumps!)
// - 98775 light pen controller
// What's not yet in: // What's not yet in:
// - Better naming of tape drive image (it's now "magt", should be "t15") // - Better naming of tape drive image (it's now "magt", should be "t15")
// - Better documentation of this file // - Better documentation of this file
// - Emulation of 45T system
// - Display softkeys on 45C & 45T // - Display softkeys on 45C & 45T
// - Better keyboard mapping // - Better keyboard mapping
// - German keyboard // - German keyboard
// What's wrong: // What's wrong:
// - Speed, as usual // - Speed, as usual
// - Light pen sometimes behaves erratically in 45C // - Light pen tracing sometimes behaves erratically in 45C and 45T
// What will probably never be in: // What will probably never be in:
// - Integral printer (firmware and character generator ROMs are very difficult to dump) // - Integral printer (firmware and character generator ROMs are very difficult to dump)
// - Fast LPU processor (dump of microcode PROMs is not available) // - Fast LPU processor (dump of microcode PROMs is not available)
@ -60,11 +60,6 @@
#define BIT_CLR(w , n) ((w) &= ~BIT_MASK(n)) #define BIT_CLR(w , n) ((w) &= ~BIT_MASK(n))
#define BIT_SET(w , n) ((w) |= BIT_MASK(n)) #define BIT_SET(w , n) ((w) |= BIT_MASK(n))
// The FLG behavior in real 98780A hw apparently doesn't match what's
// documented in Tony Duell's schematics.
// The following macro selects the FLG behavior implemented by this driver.
#define HP98780A_REAL_HW
/* /*
The 9845 has three possible display options: The 9845 has three possible display options:
@ -2695,7 +2690,6 @@ READ16_MEMBER(hp9845t_state::graphic_r)
} }
BIT_SET(res, 9); // ID BIT_SET(res, 9); // ID
BIT_SET(res, 11); // ID BIT_SET(res, 11); // ID
// TODO: fix grstat
if (m_gv_stat) { if (m_gv_stat) {
BIT_SET(res, 13); // error indication BIT_SET(res, 13); // error indication
} }
@ -2734,6 +2728,9 @@ WRITE16_MEMBER(hp9845t_state::graphic_w)
m_gv_data_w = data; m_gv_data_w = data;
advance_gv_fsm(true , false); advance_gv_fsm(true , false);
lp_r4_w(data); lp_r4_w(data);
if (m_gv_lp_int_en) {
m_gv_lp_fullbright = BIT(data , 1);
}
break; break;
case 1: case 1:
@ -2755,6 +2752,9 @@ WRITE16_MEMBER(hp9845t_state::graphic_w)
m_gv_dma_en = false; m_gv_dma_en = false;
m_gv_data_w = data; m_gv_data_w = data;
lp_r4_w(data); lp_r4_w(data);
if (m_gv_lp_int_en) {
m_gv_lp_fullbright = BIT(data , 1);
}
advance_gv_fsm(true , false); advance_gv_fsm(true , false);
break; break;
@ -3386,16 +3386,18 @@ void hp9845t_state::update_graphic_bits(void)
m_gv_fsm_state == GV_STAT_WAIT_DS_2; m_gv_fsm_state == GV_STAT_WAIT_DS_2;
} }
#ifdef HP98780A_REAL_HW // WARNING! Race conditions here!
// In 98780 real hw, the FLG signal is apparently set to true // FLG and IRQ are raised together. In enhgfxb ROM a SFC instruction
// whenever the LP is selected, regardless of its interrupt // that spins on itself waiting for FLG to be true was getting
// request status. // stuck because the interrupt always took precedence (and the ISR
flg_w(GVIDEO_PA , gv_ready || m_gv_lp_int_en); // cleared the FLG bit).
#else // In real hw there was a non-zero chance that SFC exited the loop before
// In Duell's schematics, the FLG signal follows the // interrupt was serviced. In case SFC stayed in the loop, it got another
// LP interrupt request // chance at the next interrupt.
// Fix for this problem is in commit 27004d00
// My apologies to Tony Duell for doubting at one point the correctness
// of his 98780A schematics.. :)
flg_w(GVIDEO_PA , gv_ready); flg_w(GVIDEO_PA , gv_ready);
#endif
bool irq = m_gv_int_en && !m_gv_dma_en && gv_ready; bool irq = m_gv_int_en && !m_gv_dma_en && gv_ready;
@ -3742,10 +3744,8 @@ ROM_START( hp9845c )
ROM_END ROM_END
ROM_START( hp9845t ) ROM_START( hp9845t )
//ROM_REGION(0x1000 , "chargen" , 0)
//ROM_LOAD("1818-1395-sh.bin" , 0 , 0x1000 , CRC(361e5eca) SHA1(62c81e133bd1ce19212b1da57a05074abccae247))
ROM_REGION(0x1000 , "chargen" , 0) ROM_REGION(0x1000 , "chargen" , 0)
ROM_LOAD("1818-1395-s2.bin" , 0 , 0x1000 , CRC(7b555edf) SHA1(3b08e094635ef02aef9a2e37b049c61bcf1ec037)) ROM_LOAD("1818-1395.bin" , 0 , 0x1000 , CRC(7b555edf) SHA1(3b08e094635ef02aef9a2e37b049c61bcf1ec037))
ROM_REGION(0x10000, "lpu", ROMREGION_16BIT | ROMREGION_BE) ROM_REGION(0x10000, "lpu", ROMREGION_16BIT | ROMREGION_BE)
ROM_LOAD("9845-LPU-Standard-Processor.bin", 0, 0x10000, CRC(dc266c1b) SHA1(1cf3267f13872fbbfc035b70f8b4ec6b5923f182)) ROM_LOAD("9845-LPU-Standard-Processor.bin", 0, 0x10000, CRC(dc266c1b) SHA1(1cf3267f13872fbbfc035b70f8b4ec6b5923f182))
@ -3754,10 +3754,11 @@ ROM_START( hp9845t )
ROM_LOAD("9845-PPU-Color-Enhanced-Graphics.bin", 0, 0x10000, CRC(96e11edc) SHA1(3f1da50edb35dfc57ec2ecfd816a8c8230e110bd)) ROM_LOAD("9845-PPU-Color-Enhanced-Graphics.bin", 0, 0x10000, CRC(96e11edc) SHA1(3f1da50edb35dfc57ec2ecfd816a8c8230e110bd))
ROM_END ROM_END
COMP( 1978, hp9845a, 0, 0, hp9845a, hp9845, driver_device, 0, "Hewlett-Packard", "9845A", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) // YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS
COMP( 1978, hp9845s, hp9845a, 0, hp9845a, hp9845, driver_device, 0, "Hewlett-Packard", "9845S", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) COMP( 1977, hp9845a, 0, 0, hp9845a, hp9845, driver_device, 0, "Hewlett-Packard", "9845A", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
COMP( 1977, hp9845s, hp9845a, 0, hp9845a, hp9845, driver_device, 0, "Hewlett-Packard", "9845S", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
COMP( 1979, hp9835a, 0, 0, hp9835a, hp9845, driver_device, 0, "Hewlett-Packard", "9835A", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) COMP( 1979, hp9835a, 0, 0, hp9835a, hp9845, driver_device, 0, "Hewlett-Packard", "9835A", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
COMP( 1979, hp9835b, hp9835a, 0, hp9835a, hp9845, driver_device, 0, "Hewlett-Packard", "9835B", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) COMP( 1979, hp9835b, hp9835a, 0, hp9835a, hp9845, driver_device, 0, "Hewlett-Packard", "9835B", MACHINE_IS_SKELETON | MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
COMP( 1980, hp9845b, 0, 0, hp9845b, hp9845_base,driver_device, 0, "Hewlett-Packard", "9845B", 0 ) COMP( 1979, hp9845b, 0, 0, hp9845b, hp9845_base,driver_device, 0, "Hewlett-Packard", "9845B", 0 )
COMP( 1980, hp9845t, 0, 0, hp9845t, hp9845ct,driver_device, 0, "Hewlett-Packard", "9845T", 0 ) COMP( 1982, hp9845t, 0, 0, hp9845t, hp9845ct,driver_device, 0, "Hewlett-Packard", "9845T", 0 )
COMP( 1981, hp9845c, 0, 0, hp9845c, hp9845ct,driver_device, 0, "Hewlett-Packard", "9845C", 0 ) COMP( 1980, hp9845c, 0, 0, hp9845c, hp9845ct,driver_device, 0, "Hewlett-Packard", "9845C", 0 )