Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-06 02:18:09 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

-cgsix: Renamed turbogx.* to cgsix.* and added TurboGX+ support. [Ryan Holtz, Andrew Liles]

Browse Source
This commit is contained in:
mooglyguy 2018-09-15 20:28:53 +02:00
parent c7170bed75
commit 0a86f2efe9
11 changed files with 206 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/src/bus.lua
View File

@ -3040,14 +3040,14 @@ if (BUSES["SBUS"]~=null) then
files {
MAME_DIR .. "src/devices/bus/sbus/bwtwo.cpp",
MAME_DIR .. "src/devices/bus/sbus/bwtwo.h",
MAME_DIR .. "src/devices/bus/sbus/cgsix.cpp",
MAME_DIR .. "src/devices/bus/sbus/cgsix.h",
MAME_DIR .. "src/devices/bus/sbus/cgthree.cpp",
MAME_DIR .. "src/devices/bus/sbus/cgthree.h",
MAME_DIR .. "src/devices/bus/sbus/hme.cpp",
MAME_DIR .. "src/devices/bus/sbus/hme.h",
MAME_DIR .. "src/devices/bus/sbus/sunpc.cpp",
MAME_DIR .. "src/devices/bus/sbus/sunpc.h",
MAME_DIR .. "src/devices/bus/sbus/turbogx.cpp",
MAME_DIR .. "src/devices/bus/sbus/turbogx.h",
MAME_DIR .. "src/devices/bus/sbus/sbus.cpp",
MAME_DIR .. "src/devices/bus/sbus/sbus.h",
}

2
src/devices/bus/sbus/bwtwo.h
View File

@ -45,7 +45,7 @@ private:
required_device<screen_device> m_screen;
};
// device type definition
DECLARE_DEVICE_TYPE(SBUS_BWTWO, sbus_bwtwo_device)
#endif // MAME_BUS_SBUS_BWTWO_H

161
src/devices/bus/sbus/turbogx.cpp → src/devices/bus/sbus/cgsix.cpp
View File

