summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorGravatarGravatar AJR <ajrhacker@users.noreply.github.com>2017-10-28 03:20:55 -0400
committerGravatarGravatar AJR <ajrhacker@users.noreply.github.com>2017-10-28 03:20:55 -0400
commit07a36d9d661d102da6c6418f1c817f4fd435ecde (patch)
treee8077b5524fe511614cc6abbeed80942400aa361
parente42be958c90bd6a8400d3bb1d103c8e99d8f49cc (diff)
wd_fdc: Convert line handlers to READ/WRITE_LINE_MEMBER to make them devcb-accessible (nw)
-rw-r--r--src/devices/machine/wd_fdc.cpp18
-rw-r--r--src/devices/machine/wd_fdc.h12
2 files changed, 15 insertions, 15 deletions
diff --git a/src/devices/machine/wd_fdc.cpp b/src/devices/machine/wd_fdc.cpp
index f629fdc08bd..8baeff7edf0 100644
--- a/src/devices/machine/wd_fdc.cpp
+++ b/src/devices/machine/wd_fdc.cpp
@@ -200,15 +200,15 @@ void wd_fdc_device_base::set_floppy(floppy_image_device *_floppy)
ready_callback(floppy, next_ready);
}
-void wd_fdc_device_base::dden_w(bool _dden)
+WRITE_LINE_MEMBER(wd_fdc_device_base::dden_w)
{
if(disable_mfm) {
logerror("Error, this chip does not have a dden line\n");
return;
}
- if(dden != _dden) {
- dden = _dden;
+ if(dden != bool(state)) {
+ dden = bool(state);
if (TRACE_LINES) logerror("select %s\n", dden ? "fm" : "mfm");
}
}
@@ -1368,27 +1368,27 @@ void wd_fdc_device_base::index_callback(floppy_image_device *floppy, int state)
general_continue();
}
-bool wd_fdc_device_base::intrq_r()
+READ_LINE_MEMBER(wd_fdc_device_base::intrq_r)
{
return intrq;
}
-bool wd_fdc_device_base::drq_r()
+READ_LINE_MEMBER(wd_fdc_device_base::drq_r)
{
return drq;
}
-bool wd_fdc_device_base::hld_r()
+READ_LINE_MEMBER(wd_fdc_device_base::hld_r)
{
return hld;
}
-void wd_fdc_device_base::hlt_w(bool state)
+WRITE_LINE_MEMBER(wd_fdc_device_base::hlt_w)
{
- hlt = state;
+ hlt = bool(state);
}
-bool wd_fdc_device_base::enp_r()
+READ_LINE_MEMBER(wd_fdc_device_base::enp_r)
{
return enp;
}
diff --git a/src/devices/machine/wd_fdc.h b/src/devices/machine/wd_fdc.h
index e3811b003f1..a5d3006e3b1 100644
--- a/src/devices/machine/wd_fdc.h
+++ b/src/devices/machine/wd_fdc.h
@@ -145,7 +145,7 @@ public:
void soft_reset();
- void dden_w(bool dden);
+ DECLARE_WRITE_LINE_MEMBER(dden_w);
void set_floppy(floppy_image_device *floppy);
void set_force_ready(bool force_ready);
void set_disable_motor_control(bool _disable_motor_control);
@@ -175,13 +175,13 @@ public:
DECLARE_READ8_MEMBER( read ) { return gen_r(offset); }
DECLARE_WRITE8_MEMBER( write ) { gen_w(offset,data); }
- bool intrq_r();
- bool drq_r();
+ DECLARE_READ_LINE_MEMBER(intrq_r);
+ DECLARE_READ_LINE_MEMBER(drq_r);
- bool hld_r();
- void hlt_w(bool state);
+ DECLARE_READ_LINE_MEMBER(hld_r);
+ DECLARE_WRITE_LINE_MEMBER(hlt_w);
- bool enp_r();
+ DECLARE_READ_LINE_MEMBER(enp_r);
void index_callback(floppy_image_device *floppy, int state);