Skip to content

Commit 28e69a1

Browse files
committed
Added SPDX license and my handle.
Removed github workflow files. Re-arranged the setters to follow the constructors in the main constructor.
1 parent 263cfc3 commit 28e69a1

File tree

5 files changed

+435
-15
lines changed

5 files changed

+435
-15
lines changed

src/mame/f256/f256.cpp

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// license:BSD-3-Clause
2+
// copyright-holders:Daniel Tremblay
13
#include "emu.h"
24
#include "f256.h"
35

@@ -57,21 +59,25 @@ f256_state::f256_state(const machine_config &mconfig, device_type type, const ch
5759
void f256_state::f256k(machine_config &config)
5860
{
5961
W65C02(config, m_maincpu, MASTER_CLOCK/4);
62+
m_maincpu->set_addrmap(AS_PROGRAM, &f256_state::program_map);
63+
6064
RAM(config, m_ram).set_default_size("512k").set_default_value(0x0);
6165
RAM(config, m_iopage0).set_default_size("8k").set_default_value(0x0);
6266
RAM(config, m_iopage1).set_default_size("8k").set_default_value(0x0);
6367
RAM(config, m_iopage2).set_default_size("8k").set_default_value(0x0);
6468
RAM(config, m_iopage3).set_default_size("8k").set_default_value(0x0);
65-
SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
66-
BQ4802(config, m_rtc, MASTER_CLOCK / 1000); // RTC clock in kHz
67-
68-
m_maincpu->set_addrmap(AS_PROGRAM, &f256_state::program_map);
6969

70+
SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
7071
m_screen->set_refresh_hz(60); // Refresh rate (e.g., 60Hz)
7172
m_screen->set_size(800,525);
7273
//m_screen->set_visarea(160, 799, 45, 524); // this is how it should reall work, but the screen ends up offset
7374
m_screen->set_visarea(0, 639, 0, 479);
7475
m_screen->set_screen_update(m_video, FUNC(tiny_vicky_video_device::screen_update));
76+
77+
BQ4802(config, m_rtc, MASTER_CLOCK / 1000); // RTC clock in kHz
78+
//set interrupt handler for the RTC
79+
m_rtc->int_handler().set(FUNC(f256_state::rtc_interrupt_handler));
80+
7581
TINY_VICKY(config, m_video, MASTER_CLOCK);
7682
m_video->sof_irq_handler().set(FUNC(f256_state::sof_interrtupt));
7783
m_video->sol_irq_handler().set(FUNC(f256_state::sol_interrtupt));
@@ -88,6 +94,7 @@ void f256_state::f256k(machine_config &config)
8894
// initialize the PS2 mouse
8995
PC_KBDC(config, m_ps2_keyboard, XTAL(32'768));
9096
HLE_PS2_MOUSE(config, m_mouse, XTAL(32'768));
97+
m_mouse->set_pc_kbdc(m_ps2_keyboard);
9198

9299
MOS6522(config, m_via6522_1, MASTER_CLOCK / 4); // Keyboard XTAL(14'318'181)/14)
93100
m_via6522_1->readpa_handler().set(FUNC(f256_state::via1_system_porta_r));
@@ -98,32 +105,30 @@ void f256_state::f256k(machine_config &config)
98105
m_via6522_1->cb2_handler().set(FUNC(f256_state::via1_cb2_write));
99106
m_via6522_1->irq_handler().set(FUNC(f256_state::via1_interrupt));
100107

101-
SN76489(config, m_sn0, MUSIC_CLOCK / 4);
102-
SN76489(config, m_sn1, MUSIC_CLOCK / 4);
103-
YMF262(config, m_opl3, MUSIC_CLOCK);
104-
MOS6581(config, m_sid0, MUSIC_CLOCK/14);
105-
MOS6581(config, m_sid1, MUSIC_CLOCK/14);
106-
107-
SPEAKER(config, "lspeaker").front_left();
108-
SPEAKER(config, "rspeaker").front_right();
109108
// Mix PSG
109+
SN76489(config, m_sn0, MUSIC_CLOCK / 4);
110110
m_sn0->add_route(ALL_OUTPUTS, "lspeaker", 0.5);
111111
m_sn0->add_route(ALL_OUTPUTS, "rspeaker", 0.5);
112+
SN76489(config, m_sn1, MUSIC_CLOCK / 4);
112113
m_sn1->add_route(ALL_OUTPUTS, "lspeaker", 0.5);
113114
m_sn1->add_route(ALL_OUTPUTS, "rspeaker", 0.5);
114115

116+
YMF262(config, m_opl3, MUSIC_CLOCK);
115117
m_opl3->add_route(0, "lspeaker", 1.0);
116118
m_opl3->add_route(1, "rspeaker", 1.0);
117119
m_opl3->add_route(2, "lspeaker", 1.0);
118120
m_opl3->add_route(3, "rspeaker", 1.0);
121+
119122
// The SIDs are very noisy
123+
MOS6581(config, m_sid0, MUSIC_CLOCK/14);
120124
m_sid0->add_route(ALL_OUTPUTS, "lspeaker", 0.5);
121125
m_sid0->add_route(ALL_OUTPUTS, "rspeaker", 0.5);
126+
MOS6581(config, m_sid1, MUSIC_CLOCK/14);
122127
m_sid1->add_route(ALL_OUTPUTS, "lspeaker", 0.5);
123128
m_sid1->add_route(ALL_OUTPUTS, "rspeaker", 0.5);
124129

125-
//set interrupt handler for the RTC
126-
m_rtc->int_handler().set(FUNC(f256_state::rtc_interrupt_handler));
130+
SPEAKER(config, "lspeaker").front_left();
131+
SPEAKER(config, "rspeaker").front_right();
127132

128133
// Add an SD card device
129134
SPI_SDCARD(config, m_sdcard, 0);
@@ -134,9 +139,10 @@ void f256_state::f256k(machine_config &config)
134139
m_in_latch |= state;
135140
});
136141

137-
m_mouse->set_pc_kbdc(m_ps2_keyboard);
142+
138143
NS16550(config, m_uart, MASTER_CLOCK);
139144

145+
// The IEC interface is not yet implemented
140146
// cbm_iec_slot_device::add(config, m_iec, "c1581");
141147
// m_iec->srq_callback().set(FUNC(f256_state::iec_srq_w));
142148
// m_iec->data_callback().set(FUNC(f256_state::iec_data_w));

src/mame/f256/f256.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// license:BSD-3-Clause
2+
// copyright-holders:Daniel Tremblay
13
#ifndef MAME_F256_F256_H
24
#define MAME_F256_F256_H
35

0 commit comments

Comments
 (0)