@ -2,49 +2,30 @@
// copyright-holders:Ryan Holtz
/***************************************************************************
Sun TurboGX accelerated 8-bit color video controller
Sun cgsix-series accelerated 8-bit color video controller
***************************************************************************/
#include "emu.h"
#include "turbogx.h"
#include "screen.h"
#include "cgsix.h"
DEFINE_DEVICE_TYPE(SBUS_TURBOGX, sbus_turbogx_device, "turbogx", "Sun TurboGX SBus Video")
DEFINE_DEVICE_TYPE(SBUS_TURBOGXP, sbus_turbogxp_device, "turbogxp", "Sun TurboGX+ SBus Video")
void sbus_turbogx_device::mem_map(address_map &map)
//-------------------------------------------------
// base cgsix device
//-------------------------------------------------
void sbus_cgsix_device::base_map(address_map &map)
{
map(0x00000000, 0x01ffffff).rw(FUNC(sbus_turbogx_device::unknown_r), FUNC(sbus_turbogx_device::unknown_w));
map(0x00000000, 0x00007fff).r(FUNC(sbus_turbogx_device::rom_r));
map(0x00000000, 0x01ffffff).rw(FUNC(sbus_cgsix_device::unknown_r), FUNC(sbus_cgsix_device::unknown_w));
map(0x00000000, 0x00007fff).r(FUNC(sbus_cgsix_device::rom_r));
map(0x00200000, 0x0020000f).m(m_ramdac, FUNC(bt458_device::map)).umask32(0xff000000);
map(0x00700000, 0x00700fff).rw(FUNC(sbus_turbogx_device::fbc_r), FUNC(sbus_turbogx_device::fbc_w));
map(0x00800000, 0x008fffff).rw(FUNC(sbus_turbogx_device::vram_r), FUNC(sbus_turbogx_device::vram_w));
map(0x00700000, 0x00700fff).rw(FUNC(sbus_cgsix_device::fbc_r), FUNC(sbus_cgsix_device::fbc_w));
}
ROM_START( sbus_turbogx )
ROM_REGION32_BE(0x8000, "prom", ROMREGION_ERASEFF)
ROM_LOAD( "sunw,501-2325.bin", 0x0000, 0x8000, CRC(bbdc45f8) SHA1(e4a51d78e199cd57f2fcb9d45b25dfae2bd537e4))
ROM_END
const tiny_rom_entry *sbus_turbogx_device::device_rom_region() const
{
return ROM_NAME( sbus_turbogx );
}
void sbus_turbogx_device::device_add_mconfig(machine_config &config)
{
SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
m_screen->set_screen_update(FUNC(sbus_turbogx_device::screen_update));
m_screen->set_size(1152, 900);
m_screen->set_visarea(0, 1152-1, 0, 900-1);
m_screen->set_refresh_hz(72);
BT458(config, m_ramdac, 0);
}
sbus_turbogx_device::sbus_turbogx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SBUS_TURBOGX, tag, owner, clock)
sbus_cgsix_device::sbus_cgsix_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, type, tag, owner, clock)
, device_sbus_card_interface(mconfig, *this)
, m_rom(*this, "prom")
, m_screen(*this, "screen")
@ -52,22 +33,17 @@ sbus_turbogx_device::sbus_turbogx_device(const machine_config &mconfig, const ch
{
}
void sbus_turbogx_device::device_start()
void sbus_cgsix_device::device_start()
{
m_vram = std::make_unique<uint32_t[]>(0x100000/4);
m_vram = std::make_unique<uint32_t[]>(m_vram_size / 4);
}
void sbus_turbogx_device::device_reset()
void sbus_cgsix_device::device_reset()
{
memset(&m_fbc, 0, sizeof(m_fbc));
}
void sbus_turbogx_device::install_device()
{
m_sbus->install_device(m_base, m_base + 0x1ffffff, *this, &sbus_turbogx_device::mem_map);
}
uint32_t sbus_turbogx_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
uint32_t sbus_cgsix_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
const pen_t *pens = m_ramdac->pens();
uint8_t *vram = (uint8_t *)&m_vram[0];
@ -85,33 +61,33 @@ uint32_t sbus_turbogx_device::screen_update(screen_device &screen, bitmap_rgb32
return 0;
}
READ32_MEMBER(sbus_turbogx_device::rom_r)
READ32_MEMBER(sbus_cgsix_device::rom_r)
{
return ((uint32_t*)m_rom->base())[offset];
}
READ32_MEMBER(sbus_turbogx_device::unknown_r)
READ32_MEMBER(sbus_cgsix_device::unknown_r)
{
logerror("%s: unknown_r: %08x & %08x\n", machine().describe_context(), offset << 2, mem_mask);
return 0;
}
WRITE32_MEMBER(sbus_turbogx_device::unknown_w)
WRITE32_MEMBER(sbus_cgsix_device::unknown_w)
{
logerror("%s: unknown_w: %08x = %08x & %08x\n", machine().describe_context(), offset << 2, data, mem_mask);
}
READ32_MEMBER(sbus_turbogx_device::vram_r)
READ32_MEMBER(sbus_cgsix_device::vram_r)
{
return m_vram[offset];
}
WRITE32_MEMBER(sbus_turbogx_device::vram_w)
WRITE32_MEMBER(sbus_cgsix_device::vram_w)
{
COMBINE_DATA(&m_vram[offset]);
}
uint8_t sbus_turbogx_device::perform_rasterop(uint8_t src, uint8_t dst)
uint8_t sbus_cgsix_device::perform_rasterop(uint8_t src, uint8_t dst)
{
const uint32_t rops[4] = { fbc_rasterop_rop00(), fbc_rasterop_rop01(), fbc_rasterop_rop10(), fbc_rasterop_rop11() };
@ -154,7 +130,7 @@ uint8_t sbus_turbogx_device::perform_rasterop(uint8_t src, uint8_t dst)
}
// NOTE: This is basically untested, and probably full of bugs!
void sbus_turbogx_device::handle_draw_command()
void sbus_cgsix_device::handle_draw_command()
{
if (fbc_misc_draw() != FBC_MISC_DRAW_RENDER)
{
@ -198,7 +174,7 @@ void sbus_turbogx_device::handle_draw_command()
}
// NOTE: This is basically untested, and probably full of bugs!
void sbus_turbogx_device::handle_blit_command()
void sbus_cgsix_device::handle_blit_command()
{
uint8_t *vram = (uint8_t*)&m_vram[0];
const uint32_t fbw = (m_fbc.m_clip_maxx + 1);
@ -227,7 +203,7 @@ void sbus_turbogx_device::handle_blit_command()
}
}
READ32_MEMBER(sbus_turbogx_device::fbc_r)
READ32_MEMBER(sbus_cgsix_device::fbc_r)
{
uint32_t ret = 0;
switch (offset)
@ -534,7 +510,7 @@ READ32_MEMBER(sbus_turbogx_device::fbc_r)
return ret;
}
WRITE32_MEMBER(sbus_turbogx_device::fbc_w)
WRITE32_MEMBER(sbus_cgsix_device::fbc_w)
{
static const char* misc_bdisp_name[4] = { "IGNORE", "0", "1", "ILLEGAL" };
static const char* misc_bread_name[4] = { "IGNORE", "0", "1", "ILLEGAL" };
@ -972,3 +948,86 @@ WRITE32_MEMBER(sbus_turbogx_device::fbc_w)
break;
}
}
//-------------------------------------------------
// TurboGX implementation
//-------------------------------------------------
void sbus_turbogx_device::mem_map(address_map &map)
{
base_map(map);
map(0x00800000, 0x008fffff).rw(FUNC(sbus_turbogx_device::vram_r), FUNC(sbus_turbogx_device::vram_w));
}
ROM_START( sbus_turbogx )
ROM_REGION32_BE(0x8000, "prom", ROMREGION_ERASEFF)
ROM_LOAD( "sunw,501-2325.bin", 0x0000, 0x8000, CRC(bbdc45f8) SHA1(e4a51d78e199cd57f2fcb9d45b25dfae2bd537e4))
ROM_END
const tiny_rom_entry *sbus_turbogx_device::device_rom_region() const
{
return ROM_NAME( sbus_turbogx );
}
void sbus_turbogx_device::device_add_mconfig(machine_config &config)
{
SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
m_screen->set_screen_update(FUNC(sbus_turbogx_device::screen_update));
m_screen->set_size(1152, 900);
m_screen->set_visarea(0, 1152-1, 0, 900-1);
m_screen->set_refresh_hz(72);
BT458(config, m_ramdac, 0);
}
sbus_turbogx_device::sbus_turbogx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sbus_cgsix_device(mconfig, SBUS_TURBOGX, tag, owner, clock, 0x100000)
{
}
void sbus_turbogx_device::install_device()
{
m_sbus->install_device(m_base, m_base + 0x1ffffff, *this, &sbus_turbogx_device::mem_map);
}
//-------------------------------------------------
// TurboGX+ implementation
//-------------------------------------------------
void sbus_turbogxp_device::mem_map(address_map &map)
{
base_map(map);
map(0x00800000, 0x00bfffff).rw(FUNC(sbus_turbogxp_device::vram_r), FUNC(sbus_turbogxp_device::vram_w));
}
ROM_START( sbus_turbogxp )
ROM_REGION32_BE(0x8000, "prom", ROMREGION_ERASEFF)
ROM_LOAD( "sunw,501-2253.bin", 0x0000, 0x8000, CRC(525a58db) SHA1(721fc378d4b952b5cbb271e16bd67bc02439efdc))
ROM_END
const tiny_rom_entry *sbus_turbogxp_device::device_rom_region() const
{
return ROM_NAME( sbus_turbogxp );
}
void sbus_turbogxp_device::device_add_mconfig(machine_config &config)
{
SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
m_screen->set_screen_update(FUNC(sbus_turbogxp_device::screen_update));
m_screen->set_size(1152, 900);
m_screen->set_visarea(0, 1152-1, 0, 900-1);
m_screen->set_refresh_hz(72);
BT467(config, m_ramdac, 0);
}
sbus_turbogxp_device::sbus_turbogxp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: sbus_cgsix_device(mconfig, SBUS_TURBOGXP, tag, owner, clock, 0x400000)
{
}
void sbus_turbogxp_device::install_device()
{
m_sbus->install_device(m_base, m_base + 0x1ffffff, *this, &sbus_turbogxp_device::mem_map);
}

