Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-05 09:57:47 +03:00
Code Issues Actions 33 Packages Projects Releases Wiki Activity

(MESS) bw12: Removed palette and fixed floppy regression. (nw)

Browse Source
This commit is contained in:
Curt Coder 2012-11-16 18:36:01 +00:00
parent 954c61d7c8
commit 3d7069cd20
2 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/mess/drivers/bw12.c
View File

@ -23,20 +23,6 @@
****************************************************************************/
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/ram.h"
#include "formats/mfi_dsk.h"
#include "machine/6821pia.h"
#include "machine/ctronics.h"
#include "machine/upd765.h"
#include "machine/pit8253.h"
#include "machine/rescap.h"
#include "machine/z80dart.h"
#include "machine/kb3600.h"
#include "video/mc6845.h"
#include "sound/dac.h"
#include "includes/bw12.h"
/*
@ -81,8 +67,8 @@ void bw12_state::bankswitch()
void bw12_state::floppy_motor_off()
{
m_floppy0->mon_w(true);
m_floppy1->mon_w(true);
m_floppy0->mon_w(1);
m_floppy1->mon_w(1);
m_motor_on = 0;
}
@ -97,7 +83,7 @@ void bw12_state::set_floppy_motor_off_timer()
if (m_motor0 || m_motor1)
{
m_motor_on = 1;
m_floppy_timer->enable(0);
m_floppy_timer->enable(false);
}
else
{
@ -142,7 +128,7 @@ void bw12_state::ls259_w(int address, int data)
if (data)
{
m_floppy0->mon_w(false);
m_floppy0->mon_w(0);
}
set_floppy_motor_off_timer();
@ -153,7 +139,7 @@ void bw12_state::ls259_w(int address, int data)
if (data)
{
m_floppy1->mon_w(false);
m_floppy1->mon_w(0);
}
set_floppy_motor_off_timer();
@ -352,7 +338,6 @@ INPUT_PORTS_END
static MC6845_UPDATE_ROW( bw12_update_row )
{
bw12_state *state = device->machine().driver_data<bw12_state>();
const rgb_t *palette = palette_entry_list_raw(bitmap.palette());
int column, bit;
@ -372,7 +357,7 @@ static MC6845_UPDATE_ROW( bw12_update_row )
int x = (column * 8) + bit;
int color = BIT(data, 7);
bitmap.pix32(y, x) = palette[color];
bitmap.pix32(y, x) = RGB_MONOCHROME_AMBER[color];
data <<= 1;
}
@ -525,7 +510,7 @@ static const struct pit8253_config pit_intf =
{
XTAL_1_8432MHz,
DEVCB_NULL,
DEVCB_DRIVER_LINE_MEMBER(bw12_state,pit_out0_w)
DEVCB_DRIVER_LINE_MEMBER(bw12_state, pit_out0_w)
},
{
XTAL_1_8432MHz,
@ -618,29 +603,33 @@ void bw12_state::machine_start()
void bw12_state::machine_reset()
{
int i;
for (i = 0; i < 8; i++)
for (int i = 0; i < 8; i++)
{
ls259_w(i, 0);
}
}
static SLOT_INTERFACE_START( bw12_floppies )
SLOT_INTERFACE( "525ssdd", FLOPPY_525_SSDD )
SLOT_INTERFACE( "525dd", FLOPPY_525_SSDD )
SLOT_INTERFACE_END
static const floppy_format_type bw12_floppy_formats[] = {
FLOPPY_BW12_FORMAT,
FLOPPY_IMD_FORMAT,
FLOPPY_MFI_FORMAT,
FLOPPY_MFM_FORMAT,
NULL
};
static SLOT_INTERFACE_START( bw14_floppies )
SLOT_INTERFACE( "525hd", FLOPPY_525_HD )
SLOT_INTERFACE( "525dd", FLOPPY_525_DD )
SLOT_INTERFACE_END
static const floppy_format_type bw14_floppy_formats[] = {
FLOPPY_BW12_FORMAT,
FLOPPY_IMD_FORMAT,
FLOPPY_MFI_FORMAT,
FLOPPY_MFM_FORMAT,
NULL
};
@ -679,8 +668,6 @@ static MACHINE_CONFIG_START( common, bw12_state )
MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 200-1)
MCFG_GFXDECODE(bw12)
MCFG_PALETTE_LENGTH(2)
MCFG_PALETTE_INIT(monochrome_amber)
MCFG_MC6845_ADD(MC6845_TAG, MC6845, XTAL_16MHz/8, bw12_mc6845_interface)
@ -704,8 +691,8 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bw12, common )
/* floppy drives */
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", bw12_floppies, "525ssdd", 0, bw12_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", bw12_floppies, "525ssdd", 0, bw12_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", bw12_floppies, "525dd", 0, bw12_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", bw12_floppies, "525dd", 0, bw12_floppy_formats)
// software lists
MCFG_SOFTWARE_LIST_ADD("flop_list", "bw12")
@ -717,8 +704,8 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( bw14, common )
/* floppy drives */
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", bw14_floppies, "525hd", 0, bw14_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", bw14_floppies, "525hd", 0, bw14_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", bw14_floppies, "525dd", 0, bw14_floppy_formats)
MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", bw14_floppies, "525dd", 0, bw14_floppy_formats)
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)

26
src/mess/includes/bw12.h
View File

@ -1,7 +1,23 @@
#ifndef __BW12__
#define __BW12__
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/ram.h"
#include "formats/bw12_dsk.h"
#include "formats/hxcmfm_dsk.h"
#include "formats/imd_dsk.h"
#include "formats/mfi_dsk.h"
#include "machine/6821pia.h"
#include "machine/ctronics.h"
#include "machine/kb3600.h"
#include "machine/pit8253.h"
#include "machine/ram.h"
#include "machine/rescap.h"
#include "machine/upd765.h"
#include "machine/z80dart.h"
#include "video/mc6845.h"
#include "sound/dac.h"
#define SCREEN_TAG "screen"
#define Z80_TAG "ic35"
@ -31,11 +47,11 @@ public:
m_crtc(*this, MC6845_TAG),
m_centronics(*this, CENTRONICS_TAG),
m_ram(*this, RAM_TAG),
m_floppy0(*this, UPD765_TAG ":0:525ssdd"),
m_floppy1(*this, UPD765_TAG ":1:525ssdd"),
m_floppy_timer(*this, FLOPPY_TIMER_TAG)
,
m_video_ram(*this, "video_ram"){ }
m_floppy0(*this, UPD765_TAG ":0:525dd"),
m_floppy1(*this, UPD765_TAG ":1:525dd"),
m_floppy_timer(*this, FLOPPY_TIMER_TAG),
m_video_ram(*this, "video_ram")
{ }
required_device<cpu_device> m_maincpu;
required_device<pia6821_device> m_pia;