From afffa28cda747a254089a4d9e4b008355f6232cc Mon Sep 17 00:00:00 2001 From: cracyc Date: Sun, 12 May 2013 18:39:45 +0000 Subject: [PATCH] (mess) pc_joy: MSVC warning (nw) --- src/mess/drivers/pc.c | 1 - src/mess/machine/pc_joy.h | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/mess/drivers/pc.c b/src/mess/drivers/pc.c index 4470c0eb0a0..d0ace1dbaef 100644 --- a/src/mess/drivers/pc.c +++ b/src/mess/drivers/pc.c @@ -277,7 +277,6 @@ ADDRESS_MAP_END static ADDRESS_MAP_START(asst128_io, AS_IO, 16, pc_state) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x0000, 0x000f) AM_DEVREADWRITE8("dma8237", am9517a_device, read, write, 0xffff) AM_RANGE(0x0020, 0x0021) AM_DEVREADWRITE8_LEGACY("pic8259", pic8259_r, pic8259_w, 0xffff) AM_RANGE(0x0040, 0x0043) AM_DEVREADWRITE8_LEGACY("pit8253", pit8253_r, pit8253_w, 0xffff) AM_RANGE(0x0060, 0x0063) AM_DEVREADWRITE8("ppi8255", i8255_device, read, write, 0xffff) diff --git a/src/mess/machine/pc_joy.h b/src/mess/machine/pc_joy.h index b5a69dd833f..a4c40451b1f 100644 --- a/src/mess/machine/pc_joy.h +++ b/src/mess/machine/pc_joy.h @@ -23,10 +23,10 @@ public: device_pc_joy_interface(const machine_config &mconfig, device_t &device); virtual ~device_pc_joy_interface(); - virtual bool x1(int delta) { return false; } - virtual bool x2(int delta) { return false; } - virtual bool y1(int delta) { return false; } - virtual bool y2(int delta) { return false; } + virtual UINT8 x1(int delta) { return 0; } + virtual UINT8 x2(int delta) { return 0; } + virtual UINT8 y1(int delta) { return 0; } + virtual UINT8 y2(int delta) { return 0; } virtual UINT8 btn() { return 0xf; } virtual void port_write() { } }; @@ -56,10 +56,10 @@ public: pc_basic_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ioport_constructor device_input_ports() const; - virtual bool x1(int delta) { return (m_x1->read() > delta); } - virtual bool x2(int delta) { return (m_x2->read() > delta); } - virtual bool y1(int delta) { return (m_y1->read() > delta); } - virtual bool y2(int delta) { return (m_y2->read() > delta); } + virtual UINT8 x1(int delta) { return (m_x1->read() > delta); } + virtual UINT8 x2(int delta) { return (m_x2->read() > delta); } + virtual UINT8 y1(int delta) { return (m_y1->read() > delta); } + virtual UINT8 y2(int delta) { return (m_y2->read() > delta); } virtual UINT8 btn() { return m_btn->read(); } protected: