rm/rm380z.cpp: Use real character ROM for COS 4.0, correct screen resolution and add support for user defined characters #12031
Conversation
|
Just fixed a logic error with my underline attribute check. I was only swapping the last row (instead of the last two rows) when underlining. Visually it made no difference as only the last row is normally different, but still a bug! Everything should be ok now and this is ready for review. |
src/mame/rm/rm380z.h
Outdated
| template <int ROWS, int COLS> | ||
| class rm380z_vram | ||
| { | ||
| public: | ||
| void set_char(int row, int col, uint8_t data) { m_chars[get_row(row)][col] = data; } | ||
| void set_attrib(int row, int col, uint8_t data) { m_attribs[get_row(row)][col] = data; } | ||
| void set_scroll_register(uint8_t value) { m_scroll_reg = value; } | ||
| void reset(); | ||
|
|
||
| uint8_t get_char(int row, int col) const { return m_chars[get_row(row)][col]; } | ||
| uint8_t get_attrib(int row, int col) const { return m_attribs[get_row(row)][col]; } | ||
| private: | ||
| int get_row(int row) const { return (row + m_scroll_reg) % ROWS; } | ||
|
|
||
| uint8_t m_chars[ROWS][COLS]; | ||
| uint8_t m_attribs[ROWS][COLS]; | ||
| uint8_t m_scroll_reg = 0; | ||
| }; | ||
|
|
||
| template <int ROWS, int COLS> | ||
| void rm380z_vram<ROWS, COLS>::reset() | ||
| { | ||
| memset(m_attribs, 0, sizeof(m_attribs)); | ||
| memset(m_chars, 0x80, sizeof(m_chars)); | ||
| } |
There was a problem hiding this comment.
Can you nest this class inside rm380z_state to keep it out of the global namespace?
There was a problem hiding this comment.
yes, I've now done that.
src/mame/rm/rm380z_m.cpp
Outdated
|
|
||
| //#include <iostream> | ||
| //#include <bitset> |
There was a problem hiding this comment.
Are these leftovers from something? At any rate, #includeing things before the prefix header is problematic.
There was a problem hiding this comment.
Yes, leftovers from my debug tracing. Now removed. std::bitset is quite useful for printing binary numbers in trace.
|
This does look like a big simplification that will be nice to get in. |
Great, thanks for reviewing @cuavas. I've addressed your comments so should be good to go in now. Do I need to do anything to make the updated romset available? It's attached to this PR. |
|
Usually, the way to submit data/roms is by following this guide: https://wiki.mamedev.org/index.php/Submitting_Source_Code#Submitting_ROM_or_disk_dumps |
This file has started to move away from “European” spacing around parantheses, and MAME’s convention is lowercase hex digits.
Thanks @simzy39, I've followed that guide and emailed the rom. |
* Use real character generator ROM for COS 4.0. * Corrected screen resolution. * Implemented user-defined character support.
* Use real character generator ROM for COS 4.0. * Corrected screen resolution. * Implemented user-defined character support.
I've managed to obtain a dump of the real character ROM for COS 4.0 courtesy of the Research Machines user group, and this PR pulls this in and updates the display code to use it.
What is the correct process for updating a rom set? This my working version that includes the new character rom:
rm380z.zip
The real characters are actually larger than the fake set we used before (8x10 rather then 5x9) and even include 2 extra rows to be used when the underline attribute is set. This all makes the display handling much easier and improves the display greatly.
So with these characters 80 column mode has a display resolution of 640x240 and 40 column mode uses 320x240.
For COS 3.4 I've set the display resolution to 240x240 which I think is correct because COS 3.0 only supported the VDU40 adaptor which uses the TI 74LS262 character ROM. These characters are 5x9, padded to 6x10 for display. It's a shame we don't have the real ROM for this as well, but at the moment I'm concentrating on getting COS 4.0 to work properly anyway!
The new ROM only includes characters 0x00 to 0x79 because the additional teletext characters (0x80 to 0xFF) are actually generated by COS as user defined characters. I've also added support for user defined characters so that these continue to work.
This PR includes all my changes for HW scrolling from the last PR which is still in review (#12014), but I don't want to close that until the review comment has been cleared. I can do any further re-work under this PR.