(MESS) Apollo updates: [Hans Ostermeyer]

- Added 4 and 8 plane color graphics board support
- Renamed dn3x00 to dn3x00_19i and dn3x00_15i to dn3x00
- Reworked video/apollo.c into class apollo_graphics
- Fixed recent regression where the arrow keys moved the mouse pointer
This commit is contained in:
R. Belmont 2013-05-11 01:48:15 +00:00
parent f42533c206
commit 8504b76a73
6 changed files with 103 additions and 101 deletions

View File

@ -41,7 +41,7 @@
// we use this to prevent excessive logging (if emulation runs amok)
// error.log will be 10 MB for 100000 lines
#define APOLLO_MAX_NO_OF_LOG_LINES 500000
#define APOLLO_MAX_NO_OF_LOG_LINES 1000000
#define ATBUS_IO_BASE 0x040000
#define ATBUS_IO_END 0x05ffff
@ -754,9 +754,12 @@ static ADDRESS_MAP_START(dn3500_map, AS_PROGRAM, 32, apollo_state )
AM_RANGE(0x058000, 0x058007) AM_DEVREADWRITE8_LEGACY(APOLLO_ETH_TAG, threecom3c505_r, threecom3c505_w, 0xffffffff)
AM_RANGE(0x05f800, 0x05f807) AM_DEVICE8(APOLLO_FDC_TAG, pc_fdc_at_device, map, 0xffffffff)
AM_RANGE(0x05d800, 0x05dc07) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_mcr_r, apollo_mcr_w, 0xffffffff)
AM_RANGE(0x05d800, 0x05dc07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_mcr_r, apollo_mcr_w, 0xffffffff)
AM_RANGE(0xfa0000, 0xfdffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_mgm_r, apollo_mgm_w, 0xffffffff)
AM_RANGE(0x05e800, 0x05ec07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_ccr_r, apollo_ccr_w, 0xffffffff)
AM_RANGE(0x0a0000, 0x0bffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_cgm_r, apollo_cgm_w, 0xffffffff)
AM_RANGE(ATBUS_IO_BASE, ATBUS_IO_END) AM_READWRITE16(apollo_atbus_io_r, apollo_atbus_io_w, 0xffffffff)
AM_RANGE(0x080000, 0x081fff) AM_ROM /* 3C505 boot ROM */
@ -802,8 +805,11 @@ static ADDRESS_MAP_START(dsp3500_map, AS_PROGRAM, 32, apollo_state )
AM_RANGE(0x058000, 0x058007) AM_DEVREADWRITE8_LEGACY(APOLLO_ETH_TAG, threecom3c505_r, threecom3c505_w, 0xffffffff)
AM_RANGE(0x05f800, 0x05f807) AM_DEVICE8(APOLLO_FDC_TAG, pc_fdc_at_device, map, 0xffffffff)
// AM_RANGE(0x05d800, 0x05dc07) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_mcr_r, apollo_mcr_w, 0xffffffff)
// AM_RANGE(0x05d800, 0x05dc07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_mcr_r, apollo_mcr_w, 0xffffffff)
// AM_RANGE(0xfa0000, 0xfdffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_mgm_r, apollo_mgm_w, 0xffffffff)
//
// AM_RANGE(0x05e800, 0x05ec07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_ccr_r, apollo_ccr_w, 0xffffffff)
// AM_RANGE(0x0a0000, 0x0bffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_cgm_r, apollo_cgm_w, 0xffffffff)
AM_RANGE(ATBUS_IO_BASE, ATBUS_IO_END) AM_READWRITE16(apollo_atbus_io_r, apollo_atbus_io_w, 0xffffffff)
@ -841,9 +847,12 @@ static ADDRESS_MAP_START(dn3000_map, AS_PROGRAM, 32, apollo_state )
AM_RANGE(0x058000, 0x058007) AM_DEVREADWRITE8_LEGACY(APOLLO_ETH_TAG, threecom3c505_r, threecom3c505_w, 0xffffffff)
AM_RANGE(0x05f800, 0x05f807) AM_DEVICE8(APOLLO_FDC_TAG, pc_fdc_at_device, map, 0xffffffff)
AM_RANGE(0x05d800, 0x05dc07) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_mcr_r, apollo_mcr_w, 0xffffffff)
AM_RANGE(0x05d800, 0x05dc07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_mcr_r, apollo_mcr_w, 0xffffffff)
AM_RANGE(0xfa0000, 0xfdffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_mgm_r, apollo_mgm_w, 0xffffffff)
AM_RANGE(0x05e800, 0x05ec07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_ccr_r, apollo_ccr_w, 0xffffffff)
AM_RANGE(0x0a0000, 0x0bffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_cgm_r, apollo_cgm_w, 0xffffffff)
AM_RANGE(ATBUS_IO_BASE, ATBUS_IO_END) AM_READWRITE16(apollo_atbus_io_r, apollo_atbus_io_w, 0xffffffff)
AM_RANGE(0x080000, 0x081fff) AM_ROM /* 3C505 boot ROM */
@ -879,8 +888,11 @@ static ADDRESS_MAP_START(dsp3000_map, AS_PROGRAM, 32, apollo_state )
AM_RANGE(0x058000, 0x058007) AM_DEVREADWRITE8_LEGACY(APOLLO_ETH_TAG, threecom3c505_r, threecom3c505_w, 0xffffffff)
AM_RANGE(0x05f800, 0x05f807) AM_DEVICE8(APOLLO_FDC_TAG, pc_fdc_at_device, map, 0xffffffff)
// AM_RANGE(0x05d800, 0x05dc07) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_mcr_r, apollo_mcr_w, 0xffffffff)
// AM_RANGE(0x05d800, 0x05dc07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_mcr_r, apollo_mcr_w, 0xffffffff)
// AM_RANGE(0xfa0000, 0xfdffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_mgm_r, apollo_mgm_w, 0xffffffff)
//
// AM_RANGE(0x05e800, 0x05ec07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_ccr_r, apollo_ccr_w, 0xffffffff)
// AM_RANGE(0x0a0000, 0x0bffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_cgm_r, apollo_cgm_w, 0xffffffff)
AM_RANGE(ATBUS_IO_BASE, ATBUS_IO_END) AM_READWRITE16(apollo_atbus_io_r, apollo_atbus_io_w, 0xffffffff)
@ -925,9 +937,12 @@ static ADDRESS_MAP_START(dn5500_map, AS_PROGRAM, 32, apollo_state )
AM_RANGE(0x058000, 0x058007) AM_DEVREADWRITE8_LEGACY(APOLLO_ETH_TAG, threecom3c505_r, threecom3c505_w, 0xffffffff)
AM_RANGE(0x05f800, 0x05f807) AM_DEVICE8(APOLLO_FDC_TAG, pc_fdc_at_device, map, 0xffffffff)
AM_RANGE(0x05d800, 0x05dc07) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_mcr_r, apollo_mcr_w, 0xffffffff)
AM_RANGE(0x05d800, 0x05dc07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_mcr_r, apollo_mcr_w, 0xffffffff)
AM_RANGE(0xfa0000, 0xfdffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_mgm_r, apollo_mgm_w, 0xffffffff)
AM_RANGE(0x05e800, 0x05ec07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_ccr_r, apollo_ccr_w, 0xffffffff)
AM_RANGE(0x0a0000, 0x0bffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_cgm_r, apollo_cgm_w, 0xffffffff)
AM_RANGE(ATBUS_IO_BASE, ATBUS_IO_END) AM_READWRITE16(apollo_atbus_io_r, apollo_atbus_io_w, 0xffffffff)
AM_RANGE(0x080000, 0x081fff) AM_ROM /* 3C505 boot ROM */
@ -947,7 +962,6 @@ static ADDRESS_MAP_START(dn5500_map, AS_PROGRAM, 32, apollo_state )
AM_RANGE(0x00000000, 0xffffffff) AM_READWRITE(apollo_unmapped_r, apollo_unmapped_w)
ADDRESS_MAP_END
static ADDRESS_MAP_START(dsp5500_map, AS_PROGRAM, 32, apollo_state )
AM_RANGE(0x000000, 0x00ffff) AM_ROM /* boot ROM */
AM_RANGE(0x000000, 0x00ffff) AM_WRITE(apollo_rom_w)
@ -977,8 +991,11 @@ static ADDRESS_MAP_START(dsp5500_map, AS_PROGRAM, 32, apollo_state )
AM_RANGE(0x058000, 0x058007) AM_DEVREADWRITE8_LEGACY(APOLLO_ETH_TAG, threecom3c505_r, threecom3c505_w, 0xffffffff)
AM_RANGE(0x05f800, 0x05f807) AM_DEVICE8(APOLLO_FDC_TAG, pc_fdc_at_device, map, 0xffffffff)
// AM_RANGE(0x05d800, 0x05dc07) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_mcr_r, apollo_mcr_w, 0xffffffff)
// AM_RANGE(0x05d800, 0x05dc07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_mcr_r, apollo_mcr_w, 0xffffffff)
// AM_RANGE(0xfa0000, 0xfdffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_mgm_r, apollo_mgm_w, 0xffffffff)
//
// AM_RANGE(0x05e800, 0x05ec07) AM_DEVREADWRITE8_LEGACY(APOLLO_SCREEN_TAG, apollo_ccr_r, apollo_ccr_w, 0xffffffff)
// AM_RANGE(0x0a0000, 0x0bffff) AM_DEVREADWRITE16_LEGACY(APOLLO_SCREEN_TAG, apollo_cgm_r, apollo_cgm_w, 0xffffffff)
AM_RANGE(ATBUS_IO_BASE, ATBUS_IO_END) AM_READWRITE16(apollo_atbus_io_r, apollo_atbus_io_w, 0xffffffff)
@ -1236,8 +1253,8 @@ static MACHINE_CONFIG_DERIVED( dn3500_19i, dn3500 )
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dn3500_15i, dn3500 )
/* video hardware 15" monochrome */
MCFG_APOLLO_MONO15I_ADD(APOLLO_SCREEN_TAG)
/* video hardware is 15" monochrome or color */
MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG)
MCFG_APOLLO_KBD_ADD( APOLLO_KBD_TAG, apollo_kbd_config )
MACHINE_CONFIG_END
@ -1245,8 +1262,6 @@ static MACHINE_CONFIG_DERIVED( dn3000, dn3500 )
MCFG_CPU_REPLACE(MAINCPU, M68020PMMU, 12000000) /* 12 MHz */
MCFG_CPU_PROGRAM_MAP(dn3000_map)
MCFG_DEVICE_REMOVE( APOLLO_SIO2_TAG )
MCFG_RAM_MODIFY("messram")
MCFG_RAM_DEFAULT_SIZE("8M")
MCFG_RAM_EXTRA_OPTIONS("4M")
@ -1270,7 +1285,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dn3000_15i, dn3000 )
/* video hardware 15" monochrome */
MCFG_APOLLO_MONO15I_ADD(APOLLO_SCREEN_TAG)
MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG)
MCFG_APOLLO_KBD_ADD( APOLLO_KBD_TAG, apollo_kbd_config )
MACHINE_CONFIG_END
@ -1298,7 +1313,7 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( dn5500_15i, dn5500 )
/* video hardware 15" monochrome */
MCFG_APOLLO_MONO15I_ADD(APOLLO_SCREEN_TAG)
MCFG_APOLLO_GRAPHICS_ADD(APOLLO_SCREEN_TAG)
MCFG_APOLLO_KBD_ADD( APOLLO_KBD_TAG, apollo_kbd_config )
MACHINE_CONFIG_END
@ -1343,7 +1358,7 @@ ROM_END
#define rom_dn3500_19i rom_dn3500
#define rom_dsp3000 rom_dn3000
#define rom_dn3000_15i rom_dn3000
#define rom_dn3000_19i rom_dn3000
#define rom_dsp5500 rom_dn5500
#define rom_dn5500_15i rom_dn5500
@ -1358,14 +1373,14 @@ ROM_END
//#define DSP_FLAGS GAME_NO_SOUND
/* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */
COMP( 1989, dn3500, 0, 0, dn3500_19i, dn3500, apollo_state, dn3500, "Apollo", "Apollo DN3500 19\" Monochrome", DN_FLAGS )
COMP( 1989, dn3500, 0, 0, dn3500_15i, dn3500, apollo_state, dn3500, "Apollo", "Apollo DN3500", DN_FLAGS )
COMP( 1989, dsp3500, dn3500, 0, dsp3500, dsp3500, apollo_state,dsp3500,"Apollo", "Apollo DSP3500", DSP_FLAGS )
COMP( 1989, dn3500_15i, dn3500, 0, dn3500_15i, dn3500, apollo_state, dn3500, "Apollo", "Apollo DN3500 15\" Monochrome", DN_FLAGS )
COMP( 1989, dn3500_19i, dn3500, 0, dn3500_19i, dn3500, apollo_state, dn3500, "Apollo", "Apollo DN3500 19\" Monochrome", DN_FLAGS )
COMP( 1988, dn3000, dn3500, 0, dn3000_19i, dn3500, apollo_state, dn3000, "Apollo", "Apollo DN3000 19\" Monochrome", DN_FLAGS )
COMP( 1988, dn3000, dn3500, 0, dn3000_15i, dn3500, apollo_state, dn3000, "Apollo", "Apollo DN3000", DN_FLAGS )
COMP( 1988, dsp3000, dn3500, 0, dsp3000, dsp3500, apollo_state,dsp3000,"Apollo", "Apollo DSP3000", DSP_FLAGS )
COMP( 1988, dn3000_15i, dn3500, 0, dn3000_15i, dn3500, apollo_state, dn3000, "Apollo", "Apollo DN3000 15\" Monochrome", DN_FLAGS )
COMP( 1988, dn3000_19i, dn3500, 0, dn3000_19i, dn3500, apollo_state, dn3000, "Apollo", "Apollo DN3000 19\" Monochrome", DN_FLAGS )
COMP( 1991, dn5500, dn3500, 0, dn5500_19i, dn3500, apollo_state, dn5500, "Apollo", "Apollo DN5500 19\" Monochrome", GAME_NOT_WORKING )
COMP( 1991, dn5500, dn3500, 0, dn5500_15i, dn3500, apollo_state, dn5500, "Apollo", "Apollo DN5500", GAME_NOT_WORKING )
COMP( 1991, dsp5500, dn3500, 0, dsp5500, dsp3500, apollo_state,dsp5500,"Apollo", "Apollo DSP5500", GAME_NOT_WORKING )
COMP( 1991, dn5500_15i, dn3500, 0, dn5500_15i, dn3500, apollo_state, dn5500, "Apollo", "Apollo DN5500 15\" Monochrome", GAME_NOT_WORKING )
COMP( 1991, dn5500_19i, dn3500, 0, dn5500_19i, dn3500, apollo_state, dn5500, "Apollo", "Apollo DN5500 19\" Monochrome", GAME_NOT_WORKING )

