From 98102604f9a87ca7ad8ec870a13671feac8e8d8b Mon Sep 17 00:00:00 2001
From: Dirk Best <mail@dirk-best.de>
Date: Fri, 29 May 2015 16:29:19 +0200
Subject: [PATCH] cleanups (nw)

---
 src/emu/bus/cgenie/expansion/floppy.c | 13 ++++++-------
 src/mess/drivers/cgenie.c             |  4 ++--
 src/mess/machine/z80ne.c              |  1 -
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/emu/bus/cgenie/expansion/floppy.c b/src/emu/bus/cgenie/expansion/floppy.c
index 45d7030f8cb..7f7475a2211 100644
--- a/src/emu/bus/cgenie/expansion/floppy.c
+++ b/src/emu/bus/cgenie/expansion/floppy.c
@@ -5,8 +5,8 @@
     EACA Colour Genie Floppy Disc Controller
 
     TODO:
-    - Only native MESS .mfi files load (some sectors are marked DDM)
-    - FM mode disks can be formatted but don't work correctly
+    - Plain sector files are not working (some sectors are marked DDM),
+      maybe support the .cgd format?
     - What's the exact FD1793 model?
     - How does it turn off the motor?
     - What's the source of the timer and the exact timings?
@@ -33,11 +33,10 @@ const device_type CGENIE_FDC = &device_creator<cgenie_fdc_device>;
 
 DEVICE_ADDRESS_MAP_START( mmio, 8, cgenie_fdc_device )
 	AM_RANGE(0xe0, 0xe3) AM_MIRROR(0x10) AM_READWRITE(irq_r, select_w)
-	AM_RANGE(0xec, 0xef) AM_MIRROR(0x10) AM_DEVREAD("fd1793", fd1793_t, read)
-	AM_RANGE(0xec, 0xec) AM_MIRROR(0x10) AM_WRITE(command_w)
-	AM_RANGE(0xed, 0xed) AM_MIRROR(0x10) AM_DEVWRITE("fd1793", fd1793_t, track_w)
-	AM_RANGE(0xee, 0xee) AM_MIRROR(0x10) AM_DEVWRITE("fd1793", fd1793_t, sector_w)
-	AM_RANGE(0xef, 0xef) AM_MIRROR(0x10) AM_DEVWRITE("fd1793", fd1793_t, data_w)
+	AM_RANGE(0xec, 0xec) AM_MIRROR(0x10) AM_DEVREAD("fd1793", fd1793_t, status_r) AM_WRITE(command_w)
+	AM_RANGE(0xed, 0xed) AM_MIRROR(0x10) AM_DEVREADWRITE("fd1793", fd1793_t, track_r, track_w)
+	AM_RANGE(0xee, 0xee) AM_MIRROR(0x10) AM_DEVREADWRITE("fd1793", fd1793_t, sector_r, sector_w)
+	AM_RANGE(0xef, 0xef) AM_MIRROR(0x10) AM_DEVREADWRITE("fd1793", fd1793_t, data_r, data_w)
 ADDRESS_MAP_END
 
 FLOPPY_FORMATS_MEMBER( cgenie_fdc_device::floppy_formats )
diff --git a/src/mess/drivers/cgenie.c b/src/mess/drivers/cgenie.c
index 9771f744502..2c5ecb78546 100644
--- a/src/mess/drivers/cgenie.c
+++ b/src/mess/drivers/cgenie.c
@@ -108,7 +108,7 @@ static ADDRESS_MAP_START( cgenie_mem, AS_PROGRAM, 8, cgenie_state )
 	AM_RANGE(0x0000, 0x3fff) AM_ROM
 //  AM_RANGE(0x4000, 0xbfff) AM_RAM // set up in machine_start
 	AM_RANGE(0xc000, 0xefff) AM_NOP // cartridge space
-	AM_RANGE(0xf000, 0xf3ff) AM_READWRITE(colorram_r, colorram_w ) AM_SHARE("colorram")
+	AM_RANGE(0xf000, 0xf3ff) AM_READWRITE(colorram_r, colorram_w) AM_SHARE("colorram")
 	AM_RANGE(0xf400, 0xf7ff) AM_RAM AM_SHARE("fontram")
 	AM_RANGE(0xf800, 0xf8ff) AM_MIRROR(0x300) AM_READ(keyboard_r)
 	AM_RANGE(0xfc00, 0xffff) AM_NOP // cartridge space
@@ -220,7 +220,7 @@ INPUT_PORTS_END
 
 READ8_MEMBER( cgenie_state::keyboard_r )
 {
-	int data = 0;
+	UINT8 data = 0;
 
 	for (int i = 0; i < 8; i++)
 		if (BIT(offset, i))
diff --git a/src/mess/machine/z80ne.c b/src/mess/machine/z80ne.c
index 7ae31e9afac..4245165c902 100644
--- a/src/mess/machine/z80ne.c
+++ b/src/mess/machine/z80ne.c
@@ -15,7 +15,6 @@
 
 /* Components */
 #include "machine/ay31015.h"
-#include "machine/wd17xx.h"
 
 /* Devices */
 #include "imagedev/flopdrv.h"