74
src/devices/bus/sbus/turbogx.h → src/devices/bus/sbus/cgsix.h
View File

@ -2,34 +2,38 @@
// copyright-holders:Ryan Holtz
/***************************************************************************
Sun TurboGX accelerated 8-bit color video controller
Sun cgsix-series accelerated 8-bit color video controller
***************************************************************************/
#ifndef MAME_BUS_SBUS_TURBOGX_H
#define MAME_BUS_SBUS_TURBOGX_H
#ifndef MAME_BUS_SBUS_CGSIX_H
#define MAME_BUS_SBUS_CGSIX_H
#pragma once
#include "sbus.h"
#include "video/bt45x.h"
#include "screen.h"
class sbus_turbogx_device : public device_t, public device_sbus_card_interface
class sbus_cgsix_device : public device_t, public device_sbus_card_interface
{
public:
// construction/destruction
sbus_turbogx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// construction/destruction
sbus_cgsix_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const uint32_t vram_size)
: sbus_cgsix_device(mconfig, type, tag, owner, clock)
{
set_vram_size(vram_size);
}
sbus_cgsix_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
// configuration
void set_vram_size(uint32_t vram_size) { m_vram_size = vram_size; }
// device_t overrides
virtual const tiny_rom_entry *device_rom_region() const override;
virtual void device_add_mconfig(machine_config &config) override;
virtual void device_start() override;
virtual void device_reset() override;
// device_sbus_slot_interface overrides
virtual void install_device() override;
DECLARE_READ32_MEMBER(rom_r);
DECLARE_READ32_MEMBER(unknown_r);
DECLARE_WRITE32_MEMBER(unknown_w);
@ -38,13 +42,13 @@ protected:
DECLARE_READ32_MEMBER(fbc_r);
DECLARE_WRITE32_MEMBER(fbc_w);
private:
protected:
uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
uint8_t perform_rasterop(uint8_t src, uint8_t dst);
void handle_blit_command();
void handle_draw_command();
void mem_map(address_map &map) override;
void base_map(address_map &map);
enum
{
@ -466,9 +470,43 @@ private:
required_device<bt458_device> m_ramdac;
fbc_t m_fbc;
uint32_t m_vram_size;
};
// device type definition
DECLARE_DEVICE_TYPE(SBUS_TURBOGX, sbus_turbogx_device)
class sbus_turbogx_device : public sbus_cgsix_device
{
public:
sbus_turbogx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
#endif // MAME_BUS_SBUS_TURBOGX_H
protected:
// device_t overrides
virtual const tiny_rom_entry *device_rom_region() const override;
void device_add_mconfig(machine_config &config) override;
// device_sbus_slot_interface overrides
virtual void install_device() override;
void mem_map(address_map &map) override;
};
class sbus_turbogxp_device : public sbus_cgsix_device
{
public:
sbus_turbogxp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
// device_t overrides
virtual const tiny_rom_entry *device_rom_region() const override;
void device_add_mconfig(machine_config &config) override;
// device_sbus_slot_interface overrides
virtual void install_device() override;
void mem_map(address_map &map) override;
};
DECLARE_DEVICE_TYPE(SBUS_TURBOGX, sbus_turbogx_device)
DECLARE_DEVICE_TYPE(SBUS_TURBOGXP, sbus_turbogxp_device)
#endif // MAME_BUS_SBUS_CGSIX_H