View File

@ -210,22 +210,24 @@ public:
MACHINE_CONFIG_EXTERN( apollo );
/*----------- machine/apollo_config.c -----------*/
// configuration bit definitions
#define APOLLO_CONF_SERVICE_MODE 0x001
#define APOLLO_CONF_GERMAN_KBD 0x002
#define APOLLO_CONF_DATE_1990 0x004
#define APOLLO_CONF_NODE_ID 0x008
#define APOLLO_CONF_IDLE_SLEEP 0x010
#define APOLLO_CONF_TRAP_TRACE 0x020
#define APOLLO_CONF_FPU_TRACE 0x040
#define APOLLO_CONF_DISK_TRACE 0x080
#define APOLLO_CONF_NET_TRACE 0x100
#define APOLLO_CONF_SERVICE_MODE 0x0001
#define APOLLO_CONF_DISPLAY 0x001e
#define APOLLO_CONF_8_PLANES 0x0002
#define APOLLO_CONF_4_PLANES 0x0004
#define APOLLO_CONF_MONO_15I 0x0008
#define APOLLO_CONF_MONO_19I 0x0010
#define APOLLO_CONF_GERMAN_KBD 0x0020
#define APOLLO_CONF_DATE_1990 0x0040
#define APOLLO_CONF_NODE_ID 0x0080
#define APOLLO_CONF_IDLE_SLEEP 0x0100
#define APOLLO_CONF_TRAP_TRACE 0x0200
#define APOLLO_CONF_FPU_TRACE 0x0400
#define APOLLO_CONF_DISK_TRACE 0x0800
#define APOLLO_CONF_NET_TRACE 0x1000
// check configuration setting
int apollo_config(int mask);
@ -320,26 +322,40 @@ typedef int (*apollo_netserver_transmit)(device_t *, const UINT8 *, int);
void apollo_netserver_init(const char *root_path, apollo_netserver_transmit tx_data);
/*----------- video/apollo.c -----------*/
class apollo_mono_device : public device_t
#define APOLLO_SCREEN_TAG "apollo_screen"
class apollo_graphics_15i : public device_t
{
public:
apollo_mono_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
~apollo_mono_device() { global_free(m_token); }
apollo_graphics_15i(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
apollo_graphics_15i(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, device_type type, const char *name, const char *shortname, const char *source);
~apollo_graphics_15i() { global_free(m_token); }
// access to legacy token
void *token() const { assert(m_token != NULL); return m_token; }
protected:
// device-level overrides
virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
private:
// internal state
void *m_token;
};
extern const device_type APOLLO_GRAPHICS;
#define APOLLO_SCREEN_TAG "apollo_screen"
#define MCFG_APOLLO_GRAPHICS_ADD( _tag) \
MCFG_FRAGMENT_ADD(apollo_graphics) \
MCFG_DEVICE_ADD(_tag, APOLLO_GRAPHICS, 0)
class apollo_mono19i_device : public apollo_mono_device
MACHINE_CONFIG_EXTERN( apollo_graphics );
class apollo_graphics_19i : public apollo_graphics_15i
{
public:
apollo_mono19i_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
apollo_graphics_19i(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_config_complete();
@ -351,39 +367,22 @@ private:
extern const device_type APOLLO_MONO19I;
#define MCFG_APOLLO_MONO19I_ADD(_tag) \
MCFG_FRAGMENT_ADD(apollo_mono19i) \
MCFG_DEVICE_ADD(_tag, APOLLO_MONO19I, 0)
MACHINE_CONFIG_EXTERN( apollo_mono19i );
class apollo_mono15i_device : public apollo_mono_device
{
public:
apollo_mono15i_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
// device-level overrides
virtual void device_config_complete();
virtual void device_start();
virtual void device_reset();
private:
// internal state
};
extern const device_type APOLLO_MONO15I;
#define MCFG_APOLLO_MONO15I_ADD( _tag) \
MCFG_FRAGMENT_ADD(apollo_mono15i) \
MCFG_DEVICE_ADD(_tag, APOLLO_MONO15I, 0)
MACHINE_CONFIG_EXTERN( apollo_mono15i );
DECLARE_READ16_DEVICE_HANDLER( apollo_mcr_r ) ;
DECLARE_WRITE16_DEVICE_HANDLER(apollo_mcr_w );
DECLARE_READ8_DEVICE_HANDLER( apollo_mcr_r ) ;
DECLARE_WRITE8_DEVICE_HANDLER(apollo_mcr_w );
DECLARE_READ16_DEVICE_HANDLER( apollo_mgm_r );
DECLARE_WRITE16_DEVICE_HANDLER( apollo_mgm_w );
DECLARE_READ8_DEVICE_HANDLER( apollo_ccr_r ) ;
DECLARE_WRITE8_DEVICE_HANDLER(apollo_ccr_w );
DECLARE_READ16_DEVICE_HANDLER( apollo_cgm_r );
DECLARE_WRITE16_DEVICE_HANDLER( apollo_cgm_w );
#endif /* APOLLO_H_ */

View File

@ -46,7 +46,7 @@
</rect>
</element>
<view name="Apollo 15&quot; Monochrome">
<view name="Apollo (1024x800)">
<bezel element="background"> <bounds left="0" right="253" top="800" bottom="844" /> </bezel>
<bezel name="f1s" element="f1s"> <bounds left="0" right="60" top="806" bottom="822" /> </bezel>

View File

@ -93,15 +93,21 @@ INPUT_PORTS_START( apollo_config )
PORT_CONFSETTING(0x00, "Service" )
PORT_CONFSETTING(APOLLO_CONF_SERVICE_MODE, "Normal " )
PORT_CONFNAME(APOLLO_CONF_DISPLAY, APOLLO_CONF_8_PLANES, "Graphics Controller")
PORT_CONFSETTING(APOLLO_CONF_8_PLANES, "8-Plane Color")
PORT_CONFSETTING(APOLLO_CONF_4_PLANES, "4-Plane Color")
PORT_CONFSETTING(APOLLO_CONF_MONO_15I, "15\" Monochrome")
// PORT_CONFSETTING(APOLLO_CONF_MONO_19I, "19\" Monochrome")
PORT_CONFNAME(APOLLO_CONF_GERMAN_KBD, 0x00, "German Keyboard")
PORT_CONFSETTING(0x00, DEF_STR ( Off ) )
PORT_CONFSETTING(APOLLO_CONF_GERMAN_KBD, DEF_STR ( On ) )
PORT_CONFNAME(APOLLO_CONF_DATE_1990, 0x00, "20 Years Ago ...")
PORT_CONFNAME(APOLLO_CONF_DATE_1990, APOLLO_CONF_DATE_1990, "20 Years Ago ...")
PORT_CONFSETTING(0x00, DEF_STR ( Off ) )
PORT_CONFSETTING(APOLLO_CONF_DATE_1990, DEF_STR ( On ) )
PORT_CONFNAME(APOLLO_CONF_NODE_ID, 0x00, "Node ID from Disk")
PORT_CONFNAME(APOLLO_CONF_NODE_ID, APOLLO_CONF_NODE_ID, "Node ID from Disk")
PORT_CONFSETTING(0x00, DEF_STR ( Off ) )
PORT_CONFSETTING(APOLLO_CONF_NODE_ID, DEF_STR ( On ) )
@ -124,28 +130,9 @@ INPUT_PORTS_START( apollo_config )
PORT_CONFNAME(APOLLO_CONF_NET_TRACE, 0x00, "Network Trace")
PORT_CONFSETTING(0x00, DEF_STR ( Off ) )
PORT_CONFSETTING(APOLLO_CONF_NET_TRACE, DEF_STR ( On ) )
INPUT_PORTS_END
/*-------------------------------------------------
device start callback
-------------------------------------------------*/
static DEVICE_START(apollo_config)
{
DLOG1(("start apollo_config"));
}
/*-------------------------------------------------
device reset callback
-------------------------------------------------*/
static DEVICE_RESET(apollo_config)
{
DLOG1(("reset apollo_config"));
// load configuration
config = device->machine().root_device().ioport("apollo_config")->read();
}
class apollo_config_device : public device_t
{
public:
@ -161,7 +148,6 @@ private:
extern const device_type APOLLO_CONF;
const device_type APOLLO_CONF = &device_creator<apollo_config_device>;
apollo_config_device::apollo_config_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
@ -185,7 +171,7 @@ void apollo_config_device::device_config_complete()
void apollo_config_device::device_start()
{
DEVICE_START_NAME( apollo_config )(this);
MLOG1(("start apollo_config"));
}
//-------------------------------------------------
@ -194,7 +180,9 @@ void apollo_config_device::device_start()
void apollo_config_device::device_reset()
{
DEVICE_RESET_NAME( apollo_config )(this);
MLOG1(("reset apollo_config"));
// load configuration
config = machine().root_device().ioport("apollo_config")->read();
}

View File

@ -1199,9 +1199,9 @@ INPUT_PORTS_START( apollo_kbd )
PORT_BIT( 0x00000040, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("Center mouse button") PORT_CODE(MOUSECODE_BUTTON2)
PORT_START("mouse2") // X-axis
PORT_BIT( 0xfff, 0x00, IPT_MOUSE_X) PORT_SENSITIVITY(200) PORT_KEYDELTA(1) PORT_PLAYER(1)
PORT_BIT( 0xfff, 0x00, IPT_MOUSE_X) PORT_SENSITIVITY(200) PORT_KEYDELTA(1) PORT_PLAYER(1) PORT_CODE_DEC(INPUT_CODE_INVALID) PORT_CODE_INC(INPUT_CODE_INVALID)
PORT_START("mouse3") // Y-axis
PORT_BIT( 0xfff, 0x00, IPT_MOUSE_Y) PORT_SENSITIVITY(200) PORT_KEYDELTA(1) PORT_PLAYER(1)
PORT_BIT( 0xfff, 0x00, IPT_MOUSE_Y) PORT_SENSITIVITY(200) PORT_KEYDELTA(1) PORT_PLAYER(1) PORT_CODE_DEC(INPUT_CODE_INVALID) PORT_CODE_INC(INPUT_CODE_INVALID)
INPUT_PORTS_END

View File

@ -406,15 +406,15 @@ nc150 // 1992 NC150
nc200 // 1993 NC200
// Apollo
dn3500 // Apollo Workstation DN3500 19" monochrome (1989)
dsp3500 // Apollo Server DSP3500 (1989)
dn3000 // Apollo Workstation DN3000 19" monochrome (1987)
dsp3000 // Apollo Server DSP3000 (1987)
dn3500_15i // Apollo Workstation DN3500 15" monochrome (1989)
dn3000_15i // Apollo Workstation DN3000 15" monochrome (1988)
dn5500 // Apollo Workstation DN5500 19" monochrome (1991)
dsp5500 // Apollo Server DSP5500 (1991)
dn5500_15i // Apollo Workstation DN5500 15" monochrome (1991)
dn3500 // Apollo Workstation DN3500 15" Color (1989)
dn3500_19i // Apollo Workstation DN3500 19" Monochrome (1989)
dsp3500 // Apollo Server DSP3500 (1989)
dn3000 // Apollo Workstation DN3000 15" Color (1988)
dn3000_19i // Apollo Workstation DN3000 19" Monochrome (1987)
dsp3000 // Apollo Server DSP3000 (1987)
dn5500 // Apollo Workstation DN5500 15" Color (1991)
dn5500_19i // Apollo Workstation DN5500 19" Monochrome (1991)
dsp5500 // Apollo Server DSP5500 (1991)
// Apple
apple1 // Jul 1976 Apple 1