mirror of
https://github.com/holub/mame
synced 2025-10-05 08:41:31 +03:00
octopus: correct CPU speeds, add Z80, add basic video output
This commit is contained in:
mahlemiut
parent
6dcfe97f71
commit
e79465f0f2
@ -6,7 +6,7 @@
|
||||
|
||||
#include "scn2674.h"
|
||||
|
||||
#define S674VERBOSE 0
|
||||
#define S674VERBOSE 1
|
||||
#define LOG2674(x) do { if (S674VERBOSE) logerror x; } while (0)
|
||||
|
||||
const device_type SCN2674_VIDEO = &device_creator<scn2674_device>;
|
||||
@ -461,6 +461,7 @@ void scn2674_device::write_command(UINT8 data)
|
||||
break;
|
||||
|
||||
case 0xab:
|
||||
case 0xaf: // LSI Octopus sends command 0xAF
|
||||
/* write at cursor address + increment */
|
||||
space().write_byte(m_cursor_l | (m_cursor_h << 8), m_buffer);
|
||||
if(!(++m_cursor_l))
|
||||
|
||||
@ -108,78 +108,166 @@ Its BIOS performs POST and halts as there's no keyboard.
|
||||
|
||||
#include "emu.h"
|
||||
#include "cpu/i86/i86.h"
|
||||
|
||||
#include "cpu/z80/z80.h"
|
||||
#include "video/scn2674.h"
|
||||
|
||||
class octopus_state : public driver_device
|
||||
{
|
||||
public:
|
||||
octopus_state(const machine_config &mconfig, device_type type, const char *tag)
|
||||
: driver_device(mconfig, type, tag) ,
|
||||
m_maincpu(*this, "maincpu") { }
|
||||
m_maincpu(*this, "maincpu"),
|
||||
m_subcpu(*this, "subcpu"),
|
||||
m_crtc(*this, "crtc"),
|
||||
m_vram(*this, "vram"),
|
||||
m_fontram(*this, "fram")
|
||||
{ }
|
||||
|
||||
virtual void machine_reset() override;
|
||||
virtual void video_start() override;
|
||||
DECLARE_WRITE8_MEMBER(port_c9);
|
||||
UINT32 screen_update_octopus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
|
||||
SCN2674_DRAW_CHARACTER_MEMBER(display_pixels);
|
||||
DECLARE_READ8_MEMBER(vram_r);
|
||||
DECLARE_WRITE8_MEMBER(vram_w);
|
||||
private:
|
||||
required_device<cpu_device> m_maincpu;
|
||||
required_device<cpu_device> m_subcpu;
|
||||
required_device<scn2674_device> m_crtc;
|
||||
required_shared_ptr<UINT8> m_vram;
|
||||
required_shared_ptr<UINT8> m_fontram;
|
||||
};
|
||||
|
||||
|
||||
static ADDRESS_MAP_START( octopus_mem, AS_PROGRAM, 8, octopus_state )
|
||||
ADDRESS_MAP_UNMAP_HIGH
|
||||
AM_RANGE(0x00000, 0x1ffff) AM_RAM
|
||||
AM_RANGE(0xe4000, 0xe4fff) AM_RAM // character definitions
|
||||
// second 128kB for 256kB system
|
||||
// expansion RAM, up to 512kB extra
|
||||
AM_RANGE(0xd0000, 0xdffff) AM_RAM AM_SHARE("vram")
|
||||
AM_RANGE(0xe4000, 0xe5fff) AM_RAM AM_SHARE("fram")
|
||||
AM_RANGE(0xf4000, 0xf5fff) AM_ROM AM_REGION("chargen",0)
|
||||
AM_RANGE(0xfc000, 0xfffff) AM_ROM AM_REGION("user1",0)
|
||||
ADDRESS_MAP_END
|
||||
|
||||
static ADDRESS_MAP_START( octopus_io, AS_IO, 8, octopus_state )
|
||||
ADDRESS_MAP_UNMAP_HIGH
|
||||
AM_RANGE(0xc5, 0xc9) AM_WRITE(port_c9)
|
||||
// 0x00-0f: i8237 DMA #1
|
||||
// 0x10-1f: i8237 DMA #2
|
||||
// 0x20: System type switch (read), Z80 NMI (write)
|
||||
// 0x21: Parity fail reset (write), bit5 SLCTOUT from parallel, bit6 option board parity fail bit7 main board parity fail (read)
|
||||
// 0x28: Z80 enable (write)
|
||||
// 0x31: hard disk bank
|
||||
// 0x32: floppy bank
|
||||
// 0x33: RAM refresh / Z80 bank
|
||||
// 0x50-51: Keyboard (i8251)
|
||||
// 0x60/0xd0: FDC (WD1793) - location depends on FPLA version
|
||||
// 0x70-73: HD controller
|
||||
// 0x80-83: serial timers (i8253)
|
||||
// 0xa0-a3: serial interface (Z80 SIO/2)
|
||||
// 0xb0-b1: master interrupt controller (i8259)
|
||||
// 0xb4-b5: slave interrupt controller (i8259)
|
||||
AM_RANGE(0xc0, 0xc7) AM_DEVREADWRITE("crtc", scn2674_device, read, write)
|
||||
// 0xc8: video control
|
||||
AM_RANGE(0xc9, 0xc9) AM_DEVREADWRITE("crtc", scn2674_device, buffer_r, buffer_w) //AM_RAM // character writes go here
|
||||
AM_RANGE(0xca, 0xca) AM_RAM // attribute writes go here
|
||||
// 0xcf: mode control
|
||||
// 0xe0: Z80 interrupt vector for RS232
|
||||
// 0xe4: Z80 interrupt vector for RS422
|
||||
// 0xf0-f1: Parallel interface data I/O (Centronics), and control/status
|
||||
ADDRESS_MAP_END
|
||||
|
||||
WRITE8_MEMBER( octopus_state::port_c9 )
|
||||
{
|
||||
if (offset == 0)
|
||||
printf("\n");
|
||||
if (offset == 4)
|
||||
printf("%c",data);
|
||||
}
|
||||
|
||||
static ADDRESS_MAP_START( octopus_sub_mem, AS_PROGRAM, 8, octopus_state )
|
||||
ADDRESS_MAP_UNMAP_HIGH
|
||||
ADDRESS_MAP_END
|
||||
|
||||
static ADDRESS_MAP_START( octopus_sub_io, AS_IO, 8, octopus_state )
|
||||
ADDRESS_MAP_UNMAP_HIGH
|
||||
ADDRESS_MAP_END
|
||||
|
||||
static ADDRESS_MAP_START( octopus_vram, AS_0, 8, octopus_state )
|
||||
AM_RANGE(0x0000,0xffff) AM_READWRITE(vram_r, vram_w)
|
||||
ADDRESS_MAP_END
|
||||
|
||||
/* Input ports */
|
||||
static INPUT_PORTS_START( octopus )
|
||||
INPUT_PORTS_END
|
||||
|
||||
|
||||
WRITE8_MEMBER(octopus_state::vram_w)
|
||||
{
|
||||
m_vram[offset] = data;
|
||||
}
|
||||
|
||||
READ8_MEMBER(octopus_state::vram_r)
|
||||
{
|
||||
return m_vram[offset];
|
||||
}
|
||||
|
||||
|
||||
void octopus_state::machine_reset()
|
||||
{
|
||||
m_subcpu->set_input_line(INPUT_LINE_HALT,ASSERT_LINE); // halt Z80 to start with
|
||||
}
|
||||
|
||||
void octopus_state::video_start()
|
||||
{
|
||||
m_vram.allocate(0x10000);
|
||||
}
|
||||
|
||||
UINT32 octopus_state::screen_update_octopus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
|
||||
SCN2674_DRAW_CHARACTER_MEMBER(octopus_state::display_pixels)
|
||||
{
|
||||
return 0;
|
||||
if(!lg)
|
||||
{
|
||||
// UINT16 tile = m_vid_mainram[address & 0x7fff];
|
||||
// const UINT8 *line = m_gfxdecode->gfx(m_gfx_index+0)->get_data(tile & 0xfff);
|
||||
// int offset = m_gfxdecode->gfx(m_gfx_index+0)->rowbytes() * linecount;
|
||||
// for(int i = 0; i < 8; i++)
|
||||
// bitmap.pix32(y, x + i) = (tile >> 12) ? m_palette->pen(line[offset + i]) : m_palette->black_pen();
|
||||
UINT8 tile = m_vram[address & 0x1fff];
|
||||
UINT8 data = m_fontram[(tile * 16) + linecount];
|
||||
for (int z=0;z<8;z++)
|
||||
bitmap.pix32(y,x + z) = BIT(data,z) ? rgb_t::white : rgb_t::black;
|
||||
}
|
||||
}
|
||||
|
||||
static MACHINE_CONFIG_START( octopus, octopus_state )
|
||||
/* basic machine hardware */
|
||||
MCFG_CPU_ADD("maincpu",I8088, XTAL_9_8304MHz) // absolutely no idea what frequency
|
||||
MCFG_CPU_ADD("maincpu",I8088, XTAL_24MHz / 3) // 8MHz
|
||||
MCFG_CPU_PROGRAM_MAP(octopus_mem)
|
||||
MCFG_CPU_IO_MAP(octopus_io)
|
||||
|
||||
MCFG_CPU_ADD("subcpu",Z80, XTAL_24MHz / 4) // 6MHz
|
||||
MCFG_CPU_PROGRAM_MAP(octopus_sub_mem)
|
||||
MCFG_CPU_IO_MAP(octopus_sub_io)
|
||||
|
||||
// TODO: add components
|
||||
// 2x i8237A DMA controller
|
||||
// 2x i8259 PIC
|
||||
// i8253 PIT timer (speaker output, serial timing, other stuff too?)
|
||||
// i8251 serial controller (keyboard)
|
||||
// MC146818 RTC
|
||||
// i8255A PPI (RTC access, FDC)
|
||||
// Centronics parallel interface
|
||||
// Z80SIO/2 (serial)
|
||||
// WD or SMC 1793 FDC
|
||||
// Winchester HD controller (Xebec compatible? uses TTL logic)
|
||||
|
||||
/* video hardware */
|
||||
MCFG_SCREEN_ADD("screen", RASTER)
|
||||
MCFG_SCREEN_REFRESH_RATE(50)
|
||||
MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
|
||||
MCFG_SCREEN_SIZE(640, 480)
|
||||
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
|
||||
MCFG_SCREEN_UPDATE_DRIVER(octopus_state, screen_update_octopus)
|
||||
MCFG_SCREEN_PALETTE("palette")
|
||||
MCFG_SCREEN_SIZE(720, 360)
|
||||
MCFG_SCREEN_VISIBLE_AREA(0, 720-1, 0, 360-1)
|
||||
MCFG_SCREEN_UPDATE_DEVICE("crtc",scn2674_device, screen_update)
|
||||
// MCFG_SCREEN_PALETTE("palette")
|
||||
// MCFG_PALETTE_ADD_MONOCHROME("palette")
|
||||
|
||||
MCFG_SCN2674_VIDEO_ADD("crtc", 0, INPUTLINE("maincpu",1)) // character clock can be selectable, either 16MHz or 17.6MHz
|
||||
MCFG_SCN2674_TEXT_CHARACTER_WIDTH(8)
|
||||
MCFG_SCN2674_GFX_CHARACTER_WIDTH(8)
|
||||
MCFG_SCN2674_DRAW_CHARACTER_CALLBACK_OWNER(octopus_state, display_pixels)
|
||||
MCFG_DEVICE_ADDRESS_MAP(AS_0, octopus_vram)
|
||||
|
||||
MCFG_PALETTE_ADD_MONOCHROME("palette")
|
||||
MACHINE_CONFIG_END
|
||||
|
||||
/* ROM definition */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user