2
src/devices/bus/sbus/cgthree.h
View File

@ -50,7 +50,7 @@ private:
required_device<bt458_device> m_ramdac;
};
// device type definition
DECLARE_DEVICE_TYPE(SBUS_CGTHREE, sbus_cgthree_device)
#endif // MAME_BUS_SBUS_CGTHREE_H

2
src/devices/bus/sbus/hme.h
View File

@ -39,7 +39,7 @@ private:
required_memory_region m_rom;
};
// device type definition
DECLARE_DEVICE_TYPE(SBUS_HME, sbus_hme_device)
#endif // MAME_BUS_SBUS_HME_H

3
src/devices/bus/sbus/sbus.cpp
View File

@ -11,7 +11,7 @@
// Display boards
#include "bwtwo.h"
#include "cgthree.h"
#include "turbogx.h"
#include "cgsix.h"
// Accelerator boards
#include "sunpc.h"
@ -26,6 +26,7 @@ void sbus_cards(device_slot_interface &device)
device.option_add("bwtwo", SBUS_BWTWO); /* Sun bwtwo monochrome display board */
device.option_add("cgthree", SBUS_CGTHREE); /* Sun cgthree color display board */
device.option_add("turbogx", SBUS_TURBOGX); /* Sun TurboGX 8-bit color display board */
device.option_add("turbogxp", SBUS_TURBOGXP); /* Sun TurboGX+ 8-bit color display board */
device.option_add("sunpc", SBUS_SUNPC); /* Sun SunPC 5x86 Accelerator board */
device.option_add("hme", SBUS_HME); /* Sun SunSwift 10/100 + Fast Wide SCSI "Colossus" board */
}

