Skip to content

sinclair/screen_ula.cpp: Fixed Timex screen1 selection #14247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 1, 2025
Merged

sinclair/screen_ula.cpp: Fixed Timex screen1 selection #14247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/mame/sinclair/screen_ula.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,11 @@ void screen_ula_device::draw(screen_device &screen, bitmap_rgb32 &bitmap, const
void screen_ula_device::draw_ula(bitmap_rgb32 &bitmap, const rectangle &clip, bool flash, bitmap_ind8 &priority_bitmap, u8 pcode)
{
const bool hicolor = screen_mode() == 2; // timex hicolor
const bool timex_alt = !m_ula_shadow_en && screen_mode() == 1;
flash &= !m_ulanext_en && !m_ulap_en;
const rgb_t gt0 = rgbexpand<3,3,3>((m_global_transparent << 1) | 0, 6, 3, 0);
const rgb_t gt1 = rgbexpand<3,3,3>((m_global_transparent << 1) | 1, 6, 3, 0);
const u8 *screen_location = m_host_ram_ptr + ((m_ula_shadow_en ? 7 : 5) << 14);
const u8 *screen_location = m_host_ram_ptr + ((m_ula_shadow_en ? 7 : 5) << 14) + (timex_alt ? 0x2000 : 0);

const u16 x_min = (((clip.left() - m_offset_h) >> 1) + m_ula_scroll_x) % SCREEN_AREA.width();
for (u16 vpos = clip.top(); vpos <= clip.bottom(); vpos++)
Expand Down
7 changes: 4 additions & 3 deletions src/mame/sinclair/specnext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,6 +1038,7 @@ u8 specnext_state::port_ff_r()

void specnext_state::port_ff_w(u8 data)
{
m_screen->update_now();
m_port_ff_data = data; // ==port_ff_dat_tmx
m_ula_scr->port_ff_reg_w(m_port_ff_data);
nr_6a_lores_radastan_xor_w(m_nr_6a_lores_radastan_xor);
Expand Down Expand Up @@ -1972,7 +1973,7 @@ void specnext_state::reg_w(offs_t nr_wr_reg, u8 nr_wr_dat)
m_nr_22_line_interrupt_en = BIT(nr_wr_dat, 1);
m_nr_23_line_interrupt = (m_nr_23_line_interrupt & ~0x0100) | (BIT(nr_wr_dat, 0) << 8);
line_irq_adjust();
m_port_ff_data = (m_port_ff_data & 0xbf) | (BIT(nr_wr_dat, 1) << 6);
port_ff_w((m_port_ff_data & 0xbf) | (BIT(nr_wr_dat, 1) << 6));
break;
case 0x23:
m_nr_23_line_interrupt = (m_nr_23_line_interrupt & ~0x00ff) | nr_wr_dat;
Expand Down Expand Up @@ -2128,7 +2129,7 @@ void specnext_state::reg_w(offs_t nr_wr_reg, u8 nr_wr_dat)
m_nr_68_ula_stencil_mode = BIT(nr_wr_dat, 0);
break;
case 0x69:
m_port_ff_data = (m_port_ff_data & 0xc0) | (nr_wr_dat & 0x3f);
port_ff_w((m_port_ff_data & 0xc0) | (nr_wr_dat & 0x3f));
port_7ffd_reg_w((m_port_7ffd_data & ~0x08) | (BIT(nr_wr_dat, 6) << 3));
port_123b_layer2_en_w(BIT(nr_wr_dat, 7));
break;
Expand Down Expand Up @@ -2291,7 +2292,7 @@ void specnext_state::reg_w(offs_t nr_wr_reg, u8 nr_wr_dat)
m_nr_c4_int_en_0_expbus = BIT(nr_wr_dat, 7);
m_nr_22_line_interrupt_en = BIT(nr_wr_dat, 1);
line_irq_adjust();
m_port_ff_data = (m_port_ff_data & 0xbf) | (BIT(~nr_wr_dat, 0) << 6);
port_ff_w((m_port_ff_data & 0xbf) | (BIT(~nr_wr_dat, 0) << 6));
break;
case 0xc5:
{
Expand Down
Loading