From 18727502478001e0ee46ca2ab0d7f44f92405d1d Mon Sep 17 00:00:00 2001 From: Dirk Best Date: Wed, 27 May 2015 17:23:55 +0200 Subject: [PATCH] cleanup/bbcm fix (nw) --- src/lib/formats/bbc_dsk.c | 8 ++++---- src/mess/machine/bbc.c | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/lib/formats/bbc_dsk.c b/src/lib/formats/bbc_dsk.c index dfa78c0bfd8..dfa21213e20 100644 --- a/src/lib/formats/bbc_dsk.c +++ b/src/lib/formats/bbc_dsk.c @@ -31,19 +31,19 @@ const char *bbc_format::extensions() const const bbc_format::format bbc_format::formats[] = { - { // 100k single sided single density + { // 100k single sided single density floppy_image::FF_525, floppy_image::SSSD, floppy_image::FM, 4000, 10, 40, 1, 256, {}, 0, {}, 16, 11, 19 }, - { // 200k double sided single density + { // 200k double sided single density floppy_image::FF_525, floppy_image::DSSD, floppy_image::FM, 4000, 10, 40, 2, 256, {}, 0, {}, 16, 11, 19 }, - { // 200k single sided double density + { // 200k single sided double density floppy_image::FF_525, floppy_image::SSQD, floppy_image::FM, 4000, 10, 80, 1, 256, {}, 0, {}, 16, 11, 19 }, - { // 400k double sided double density + { // 400k double sided double density floppy_image::FF_525, floppy_image::DSQD, floppy_image::FM, 4000, 10, 80, 2, 256, {}, 0, {}, 16, 11, 19 }, diff --git a/src/mess/machine/bbc.c b/src/mess/machine/bbc.c index d0a5572540e..ef73ee4700a 100644 --- a/src/mess/machine/bbc.c +++ b/src/mess/machine/bbc.c @@ -1576,7 +1576,7 @@ void bbc_state::bbc_update_fdq_int(int state) /* do not trigger int */ bbc_state = 0; } -//printf("bbc_state %d prev %d\n", bbc_state, m_previous_wd177x_int_state); + /* nmi is edge triggered, and triggers when the state goes from clear->set. Here we are checking this transition before triggering the nmi */ if (bbc_state!=m_previous_wd177x_int_state) @@ -1594,7 +1594,6 @@ void bbc_state::bbc_update_fdq_int(int state) WRITE_LINE_MEMBER(bbc_state::bbc_wd177x_intrq_w) { -//printf("bbc_wd177x_intrq_w %d \n", state); m_wd177x_irq_state = state; bbc_update_fdq_int(state); } @@ -1891,6 +1890,8 @@ WRITE8_MEMBER(bbc_state::bbcm_wd1770l_write) if (BIT(data, 0)) floppy = floppy0; if (BIT(data, 1)) floppy = floppy1; + fdc->set_floppy(floppy); + // bit 4: side select if (floppy) floppy->ss_w(BIT(data, 4));