From 018102f077d00dcf344da924b7eef2e91712809f Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Fri, 2 May 2014 07:39:32 +0000 Subject: [PATCH] removed CassetteOptions that is already default (nw) --- src/mess/drivers/dai.c | 8 +------- src/mess/drivers/hec2hrp.c | 8 +------- src/mess/drivers/interact.c | 8 +------- src/mess/drivers/vg5k.c | 9 +-------- src/mess/drivers/zx.c | 10 ++-------- 5 files changed, 6 insertions(+), 37 deletions(-) diff --git a/src/mess/drivers/dai.c b/src/mess/drivers/dai.c index e2cfb9352ab..706b0adbf65 100644 --- a/src/mess/drivers/dai.c +++ b/src/mess/drivers/dai.c @@ -161,16 +161,10 @@ static INPUT_PORTS_START (dai) PORT_BIT(0xcb, IP_ACTIVE_HIGH, IPT_UNUSED) INPUT_PORTS_END -static const struct CassetteOptions dai_cassette_options = { - 1, /* channels */ - 16, /* bits per sample */ - 44100 /* sample frequency */ -}; - static const cassette_interface dai_cassette_interface = { cassette_default_formats, - &dai_cassette_options, + NULL, (cassette_state)(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED), NULL, NULL diff --git a/src/mess/drivers/hec2hrp.c b/src/mess/drivers/hec2hrp.c index 303fdc2c983..5226150c946 100644 --- a/src/mess/drivers/hec2hrp.c +++ b/src/mess/drivers/hec2hrp.c @@ -380,16 +380,10 @@ MACHINE_RESET_MEMBER(hec2hrp_state,hec2mdhrx) } /* Cassette definition */ -static const struct CassetteOptions hector_cassette_options = { - 1, /* channels */ - 16, /* bits per sample */ - 44100 /* sample frequency */ -}; - static const cassette_interface hector_cassette_interface = { hector_cassette_formats, - &hector_cassette_options, + NULL, (cassette_state)(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED), NULL, NULL diff --git a/src/mess/drivers/interact.c b/src/mess/drivers/interact.c index 425ab6a98fa..3ed77b4f049 100644 --- a/src/mess/drivers/interact.c +++ b/src/mess/drivers/interact.c @@ -98,16 +98,10 @@ static ADDRESS_MAP_START(interact_mem, AS_PROGRAM, 8, interact_state ) ADDRESS_MAP_END /* Cassette definition */ -static const struct CassetteOptions interact_cassette_options = { - 1, /* channels */ - 16, /* bits per sample */ - 44100 /* sample frequency */ -}; - static const cassette_interface interact_cassette_interface = { hector_cassette_formats, - &interact_cassette_options, + NULL, (cassette_state)(CASSETTE_STOPPED | CASSETTE_MASK_SPEAKER), "interact_cass", NULL diff --git a/src/mess/drivers/vg5k.c b/src/mess/drivers/vg5k.c index eb038162877..51d2df6ede7 100644 --- a/src/mess/drivers/vg5k.c +++ b/src/mess/drivers/vg5k.c @@ -351,17 +351,10 @@ DRIVER_INIT_MEMBER(vg5k_state,vg5k) } -static const struct CassetteOptions vg5k_cassette_options = -{ - 1, /* channels */ - 16, /* bits per sample */ - 44100 /* sample frequency */ -}; - static const cassette_interface vg5k_cassette_interface = { vg5k_cassette_formats, - &vg5k_cassette_options, + NULL, (cassette_state)(CASSETTE_STOPPED | CASSETTE_MASK_SPEAKER), "vg5k_cass", NULL diff --git a/src/mess/drivers/zx.c b/src/mess/drivers/zx.c index ca504f5b66b..bd58876e210 100644 --- a/src/mess/drivers/zx.c +++ b/src/mess/drivers/zx.c @@ -357,16 +357,10 @@ PALETTE_INIT_MEMBER(zx_state,ts1000) /* Machine Drivers */ -static const struct CassetteOptions zx81_cassette_options = { - 1, /* channels */ - 16, /* bits per sample */ - 44100 /* sample frequency */ -}; - static const cassette_interface zx80_cassette_interface = { zx80_o_format, - &zx81_cassette_options, + NULL, (cassette_state)(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED), NULL }; @@ -374,7 +368,7 @@ static const cassette_interface zx80_cassette_interface = static const cassette_interface zx81_cassette_interface = { zx81_p_format, - &zx81_cassette_options, + NULL, (cassette_state)(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED), NULL, NULL