summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/microtch.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/microtch.h')
-rw-r--r--src/devices/machine/microtch.h18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/devices/machine/microtch.h b/src/devices/machine/microtch.h
index 0c56c87379f..ecb16e5b622 100644
--- a/src/devices/machine/microtch.h
+++ b/src/devices/machine/microtch.h
@@ -1,8 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Mariusz Wojcieszek
-#ifndef _MICROTOUCH_H
-#define _MICROTOUCH_H
+#ifndef MAME_MACHINE_MICROTCH_H
+#define MAME_MACHINE_MICROTCH_H
+#pragma once
class microtouch_device :
@@ -11,20 +12,22 @@ class microtouch_device :
{
public:
microtouch_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &static_set_stx_callback(device_t &device, _Object object) { return downcast<microtouch_device &>(device).m_out_stx_func.set_callback(object); }
+ template <class Object> static devcb_base &static_set_stx_callback(device_t &device, Object &&cb) { return downcast<microtouch_device &>(device).m_out_stx_func.set_callback(std::forward<Object>(cb)); }
virtual ioport_constructor device_input_ports() const override;
DECLARE_WRITE_LINE_MEMBER(rx) { device_serial_interface::rx_w(state); }
DECLARE_INPUT_CHANGED_MEMBER(touch);
typedef delegate<int (int *, int *)> touch_cb;
- static void static_set_touch_callback(device_t &device, touch_cb object) { downcast<microtouch_device &>(device).m_out_touch_cb = object; }
+ static void static_set_touch_callback(device_t &device, touch_cb &&object) { downcast<microtouch_device &>(device).m_out_touch_cb = std::move(object); }
+
protected:
virtual void device_start() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual void tra_callback() override;
virtual void tra_complete() override;
virtual void rcv_complete() override;
+
private:
int check_command( const char* commandtocheck, int command_len, uint8_t* command_data );
void send_format_table_packet(uint8_t flag, int x, int y);
@@ -37,12 +40,14 @@ private:
FORMAT_TABLET,
FORMAT_DECIMAL
};
+
enum
{
MODE_INACTIVE,
MODE_STREAM,
MODE_POINT
};
+
uint8_t m_rx_buffer[16];
int m_rx_buffer_ptr;
uint8_t m_tx_buffer[16];
@@ -64,7 +69,7 @@ private:
uint8_t m_output;
};
-extern const device_type MICROTOUCH;
+DECLARE_DEVICE_TYPE(MICROTOUCH, microtouch_device)
#define MCFG_MICROTOUCH_ADD(_tag, _clock, _devcb) \
MCFG_DEVICE_ADD(_tag, MICROTOUCH, _clock) \
@@ -73,5 +78,4 @@ extern const device_type MICROTOUCH;
#define MCFG_MICROTOUCH_TOUCH_CB(_class, _touch_cb) \
microtouch_device::static_set_touch_callback(*device, microtouch_device::touch_cb(&_class::_touch_cb, (_class *)owner));
-
-#endif //_MICROTOUCH_H
+#endif // MAME_MACHINE_MICROTCH_H