summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/nes_ctrl/bcbattle.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/nes_ctrl/bcbattle.h')
-rw-r--r--src/devices/bus/nes_ctrl/bcbattle.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/devices/bus/nes_ctrl/bcbattle.h b/src/devices/bus/nes_ctrl/bcbattle.h
index db0299bd9ec..f485d9c6b35 100644
--- a/src/devices/bus/nes_ctrl/bcbattle.h
+++ b/src/devices/bus/nes_ctrl/bcbattle.h
@@ -6,15 +6,15 @@
**********************************************************************/
-#pragma once
-
-#ifndef __NES_BCBATTLE__
-#define __NES_BCBATTLE__
+#ifndef MAME_BUS_NES_CTRL_BCBATTLE_H
+#define MAME_BUS_NES_CTRL_BCBATTLE_H
+#pragma once
#include "ctrl.h"
#include "machine/bcreader.h"
+
//**************************************************************************
// TYPE DEFINITIONS
//**************************************************************************
@@ -28,18 +28,19 @@ public:
// construction/destruction
nes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual machine_config_constructor device_mconfig_additions() const override;
protected:
+ static constexpr device_timer_id TIMER_BATTLER = 1;
+
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
+ virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
virtual uint8_t read_exp(offs_t offset) override;
int read_current_bit();
- static const device_timer_id TIMER_BATTLER = 1;
required_device<barcode_reader_device> m_reader;
uint8_t m_current_barcode[20];
int m_pending_code, m_new_code, m_transmitting, m_cur_bit, m_cur_byte;
@@ -47,6 +48,6 @@ protected:
};
// device type definition
-extern const device_type NES_BARCODE_BATTLER;
+DECLARE_DEVICE_TYPE(NES_BARCODE_BATTLER, nes_bcbattle_device)
-#endif
+#endif // MAME_BUS_NES_CTRL_BCBATTLE_H