diff options
author | 2018-08-10 09:45:53 +0200 | |
---|---|---|
committer | 2018-08-10 09:47:04 +0200 | |
commit | f1b7a2f97e0a31ab928283732388bec2e6b8f043 (patch) | |
tree | 158df2a8daa410be1e5882d1369a89af2860c5f8 /src/devices/bus/midi | |
parent | e78ca34bac6e5ef1e8ae8deebae9ae8563cb1b04 (diff) |
wd_fdc: Simplify API. Plus some collateral damage [O. Galibert]
Diffstat (limited to 'src/devices/bus/midi')
-rw-r--r-- | src/devices/bus/midi/midi.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/midi/midi.h | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/devices/bus/midi/midi.cpp b/src/devices/bus/midi/midi.cpp index be55f0d71a1..ca87636e6e6 100644 --- a/src/devices/bus/midi/midi.cpp +++ b/src/devices/bus/midi/midi.cpp @@ -46,14 +46,18 @@ device_midi_port_interface::~device_midi_port_interface() #include "bus/midi/midiinport.h" -void midiin_slot(device_slot_interface &device) +device_slot_interface &midiin_slot(device_slot_interface &device) { device.option_add("midiin", MIDIIN_PORT); + device.set_default_option("midiin"); + return device; } #include "bus/midi/midioutport.h" -void midiout_slot(device_slot_interface &device) +device_slot_interface &midiout_slot(device_slot_interface &device) { device.option_add("midiout", MIDIOUT_PORT); + device.set_default_option("midiout"); + return device; } diff --git a/src/devices/bus/midi/midi.h b/src/devices/bus/midi/midi.h index 5ca8bb92e2c..757feefeabc 100644 --- a/src/devices/bus/midi/midi.h +++ b/src/devices/bus/midi/midi.h @@ -21,11 +21,12 @@ class midi_port_device : public device_t, friend class device_midi_port_interface; public: - midi_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + midi_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); virtual ~midi_port_device(); // static configuration helpers template <class Object> devcb_base &set_rx_handler(Object &&cb) { return m_rxd_handler.set_callback(std::forward<Object>(cb)); } + auto rxd_handler() { return m_rxd_handler.bind(); } DECLARE_WRITE_LINE_MEMBER( write_txd ); @@ -61,7 +62,7 @@ protected: DECLARE_DEVICE_TYPE(MIDI_PORT, midi_port_device) -void midiin_slot(device_slot_interface &device); -void midiout_slot(device_slot_interface &device); +device_slot_interface &midiin_slot(device_slot_interface &device); +device_slot_interface &midiout_slot(device_slot_interface &device); #endif // MAME_BUS_MIDI_MIDI_H |