2
src/devices/bus/sbus/sunpc.h
View File

@ -39,7 +39,7 @@ private:
required_memory_region m_rom;
};
// device type definition
DECLARE_DEVICE_TYPE(SBUS_SUNPC, sbus_sunpc_device)
#endif // MAME_BUS_SBUS_SUNPC_H

2
src/devices/cpu/sparc/mb86901.cpp
View File

@ -2846,7 +2846,7 @@ void mb86901_device::dispatch_instruction(uint32_t op)
if (illegal_IU_instr)
{
printf("illegal instruction at %08x\n", PC);
printf("illegal instruction at %08x: %08x\n", PC, op);
m_trap = 1;
m_illegal_instruction = 1;
}

17
src/devices/video/bt45x.cpp
View File

@ -17,12 +17,16 @@
* Bt455 170MHz 4 bit 1 bit 1 4 bit
* Bt457 165Mhz 8 bit 2 bit 1 8 bit blinking, multiplexing
* Bt458 165MHz 8 bit 2 bit 3 8 bit blinking, multiplexing
* Bt467 220MHz 8 bit 2 bit 3 8 bit blinking, multiplexing [NOTE: Specs are assumed based on Bt458 compatibility)
*
* Reference: http://www.bitsavers.org/components/brooktree/_dataBooks/1991_Brooktree_Product_Databook.pdf
*
* The bt45x_mono_device_base uses the standard red/green/blue read/write
* cycles defined in the databook, with color data active on the green cycle.
*
* The Bt467 is specified in its datasheet as register-compatible with the Bt458.
* As such, it is currently implemented as a simple alias of the Bt458.
*
* TODO
* - refactor to separate devices with registers
* - implement blinking and overlay
@ -45,6 +49,7 @@ DEFINE_DEVICE_TYPE(BT454, bt454_device, "bt454", "Brooktree Bt454 16 Color RAMDA
DEFINE_DEVICE_TYPE(BT455, bt455_device, "bt455", "Brooktree Bt455 16 Color RAMDAC")
DEFINE_DEVICE_TYPE(BT457, bt457_device, "bt457", "Brooktree Bt457 256 Color RAMDAC")
DEFINE_DEVICE_TYPE(BT458, bt458_device, "bt458", "Brooktree Bt458 256 Color RAMDAC")
DEFINE_DEVICE_TYPE(BT467, bt467_device, "bt467", "Brooktree Bt467 256 Color RAMDAC")
void bt45x_device_base::map(address_map &map)
{
@ -122,8 +127,18 @@ bt457_device::bt457_device(const machine_config &mconfig, const char *tag, devic
{
}
bt458_device::bt458_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
: bt45x_rgb_device_base(mconfig, type, tag, owner, clock, 256, 3)
{
}
bt458_device::bt458_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: bt45x_rgb_device_base(mconfig, BT458, tag, owner, clock, 256, 3)
: bt458_device(mconfig, BT458, tag, owner, clock)
{
}
bt467_device::bt467_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: bt458_device(mconfig, BT467, tag, owner, clock)
{
}

10
src/devices/video/bt45x.h
View File

@ -169,6 +169,15 @@ class bt458_device : public bt45x_rgb_device_base
{
public:
bt458_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
protected:
bt458_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
};
class bt467_device : public bt458_device
{
public:
bt467_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
DECLARE_DEVICE_TYPE(BT451, bt451_device)
@ -177,5 +186,6 @@ DECLARE_DEVICE_TYPE(BT454, bt454_device)
DECLARE_DEVICE_TYPE(BT455, bt455_device)
DECLARE_DEVICE_TYPE(BT457, bt457_device)
DECLARE_DEVICE_TYPE(BT458, bt458_device)
DECLARE_DEVICE_TYPE(BT467, bt467_device)
#endif // MAME_VIDEO_BT45X_H