Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

osborne1: remove legacy floppy options, use standard monochrome green

Browse Source 
palette
This commit is contained in:
Dirk Best 2015-06-08 10:40:46 +02:00
parent b2c3fb09e2
commit 7cd70226a3
3 changed files with 12 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/mess/drivers/osborne1.c
View File

@ -144,14 +144,6 @@ static INPUT_PORTS_START( osborne1 )
INPUT_PORTS_END
PALETTE_INIT_MEMBER(osborne1_state, osborne1)
{
palette.set_pen_color( 0, 0, 0, 0 ); /* Black */
palette.set_pen_color( 1, 0, 255, 0 ); /* Full */
palette.set_pen_color( 2, 0, 128, 0 ); /* Dimmed */
}
static const z80_daisy_config osborne1_daisy_chain[] =
{
/* { osborne1_z80_reset, osborne1_z80_irq_state, osborne1_z80_irq_ack, osborne1_z80_irq_reti, 0 }, */
@ -159,6 +151,7 @@ static const z80_daisy_config osborne1_daisy_chain[] =
{ NULL }
};
/*
* The Osborne-1 supports the following disc formats:
* - Osborne single density: 40 tracks, 10 sectors per track, 256-byte sectors (100 KByte)
@ -168,46 +161,13 @@ static const z80_daisy_config osborne1_daisy_chain[] =
* - DEC 1820 double density: 40 tracks, 9 sectors per track, 512-byte sectors (180 KByte)
*
*/
/*
static LEGACY_FLOPPY_OPTIONS_START(osborne1 )
LEGACY_FLOPPY_OPTION( osd, "img", "Osborne single density", basicdsk_identify_default, basicdsk_construct_default, NULL,
HEADS([1])
TRACKS([40])
SECTORS([10])
SECTOR_LENGTH([256])
FIRST_SECTOR_ID([1]))
LEGACY_FLOPPY_OPTION( odd, "img", "Osborne double density", basicdsk_identify_default, basicdsk_construct_default, NULL,
HEADS([1])
TRACKS([40])
SECTORS([5])
SECTOR_LENGTH([1024])
FIRST_SECTOR_ID([1]))
LEGACY_FLOPPY_OPTION( ibm, "img", "IBM Personal Computer", basicdsk_identify_default, basicdsk_construct_default, NULL,
HEADS([1])
TRACKS([40])
SECTORS([8])
SECTOR_LENGTH([512])
FIRST_SECTOR_ID([1]))
LEGACY_FLOPPY_OPTION( xerox, "img", "Xerox 820 Computer", basicdsk_identify_default, basicdsk_construct_default, NULL,
HEADS([1])
TRACKS([40])
SECTORS([18])
SECTOR_LENGTH([128])
FIRST_SECTOR_ID([1]))
LEGACY_FLOPPY_OPTION( dec, "img", "DEC 1820 double density", basicdsk_identify_default, basicdsk_construct_default, NULL,
HEADS([1])
TRACKS([40])
SECTORS([9])
SECTOR_LENGTH([512])
FIRST_SECTOR_ID([1]))
LEGACY_FLOPPY_OPTIONS_END
*/
static SLOT_INTERFACE_START( osborne1_floppies )
SLOT_INTERFACE( "525sssd", FLOPPY_525_SSSD ) // Siemens FDD 100-5, custom Osborne electronics
SLOT_INTERFACE( "525ssdd", FLOPPY_525_SSDD ) // MPI 52(?), custom Osborne electronics
SLOT_INTERFACE_END
/* F4 Character Displayer */
static const gfx_layout osborne1_charlayout =
{
@ -226,6 +186,7 @@ static GFXDECODE_START( osborne1 )
GFXDECODE_ENTRY( "chargen", 0x0000, osborne1_charlayout, 0, 1 )
GFXDECODE_END
static MACHINE_CONFIG_START( osborne1, osborne1_state )
MCFG_CPU_ADD( "maincpu", Z80, MAIN_CLOCK/4 )
MCFG_CPU_PROGRAM_MAP( osborne1_mem)
@ -239,8 +200,7 @@ static MACHINE_CONFIG_START( osborne1, osborne1_state )
MCFG_SCREEN_RAW_PARAMS( MAIN_CLOCK/2, 512, 0, 416, 260, 0, 240 )
MCFG_SCREEN_PALETTE("palette")
MCFG_GFXDECODE_ADD("gfxdecode", "palette", osborne1)
MCFG_PALETTE_ADD( "palette", 3 )
MCFG_PALETTE_INIT_OWNER(osborne1_state, osborne1)
MCFG_PALETTE_ADD_MONOCHROME_GREEN_HIGHLIGHT("palette")
MCFG_SPEAKER_STANDARD_MONO( "mono" )
MCFG_SOUND_ADD( "beeper", BEEP, 0 )

1
src/mess/includes/osborne1.h
View File

@ -103,7 +103,6 @@ public:
bool m_beep_state;
DECLARE_DRIVER_INIT(osborne1);
virtual void machine_reset();
DECLARE_PALETTE_INIT(osborne1);
TIMER_CALLBACK_MEMBER(osborne1_video_callback);
TIMER_CALLBACK_MEMBER(setup_osborne1);

16
src/mess/machine/osborne1.c
View File

@ -369,14 +369,14 @@ TIMER_CALLBACK_MEMBER(osborne1_state::osborne1_video_callback)
gfx = m_p_chargen[ (ra << 7) | ( chr & 0x7F ) ];
/* Display a scanline of a character */
*p++ = BIT(gfx, 7) ? ( dim ? 1 : 2 ) : 0;
*p++ = BIT(gfx, 6) ? ( dim ? 1 : 2 ) : 0;
*p++ = BIT(gfx, 5) ? ( dim ? 1 : 2 ) : 0;
*p++ = BIT(gfx, 4) ? ( dim ? 1 : 2 ) : 0;
*p++ = BIT(gfx, 3) ? ( dim ? 1 : 2 ) : 0;
*p++ = BIT(gfx, 2) ? ( dim ? 1 : 2 ) : 0;
*p++ = BIT(gfx, 1) ? ( dim ? 1 : 2 ) : 0;
*p++ = BIT(gfx, 0) ? ( dim ? 1 : 2 ) : 0;
*p++ = BIT(gfx, 7) ? ( dim ? 2 : 1 ) : 0;
*p++ = BIT(gfx, 6) ? ( dim ? 2 : 1 ) : 0;
*p++ = BIT(gfx, 5) ? ( dim ? 2 : 1 ) : 0;
*p++ = BIT(gfx, 4) ? ( dim ? 2 : 1 ) : 0;
*p++ = BIT(gfx, 3) ? ( dim ? 2 : 1 ) : 0;
*p++ = BIT(gfx, 2) ? ( dim ? 2 : 1 ) : 0;
*p++ = BIT(gfx, 1) ? ( dim ? 2 : 1 ) : 0;
*p++ = BIT(gfx, 0) ? ( dim ? 2 : 1 ) : 0;
}
}