From b23b2a1060e73b99f98ec0630a9d8c139387f08e Mon Sep 17 00:00:00 2001
From: Curt Coder <curtcoder@mail.com>
Date: Thu, 29 Nov 2012 19:01:35 +0000
Subject: [PATCH] (MESS) bw2: Fixed floppy format and FDC clock. (nw)

---
 src/lib/formats/bw2_dsk.c | 15 +++++++--------
 src/lib/formats/bw2_dsk.h |  4 ++--
 src/mess/drivers/bw2.c    |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/lib/formats/bw2_dsk.c b/src/lib/formats/bw2_dsk.c
index a180118fa38..6cd81359c1a 100644
--- a/src/lib/formats/bw2_dsk.c
+++ b/src/lib/formats/bw2_dsk.c
@@ -42,7 +42,7 @@
 #include "emu.h"
 #include "formats/bw2_dsk.h"
 
-bw2_format::bw2_format() : wd177x_format(formats)
+bw2_format::bw2_format() : upd765_format(formats)
 {
 }
 
@@ -61,15 +61,14 @@ const char *bw2_format::extensions() const
 	return "dsk";
 }
 
-// Unverified gap sizes
 const bw2_format::format bw2_format::formats[] = {
-	{   /*  340K 3 1/2 inch double density */
-		floppy_image::FF_35,  floppy_image::SSDD,
-		2000, 17, 80, 1, 256, {}, 0, {}, 100, 22, 20
+	{   // 340K 3 1/2 inch double density
+		floppy_image::FF_35, floppy_image::SSDD,
+		2000, 17, 80, 1, 256, {}, 0, {}, 80, 20, 22, 14
 	},
-	{   /*  360K 3 1/2 inch double density */
-		floppy_image::FF_35,  floppy_image::SSDD,
-		2000, 18, 80, 1, 256, {}, 0, {}, 100, 22, 20
+	{   // 360K 3 1/2 inch double density
+		floppy_image::FF_35, floppy_image::SSDD,
+		2000, 18, 80, 1, 256, {}, 0, {}, 80, 20, 22, 14
 	},
 	{}
 };
diff --git a/src/lib/formats/bw2_dsk.h b/src/lib/formats/bw2_dsk.h
index ef0482add6f..c56d228d5ff 100644
--- a/src/lib/formats/bw2_dsk.h
+++ b/src/lib/formats/bw2_dsk.h
@@ -9,9 +9,9 @@
 #ifndef BW2_DSK_H_
 #define BW2_DSK_H_
 
-#include "wd177x_dsk.h"
+#include "upd765_dsk.h"
 
-class bw2_format : public wd177x_format {
+class bw2_format : public upd765_format {
 public:
 	bw2_format();
 
diff --git a/src/mess/drivers/bw2.c b/src/mess/drivers/bw2.c
index 8130b584db6..12f77dfa92f 100644
--- a/src/mess/drivers/bw2.c
+++ b/src/mess/drivers/bw2.c
@@ -649,7 +649,7 @@ static MACHINE_CONFIG_START( bw2, bw2_state )
 	MCFG_MSM6255_ADD(MSM6255_TAG, XTAL_16MHz, 0, SCREEN_TAG, lcdc_map)
 	MCFG_CENTRONICS_PRINTER_ADD(CENTRONICS_TAG, standard_centronics)
 	MCFG_I8251_ADD(I8251_TAG, default_i8251_interface)
-	MCFG_WD2797x_ADD(WD2797_TAG, XTAL_16MHz/16*8)
+	MCFG_WD2797x_ADD(WD2797_TAG, XTAL_16MHz/8)
 	MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":0", bw2_floppies, "35dd", NULL, bw2_state::floppy_formats)
 	MCFG_FLOPPY_DRIVE_ADD(WD2797_TAG":1", bw2_floppies, NULL,   NULL, bw2_state::floppy_formats)
 	MCFG_BW2_EXPANSION_SLOT_ADD(BW2_EXPANSION_SLOT_TAG, XTAL_16MHz, bw2_expansion_cards, NULL, NULL)