summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2024-11-25 03:37:11 +1100
committer Vas Crabb <vas@vastheman.com>2024-11-25 03:37:11 +1100
commit116c0bf38433f7294ba7713a23fa48f00370341b (patch)
tree5c7bc16890a310a25533983b1f86c0da6c1e206b /src/devices
parenteaeac3f65f5ac8813f69f26c61c49f9f8503e889 (diff)
Cleanup:
* toaplan/mjsister.cpp: Use memory share creator for VRAM, put banked ROM in its own region so the fixed ROM region can be sized correctly. * cpu/s2650: Use util::sext rather than goofy lookup table. * Fixed a lot more #include guards that didn't match header paths.
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/bus/bbc/tube/tube_cms6809.h8
-rw-r--r--src/devices/bus/bbc/tube/tube_matchbox.h8
-rw-r--r--src/devices/bus/bbc/tube/tube_rc6502.h8
-rw-r--r--src/devices/bus/bbc/tube/tube_x25.h8
-rw-r--r--src/devices/bus/bbc/tube/tube_z80.h8
-rw-r--r--src/devices/bus/bbc/tube/tube_zep100.h8
-rw-r--r--src/devices/bus/bml3/kanji.h8
-rw-r--r--src/devices/bus/bml3/mp1802.h8
-rw-r--r--src/devices/bus/bml3/mp1805.h8
-rw-r--r--src/devices/bus/bml3/rtc.h8
-rw-r--r--src/devices/bus/c64/final3.h6
-rw-r--r--src/devices/bus/c64/georam.h6
-rw-r--r--src/devices/bus/c64/stardos.h6
-rw-r--r--src/devices/bus/c64/system3.h4
-rw-r--r--src/devices/bus/c64/tibdd001.h6
-rw-r--r--src/devices/bus/cbmiec/c1526.h6
-rw-r--r--src/devices/bus/cbus/mpu_pc98.h6
-rw-r--r--src/devices/bus/cbus/pc9801_cbus.h6
-rw-r--r--src/devices/bus/coco/coco_dwsock.h6
-rw-r--r--src/devices/bus/coco/coco_multi.h6
-rw-r--r--src/devices/bus/coco/meb_intrf.h8
-rw-r--r--src/devices/bus/coleco/cartridge/exp.h6
-rw-r--r--src/devices/bus/coleco/cartridge/megacart.h6
-rw-r--r--src/devices/bus/coleco/cartridge/std.h7
-rw-r--r--src/devices/bus/coleco/cartridge/xin1.h7
-rw-r--r--src/devices/bus/coleco/controller/ctrl.h6
-rw-r--r--src/devices/bus/coleco/controller/hand.h7
-rw-r--r--src/devices/bus/coleco/controller/sac.h7
-rw-r--r--src/devices/bus/coleco/expansion/cards.h6
-rw-r--r--src/devices/bus/coleco/expansion/expansion.h6
-rw-r--r--src/devices/bus/einstein/pipe/silicon_disc.h6
-rw-r--r--src/devices/bus/einstein/pipe/tk02.h6
-rw-r--r--src/devices/bus/electron/cart/slot.h7
-rw-r--r--src/devices/bus/electron/m2105.h7
-rw-r--r--src/devices/bus/electron/mc68k.h7
-rw-r--r--src/devices/bus/epson_qx/keyboard/keyboard.h6
-rw-r--r--src/devices/bus/epson_qx/option.h6
-rw-r--r--src/devices/bus/epson_qx/sound_card.h6
-rw-r--r--src/devices/bus/fp1000/fp1000_exp.h6
-rw-r--r--src/devices/bus/fp1000/fp1020fd.h7
-rw-r--r--src/devices/bus/fp1000/fp1030_rampack.h6
-rw-r--r--src/devices/bus/fp1000/fp1060io.h7
-rw-r--r--src/devices/bus/fp1000/fp1060io_exp.h7
-rw-r--r--src/devices/bus/gamate/gamate_protection.h7
-rw-r--r--src/devices/bus/gio64/newport.h6
-rw-r--r--src/devices/bus/heathzenith/h89/z37_fdc.h2
-rw-r--r--src/devices/bus/hp9845_io/98035.h6
-rw-r--r--src/devices/bus/hp_dio/hp98265a.h6
-rw-r--r--src/devices/bus/hp_dio/hp98543.h6
-rw-r--r--src/devices/bus/hp_dio/hp98544.h6
-rw-r--r--src/devices/bus/hp_dio/hp98550.h6
-rw-r--r--src/devices/bus/hp_dio/hp98603a.h6
-rw-r--r--src/devices/bus/hp_dio/hp98603b.h6
-rw-r--r--src/devices/bus/hp_dio/hp98620.h6
-rw-r--r--src/devices/bus/hp_dio/hp98624.h6
-rw-r--r--src/devices/bus/hp_dio/hp98643.h6
-rw-r--r--src/devices/bus/hp_dio/hp98644.h8
-rw-r--r--src/devices/bus/hp_dio/hp_dio.h6
-rw-r--r--src/devices/bus/hp_dio/human_interface.h6
-rw-r--r--src/devices/bus/hp_hil/hlebase.h6
-rw-r--r--src/devices/bus/hp_hil/hlekbd.h6
-rw-r--r--src/devices/bus/hp_hil/hlemouse.h6
-rw-r--r--src/devices/bus/ieee488/c8050.h6
-rw-r--r--src/devices/bus/interpro/keyboard/hle.h6
-rw-r--r--src/devices/bus/interpro/keyboard/lle.h6
-rw-r--r--src/devices/bus/intv/voice.h11
-rw-r--r--src/devices/bus/isa/aha1542c.h6
-rw-r--r--src/devices/bus/isa/lbaenhancer.h6
-rw-r--r--src/devices/bus/isa/p1_sound.h6
-rw-r--r--src/devices/bus/isa/wdxt_gen.h6
-rw-r--r--src/devices/bus/isbx/isbx.h6
-rw-r--r--src/devices/bus/jvs/jvshle.h6
-rw-r--r--src/devices/bus/macpds/hyperdrive.h6
-rw-r--r--src/devices/bus/macpds/pds_tpdfpd.h6
-rw-r--r--src/devices/bus/mc10/mc10_cart.h6
-rw-r--r--src/devices/bus/mc10/mcx128.h6
-rw-r--r--src/devices/bus/mc10/pak.h6
-rw-r--r--src/devices/bus/mc10/ram.h6
-rw-r--r--src/devices/bus/msx/cart/easi_speech.h6
-rw-r--r--src/devices/bus/mtu130/board.h6
-rw-r--r--src/devices/bus/mtx/sdx.h7
-rw-r--r--src/devices/bus/nes_ctrl/bandaihs.h6
-rw-r--r--src/devices/bus/nes_ctrl/fckeybrd.h6
-rw-r--r--src/devices/bus/nes_ctrl/rob.h6
-rw-r--r--src/devices/bus/nes_ctrl/zapper.h6
-rw-r--r--src/devices/bus/nes_ctrl/zapper_sensor.h6
-rw-r--r--src/devices/bus/nscsi/cw7501.h6
-rw-r--r--src/devices/bus/nscsi/s1410.h4
-rw-r--r--src/devices/bus/nubus/8lc.h6
-rw-r--r--src/devices/bus/nubus/nubus_vikbw.h6
-rw-r--r--src/devices/bus/nubus/nubus_wsportrait.h6
-rw-r--r--src/devices/bus/nubus/thunder4gx.h6
-rw-r--r--src/devices/bus/pc8801/pc8801_23.h7
-rw-r--r--src/devices/bus/pc8801/pc8801_31.h6
-rw-r--r--src/devices/bus/pc8801/pc8801_exp.h6
-rw-r--r--src/devices/bus/pc_joy/pc_joy_magnum6.h6
-rw-r--r--src/devices/bus/pc_kbd/hle_mouse.h6
-rw-r--r--src/devices/bus/pc_kbd/msnat.h6
-rw-r--r--src/devices/bus/pccard/ataflash.h6
-rw-r--r--src/devices/bus/pccard/konami_dual.h6
-rw-r--r--src/devices/bus/pci/ncr53c825.h6
-rw-r--r--src/devices/bus/pci/neon250.h7
-rw-r--r--src/devices/bus/pci/oti_spitfire.h7
-rw-r--r--src/devices/bus/pci/rivatnt.h8
-rw-r--r--src/devices/bus/pci/rtl8139_pci.h7
-rw-r--r--src/devices/bus/pci/vision.h6
-rw-r--r--src/devices/bus/plg1x0/plg100-vl.h4
-rw-r--r--src/devices/bus/plg1x0/plg150-ap.h4
-rw-r--r--src/devices/bus/ql/kempston_di.h6
-rw-r--r--src/devices/bus/ql/miracle_hd.h6
-rw-r--r--src/devices/bus/rc2014/cf.h6
-rw-r--r--src/devices/bus/s100/seals8k.h6
-rw-r--r--src/devices/bus/saitek_osa/expansion.h7
-rw-r--r--src/devices/bus/saitek_osa/maestro.h6
-rw-r--r--src/devices/bus/saitek_osa/maestroa.h6
-rw-r--r--src/devices/bus/saitek_osa/sparc.h6
-rw-r--r--src/devices/bus/scsi/scsicd512.h6
-rw-r--r--src/devices/bus/sega8/sega8_slot.h6
-rw-r--r--src/devices/bus/segaai/segaai_exp.h6
-rw-r--r--src/devices/bus/segaai/segaai_slot.h6
-rw-r--r--src/devices/bus/sg1000_exp/kblink.h6
-rw-r--r--src/devices/bus/sg1000_exp/sk1100prn.h7
-rw-r--r--src/devices/bus/sms_ctrl/rs232adapt.h6
-rw-r--r--src/devices/bus/sms_ctrl/sportsjp.h6
-rw-r--r--src/devices/bus/snes_ctrl/sscope.h6
-rw-r--r--src/devices/bus/spectrum/floppyone.h13
-rw-r--r--src/devices/bus/spectrum/nemoide.h6
-rw-r--r--src/devices/bus/spectrum/neogs.h6
-rw-r--r--src/devices/bus/spectrum/smuc.h6
-rw-r--r--src/devices/bus/ss50/dc5.h6
-rw-r--r--src/devices/bus/ss50/mpc.h6
-rw-r--r--src/devices/bus/ss50/mps.h6
-rw-r--r--src/devices/bus/ss50/mps2.h6
-rw-r--r--src/devices/bus/ss50/mpt.h6
-rw-r--r--src/devices/bus/ss50/piaide.h6
-rw-r--r--src/devices/bus/sunkbd/hlekbd.h6
-rw-r--r--src/devices/bus/sunmouse/hlemouse.h6
-rw-r--r--src/devices/bus/supracan/rom.h6
-rw-r--r--src/devices/bus/supracan/slot.h6
-rw-r--r--src/devices/bus/tanbus/keyboard/keyboard.h6
-rw-r--r--src/devices/bus/ti8x/teeconn.h6
-rw-r--r--src/devices/bus/ti8x/ti8x.h6
-rw-r--r--src/devices/bus/ti8x/tispeaker.h6
-rw-r--r--src/devices/cpu/s2650/s2650.cpp42
144 files changed, 453 insertions, 491 deletions
diff --git a/src/devices/bus/bbc/tube/tube_cms6809.h b/src/devices/bus/bbc/tube/tube_cms6809.h
index 6e2f4e49e9f..2066de5d339 100644
--- a/src/devices/bus/bbc/tube/tube_cms6809.h
+++ b/src/devices/bus/bbc/tube/tube_cms6809.h
@@ -6,9 +6,10 @@
**********************************************************************/
+#ifndef MAME_BUS_BBC_TUBE_TUBE_CMS6809_H
+#define MAME_BUS_BBC_TUBE_TUBE_CMS6809_H
-#ifndef MAME_BUS_BBC_TUBE_CMS6809_H
-#define MAME_BUS_BBC_TUBE_CMS6809_H
+#pragma once
#include "tube.h"
#include "cpu/m6809/m6809.h"
@@ -50,5 +51,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(BBC_TUBE_CMS6809, bbc_tube_cms6809_device)
-
-#endif /* MAME_BUS_BBC_TUBE_CMS6809_H */
+#endif // MAME_BUS_BBC_TUBE_TUBE_CMS6809_H
diff --git a/src/devices/bus/bbc/tube/tube_matchbox.h b/src/devices/bus/bbc/tube/tube_matchbox.h
index 5feb9c700c6..250f4bf4b48 100644
--- a/src/devices/bus/bbc/tube/tube_matchbox.h
+++ b/src/devices/bus/bbc/tube/tube_matchbox.h
@@ -1,11 +1,13 @@
// license:BSD-3-Clause
// copyright-holders:Nigel Barnes
-#ifndef MAME_BUS_BBC_TUBE_MATCHBOX_H
-#define MAME_BUS_BBC_TUBE_MATCHBOX_H
+#ifndef MAME_BUS_BBC_TUBE_TUBE_MATCHBOX_H
+#define MAME_BUS_BBC_TUBE_TUBE_MATCHBOX_H
+
+#pragma once
#include "tube.h"
DECLARE_DEVICE_TYPE(BBC_TUBE_MATCHBOX, device_bbc_tube_interface)
-#endif // MAME_BUS_BBC_TUBE_MATCHBOX_H
+#endif // MAME_BUS_BBC_TUBE_TUBE_MATCHBOX_H
diff --git a/src/devices/bus/bbc/tube/tube_rc6502.h b/src/devices/bus/bbc/tube/tube_rc6502.h
index 20ad64dcb1a..016c1b3bd85 100644
--- a/src/devices/bus/bbc/tube/tube_rc6502.h
+++ b/src/devices/bus/bbc/tube/tube_rc6502.h
@@ -8,9 +8,10 @@
**********************************************************************/
+#ifndef MAME_BUS_BBC_TUBE_TUBE_RC6502_H
+#define MAME_BUS_BBC_TUBE_TUBE_RC6502_H
-#ifndef MAME_BUS_BBC_TUBE_RC6502_H
-#define MAME_BUS_BBC_TUBE_RC6502_H
+#pragma once
#include "tube.h"
#include "cpu/m6502/w65c02s.h"
@@ -94,5 +95,4 @@ private:
DECLARE_DEVICE_TYPE(BBC_TUBE_RC6502, bbc_tube_rc6502_device)
DECLARE_DEVICE_TYPE(BBC_TUBE_RC65816, bbc_tube_rc65816_device)
-
-#endif /* MAME_BUS_BBC_TUBE_RC6502_H */
+#endif // MAME_BUS_BBC_TUBE_TUBE_RC6502_H
diff --git a/src/devices/bus/bbc/tube/tube_x25.h b/src/devices/bus/bbc/tube/tube_x25.h
index ad3bf3e8015..f0ac884d96b 100644
--- a/src/devices/bus/bbc/tube/tube_x25.h
+++ b/src/devices/bus/bbc/tube/tube_x25.h
@@ -8,9 +8,10 @@
**********************************************************************/
+#ifndef MAME_BUS_BBC_TUBE_TUBE_X25_H
+#define MAME_BUS_BBC_TUBE_TUBE_X25_H
-#ifndef MAME_BUS_BBC_TUBE_X25_H
-#define MAME_BUS_BBC_TUBE_X25_H
+#pragma once
#include "tube.h"
#include "cpu/z80/z80.h"
@@ -63,5 +64,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(BBC_TUBE_X25, bbc_tube_x25_device)
-
-#endif /* MAME_BUS_BBC_TUBE_X25_H */
+#endif // MAME_BUS_BBC_TUBE_TUBE_X25_H
diff --git a/src/devices/bus/bbc/tube/tube_z80.h b/src/devices/bus/bbc/tube/tube_z80.h
index bb19c59263f..981f1f8ac6b 100644
--- a/src/devices/bus/bbc/tube/tube_z80.h
+++ b/src/devices/bus/bbc/tube/tube_z80.h
@@ -8,9 +8,10 @@
**********************************************************************/
+#ifndef MAME_BUS_BBC_TUBE_TUBE_Z80_H
+#define MAME_BUS_BBC_TUBE_TUBE_Z80_H
-#ifndef MAME_BUS_BBC_TUBE_Z80_H
-#define MAME_BUS_BBC_TUBE_Z80_H
+#pragma once
#include "tube.h"
#include "cpu/z80/z80.h"
@@ -82,5 +83,4 @@ protected:
DECLARE_DEVICE_TYPE(BBC_TUBE_Z80, bbc_tube_z80_device)
DECLARE_DEVICE_TYPE(BBC_TUBE_Z80W, bbc_tube_z80w_device)
-
-#endif /* MAME_BUS_BBC_TUBE_Z80_H */
+#endif // MAME_BUS_BBC_TUBE_TUBE_Z80_H
diff --git a/src/devices/bus/bbc/tube/tube_zep100.h b/src/devices/bus/bbc/tube/tube_zep100.h
index d135116b07b..e426e51c0db 100644
--- a/src/devices/bus/bbc/tube/tube_zep100.h
+++ b/src/devices/bus/bbc/tube/tube_zep100.h
@@ -8,9 +8,10 @@
**********************************************************************/
+#ifndef MAME_BUS_BBC_TUBE_TUBE_ZEP100_H
+#define MAME_BUS_BBC_TUBE_TUBE_ZEP100_H
-#ifndef MAME_BUS_BBC_TUBE_ZEP100_H
-#define MAME_BUS_BBC_TUBE_ZEP100_H
+#pragma once
#include "tube.h"
#include "cpu/z80/z80.h"
@@ -104,5 +105,4 @@ DECLARE_DEVICE_TYPE(BBC_TUBE_ZEP100L, bbc_tube_zep100l_device)
DECLARE_DEVICE_TYPE(BBC_TUBE_ZEP100W, bbc_tube_zep100w_device)
DECLARE_DEVICE_TYPE(BBC_TUBE_ZEP100M, bbc_tube_zep100m_device)
-
-#endif /* MAME_BUS_BBC_TUBE_ZEP100_H */
+#endif // MAME_BUS_BBC_TUBE_TUBE_ZEP100_H
diff --git a/src/devices/bus/bml3/kanji.h b/src/devices/bus/bml3/kanji.h
index 3afdf75350d..3d559010a76 100644
--- a/src/devices/bus/bml3/kanji.h
+++ b/src/devices/bus/bml3/kanji.h
@@ -2,14 +2,14 @@
// copyright-holders:Jonathan Edwards
/*********************************************************************
- bml3kanji.h
+ kanji.h
Hitachi MP-9740 (?) kanji character ROM for the MB-689x
*********************************************************************/
-#ifndef MAME_BUS_BML3_BML3KANJI_H
-#define MAME_BUS_BML3_BML3KANJI_H
+#ifndef MAME_BUS_BML3_KANJI_H
+#define MAME_BUS_BML3_KANJI_H
#pragma once
@@ -48,4 +48,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(BML3BUS_KANJI, bml3bus_kanji_device)
-#endif // MAME_BUS_BML3_BML3KANJI_H
+#endif // MAME_BUS_BML3_KANJI_H
diff --git a/src/devices/bus/bml3/mp1802.h b/src/devices/bus/bml3/mp1802.h
index 7b9701d56f7..908442a6bd7 100644
--- a/src/devices/bus/bml3/mp1802.h
+++ b/src/devices/bus/bml3/mp1802.h
@@ -2,15 +2,15 @@
// copyright-holders:Jonathan Edwards
/*********************************************************************
- bml3mp1802.h
+ mp1802.h
Hitachi MP-1802 floppy disk controller card for the MB-6890
Hitachi MP-3550 floppy drive is attached
*********************************************************************/
-#ifndef MAME_BUS_BML3_BML3MP1802_H
-#define MAME_BUS_BML3_BML3MP1802_H
+#ifndef MAME_BUS_BML3_MP1802_H
+#define MAME_BUS_BML3_MP1802_H
#pragma once
@@ -59,4 +59,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(BML3BUS_MP1802, bml3bus_mp1802_device)
-#endif // MAME_BUS_BML3_BML3MP1802_H
+#endif // MAME_BUS_BML3_MP1802_H
diff --git a/src/devices/bus/bml3/mp1805.h b/src/devices/bus/bml3/mp1805.h
index 63eae04b81a..c4f089eed83 100644
--- a/src/devices/bus/bml3/mp1805.h
+++ b/src/devices/bus/bml3/mp1805.h
@@ -2,15 +2,15 @@
// copyright-holders:Jonathan Edwards
/*********************************************************************
- bml3mp1805.h
+ mp1805.h
Hitachi MP-1805 floppy disk controller card for the MB-6890
Floppy drive is attached
*********************************************************************/
-#ifndef MAME_BUS_BML3_BML3MP1805_H
-#define MAME_BUS_BML3_BML3MP1805_H
+#ifndef MAME_BUS_BML3_MP1805_H
+#define MAME_BUS_BML3_MP1805_H
#pragma once
@@ -58,4 +58,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(BML3BUS_MP1805, bml3bus_mp1805_device)
-#endif // MAME_BUS_BML3_BML3MP1805_H
+#endif // MAME_BUS_BML3_MP1805_H
diff --git a/src/devices/bus/bml3/rtc.h b/src/devices/bus/bml3/rtc.h
index 106b17d6d24..cc29da7f920 100644
--- a/src/devices/bus/bml3/rtc.h
+++ b/src/devices/bus/bml3/rtc.h
@@ -2,14 +2,14 @@
// copyright-holders:Russell Bull
/*********************************************************************
- bml3rtc.h
+ rtc.h
Hitachi RTC card for the MB-6890
*********************************************************************/
-#ifndef MAME_BUS_BML3_BML3RTC_H
-#define MAME_BUS_BML3_BML3RTC_H
+#ifndef MAME_BUS_BML3_RTC_H
+#define MAME_BUS_BML3_RTC_H
#pragma once
@@ -51,4 +51,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(BML3BUS_RTC, bml3bus_rtc_device)
-#endif // MAME_BUS_BML3_BML3RTC_H
+#endif // MAME_BUS_BML3_RTC_H
diff --git a/src/devices/bus/c64/final3.h b/src/devices/bus/c64/final3.h
index 11fe285fdaa..03b5c959c0c 100644
--- a/src/devices/bus/c64/final3.h
+++ b/src/devices/bus/c64/final3.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_C4_FINAL3_H
-#define MAME_BUS_C4_FINAL3_H
+#ifndef MAME_BUS_C64_FINAL3_H
+#define MAME_BUS_C64_FINAL3_H
#pragma once
@@ -53,4 +53,4 @@ private:
DECLARE_DEVICE_TYPE(C64_FINAL3, c64_final3_cartridge_device)
-#endif // MAME_BUS_C4_FINAL3_H
+#endif // MAME_BUS_C64_FINAL3_H
diff --git a/src/devices/bus/c64/georam.h b/src/devices/bus/c64/georam.h
index 48848fd8679..0f8c53f642a 100644
--- a/src/devices/bus/c64/georam.h
+++ b/src/devices/bus/c64/georam.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUC_C64_GEORAM_H
-#define MAME_BUC_C64_GEORAM_H
+#ifndef MAME_BUS_C64_GEORAM_H
+#define MAME_BUS_C64_GEORAM_H
#pragma once
@@ -49,4 +49,4 @@ private:
DECLARE_DEVICE_TYPE(C64_GEORAM, c64_georam_cartridge_device)
-#endif // MAME_BUC_C64_GEORAM_H
+#endif // MAME_BUS_C64_GEORAM_H
diff --git a/src/devices/bus/c64/stardos.h b/src/devices/bus/c64/stardos.h
index a1174de9d06..ca6aea021d2 100644
--- a/src/devices/bus/c64/stardos.h
+++ b/src/devices/bus/c64/stardos.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_C4_STARDOS_H
-#define MAME_BUS_C4_STARDOS_H
+#ifndef MAME_BUS_C64_STARDOS_H
+#define MAME_BUS_C64_STARDOS_H
#pragma once
@@ -56,4 +56,4 @@ private:
DECLARE_DEVICE_TYPE(C64_STARDOS, c64_stardos_cartridge_device)
-#endif // MAME_BUS_C4_STARDOS_H
+#endif // MAME_BUS_C64_STARDOS_H
diff --git a/src/devices/bus/c64/system3.h b/src/devices/bus/c64/system3.h
index 8bb916c24d0..fde76522a58 100644
--- a/src/devices/bus/c64/system3.h
+++ b/src/devices/bus/c64/system3.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_BUS_SYSTEM3_H
-#define MAME_BUS_BUS_SYSTEM3_H
+#ifndef MAME_BUS_C64_SYSTEM3_H
+#define MAME_BUS_C64_SYSTEM3_H
#pragma once
diff --git a/src/devices/bus/c64/tibdd001.h b/src/devices/bus/c64/tibdd001.h
index 57b75fddef7..21511806087 100644
--- a/src/devices/bus/c64/tibdd001.h
+++ b/src/devices/bus/c64/tibdd001.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_C64_TIB_DD_001_H
-#define MAME_BUS_C64_TIB_DD_001_H
+#ifndef MAME_BUS_C64_TIBDD001_H
+#define MAME_BUS_C64_TIBDD001_H
#pragma once
@@ -57,4 +57,4 @@ private:
DECLARE_DEVICE_TYPE(C64_TIB_DD_001, c64_tib_dd_001_device)
-#endif // MAME_BUS_C64_TIB_DD_001_H
+#endif // MAME_BUS_C64_TIBDD001_H
diff --git a/src/devices/bus/cbmiec/c1526.h b/src/devices/bus/cbmiec/c1526.h
index 90d84568349..52b7f906a47 100644
--- a/src/devices/bus/cbmiec/c1526.h
+++ b/src/devices/bus/cbmiec/c1526.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_CBMIEC_C1626_H
-#define MAME_BUS_CBMIEC_C1626_H
+#ifndef MAME_BUS_CBMIEC_C1526_H
+#define MAME_BUS_CBMIEC_C1526_H
#pragma once
@@ -82,4 +82,4 @@ DECLARE_DEVICE_TYPE(C1526, c1526_device)
DECLARE_DEVICE_TYPE(C4023, c4023_device)
-#endif // MAME_BUS_CBMIEC_C1626_H
+#endif // MAME_BUS_CBMIEC_C1526_H
diff --git a/src/devices/bus/cbus/mpu_pc98.h b/src/devices/bus/cbus/mpu_pc98.h
index 6f754094afd..71c6d5c6f11 100644
--- a/src/devices/bus/cbus/mpu_pc98.h
+++ b/src/devices/bus/cbus/mpu_pc98.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont,Kevin Horton
-#ifndef MAME_BUS_CBUS_MPU401_H
-#define MAME_BUS_CBUS_MPU401_H
+#ifndef MAME_BUS_CBUS_MPU_PC98_H
+#define MAME_BUS_CBUS_MPU_PC98_H
#pragma once
@@ -42,4 +42,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(MPU_PC98, mpu_pc98_device)
-#endif // MAME_BUS_CBUS_MPU401_H
+#endif // MAME_BUS_CBUS_MPU_PC98_H
diff --git a/src/devices/bus/cbus/pc9801_cbus.h b/src/devices/bus/cbus/pc9801_cbus.h
index 9f2aa21832f..14c1213e00b 100644
--- a/src/devices/bus/cbus/pc9801_cbus.h
+++ b/src/devices/bus/cbus/pc9801_cbus.h
@@ -58,8 +58,8 @@
<B> <A>
**********************************************************************/
-#ifndef MAME_MACHINE_PC9801_CBUS_H
-#define MAME_MACHINE_PC9801_CBUS_H
+#ifndef MAME_BUS_CBUS_PC9801_CBUS_H
+#define MAME_BUS_CBUS_PC9801_CBUS_H
#pragma once
@@ -135,4 +135,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(PC9801CBUS_SLOT, pc9801_slot_device)
-#endif // MAME_MACHINE_PC9801_CBUS_H
+#endif // MAME_BUS_CBUS_PC9801_CBUS_H
diff --git a/src/devices/bus/coco/coco_dwsock.h b/src/devices/bus/coco/coco_dwsock.h
index a9d474e6087..9533b4ca15b 100644
--- a/src/devices/bus/coco/coco_dwsock.h
+++ b/src/devices/bus/coco/coco_dwsock.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Nathan Woods
-#ifndef MAME_BUS_COCO_COCO_DWSOCKH_H
-#define MAME_BUS_COCO_COCO_DWSOCKH_H
+#ifndef MAME_BUS_COCO_COCO_DWSOCK_H
+#define MAME_BUS_COCO_COCO_DWSOCK_H
#include "osdfile.h"
@@ -69,4 +69,4 @@ DECLARE_DEVICE_TYPE(COCO_DWSOCK, beckerport_device)
// device iterator
typedef device_type_enumerator<beckerport_device> beckerport_device_enumerator;
-#endif // MAME_BUS_COCO_COCO_DWSOCKH_H
+#endif // MAME_BUS_COCO_COCO_DWSOCK_H
diff --git a/src/devices/bus/coco/coco_multi.h b/src/devices/bus/coco/coco_multi.h
index 94e9c6bbc05..f4f3ea23db5 100644
--- a/src/devices/bus/coco/coco_multi.h
+++ b/src/devices/bus/coco/coco_multi.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Nathan Woods
-#ifndef MAME_BUS_COCO_COCO_MULTIPAK_H
-#define MAME_BUS_COCO_COCO_MULTIPAK_H
+#ifndef MAME_BUS_COCO_COCO_MULTI_H
+#define MAME_BUS_COCO_COCO_MULTI_H
#pragma once
@@ -11,4 +11,4 @@
DECLARE_DEVICE_TYPE(COCO_MULTIPAK, device_cococart_interface)
DECLARE_DEVICE_TYPE(DRAGON_MULTIPAK, device_cococart_interface)
-#endif // MAME_BUS_COCO_COCO_MULTIPAK_H
+#endif // MAME_BUS_COCO_COCO_MULTI_H
diff --git a/src/devices/bus/coco/meb_intrf.h b/src/devices/bus/coco/meb_intrf.h
index 859ea6366b2..d9919cb1e51 100644
--- a/src/devices/bus/coco/meb_intrf.h
+++ b/src/devices/bus/coco/meb_intrf.h
@@ -2,14 +2,14 @@
// copyright-holders:tim lindner
/*********************************************************************
- intrf.h
+ meb_intrf.h
CRC / Disto Mini Expansion Bus management
*********************************************************************/
-#ifndef MAME_BUS_COCO_DISTOMEB_H
-#define MAME_BUS_COCO_DISTOMEB_H
+#ifndef MAME_BUS_COCO_MEB_INTRF_H
+#define MAME_BUS_COCO_MEB_INTRF_H
#pragma once
@@ -87,4 +87,4 @@ private:
void disto_meb_add_basic_devices(device_slot_interface &device);
-#endif // MAME_BUS_COCO_DISTOMEB_H
+#endif // MAME_BUS_COCO_MEB_INTRF_H
diff --git a/src/devices/bus/coleco/cartridge/exp.h b/src/devices/bus/coleco/cartridge/exp.h
index ef007010fcd..59362fff11b 100644
--- a/src/devices/bus/coleco/cartridge/exp.h
+++ b/src/devices/bus/coleco/cartridge/exp.h
@@ -25,8 +25,8 @@
**********************************************************************/
-#ifndef MAME_BUS_COLECO_EXP_H
-#define MAME_BUS_COLECO_EXP_H
+#ifndef MAME_BUS_COLECO_CARTRIDGE_EXP_H
+#define MAME_BUS_COLECO_CARTRIDGE_EXP_H
#pragma once
@@ -113,4 +113,4 @@ DECLARE_DEVICE_TYPE(COLECOVISION_CARTRIDGE_SLOT, colecovision_cartridge_slot_dev
void colecovision_cartridges(device_slot_interface &device);
-#endif // MAME_BUS_COLECO_EXP_H
+#endif // MAME_BUS_COLECO_CARTRIDGE_EXP_H
diff --git a/src/devices/bus/coleco/cartridge/megacart.h b/src/devices/bus/coleco/cartridge/megacart.h
index 6df59475f67..cc94c5932e6 100644
--- a/src/devices/bus/coleco/cartridge/megacart.h
+++ b/src/devices/bus/coleco/cartridge/megacart.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_COLECO_MEGACART_H
-#define MAME_BUS_COLECO_MEGACART_H
+#ifndef MAME_BUS_COLECO_CARTRIDGE_MEGACART_H
+#define MAME_BUS_COLECO_CARTRIDGE_MEGACART_H
#pragma once
@@ -46,4 +46,4 @@ private:
DECLARE_DEVICE_TYPE(COLECOVISION_MEGACART, colecovision_megacart_cartridge_device)
-#endif // MAME_BUS_COLECO_MEGACART_H
+#endif // MAME_BUS_COLECO_CARTRIDGE_MEGACART_H
diff --git a/src/devices/bus/coleco/cartridge/std.h b/src/devices/bus/coleco/cartridge/std.h
index 54ff0b70b13..33c11cf050e 100644
--- a/src/devices/bus/coleco/cartridge/std.h
+++ b/src/devices/bus/coleco/cartridge/std.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_COLECO_STD_H
-#define MAME_BUS_COLECO_STD_H
+#ifndef MAME_BUS_COLECO_CARTRIDGE_STD_H
+#define MAME_BUS_COLECO_CARTRIDGE_STD_H
#pragma once
@@ -40,5 +40,4 @@ protected:
// device type definition
DECLARE_DEVICE_TYPE(COLECOVISION_STANDARD, colecovision_standard_cartridge_device)
-
-#endif // MAME_BUS_COLECO_STD_H
+#endif // MAME_BUS_COLECO_CARTRIDGE_STD_H
diff --git a/src/devices/bus/coleco/cartridge/xin1.h b/src/devices/bus/coleco/cartridge/xin1.h
index 5e1dd6fc9c9..757095f705d 100644
--- a/src/devices/bus/coleco/cartridge/xin1.h
+++ b/src/devices/bus/coleco/cartridge/xin1.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_COLECO_XIN1_H
-#define MAME_BUS_COLECO_XIN1_H
+#ifndef MAME_BUS_COLECO_CARTRIDGE_XIN1_H
+#define MAME_BUS_COLECO_CARTRIDGE_XIN1_H
#pragma once
@@ -44,5 +44,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(COLECOVISION_XIN1, colecovision_xin1_cartridge_device)
-
-#endif // MAME_BUS_COLECO_XIN1_H
+#endif // MAME_BUS_COLECO_CARTRIDGE_XIN1_H
diff --git a/src/devices/bus/coleco/controller/ctrl.h b/src/devices/bus/coleco/controller/ctrl.h
index b5f5c36127f..6862f4d1380 100644
--- a/src/devices/bus/coleco/controller/ctrl.h
+++ b/src/devices/bus/coleco/controller/ctrl.h
@@ -9,8 +9,8 @@
**********************************************************************/
-#ifndef MAME_BUS_COLECO_CTRL_H
-#define MAME_BUS_COLECO_CTRL_H
+#ifndef MAME_BUS_COLECO_CONTROLLER_CTRL_H
+#define MAME_BUS_COLECO_CONTROLLER_CTRL_H
#pragma once
@@ -89,4 +89,4 @@ DECLARE_DEVICE_TYPE(COLECOVISION_CONTROL_PORT, colecovision_control_port_device)
void colecovision_control_port_devices(device_slot_interface &device);
-#endif // MAME_BUS_COLECO_CTRL_H
+#endif // MAME_BUS_COLECO_CONTROLLER_CTRL_H
diff --git a/src/devices/bus/coleco/controller/hand.h b/src/devices/bus/coleco/controller/hand.h
index 026ef89a7df..9f6395be155 100644
--- a/src/devices/bus/coleco/controller/hand.h
+++ b/src/devices/bus/coleco/controller/hand.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_COLECO_HAND_H
-#define MAME_BUS_COLECO_HAND_H
+#ifndef MAME_BUS_COLECO_CONTROLLER_HAND_H
+#define MAME_BUS_COLECO_CONTROLLER_HAND_H
#pragma once
@@ -50,5 +50,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(COLECO_HAND_CONTROLLER, coleco_hand_controller_device)
-
-#endif // MAME_BUS_COLECO_HAND_H
+#endif // MAME_BUS_COLECO_CONTROLLER_HAND_H
diff --git a/src/devices/bus/coleco/controller/sac.h b/src/devices/bus/coleco/controller/sac.h
index f1f3db57344..ba7df71efd1 100644
--- a/src/devices/bus/coleco/controller/sac.h
+++ b/src/devices/bus/coleco/controller/sac.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_COLECO_SAC_H
-#define MAME_BUS_COLECO_SAC_H
+#ifndef MAME_BUS_COLECO_CONTROLLER_SAC_H
+#define MAME_BUS_COLECO_CONTROLLER_SAC_H
#pragma once
@@ -51,5 +51,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(COLECO_SUPER_ACTION_CONTROLLER, coleco_super_action_controller_device)
-
-#endif // MAME_BUS_COLECO_SAC_H
+#endif // MAME_BUS_COLECO_CONTROLLER_SAC_H
diff --git a/src/devices/bus/coleco/expansion/cards.h b/src/devices/bus/coleco/expansion/cards.h
index 08577a2cba9..6d724420df8 100644
--- a/src/devices/bus/coleco/expansion/cards.h
+++ b/src/devices/bus/coleco/expansion/cards.h
@@ -6,11 +6,11 @@
***************************************************************************/
-#ifndef MAME_BUS_COlECO_EXPANSION_CARDS_H
-#define MAME_BUS_COlECO_EXPANSION_CARDS_H
+#ifndef MAME_BUS_COLECO_EXPANSION_CARDS_H
+#define MAME_BUS_COLECO_EXPANSION_CARDS_H
#pragma once
void coleco_expansion_cards(device_slot_interface &device);
-#endif // MAME_BUS_COlECO_EXPANSION_CARDS_H
+#endif // MAME_BUS_COLECO_EXPANSION_CARDS_H
diff --git a/src/devices/bus/coleco/expansion/expansion.h b/src/devices/bus/coleco/expansion/expansion.h
index e48cc59b2f7..0c38f42f514 100644
--- a/src/devices/bus/coleco/expansion/expansion.h
+++ b/src/devices/bus/coleco/expansion/expansion.h
@@ -39,8 +39,8 @@
***************************************************************************/
-#ifndef MAME_BUS_COlECO_EXPANSION_EXPANSION_H
-#define MAME_BUS_COlECO_EXPANSION_EXPANSION_H
+#ifndef MAME_BUS_COLECO_EXPANSION_EXPANSION_H
+#define MAME_BUS_COLECO_EXPANSION_EXPANSION_H
#pragma once
@@ -123,4 +123,4 @@ protected:
DECLARE_DEVICE_TYPE(COLECO_EXPANSION, coleco_expansion_device)
-#endif // MAME_BUS_COlECO_EXPANSION_EXPANSION_H
+#endif // MAME_BUS_COLECO_EXPANSION_EXPANSION_H
diff --git a/src/devices/bus/einstein/pipe/silicon_disc.h b/src/devices/bus/einstein/pipe/silicon_disc.h
index d30f564b0d2..132414c04b5 100644
--- a/src/devices/bus/einstein/pipe/silicon_disc.h
+++ b/src/devices/bus/einstein/pipe/silicon_disc.h
@@ -8,8 +8,8 @@
***************************************************************************/
-#ifndef MAME_BUS_EINSTEIN_SILICON_DISC_H
-#define MAME_BUS_EINSTEIN_SILICON_DISC_H
+#ifndef MAME_BUS_EINSTEIN_PIPE_SILICON_DISC_H
+#define MAME_BUS_EINSTEIN_PIPE_SILICON_DISC_H
#pragma once
@@ -51,4 +51,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(EINSTEIN_SILICON_DISC, einstein_silicon_disc_device)
-#endif // MAME_BUS_EINSTEIN_SILICON_DISC_H
+#endif // MAME_BUS_EINSTEIN_PIPE_SILICON_DISC_H
diff --git a/src/devices/bus/einstein/pipe/tk02.h b/src/devices/bus/einstein/pipe/tk02.h
index 2a592715907..5b4c05e4c18 100644
--- a/src/devices/bus/einstein/pipe/tk02.h
+++ b/src/devices/bus/einstein/pipe/tk02.h
@@ -6,8 +6,8 @@
***************************************************************************/
-#ifndef MAME_BUS_EINSTEIN_TK02_H
-#define MAME_BUS_EINSTEIN_TK02_H
+#ifndef MAME_BUS_EINSTEIN_PIPE_TK02_H
+#define MAME_BUS_EINSTEIN_PIPE_TK02_H
#pragma once
@@ -59,4 +59,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(TK02_80COL, tk02_device)
-#endif // MAME_BUS_EINSTEIN_TK02_H
+#endif // MAME_BUS_EINSTEIN_PIPE_TK02_H
diff --git a/src/devices/bus/electron/cart/slot.h b/src/devices/bus/electron/cart/slot.h
index 8f930392e66..a9f4ab1e12e 100644
--- a/src/devices/bus/electron/cart/slot.h
+++ b/src/devices/bus/electron/cart/slot.h
@@ -91,8 +91,8 @@
22 0V - Zero volts.
**********************************************************************/
-#ifndef MAME_BUS_ELECTRON_CARTSLOT_H
-#define MAME_BUS_ELECTRON_CARTSLOT_H
+#ifndef MAME_BUS_ELECTRON_CART_SLOT_H
+#define MAME_BUS_ELECTRON_CART_SLOT_H
#pragma once
@@ -211,5 +211,4 @@ DECLARE_DEVICE_TYPE(ELECTRON_CARTSLOT, electron_cartslot_device)
void electron_cart(device_slot_interface &device);
-
-#endif // MAME_BUS_ELECTRON_CARTSLOT_H
+#endif // MAME_BUS_ELECTRON_CART_SLOT_H
diff --git a/src/devices/bus/electron/m2105.h b/src/devices/bus/electron/m2105.h
index b9c02a179a9..152f229a96c 100644
--- a/src/devices/bus/electron/m2105.h
+++ b/src/devices/bus/electron/m2105.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_ELECTRON_M2105_M
-#define MAME_BUS_ELECTRON_M2105_M
+#ifndef MAME_BUS_ELECTRON_M2105_H
+#define MAME_BUS_ELECTRON_M2105_H
#pragma once
@@ -59,5 +59,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(ELECTRON_M2105, electron_m2105_device)
-
-#endif // MAME_BUS_ELECTRON_M2105_M
+#endif // MAME_BUS_ELECTRON_M2105_H
diff --git a/src/devices/bus/electron/mc68k.h b/src/devices/bus/electron/mc68k.h
index d8b5e29894c..67c23eba8a6 100644
--- a/src/devices/bus/electron/mc68k.h
+++ b/src/devices/bus/electron/mc68k.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_ELECTRON_MC68K_M
-#define MAME_BUS_ELECTRON_MC68K_M
+#ifndef MAME_BUS_ELECTRON_MC68K_H
+#define MAME_BUS_ELECTRON_MC68K_H
#pragma once
@@ -59,5 +59,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(ELECTRON_MC68K, electron_mc68k_device)
-
-#endif // MAME_BUS_ELECTRON_MC68K_M
+#endif // MAME_BUS_ELECTRON_MC68K_H
diff --git a/src/devices/bus/epson_qx/keyboard/keyboard.h b/src/devices/bus/epson_qx/keyboard/keyboard.h
index b0ee9275d61..f260cd4849d 100644
--- a/src/devices/bus/epson_qx/keyboard/keyboard.h
+++ b/src/devices/bus/epson_qx/keyboard/keyboard.h
@@ -10,8 +10,8 @@
***************************************************************************/
-#ifndef MAME_BUS_EPSON_QX_KEYBOARD_H
-#define MAME_BUS_EPSON_QX_KEYBOARD_H
+#ifndef MAME_BUS_EPSON_QX_KEYBOARD_KEYBOARD_H
+#define MAME_BUS_EPSON_QX_KEYBOARD_KEYBOARD_H
#pragma once
@@ -111,4 +111,4 @@ DECLARE_DEVICE_TYPE_NS(EPSON_QX_KEYBOARD_PORT, bus::epson_qx::keyboard, keyboard
DECLARE_DEVICE_TYPE_NS(QX10_KEYBOARD_HASCI, bus::epson_qx::keyboard, qx10_keyboard_hasci)
DECLARE_DEVICE_TYPE_NS(QX10_KEYBOARD_ASCII, bus::epson_qx::keyboard, qx10_keyboard_ascii)
-#endif
+#endif // MAME_BUS_EPSON_QX_KEYBOARD_KEYBOARD_H
diff --git a/src/devices/bus/epson_qx/option.h b/src/devices/bus/epson_qx/option.h
index 8df99a60211..0f39a194b51 100644
--- a/src/devices/bus/epson_qx/option.h
+++ b/src/devices/bus/epson_qx/option.h
@@ -97,8 +97,8 @@
|---| |---| |---| |---| |---|
*/
-#ifndef MAME_BUS_EPSON_QX_BUS_H
-#define MAME_BUS_EPSON_QX_BUS_H
+#ifndef MAME_BUS_EPSON_QX_OPTION_H
+#define MAME_BUS_EPSON_QX_OPTION_H
#pragma once
@@ -277,4 +277,4 @@ void option_bus_devices(device_slot_interface &device);
DECLARE_DEVICE_TYPE_NS(EPSON_QX_OPTION_BUS_SLOT, bus::epson_qx, option_slot_device)
DECLARE_DEVICE_TYPE_NS(EPSON_QX_OPTION_BUS, bus::epson_qx, option_bus_device)
-#endif
+#endif // MAME_BUS_EPSON_QX_OPTION_H
diff --git a/src/devices/bus/epson_qx/sound_card.h b/src/devices/bus/epson_qx/sound_card.h
index 2d36ff6bc43..61d1a8a4ed1 100644
--- a/src/devices/bus/epson_qx/sound_card.h
+++ b/src/devices/bus/epson_qx/sound_card.h
@@ -6,8 +6,8 @@
*
*******************************************************************/
-#ifndef MAME_BUS_EPSON_QX_YM2149_H
-#define MAME_BUS_EPSON_QX_YM2149_H
+#ifndef MAME_BUS_EPSON_QX_SOUND_CARD_H
+#define MAME_BUS_EPSON_QX_SOUND_CARD_H
#pragma once
@@ -58,4 +58,4 @@ private:
DECLARE_DEVICE_TYPE_NS(EPSON_QX_OPTION_YM2149, bus::epson_qx, ym2149_sound_card_device)
-#endif // MAME_BUS_EPSON_QX_YM2149_H
+#endif // MAME_BUS_EPSON_QX_SOUND_CARD_H
diff --git a/src/devices/bus/fp1000/fp1000_exp.h b/src/devices/bus/fp1000/fp1000_exp.h
index 39dd2449795..4faca42d4f2 100644
--- a/src/devices/bus/fp1000/fp1000_exp.h
+++ b/src/devices/bus/fp1000/fp1000_exp.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Angelo Salese
-#ifndef MAME_BUS_FP1000_EXP_H
-#define MAME_BUS_FP1000_EXP_H
+#ifndef MAME_BUS_FP1000_FP1000_EXP_H
+#define MAME_BUS_FP1000_FP1000_EXP_H
#pragma once
@@ -98,4 +98,4 @@ DECLARE_DEVICE_TYPE(FP1000_EXP_SLOT, fp1000_exp_slot_device)
void fp1000_exp_devices(device_slot_interface &device);
-#endif // MAME_MACHINE_FP1000_EXP_H
+#endif // MAME_BUS_FP1000_FP1000_EXP_H
diff --git a/src/devices/bus/fp1000/fp1020fd.h b/src/devices/bus/fp1000/fp1020fd.h
index 3ba84bc61eb..e19feef985b 100644
--- a/src/devices/bus/fp1000/fp1020fd.h
+++ b/src/devices/bus/fp1000/fp1020fd.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Angelo Salese
-#ifndef MAME_BUS_FP1020FD_H
-#define MAME_BUS_FP1020FD_H
+#ifndef MAME_BUS_FP1000_FP1020FD_H
+#define MAME_BUS_FP1000_FP1020FD_H
#pragma once
@@ -39,5 +39,4 @@ private:
DECLARE_DEVICE_TYPE(FP1020FD, fp1020fd_device)
-
-#endif // MAME_BUS_FP1020FD_H
+#endif // MAME_BUS_FP1000_FP1020FD_H
diff --git a/src/devices/bus/fp1000/fp1030_rampack.h b/src/devices/bus/fp1000/fp1030_rampack.h
index aa63a8dffb5..05168afccc0 100644
--- a/src/devices/bus/fp1000/fp1030_rampack.h
+++ b/src/devices/bus/fp1000/fp1030_rampack.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Angelo Salese
-#ifndef MAME_BUS_FP1030_RAMPACK_H
-#define MAME_BUS_FP1030_RAMPACK_H
+#ifndef MAME_BUS_FP1000_FP1030_RAMPACK_H
+#define MAME_BUS_FP1000_FP1030_RAMPACK_H
#pragma once
@@ -31,4 +31,4 @@ private:
DECLARE_DEVICE_TYPE(FP1030_RAMPACK, fp1030_rampack_device)
-#endif // MAME_BUS_FP1030_RAMPACK_H
+#endif // MAME_BUS_FP1000_FP1030_RAMPACK_H
diff --git a/src/devices/bus/fp1000/fp1060io.h b/src/devices/bus/fp1000/fp1060io.h
index 7e4f298fe29..4f69eeddf1a 100644
--- a/src/devices/bus/fp1000/fp1060io.h
+++ b/src/devices/bus/fp1000/fp1060io.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Angelo Salese
-#ifndef MAME_BUS_FP1060IO_H
-#define MAME_BUS_FP1060IO_H
+#ifndef MAME_BUS_FP1000_FP1060IO_H
+#define MAME_BUS_FP1000_FP1060IO_H
#pragma once
@@ -35,5 +35,4 @@ private:
DECLARE_DEVICE_TYPE(FP1060IO, fp1060io_device)
-
-#endif // MAME_BUS_FP1060IO_H
+#endif // MAME_BUS_FP1000_FP1060IO_H
diff --git a/src/devices/bus/fp1000/fp1060io_exp.h b/src/devices/bus/fp1000/fp1060io_exp.h
index df39924647c..59e176b6ff8 100644
--- a/src/devices/bus/fp1000/fp1060io_exp.h
+++ b/src/devices/bus/fp1000/fp1060io_exp.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Angelo Salese
-#ifndef MAME_BUS_FP1060IO_EXP_H
-#define MAME_BUS_FP1060IO_EXP_H
+#ifndef MAME_BUS_FP1000_FP1060IO_EXP_H
+#define MAME_BUS_FP1000_FP1060IO_EXP_H
#pragma once
@@ -83,5 +83,4 @@ void fp1060io_slot_devices(device_slot_interface &device);
DECLARE_DEVICE_TYPE(FP1060IO_EXP_SLOT, fp1060io_exp_slot_device)
-#endif // MAME_BUS_FP1060IO_EXP_H
-
+#endif // MAME_BUS_FP1000_FP1060IO_EXP_H
diff --git a/src/devices/bus/gamate/gamate_protection.h b/src/devices/bus/gamate/gamate_protection.h
index 4c6f077f246..d0065693dbe 100644
--- a/src/devices/bus/gamate/gamate_protection.h
+++ b/src/devices/bus/gamate/gamate_protection.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
-#ifndef MAME_BUS_GAMATE_PROTECTION_H
-#define MAME_BUS_GAMATE_PROTECTION_H
+#ifndef MAME_BUS_GAMATE_GAMATE_PROTECTION_H
+#define MAME_BUS_GAMATE_GAMATE_PROTECTION_H
#pragma once
@@ -35,5 +35,4 @@ private:
const uint8_t m_prot_string[15] = { 0x42, 0x49, 0x54, 0x20, 0x43, 0x4F, 0x52, 0x50, 0x4F, 0x52, 0x41, 0x54, 0x49, 0x4F, 0x4E }; // "BIT CORPORATION"
};
-#endif // MAME_BUS_GAMATE_PROTECTION_H
-
+#endif // MAME_BUS_GAMATE_GAMATE_PROTECTION_H
diff --git a/src/devices/bus/gio64/newport.h b/src/devices/bus/gio64/newport.h
index 116ff6637be..65a03476e35 100644
--- a/src/devices/bus/gio64/newport.h
+++ b/src/devices/bus/gio64/newport.h
@@ -8,8 +8,8 @@
*********************************************************************/
-#ifndef MAME_BUS_GIO_NEWPORT_H
-#define MAME_BUS_GIO_NEWPORT_H
+#ifndef MAME_BUS_GIO64_NEWPORT_H
+#define MAME_BUS_GIO64_NEWPORT_H
#pragma once
@@ -547,4 +547,4 @@ protected:
DECLARE_DEVICE_TYPE(GIO64_XL8, gio64_xl8_device)
DECLARE_DEVICE_TYPE(GIO64_XL24, gio64_xl24_device)
-#endif // MAME_BUS_GIO_NEWPORT_H
+#endif // MAME_BUS_GIO64_NEWPORT_H
diff --git a/src/devices/bus/heathzenith/h89/z37_fdc.h b/src/devices/bus/heathzenith/h89/z37_fdc.h
index a3400914250..045ccabc74a 100644
--- a/src/devices/bus/heathzenith/h89/z37_fdc.h
+++ b/src/devices/bus/heathzenith/h89/z37_fdc.h
@@ -6,7 +6,7 @@
****************************************************************************/
-#ifndef MAME__Z37_FDC_H
+#ifndef MAME_BUS_HEATHZENITH_H89_Z37_FDC_H
#define MAME_BUS_HEATHZENITH_H89_Z37_FDC_H
#pragma once
diff --git a/src/devices/bus/hp9845_io/98035.h b/src/devices/bus/hp9845_io/98035.h
index c7c56579ddc..b6a9fe40264 100644
--- a/src/devices/bus/hp9845_io/98035.h
+++ b/src/devices/bus/hp9845_io/98035.h
@@ -8,8 +8,8 @@
*********************************************************************/
-#ifndef MAME_BUS_HP_9845_IO_98035_H
-#define MAME_BUS_HP_9845_IO_98035_H
+#ifndef MAME_BUS_HP9845_IO_98035_H
+#define MAME_BUS_HP9845_IO_98035_H
#pragma once
@@ -125,4 +125,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(HP98035_IO_CARD, hp98035_io_card_device)
-#endif // MAME_BUS_HP_9845_IO_98035_H
+#endif // MAME_BUS_HP9845_IO_98035_H
diff --git a/src/devices/bus/hp_dio/hp98265a.h b/src/devices/bus/hp_dio/hp98265a.h
index f4be410e236..945777f4418 100644
--- a/src/devices/bus/hp_dio/hp98265a.h
+++ b/src/devices/bus/hp_dio/hp98265a.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Sven Schnelle
-#ifndef MAME_BUS_HPDIO_98265A_H
-#define MAME_BUS_HPDIO_98265A_H
+#ifndef MAME_BUS_HP_DIO_HP98265A_H
+#define MAME_BUS_HP_DIO_HP98265A_H
#pragma once
@@ -10,4 +10,4 @@
DECLARE_DEVICE_TYPE_NS(HPDIO_98265A, bus::hp_dio, device_dio16_card_interface)
-#endif // MAME_BUS_HPDIO_98265A_H
+#endif // MAME_BUS_HP_DIO_HP98265A_H
diff --git a/src/devices/bus/hp_dio/hp98543.h b/src/devices/bus/hp_dio/hp98543.h
index edf7ccdb3be..2432380e5c3 100644
--- a/src/devices/bus/hp_dio/hp98543.h
+++ b/src/devices/bus/hp_dio/hp98543.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Sven Schnelle
-#ifndef MAME_BUS_HPDIO_98543_H
-#define MAME_BUS_HPDIO_98543_H
+#ifndef MAME_BUS_HP_DIO_HP98543_H
+#define MAME_BUS_HP_DIO_HP98543_H
#pragma once
@@ -11,4 +11,4 @@
// device type definition
DECLARE_DEVICE_TYPE_NS(HPDIO_98543, bus::hp_dio, device_dio16_card_interface)
-#endif // MAME_BUS_HPDIO_98543_H
+#endif // MAME_BUS_HP_DIO_HP98543_H
diff --git a/src/devices/bus/hp_dio/hp98544.h b/src/devices/bus/hp_dio/hp98544.h
index 63a41d4386e..3b1116e307a 100644
--- a/src/devices/bus/hp_dio/hp98544.h
+++ b/src/devices/bus/hp_dio/hp98544.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont
-#ifndef MAME_BUS_HPDIO_98544_H
-#define MAME_BUS_HPDIO_98544_H
+#ifndef MAME_BUS_HP_DIO_HP98544_H
+#define MAME_BUS_HP_DIO_HP98544_H
#pragma once
@@ -9,4 +9,4 @@
DECLARE_DEVICE_TYPE_NS(HPDIO_98544, bus::hp_dio, device_dio16_card_interface)
-#endif // MAME_BUS_HPDIO_98544_H
+#endif // MAME_BUS_HP_DIO_HP98544_H
diff --git a/src/devices/bus/hp_dio/hp98550.h b/src/devices/bus/hp_dio/hp98550.h
index 174a01a04d2..ca2e681fb02 100644
--- a/src/devices/bus/hp_dio/hp98550.h
+++ b/src/devices/bus/hp_dio/hp98550.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Sven Schnelle
-#ifndef MAME_BUS_HPDIO_98550_H
-#define MAME_BUS_HPDIO_98550_H
+#ifndef MAME_BUS_HP_DIO_HP98550_H
+#define MAME_BUS_HP_DIO_HP98550_H
#pragma once
@@ -10,4 +10,4 @@
DECLARE_DEVICE_TYPE_NS(HPDIO_98550, bus::hp_dio, device_dio32_card_interface)
-#endif // MAME_BUS_HPDIO_98550_H
+#endif // MAME_BUS_HP_DIO_HP98550_H
diff --git a/src/devices/bus/hp_dio/hp98603a.h b/src/devices/bus/hp_dio/hp98603a.h
index e7f7efb40f4..c5573a287c8 100644
--- a/src/devices/bus/hp_dio/hp98603a.h
+++ b/src/devices/bus/hp_dio/hp98603a.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Sven Schnelle
-#ifndef MAME_BUS_HPDIO_98603A_H
-#define MAME_BUS_HPDIO_98603A_H
+#ifndef MAME_BUS_HP_DIO_HP98603A_H
+#define MAME_BUS_HP_DIO_HP98603A_H
#pragma once
@@ -10,4 +10,4 @@
DECLARE_DEVICE_TYPE_NS(HPDIO_98603A, bus::hp_dio, device_dio16_card_interface)
-#endif // MAME_BUS_HPDIO_98603A_H
+#endif // MAME_BUS_HP_DIO_HP98603A_H
diff --git a/src/devices/bus/hp_dio/hp98603b.h b/src/devices/bus/hp_dio/hp98603b.h
index ade7c285e3e..e402eb9ca58 100644
--- a/src/devices/bus/hp_dio/hp98603b.h
+++ b/src/devices/bus/hp_dio/hp98603b.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Sven Schnelle
-#ifndef MAME_BUS_HPDIO_98603B_H
-#define MAME_BUS_HPDIO_98603B_H
+#ifndef MAME_BUS_HP_DIO_HP98603B_H
+#define MAME_BUS_HP_DIO_HP98603B_H
#pragma once
@@ -10,4 +10,4 @@
DECLARE_DEVICE_TYPE_NS(HPDIO_98603B, bus::hp_dio, device_dio16_card_interface)
-#endif // MAME_BUS_HPDIO_98603B_H
+#endif // MAME_BUS_HP_DIO_HP98603B_H
diff --git a/src/devices/bus/hp_dio/hp98620.h b/src/devices/bus/hp_dio/hp98620.h
index 59b97b15131..887a1535ddf 100644
--- a/src/devices/bus/hp_dio/hp98620.h
+++ b/src/devices/bus/hp_dio/hp98620.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Sven Schnelle
-#ifndef MAME_BUS_HPDIO_98620_H
-#define MAME_BUS_HPDIO_98620_H
+#ifndef MAME_BUS_HP_DIO_HP98620_H
+#define MAME_BUS_HP_DIO_HP98620_H
#pragma once
@@ -10,4 +10,4 @@
DECLARE_DEVICE_TYPE_NS(HPDIO_98620, bus::hp_dio, device_dio16_card_interface)
-#endif // MAME_BUS_HPDIO_98620_H
+#endif // MAME_BUS_HP_DIO_HP98620_H
diff --git a/src/devices/bus/hp_dio/hp98624.h b/src/devices/bus/hp_dio/hp98624.h
index bc419cd4337..71001500306 100644
--- a/src/devices/bus/hp_dio/hp98624.h
+++ b/src/devices/bus/hp_dio/hp98624.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Sven Schnelle
-#ifndef MAME_BUS_HPDIO_98624_H
-#define MAME_BUS_HPDIO_98624_H
+#ifndef MAME_BUS_HP_DIO_HP98624_H
+#define MAME_BUS_HP_DIO_HP98624_H
#pragma once
@@ -10,4 +10,4 @@
DECLARE_DEVICE_TYPE_NS(HPDIO_98624, bus::hp_dio, device_dio16_card_interface)
-#endif // MAME_BUS_HPDIO_98624_H
+#endif // MAME_BUS_HP_DIO_HP98624_H
diff --git a/src/devices/bus/hp_dio/hp98643.h b/src/devices/bus/hp_dio/hp98643.h
index 58fdf8df71c..518ed54f9dc 100644
--- a/src/devices/bus/hp_dio/hp98643.h
+++ b/src/devices/bus/hp_dio/hp98643.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Sven Schnelle
-#ifndef MAME_BUS_HPDIO_98643_H
-#define MAME_BUS_HPDIO_98643_H
+#ifndef MAME_BUS_HP_DIO_HP98643_H
+#define MAME_BUS_HP_DIO_HP98643_H
#pragma once
@@ -11,4 +11,4 @@
// device type definition
DECLARE_DEVICE_TYPE_NS(HPDIO_98643, bus::hp_dio, device_dio16_card_interface)
-#endif // MAME_BUS_HPDIO_98643_H
+#endif // MAME_BUS_HP_DIO_HP98643_H
diff --git a/src/devices/bus/hp_dio/hp98644.h b/src/devices/bus/hp_dio/hp98644.h
index 848fb0ac09e..b8b3762c3b0 100644
--- a/src/devices/bus/hp_dio/hp98644.h
+++ b/src/devices/bus/hp_dio/hp98644.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
-// copyright-holders:R. Belmont
+// copyright-holders:Sven Schnelle
-#ifndef MAME_BUS_HPDIO_98644_H
-#define MAME_BUS_HPDIO_98644_H
+#ifndef MAME_BUS_HP_DIO_HP98644_H
+#define MAME_BUS_HP_DIO_HP98644_H
#pragma once
@@ -11,4 +11,4 @@
// device type definition
DECLARE_DEVICE_TYPE_NS(HPDIO_98644, bus::hp_dio, device_dio16_card_interface)
-#endif // MAME_BUS_HPDIO_98644_H
+#endif // MAME_BUS_HP_DIO_HP98644_H
diff --git a/src/devices/bus/hp_dio/hp_dio.h b/src/devices/bus/hp_dio/hp_dio.h
index af0db99ed14..2f86ae05e6a 100644
--- a/src/devices/bus/hp_dio/hp_dio.h
+++ b/src/devices/bus/hp_dio/hp_dio.h
@@ -12,8 +12,8 @@
***************************************************************************/
-#ifndef MAME_BUS_HPDIO_HPDIO_H
-#define MAME_BUS_HPDIO_HPDIO_H
+#ifndef MAME_BUS_HP_DIO_HP_DIO_H
+#define MAME_BUS_HP_DIO_HP_DIO_H
#pragma once
@@ -291,4 +291,4 @@ DECLARE_DEVICE_TYPE_NS(DIO16, bus::hp_dio, dio16_device)
void dio16_cards(device_slot_interface &device);
void dio32_cards(device_slot_interface &device);
-#endif // MAME_BUS_HPDIO_HPDIO_H
+#endif // MAME_BUS_HP_DIO_HP_DIO_H
diff --git a/src/devices/bus/hp_dio/human_interface.h b/src/devices/bus/hp_dio/human_interface.h
index b5bf0a21374..910e73b4039 100644
--- a/src/devices/bus/hp_dio/human_interface.h
+++ b/src/devices/bus/hp_dio/human_interface.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Sven Schnelle
-#ifndef MAME_BUS_HPDIO_HUMAN_INTERFACE_H
-#define MAME_BUS_HPDIO_HUMAN_INTERFACE_H
+#ifndef MAME_BUS_HP_DIO_HUMAN_INTERFACE_H
+#define MAME_BUS_HP_DIO_HUMAN_INTERFACE_H
#pragma once
@@ -102,4 +102,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE_NS(HPDIO_HUMAN_INTERFACE, bus::hp_dio, human_interface_device)
-#endif // MAME_BUS_HPDIO_HUMAN_INTERFACE_H
+#endif // MAME_BUS_HP_DIO_HUMAN_INTERFACE_H
diff --git a/src/devices/bus/hp_hil/hlebase.h b/src/devices/bus/hp_hil/hlebase.h
index 978c548379e..16cedab8ab2 100644
--- a/src/devices/bus/hp_hil/hlebase.h
+++ b/src/devices/bus/hp_hil/hlebase.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Sergey Svishchev
-#ifndef MAME_DEVICES_HP_HIL_HLEBASE_H
-#define MAME_DEVICES_HP_HIL_HLEBASE_H
+#ifndef MAME_BUS_HP_HIL_HLEBASE_H
+#define MAME_BUS_HP_HIL_HLEBASE_H
#pragma once
@@ -41,4 +41,4 @@ private:
} // namespace bus::hp_hil
-#endif // MAME_DEVICES_HP_HIL_HLEBASE_H
+#endif // MAME_BUS_HP_HIL_HLEBASE_H
diff --git a/src/devices/bus/hp_hil/hlekbd.h b/src/devices/bus/hp_hil/hlekbd.h
index cbdf8ac94be..921cf4bb757 100644
--- a/src/devices/bus/hp_hil/hlekbd.h
+++ b/src/devices/bus/hp_hil/hlekbd.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Sergey Svishchev
-#ifndef MAME_DEVICES_HP_HIL_HLEKBD_H
-#define MAME_DEVICES_HP_HIL_HLEKBD_H
+#ifndef MAME_BUS_HP_HIL_HLEKBD_H
+#define MAME_BUS_HP_HIL_HLEKBD_H
#pragma once
@@ -70,4 +70,4 @@ private:
DECLARE_DEVICE_TYPE_NS(HP_IPC_HLE_KEYBOARD, bus::hp_hil, hle_hp_ipc_device);
DECLARE_DEVICE_TYPE_NS(HP_ITF_HLE_KEYBOARD, bus::hp_hil, hle_hp_itf_device);
-#endif // MAME_DEVICES_HP_HIL_HLEKBD_H
+#endif // MAME_BUS_HP_HIL_HLEKBD_H
diff --git a/src/devices/bus/hp_hil/hlemouse.h b/src/devices/bus/hp_hil/hlemouse.h
index 14def7680bd..f8f4c019368 100644
--- a/src/devices/bus/hp_hil/hlemouse.h
+++ b/src/devices/bus/hp_hil/hlemouse.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Sven Schnelle
-#ifndef MAME_DEVICES_HP_HIL_HLEMOUSE_H
-#define MAME_DEVICES_HP_HIL_HLEMOUSE_H
+#ifndef MAME_BUS_HP_HIL_HLEMOUSE_H
+#define MAME_BUS_HP_HIL_HLEMOUSE_H
#pragma once
@@ -47,4 +47,4 @@ public:
DECLARE_DEVICE_TYPE_NS(HP_46060B_MOUSE, bus::hp_hil, hle_hp_46060b_device);
-#endif // MAME_DEVICES_HP_HIL_HLEMOUSE_H
+#endif // MAME_BUS_HP_HIL_HLEMOUSE_H
diff --git a/src/devices/bus/ieee488/c8050.h b/src/devices/bus/ieee488/c8050.h
index 11e6946e616..19ce2f03156 100644
--- a/src/devices/bus/ieee488/c8050.h
+++ b/src/devices/bus/ieee488/c8050.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_IEE488_C8050_H
-#define MAME_BUS_IEE488_C8050_H
+#ifndef MAME_BUS_IEEE488_C8050_H
+#define MAME_BUS_IEEE488_C8050_H
#pragma once
@@ -146,4 +146,4 @@ DECLARE_DEVICE_TYPE(C8250LP, c8250lp_device)
DECLARE_DEVICE_TYPE(SFD1001, sfd1001_device)
-#endif // MAME_BUS_IEE488_C8050_H
+#endif // MAME_BUS_IEEE488_C8050_H
diff --git a/src/devices/bus/interpro/keyboard/hle.h b/src/devices/bus/interpro/keyboard/hle.h
index c175a2e1ec9..9132c80800e 100644
--- a/src/devices/bus/interpro/keyboard/hle.h
+++ b/src/devices/bus/interpro/keyboard/hle.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Patrick Mackinlay
-#ifndef MAME_DEVICES_INTERPRO_KEYBOARD_HLE_H
-#define MAME_DEVICES_INTERPRO_KEYBOARD_HLE_H
+#ifndef MAME_BUS_INTERPRO_KEYBOARD_HLE_H
+#define MAME_DEBUSNTERPRO_KEYBOARD_HLE_H
#pragma once
@@ -118,4 +118,4 @@ public:
DECLARE_DEVICE_TYPE_NS(INTERPRO_HLE_EN_US_KEYBOARD, bus::interpro::keyboard, hle_en_us_device)
-#endif // MAME_DEVICES_INTERPRO_KEYBOARD_HLE_H
+#endif // MAME_BUS_INTERPRO_KEYBOARD_HLE_H
diff --git a/src/devices/bus/interpro/keyboard/lle.h b/src/devices/bus/interpro/keyboard/lle.h
index 69ff831700e..9bd869adbfa 100644
--- a/src/devices/bus/interpro/keyboard/lle.h
+++ b/src/devices/bus/interpro/keyboard/lle.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Patrick Mackinlay
-#ifndef MAME_DEVICES_INTERPRO_KEYBOARD_LLE_H
-#define MAME_DEVICES_INTERPRO_KEYBOARD_LLE_H
+#ifndef MAME_BUS_INTERPRO_KEYBOARD_LLE_H
+#define MAME_BUS_INTERPRO_KEYBOARD_LLE_H
#pragma once
@@ -70,4 +70,4 @@ public:
DECLARE_DEVICE_TYPE_NS(INTERPRO_LLE_EN_US_KEYBOARD, bus::interpro::keyboard, lle_en_us_device)
-#endif // MAME_DEVICES_INTERPRO_KEYBOARD_LLE_H
+#endif // MAME_BUS_INTERPRO_KEYBOARD_LLE_H
diff --git a/src/devices/bus/intv/voice.h b/src/devices/bus/intv/voice.h
index b28dbac0154..937c28f0a89 100644
--- a/src/devices/bus/intv/voice.h
+++ b/src/devices/bus/intv/voice.h
@@ -1,10 +1,13 @@
// license:BSD-3-Clause
// copyright-holders:Fabio Priuli
-#ifndef __INTV_VOICE_H
-#define __INTV_VOICE_H
+#ifndef MAME_BUS_INTV_VOICE_H
+#define MAME_BUS_INTV_VOICE_H
+
+#pragma once
-#include "slot.h"
#include "rom.h"
+#include "slot.h"
+
#include "sound/sp0256.h"
@@ -62,4 +65,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(INTV_ROM_VOICE, intv_voice_device)
-#endif // MAME_BUS_INTV_SLOT_H
+#endif // MAME_BUS_INTV_VOICE_H
diff --git a/src/devices/bus/isa/aha1542c.h b/src/devices/bus/isa/aha1542c.h
index 0760402e509..b3c1b556798 100644
--- a/src/devices/bus/isa/aha1542c.h
+++ b/src/devices/bus/isa/aha1542c.h
@@ -10,8 +10,8 @@
**********************************************************************/
-#ifndef MAME_BUS_AHA1542C_H
-#define MAME_BUS_AHA1542C_H
+#ifndef MAME_BUS_ISA_AHA1542C_H
+#define MAME_BUS_ISA_AHA1542C_H
#pragma once
@@ -94,4 +94,4 @@ DECLARE_DEVICE_TYPE(AHA1542C, aha1542c_device)
DECLARE_DEVICE_TYPE(AHA1542CF, aha1542cf_device)
DECLARE_DEVICE_TYPE(AHA1542CP, aha1542cp_device)
-#endif // MAME_BUS_AHA1542C_H
+#endif // MAME_BUS_ISA_AHA1542C_H
diff --git a/src/devices/bus/isa/lbaenhancer.h b/src/devices/bus/isa/lbaenhancer.h
index 6612e1ea602..c025752ede2 100644
--- a/src/devices/bus/isa/lbaenhancer.h
+++ b/src/devices/bus/isa/lbaenhancer.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_ISA_LBA_ENHANCER_H
-#define MAME_BUS_ISA_LBA_ENHANCER_H
+#ifndef MAME_BUS_ISA_LBAENHANCER_H
+#define MAME_BUS_ISA_LBAENHANCER_H
#pragma once
@@ -41,4 +41,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(ISA8_LBA_ENHANCER, lba_enhancer_device)
-#endif // MAME_BUS_ISA_LBA_ENHANCER_H
+#endif // MAME_BUS_ISA_LBAENHANCER_H
diff --git a/src/devices/bus/isa/p1_sound.h b/src/devices/bus/isa/p1_sound.h
index 17c4967a14c..54f84c07327 100644
--- a/src/devices/bus/isa/p1_sound.h
+++ b/src/devices/bus/isa/p1_sound.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_P1_SOUND_H
-#define MAME_BUS_P1_SOUND_H
+#ifndef MAME_BUS_ISA_P1_SOUND_H
+#define MAME_BUS_ISA_P1_SOUND_H
#pragma once
@@ -67,4 +67,4 @@ private:
DECLARE_DEVICE_TYPE(P1_SOUND, p1_sound_device)
-#endif // MAME_BUS_P1_SOUND_H
+#endif // MAME_BUS_ISA_P1_SOUND_H
diff --git a/src/devices/bus/isa/wdxt_gen.h b/src/devices/bus/isa/wdxt_gen.h
index d5ddffdfbc1..2c2f2ed24a2 100644
--- a/src/devices/bus/isa/wdxt_gen.h
+++ b/src/devices/bus/isa/wdxt_gen.h
@@ -13,8 +13,8 @@
**********************************************************************/
-#ifndef MAME_BUS_ISA8_WDXT_GEN_H
-#define MAME_BUS_ISA8_WDXT_GEN_H
+#ifndef MAME_BUS_ISA_WDXT_GEN_H
+#define MAME_BUS_ISA_WDXT_GEN_H
#pragma once
@@ -82,4 +82,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(ISA8_WDXT_GEN, wdxt_gen_device)
-#endif // MAME_BUS_ISA8_WDXT_GEN_H
+#endif // MAME_BUS_ISA_WDXT_GEN_H
diff --git a/src/devices/bus/isbx/isbx.h b/src/devices/bus/isbx/isbx.h
index 527474e4bbc..769d7bde8b7 100644
--- a/src/devices/bus/isbx/isbx.h
+++ b/src/devices/bus/isbx/isbx.h
@@ -31,8 +31,8 @@
**********************************************************************/
-#ifndef MAME_BUS_ISBX_ISBX_SLOT_H
-#define MAME_BUS_ISBX_ISBX_SLOT_H
+#ifndef MAME_BUS_ISBX_ISBX_H
+#define MAME_BUS_ISBX_ISBX_H
#pragma once
@@ -131,4 +131,4 @@ DECLARE_DEVICE_TYPE(ISBX_SLOT, isbx_slot_device)
void isbx_cards(device_slot_interface &device);
-#endif // MAME_BUS_ISBX_ISBX_SLOT_H
+#endif // MAME_BUS_ISBX_ISBX_H
diff --git a/src/devices/bus/jvs/jvshle.h b/src/devices/bus/jvs/jvshle.h
index 67f7b9fc859..1d3abfbd461 100644
--- a/src/devices/bus/jvs/jvshle.h
+++ b/src/devices/bus/jvs/jvshle.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:smf
-#ifndef MAME_BUS_JVS_JVSDEV_H
-#define MAME_BUS_JVS_JVSDEV_H
+#ifndef MAME_BUS_JVS_JVSHLE_H
+#define MAME_BUS_JVS_JVSHLE_H
#pragma once
@@ -172,4 +172,4 @@ private:
uint8_t m_analog_output_channels;
};
-#endif // MAME_BUS_JVS_JVSDEV_H
+#endif // MAME_BUS_JVS_JVSHLE_H
diff --git a/src/devices/bus/macpds/hyperdrive.h b/src/devices/bus/macpds/hyperdrive.h
index a3ff16b2c4c..13580c73ced 100644
--- a/src/devices/bus/macpds/hyperdrive.h
+++ b/src/devices/bus/macpds/hyperdrive.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont
-#ifndef MAME_BUS_PDS_HYPERDRIVE_H
-#define MAME_BUS_PDS_HYPERDRIVE_H
+#ifndef MAME_BUS_MACPDS_HYPERDRIVE_H
+#define MAME_BUS_MACPDS_HYPERDRIVE_H
#pragma once
@@ -50,4 +50,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(PDS_HYPERDRIVE, macpds_hyperdrive_device)
-#endif // MAME_BUS_PDS_TPDFPD_H
+#endif // MAME_BUS_MACPDS_HYPERDRIVE_H
diff --git a/src/devices/bus/macpds/pds_tpdfpd.h b/src/devices/bus/macpds/pds_tpdfpd.h
index 048c7057c90..26fef74fb3a 100644
--- a/src/devices/bus/macpds/pds_tpdfpd.h
+++ b/src/devices/bus/macpds/pds_tpdfpd.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont
-#ifndef MAME_BUS_PDS_TPDFPD_H
-#define MAME_BUS_PDS_TPDFPD_H
+#ifndef MAME_BUS_MACPDS_PDS_TPDFPD_H
+#define MAME_BUS_MACPDS_PDS_TPDFPD_H
#pragma once
@@ -53,4 +53,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(PDS_SEDISPLAY, macpds_sedisplay_device)
-#endif // MAME_BUS_PDS_TPDFPD_H
+#endif // MAME_BUS_MACPDS_PDS_TPDFPD_H
diff --git a/src/devices/bus/mc10/mc10_cart.h b/src/devices/bus/mc10/mc10_cart.h
index e726647bdd0..9f9116e3a9e 100644
--- a/src/devices/bus/mc10/mc10_cart.h
+++ b/src/devices/bus/mc10/mc10_cart.h
@@ -8,8 +8,8 @@
*********************************************************************/
-#ifndef MAME_BUS_MC10_MC10CART_H
-#define MAME_BUS_MC10_MC10CART_H
+#ifndef MAME_BUS_MC10_MC10_CART_H
+#define MAME_BUS_MC10_MC10_CART_H
#pragma once
@@ -107,4 +107,4 @@ void mc10_cart_add_basic_devices(device_slot_interface &device);
void alice_cart_add_basic_devices(device_slot_interface &device);
void alice32_cart_add_basic_devices(device_slot_interface &device);
-#endif // MAME_BUS_MC10_MC10CART_H
+#endif // MAME_BUS_MC10_MC10_CART_H
diff --git a/src/devices/bus/mc10/mcx128.h b/src/devices/bus/mc10/mcx128.h
index 865809f94f8..a4c936a3d78 100644
--- a/src/devices/bus/mc10/mcx128.h
+++ b/src/devices/bus/mc10/mcx128.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:tim lindner
-#ifndef MAME_BUS_MC10_MC10_MCX128_H
-#define MAME_BUS_MC10_MC10_MCX128_H
+#ifndef MAME_BUS_MC10_MCX128_H
+#define MAME_BUS_MC10_MCX128_H
#pragma once
@@ -10,5 +10,5 @@
// device type definition
DECLARE_DEVICE_TYPE(MC10_PAK_MCX128, device_mc10cart_interface)
-#endif // MAME_BUS_MC10_MC10_MCX128_H
+#endif // MAME_BUS_MC10_MCX128_H
diff --git a/src/devices/bus/mc10/pak.h b/src/devices/bus/mc10/pak.h
index 74bb66b140d..073e7ec6b85 100644
--- a/src/devices/bus/mc10/pak.h
+++ b/src/devices/bus/mc10/pak.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:tim lindner
-#ifndef MAME_BUS_MC10_MC10_PAK_H
-#define MAME_BUS_MC10_MC10_PAK_H
+#ifndef MAME_BUS_MC10_PAK_H
+#define MAME_BUS_MC10_PAK_H
#pragma once
@@ -9,4 +9,4 @@
DECLARE_DEVICE_TYPE(MC10_PAK, device_mc10cart_interface)
-#endif // MAME_BUS_MC10_MC10_PAK_H
+#endif // MAME_BUS_MC10_PAK_H
diff --git a/src/devices/bus/mc10/ram.h b/src/devices/bus/mc10/ram.h
index e32530f81e6..efe89fd3370 100644
--- a/src/devices/bus/mc10/ram.h
+++ b/src/devices/bus/mc10/ram.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:tim lindner
-#ifndef MAME_BUS_MC10_MC10_RAM_H
-#define MAME_BUS_MC10_MC10_RAM_H
+#ifndef MAME_BUS_MC10_RAM_H
+#define MAME_BUS_MC10_RAM_H
#pragma once
@@ -10,5 +10,5 @@
// device type definition
DECLARE_DEVICE_TYPE(MC10_PAK_RAM, device_mc10cart_interface)
-#endif // MAME_BUS_MC10_MC10_RAM_H
+#endif // MAME_BUS_MC10_RAM_H
diff --git a/src/devices/bus/msx/cart/easi_speech.h b/src/devices/bus/msx/cart/easi_speech.h
index 2403603c02a..ddb959e04bb 100644
--- a/src/devices/bus/msx/cart/easi_speech.h
+++ b/src/devices/bus/msx/cart/easi_speech.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:hap
-#ifndef MAME_BUS_MSX_CART_EASISPEECH_H
-#define MAME_BUS_MSX_CART_EASISPEECH_H
+#ifndef MAME_BUS_MSX_CART_EASI_SPEECH_H
+#define MAME_BUS_MSX_CART_EASI_SPEECH_H
#pragma once
@@ -10,4 +10,4 @@
DECLARE_DEVICE_TYPE(MSX_CART_EASISPEECH, msx_cart_interface)
-#endif // MAME_BUS_MSX_CART_EASISPEECH_H
+#endif // MAME_BUS_MSX_CART_EASI_SPEECH_H
diff --git a/src/devices/bus/mtu130/board.h b/src/devices/bus/mtu130/board.h
index 2cf3e83e515..a7b09bebeeb 100644
--- a/src/devices/bus/mtu130/board.h
+++ b/src/devices/bus/mtu130/board.h
@@ -3,8 +3,8 @@
// MTU-130 extension board
-#ifndef MAME_BUS_MTU130_EXTENSION_H
-#define MAME_BUS_MTU130_EXTENSION_H
+#ifndef MAME_BUS_MTU130_BOARD_H
+#define MAME_BUS_MTU130_BOARD_H
#include "machine/input_merger.h"
@@ -66,4 +66,4 @@ protected:
DECLARE_DEVICE_TYPE(MTU130_EXTENSION, mtu130_extension_device)
-#endif
+#endif // MAME_BUS_MTU130_BOARD_H
diff --git a/src/devices/bus/mtx/sdx.h b/src/devices/bus/mtx/sdx.h
index e55de584f1d..4e7183d9565 100644
--- a/src/devices/bus/mtx/sdx.h
+++ b/src/devices/bus/mtx/sdx.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_MTX_EXP_SDX_H
-#define MAME_BUS_MTX_EXP_SDX_H
+#ifndef MAME_BUS_MTX_SDX_H
+#define MAME_BUS_MTX_SDX_H
#include "exp.h"
#include "imagedev/floppy.h"
@@ -97,5 +97,4 @@ private:
DECLARE_DEVICE_TYPE(MTX_SDXBAS, mtx_sdxbas_device)
DECLARE_DEVICE_TYPE(MTX_SDXCPM, mtx_sdxcpm_device)
-
-#endif // MAME_BUS_MTX_EXP_SDX_H
+#endif // MAME_BUS_MTX_SDX_H
diff --git a/src/devices/bus/nes_ctrl/bandaihs.h b/src/devices/bus/nes_ctrl/bandaihs.h
index 169b9eaa5e1..ebe5615292d 100644
--- a/src/devices/bus/nes_ctrl/bandaihs.h
+++ b/src/devices/bus/nes_ctrl/bandaihs.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_NES_CTRL_BANDAIHS
-#define MAME_BUS_NES_CTRL_BANDAIHS
+#ifndef MAME_BUS_NES_CTRL_BANDAIHS_H
+#define MAME_BUS_NES_CTRL_BANDAIHS_H
#pragma once
@@ -50,4 +50,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(NES_BANDAIHS, nes_bandaihs_device)
-#endif // MAME_BUS_NES_CTRL_BANDAIHS
+#endif // MAME_BUS_NES_CTRL_BANDAIHS_H
diff --git a/src/devices/bus/nes_ctrl/fckeybrd.h b/src/devices/bus/nes_ctrl/fckeybrd.h
index 0260c5386db..623c7022d09 100644
--- a/src/devices/bus/nes_ctrl/fckeybrd.h
+++ b/src/devices/bus/nes_ctrl/fckeybrd.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_NES_CTRL_FCKEYBOARD_H
-#define MAME_BUS_NES_CTRL_FCKEYBOARD_H
+#ifndef MAME_BUS_NES_CTRL_FCKEYBRD_H
+#define MAME_BUS_NES_CTRL_FCKEYBRD_H
#pragma once
@@ -48,4 +48,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(NES_FCKEYBOARD, nes_fckeybrd_device)
-#endif // MAME_BUS_NES_CTRL_FCKEYBOARD_H
+#endif // MAME_BUS_NES_CTRL_FCKEYBRD_H
diff --git a/src/devices/bus/nes_ctrl/rob.h b/src/devices/bus/nes_ctrl/rob.h
index 36d46dd65ab..445cb5292e2 100644
--- a/src/devices/bus/nes_ctrl/rob.h
+++ b/src/devices/bus/nes_ctrl/rob.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_NES_CTRL_ROB
-#define MAME_BUS_NES_CTRL_ROB
+#ifndef MAME_BUS_NES_CTRL_ROB_H
+#define MAME_BUS_NES_CTRL_ROB_H
#pragma once
@@ -51,4 +51,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(NES_ROB, nes_rob_device)
-#endif // MAME_BUS_NES_CTRL_ROB
+#endif // MAME_BUS_NES_CTRL_ROB_H
diff --git a/src/devices/bus/nes_ctrl/zapper.h b/src/devices/bus/nes_ctrl/zapper.h
index e22a4001551..f7ec17b7401 100644
--- a/src/devices/bus/nes_ctrl/zapper.h
+++ b/src/devices/bus/nes_ctrl/zapper.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_NES_CTRL_ZAPPER
-#define MAME_BUS_NES_CTRL_ZAPPER
+#ifndef MAME_BUS_NES_CTRL_ZAPPER_H
+#define MAME_BUS_NES_CTRL_ZAPPER_H
#pragma once
@@ -50,4 +50,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(NES_ZAPPER, nes_zapper_device)
-#endif // MAME_BUS_NES_CTRL_ZAPPER
+#endif // MAME_BUS_NES_CTRL_ZAPPER_H
diff --git a/src/devices/bus/nes_ctrl/zapper_sensor.h b/src/devices/bus/nes_ctrl/zapper_sensor.h
index f63a38e6b01..0f556e27a34 100644
--- a/src/devices/bus/nes_ctrl/zapper_sensor.h
+++ b/src/devices/bus/nes_ctrl/zapper_sensor.h
@@ -7,8 +7,8 @@
**********************************************************************/
-#ifndef MAME_BUS_NES_CTRL_ZAPPER_SENSOR
-#define MAME_BUS_NES_CTRL_ZAPPER_SENSOR
+#ifndef MAME_BUS_NES_CTRL_ZAPPER_SENSOR_H
+#define MAME_BUS_NES_CTRL_ZAPPER_SENSOR_H
#pragma once
@@ -50,4 +50,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(NES_ZAPPER_SENSOR, nes_zapper_sensor_device)
-#endif // MAME_BUS_NES_CTRL_ZAPPER_SENSOR
+#endif // MAME_BUS_NES_CTRL_ZAPPER_SENSOR_H
diff --git a/src/devices/bus/nscsi/cw7501.h b/src/devices/bus/nscsi/cw7501.h
index 17a41900704..db1d3f42c69 100644
--- a/src/devices/bus/nscsi/cw7501.h
+++ b/src/devices/bus/nscsi/cw7501.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:AJR
-#ifndef MAME_BUS_NSCSI_CW7501
-#define MAME_BUS_NSCSI_CW7501 1
+#ifndef MAME_BUS_NSCSI_CW7501_H
+#define MAME_BUS_NSCSI_CW7501_H
#pragma once
@@ -49,4 +49,4 @@ protected:
DECLARE_DEVICE_TYPE(CW7501, cw7501_device)
DECLARE_DEVICE_TYPE(CDR4210, cdr4210_device)
-#endif // MAME_BUS_NSCSI_CW7501
+#endif // MAME_BUS_NSCSI_CW7501_H
diff --git a/src/devices/bus/nscsi/s1410.h b/src/devices/bus/nscsi/s1410.h
index 36ff2f5161b..a7f69e9cd94 100644
--- a/src/devices/bus/nscsi/s1410.h
+++ b/src/devices/bus/nscsi/s1410.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef MAME_MACHINE_NSCSI_S1410_H
-#define MAME_MACHINE_NSCSI_S1410_H
+#ifndef MAME_BUS_NSCSI_S1410_H
+#define MAME_BUS_NSCSI_S1410_H
#pragma once
diff --git a/src/devices/bus/nubus/8lc.h b/src/devices/bus/nubus/8lc.h
index afbb9523433..b43bc4e7583 100644
--- a/src/devices/bus/nubus/8lc.h
+++ b/src/devices/bus/nubus/8lc.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont
-#ifndef MAME_BUS_NUBUS_COLORVUE8LC_H
-#define MAME_BUS_NUBUS_COLORVUE8LC_H
+#ifndef MAME_BUS_NUBUS_8LC_H
+#define MAME_BUS_NUBUS_8LC_H
#pragma once
@@ -9,4 +9,4 @@
DECLARE_DEVICE_TYPE(PDSLC_COLORVUE8LC, device_nubus_card_interface)
-#endif // MAME_BUS_NUBUS_COLORVUE8LC_H
+#endif // MAME_BUS_NUBUS_8LC_H
diff --git a/src/devices/bus/nubus/nubus_vikbw.h b/src/devices/bus/nubus/nubus_vikbw.h
index 4e4bc038cc8..099bd9ea08d 100644
--- a/src/devices/bus/nubus/nubus_vikbw.h
+++ b/src/devices/bus/nubus/nubus_vikbw.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont
-#ifndef MAME_BUS_NUBUS_VIKBW_H
-#define MAME_BUS_NUBUS_VIKBW_H
+#ifndef MAME_BUS_NUBUS_NUBUS_VIKBW_H
+#define MAME_BUS_NUBUS_NUBUS_VIKBW_H
#pragma once
@@ -9,4 +9,4 @@
DECLARE_DEVICE_TYPE(NUBUS_VIKBW, device_nubus_card_interface)
-#endif // MAME_BUS_NUBUS_VIKBW_H
+#endif // MAME_BUS_NUBUS_NUBUS_VIKBW_H
diff --git a/src/devices/bus/nubus/nubus_wsportrait.h b/src/devices/bus/nubus/nubus_wsportrait.h
index 3b3546eb721..a0bf6011aa1 100644
--- a/src/devices/bus/nubus/nubus_wsportrait.h
+++ b/src/devices/bus/nubus/nubus_wsportrait.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont
-#ifndef MAME_BUS_NUBUS_WSPORTRAIT_H
-#define MAME_BUS_NUBUS_WSPORTRAIT_H
+#ifndef MAME_BUS_NUBUS_NUBUS_WSPORTRAIT_H
+#define MAME_BUS_NUBUS_NUBUS_WSPORTRAIT_H
#pragma once
@@ -9,4 +9,4 @@
DECLARE_DEVICE_TYPE(NUBUS_WSPORTRAIT, device_nubus_card_interface)
-#endif // MAME_BUS_NUBUS_WSPORTRAIT_H
+#endif // MAME_BUS_NUBUS_NUBUS_WSPORTRAIT_H
diff --git a/src/devices/bus/nubus/thunder4gx.h b/src/devices/bus/nubus/thunder4gx.h
index 625238c0907..e211abb9b6e 100644
--- a/src/devices/bus/nubus/thunder4gx.h
+++ b/src/devices/bus/nubus/thunder4gx.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont
-#ifndef MAME_BUS_NUBUS_THUNDER_4_GX_H
-#define MAME_BUS_NUBUS_THUNDER_4_GX_H
+#ifndef MAME_BUS_NUBUS_THUNDER4GX_H
+#define MAME_BUS_NUBUS_THUNDER4GX_H
#pragma once
@@ -9,4 +9,4 @@
DECLARE_DEVICE_TYPE(NUBUS_THUNDERIVGX, device_nubus_card_interface)
-#endif // MAME_BUS_NUBUS_THUNDER_4_GX_H
+#endif // MAME_BUS_NUBUS_THUNDER4GX_H
diff --git a/src/devices/bus/pc8801/pc8801_23.h b/src/devices/bus/pc8801/pc8801_23.h
index b0bf65ae8ab..385a2080b54 100644
--- a/src/devices/bus/pc8801/pc8801_23.h
+++ b/src/devices/bus/pc8801/pc8801_23.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Angelo Salese
-#ifndef MAME_BUS_PC8801_23_H
-#define MAME_BUS_PC8801_23_H
+#ifndef MAME_BUS_PC8801_PC8801_23_H
+#define MAME_BUS_PC8801_PC8801_23_H
#pragma once
@@ -39,5 +39,4 @@ private:
DECLARE_DEVICE_TYPE(PC8801_23, pc8801_23_device)
-
-#endif // MAME_BUS_PC8801_23_H
+#endif // MAME_BUS_PC8801_PC8801_23_H
diff --git a/src/devices/bus/pc8801/pc8801_31.h b/src/devices/bus/pc8801/pc8801_31.h
index aea5614943c..cc68677ca6d 100644
--- a/src/devices/bus/pc8801/pc8801_31.h
+++ b/src/devices/bus/pc8801/pc8801_31.h
@@ -6,8 +6,8 @@
**************************************************************************************************/
-#ifndef MAME_BUS_PC8801_31_H
-#define MAME_BUS_PC8801_31_H
+#ifndef MAME_BUS_PC8801_PC8801_31_H
+#define MAME_BUS_PC8801_PC8801_31_H
#pragma once
@@ -63,4 +63,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(PC8801_31, pc8801_31_device)
-#endif // MAME_BUS_PC8801_31_H
+#endif // MAME_BUS_PC8801_PC8801_31_H
diff --git a/src/devices/bus/pc8801/pc8801_exp.h b/src/devices/bus/pc8801/pc8801_exp.h
index 8305c68522f..b393fc8c40a 100644
--- a/src/devices/bus/pc8801/pc8801_exp.h
+++ b/src/devices/bus/pc8801/pc8801_exp.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Angelo Salese
-#ifndef MAME_BUS_PC8801_EXP_H
-#define MAME_BUS_PC8801_EXP_H
+#ifndef MAME_BUS_PC8801_PC8801_EXP_H
+#define MAME_BUS_PC8801_PC8801_EXP_H
#pragma once
@@ -91,4 +91,4 @@ DECLARE_DEVICE_TYPE(PC8801_EXP_SLOT, pc8801_exp_slot_device)
void pc8801_exp_devices(device_slot_interface &device);
-#endif // MAME_MACHINE_PC8801_EXP_H
+#endif // MAME_MACHINE_PC8801_PC8801_EXP_H
diff --git a/src/devices/bus/pc_joy/pc_joy_magnum6.h b/src/devices/bus/pc_joy/pc_joy_magnum6.h
index ab7daf41701..c6af086819b 100644
--- a/src/devices/bus/pc_joy/pc_joy_magnum6.h
+++ b/src/devices/bus/pc_joy/pc_joy_magnum6.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Angelo Salese
-#ifndef MAME_BUS_PC_JOY_MAGNUM6_H
-#define MAME_BUS_PC_JOY_MAGNUM6_H
+#ifndef MAME_BUS_PC_JOY_PC_JOY_MAGNUM6_H
+#define MAME_BUS_PC_JOY_PC_JOY_MAGNUM6_H
#include "pc_joy.h"
@@ -21,4 +21,4 @@ public:
DECLARE_DEVICE_TYPE(PC_MAGNUM6_PAD, pc_joy_magnum6_device)
-#endif // MAME_BUS_PC_JOY_MAGNUM6_H
+#endif // MAME_BUS_PC_JOY_PC_JOY_MAGNUM6_H
diff --git a/src/devices/bus/pc_kbd/hle_mouse.h b/src/devices/bus/pc_kbd/hle_mouse.h
index 1a5d91273d7..6d90cf80d05 100644
--- a/src/devices/bus/pc_kbd/hle_mouse.h
+++ b/src/devices/bus/pc_kbd/hle_mouse.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Patrick Mackinlay
-#ifndef MAME_BUS_HLE_PS2_MOUSE_H
-#define MAME_BUS_HLE_PS2_MOUSE_H
+#ifndef MAME_BUS_PC_KBD_HLE_MOUSE_H
+#define MAME_BUS_PC_KBD_HLE_MOUSE_H
#pragma once
@@ -95,4 +95,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(HLE_PS2_MOUSE, hle_ps2_mouse_device)
-#endif // MAME_BUS_HLE_PS2_MOUSE_H
+#endif // MAME_BUS_PC_KBD_HLE_MOUSE_H
diff --git a/src/devices/bus/pc_kbd/msnat.h b/src/devices/bus/pc_kbd/msnat.h
index acf98030ddf..ee339b1772b 100644
--- a/src/devices/bus/pc_kbd/msnat.h
+++ b/src/devices/bus/pc_kbd/msnat.h
@@ -6,8 +6,8 @@
***************************************************************************/
-#ifndef MAME_BUS_PC_KB_MSNAT_H
-#define MAME_BUS_PC_KB_MSNAT_H
+#ifndef MAME_BUS_PC_KBD_MSNAT_H
+#define MAME_BUS_PC_KBD_MSNAT_H
#pragma once
@@ -61,4 +61,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(PC_KBD_MICROSOFT_NATURAL, pc_kbd_microsoft_natural_device)
-#endif // MAME_BUS_PC_KB_MSNAT_H
+#endif // MAME_BUS_PC_KBD_MSNAT_H
diff --git a/src/devices/bus/pccard/ataflash.h b/src/devices/bus/pccard/ataflash.h
index 16000d88e88..02e82378a28 100644
--- a/src/devices/bus/pccard/ataflash.h
+++ b/src/devices/bus/pccard/ataflash.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:smf
-#ifndef MAME_MACHINE_ATAFLASH_H
-#define MAME_MACHINE_ATAFLASH_H
+#ifndef MAME_BUS_PCCARD_ATAFLASH_H
+#define MAME_BUS_PCCARD_ATAFLASH_H
#pragma once
@@ -101,4 +101,4 @@ DECLARE_DEVICE_TYPE(TAITO_PCCARD2, taito_pccard2_device)
DECLARE_DEVICE_TYPE(TAITO_COMPACT_FLASH, taito_compact_flash_device)
DECLARE_DEVICE_TYPE(ATA_FLASH_PCCARD, ata_flash_pccard_device)
-#endif // MAME_MACHINE_ATAFLASH_H
+#endif // MAME_BUS_PCCARD_ATAFLASH_H
diff --git a/src/devices/bus/pccard/konami_dual.h b/src/devices/bus/pccard/konami_dual.h
index aefe97ac553..c364aee57a2 100644
--- a/src/devices/bus/pccard/konami_dual.h
+++ b/src/devices/bus/pccard/konami_dual.h
@@ -1,7 +1,7 @@
// license:GPL-2.0+
// copyright-holders:smf
-#ifndef MAME_BUS_PCCARD_KONAMI_DUAL_PCCARD_H
-#define MAME_BUS_PCCARD_KONAMI_DUAL_PCCARD_H
+#ifndef MAME_BUS_PCCARD_KONAMI_DUAL_H
+#define MAME_BUS_PCCARD_KONAMI_DUAL_H
#pragma once
@@ -27,4 +27,4 @@ protected:
DECLARE_DEVICE_TYPE(KONAMI_DUAL_PCCARD, konami_dual_pccard_device)
-#endif // MAME_BUS_PCCARD_KONAMI_DUAL_PCCARD_H
+#endif // MAME_BUS_PCCARD_KONAMI_DUAL_H
diff --git a/src/devices/bus/pci/ncr53c825.h b/src/devices/bus/pci/ncr53c825.h
index 694c101d261..fe363ca22c5 100644
--- a/src/devices/bus/pci/ncr53c825.h
+++ b/src/devices/bus/pci/ncr53c825.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:
-#ifndef MAME_BUS_PCI_NCR53C825_PCI_H
-#define MAME_BUS_PCI_NCR53C825_PCI_H
+#ifndef MAME_BUS_PCI_NCR53C825_H
+#define MAME_BUS_PCI_NCR53C825_H
#pragma once
@@ -36,4 +36,4 @@ private:
DECLARE_DEVICE_TYPE(NCR53C825_PCI, ncr53c825_pci_device)
-#endif // MAME_BUS_PCI_NCR53C825_PCI_H
+#endif // MAME_BUS_PCI_NCR53C825_H
diff --git a/src/devices/bus/pci/neon250.h b/src/devices/bus/pci/neon250.h
index 41f5162ce8d..286f25a4343 100644
--- a/src/devices/bus/pci/neon250.h
+++ b/src/devices/bus/pci/neon250.h
@@ -1,8 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:
-
-#ifndef MAME_VIDEO_NEON250_H
-#define MAME_VIDEO_NEON250_H
+#ifndef MAME_BUS_PCI_NEON250_H
+#define MAME_BUS_PCI_NEON250_H
#pragma once
@@ -51,4 +50,4 @@ private:
DECLARE_DEVICE_TYPE(NEON250, neon250_device)
-#endif // MAME_VIDEO_NEON250_H
+#endif // MAME_BUS_PCI_NEON250_H
diff --git a/src/devices/bus/pci/oti_spitfire.h b/src/devices/bus/pci/oti_spitfire.h
index 11a1620cb1b..5494f9701c3 100644
--- a/src/devices/bus/pci/oti_spitfire.h
+++ b/src/devices/bus/pci/oti_spitfire.h
@@ -1,8 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Angelo Salese
-
-#ifndef MAME_BUS_PCI_OTI_SPITFIRE_PCI_H
-#define MAME_BUS_PCI_OTI_SPITFIRE_PCI_H
+#ifndef MAME_BUS_PCI_OTI_SPITFIRE_H
+#define MAME_BUS_PCI_OTI_SPITFIRE_H
#pragma once
@@ -45,4 +44,4 @@ private:
DECLARE_DEVICE_TYPE(OTI64111_PCI, oti64111_pci_device)
-#endif // MAME_BUS_PCI_OTI_SPITFIRE_PCI_H
+#endif // MAME_BUS_PCI_OTI_SPITFIRE_H
diff --git a/src/devices/bus/pci/rivatnt.h b/src/devices/bus/pci/rivatnt.h
index a23393ad29a..be68c9f7bb6 100644
--- a/src/devices/bus/pci/rivatnt.h
+++ b/src/devices/bus/pci/rivatnt.h
@@ -1,8 +1,7 @@
// license:BSD-3-Clause
// copyright-holders: Angelo Salese
-
-#ifndef MAME_BUS_VIDEO_RIVATNT_H
-#define MAME_BUS_VIDEO_RIVATNT_H
+#ifndef MAME_BUS_PCI_RIVATNT_H
+#define MAME_BUS_PCI_RIVATNT_H
#pragma once
@@ -69,5 +68,4 @@ DECLARE_DEVICE_TYPE(RIVATNT2_ULTRA, rivatnt2_ultra_device)
DECLARE_DEVICE_TYPE(VANTA, vanta_device)
DECLARE_DEVICE_TYPE(RIVATNT2_M64, rivatnt2_model64_device)
-
-#endif
+#endif // MAME_BUS_PCI_RIVATNT_H
diff --git a/src/devices/bus/pci/rtl8139_pci.h b/src/devices/bus/pci/rtl8139_pci.h
index 5e9220cdee7..bef9d7aeb8c 100644
--- a/src/devices/bus/pci/rtl8139_pci.h
+++ b/src/devices/bus/pci/rtl8139_pci.h
@@ -1,8 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:
-
-#ifndef MAME_BUS_PCI_RTL8129_PCI_H
-#define MAME_BUS_PCI_RTL8129_PCI_H
+#ifndef MAME_BUS_PCI_RTL8139_PCI_H
+#define MAME_BUS_PCI_RTL8139_PCI_H
#pragma once
@@ -35,4 +34,4 @@ private:
DECLARE_DEVICE_TYPE(RTL8139_PCI, rtl8139_pci_device)
-#endif // MAME_NETWORK_RTL8129_PCI_H
+#endif // MAME_NETWORK_RTL8139_PCI_H
diff --git a/src/devices/bus/pci/vision.h b/src/devices/bus/pci/vision.h
index ebe0f0b9a54..366a5b31ec8 100644
--- a/src/devices/bus/pci/vision.h
+++ b/src/devices/bus/pci/vision.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders: Angelo Salese
-#ifndef MAME_BUS_PCI_S3VISION_PCI_H
-#define MAME_BUS_PCI_S3VISION_PCI_H
+#ifndef MAME_BUS_PCI_VISION_H
+#define MAME_BUS_PCI_VISION_H
#pragma once
@@ -73,4 +73,4 @@ DECLARE_DEVICE_TYPE(VISION864_PCI, vision864_pci_device)
DECLARE_DEVICE_TYPE(VISION964_PCI, vision964_pci_device)
DECLARE_DEVICE_TYPE(VISION968_PCI, vision968_pci_device)
-#endif // MAME_BUS_PCI_S3VISION_PCI_H
+#endif // MAME_BUS_PCI_S3VISION_H
diff --git a/src/devices/bus/plg1x0/plg100-vl.h b/src/devices/bus/plg1x0/plg100-vl.h
index 6ff3cd48a8f..e4485c4929b 100644
--- a/src/devices/bus/plg1x0/plg100-vl.h
+++ b/src/devices/bus/plg1x0/plg100-vl.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef MAME_BUS_PLG1X0_PLG100VL_H
-#define MAME_BUS_PLG1X0_PLG100VL_H
+#ifndef MAME_BUS_PLG1X0_PLG100_VL_H
+#define MAME_BUS_PLG1X0_PLG100_VL_H
// Yamaha PLG100-VL
diff --git a/src/devices/bus/plg1x0/plg150-ap.h b/src/devices/bus/plg1x0/plg150-ap.h
index 8e56ed6061c..6316689193e 100644
--- a/src/devices/bus/plg1x0/plg150-ap.h
+++ b/src/devices/bus/plg1x0/plg150-ap.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef MAME_BUS_PLG1X0_PLG150AP_H
-#define MAME_BUS_PLG1X0_PLG150AP_H
+#ifndef MAME_BUS_PLG1X0_PLG150_AP_H
+#define MAME_BUS_PLG1X0_PLG150_AP_H
// Yamaha PLG150-AP
diff --git a/src/devices/bus/ql/kempston_di.h b/src/devices/bus/ql/kempston_di.h
index a8a8024f0fd..c7e942cbd7f 100644
--- a/src/devices/bus/ql/kempston_di.h
+++ b/src/devices/bus/ql/kempston_di.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_QQL_KEMPSTON_DI_H
-#define MAME_BUS_QQL_KEMPSTON_DI_H
+#ifndef MAME_BUS_QL_KEMPSTON_DI_H
+#define MAME_BUS_QL_KEMPSTON_DI_H
#pragma once
@@ -44,4 +44,4 @@ protected:
DECLARE_DEVICE_TYPE(KEMPSTON_DISK_INTERFACE, kempston_disk_interface_device)
-#endif // MAME_BUS_QQL_KEMPSTON_DI_H
+#endif // MAME_BUS_QL_KEMPSTON_DI_H
diff --git a/src/devices/bus/ql/miracle_hd.h b/src/devices/bus/ql/miracle_hd.h
index 285bab8ddb0..ec89dbcb1bc 100644
--- a/src/devices/bus/ql/miracle_hd.h
+++ b/src/devices/bus/ql/miracle_hd.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_QL_MIRACLE_HD
-#define MAME_BUS_QL_MIRACLE_HD
+#ifndef MAME_BUS_QL_MIRACLE_HD_H
+#define MAME_BUS_QL_MIRACLE_HD_H
#pragma once
@@ -44,4 +44,4 @@ protected:
// device type definition
DECLARE_DEVICE_TYPE(MIRACLE_HARD_DISK, miracle_hard_disk_device)
-#endif // MAME_BUS_QL_MIRACLE_HD
+#endif // MAME_BUS_QL_MIRACLE_HD_H
diff --git a/src/devices/bus/rc2014/cf.h b/src/devices/bus/rc2014/cf.h
index 3efc1223c33..c024735abd3 100644
--- a/src/devices/bus/rc2014/cf.h
+++ b/src/devices/bus/rc2014/cf.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_RC2014_COMPACT_FLASH_H
-#define MAME_BUS_RC2014_COMPACT_FLASH_H
+#ifndef MAME_BUS_RC2014_CF_H
+#define MAME_BUS_RC2014_CF_H
#pragma once
@@ -15,4 +15,4 @@
DECLARE_DEVICE_TYPE(RC2014_COMPACT_FLASH, device_rc2014_card_interface)
-#endif // MAME_BUS_RC2014_COMPACT_FLASH_H
+#endif // MAME_BUS_RC2014_CF_H
diff --git a/src/devices/bus/s100/seals8k.h b/src/devices/bus/s100/seals8k.h
index 8d12cc6de9d..fc4020e7e15 100644
--- a/src/devices/bus/s100/seals8k.h
+++ b/src/devices/bus/s100/seals8k.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_S100_8K_SC_H
-#define MAME_BUS_S100_8K_SC_H
+#ifndef MAME_BUS_S100_SEALS8K_H
+#define MAME_BUS_S100_SEALS8K_H
#pragma once
@@ -16,4 +16,4 @@
DECLARE_DEVICE_TYPE(S100_8K_SC, device_s100_card_interface)
DECLARE_DEVICE_TYPE(S100_8K_SC_BB, device_s100_card_interface)
-#endif // MAME_BUS_S100_8K_SC_H
+#endif // MAME_BUS_S100_SEALS8K_H
diff --git a/src/devices/bus/saitek_osa/expansion.h b/src/devices/bus/saitek_osa/expansion.h
index 6954c392384..3646e663bad 100644
--- a/src/devices/bus/saitek_osa/expansion.h
+++ b/src/devices/bus/saitek_osa/expansion.h
@@ -24,8 +24,8 @@
*******************************************************************************/
-#ifndef MAME_BUS_SAITEKOSA_EXPANSION_H
-#define MAME_BUS_SAITEKOSA_EXPANSION_H
+#ifndef MAME_BUS_SAITEK_OSA_EXPANSION_H
+#define MAME_BUS_SAITEK_OSA_EXPANSION_H
#pragma once
@@ -123,5 +123,4 @@ protected:
void saitekosa_expansion_modules(device_slot_interface &device);
-
-#endif // MAME_BUS_SAITEKOSA_EXPANSION_H
+#endif // MAME_BUS_SAITEK_OSA_EXPANSION_H
diff --git a/src/devices/bus/saitek_osa/maestro.h b/src/devices/bus/saitek_osa/maestro.h
index 74b38c132a2..a3440416c7a 100644
--- a/src/devices/bus/saitek_osa/maestro.h
+++ b/src/devices/bus/saitek_osa/maestro.h
@@ -6,8 +6,8 @@
*******************************************************************************/
-#ifndef MAME_BUS_SAITEKOSA_MAESTRO_H
-#define MAME_BUS_SAITEKOSA_MAESTRO_H
+#ifndef MAME_BUS_SAITEK_OSA_MAESTRO_H
+#define MAME_BUS_SAITEK_OSA_MAESTRO_H
#pragma once
@@ -16,4 +16,4 @@
DECLARE_DEVICE_TYPE(OSA_MAESTRO, device_saitekosa_expansion_interface)
DECLARE_DEVICE_TYPE(OSA_ANALYST, device_saitekosa_expansion_interface)
-#endif // MAME_BUS_SAITEKOSA_MAESTRO_H
+#endif // MAME_BUS_SAITEK_OSA_MAESTRO_H
diff --git a/src/devices/bus/saitek_osa/maestroa.h b/src/devices/bus/saitek_osa/maestroa.h
index b2021501945..9ce0909040d 100644
--- a/src/devices/bus/saitek_osa/maestroa.h
+++ b/src/devices/bus/saitek_osa/maestroa.h
@@ -6,8 +6,8 @@
*******************************************************************************/
-#ifndef MAME_BUS_SAITEKOSA_MAESTROA_H
-#define MAME_BUS_SAITEKOSA_MAESTROA_H
+#ifndef MAME_BUS_SAITEK_OSA_MAESTROA_H
+#define MAME_BUS_SAITEK_OSA_MAESTROA_H
#pragma once
@@ -15,4 +15,4 @@
DECLARE_DEVICE_TYPE(OSA_MAESTROA, device_saitekosa_expansion_interface)
-#endif // MAME_BUS_SAITEKOSA_MAESTROA_H
+#endif // MAME_BUS_SAITEK_OSA_MAESTROA_H
diff --git a/src/devices/bus/saitek_osa/sparc.h b/src/devices/bus/saitek_osa/sparc.h
index 94a870740b8..eb5484c9dc6 100644
--- a/src/devices/bus/saitek_osa/sparc.h
+++ b/src/devices/bus/saitek_osa/sparc.h
@@ -6,8 +6,8 @@
*******************************************************************************/
-#ifndef MAME_BUS_SAITEKOSA_SPARC_H
-#define MAME_BUS_SAITEKOSA_SPARC_H
+#ifndef MAME_BUS_SAITEK_OSA_SPARC_H
+#define MAME_BUS_SAITEK_OSA_SPARC_H
#pragma once
@@ -15,4 +15,4 @@
DECLARE_DEVICE_TYPE(OSA_SPARC, device_saitekosa_expansion_interface)
-#endif // MAME_BUS_SAITEKOSA_SPARC_H
+#endif // MAME_BUS_SAITEK_OSA_SPARC_H
diff --git a/src/devices/bus/scsi/scsicd512.h b/src/devices/bus/scsi/scsicd512.h
index 81055348538..b858aeea3f2 100644
--- a/src/devices/bus/scsi/scsicd512.h
+++ b/src/devices/bus/scsi/scsicd512.h
@@ -6,8 +6,8 @@
***************************************************************************/
-#ifndef DEVICES_BUS_SCSI_SCSICD512_H
-#define DEVICES_BUS_SCSI_SCSICD512_H
+#ifndef MAME_BUS_SCSI_SCSICD512_H
+#define MAME_BUS_SCSI_SCSICD512_H
#pragma once
@@ -83,4 +83,4 @@ DECLARE_DEVICE_TYPE(XM5401SUN, toshiba_xm5401_sun_device)
DECLARE_DEVICE_TYPE(XM5701, toshiba_xm5701_device)
DECLARE_DEVICE_TYPE(XM5701SUN, toshiba_xm5701_sun_device)
-#endif // DEVICES_BUS_SCSI_SCSICD512_H
+#endif // MAME_BUS_SCSI_SCSICD512_H
diff --git a/src/devices/bus/sega8/sega8_slot.h b/src/devices/bus/sega8/sega8_slot.h
index 0e2f7b0bd18..7f320b4fc42 100644
--- a/src/devices/bus/sega8/sega8_slot.h
+++ b/src/devices/bus/sega8/sega8_slot.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Fabio Priuli
-#ifndef MAME_BUS_SEGA8_SLOT_H
-#define MAME_BUS_SEGA8_SLOT_H
+#ifndef MAME_BUS_SEGA8_SEGA8_SLOT_H
+#define MAME_BUS_SEGA8_SEGA8_SLOT_H
#pragma once
@@ -353,4 +353,4 @@ void sg1000mk3_cart(device_slot_interface &device);
void sms_cart(device_slot_interface &device);
void gg_cart(device_slot_interface &device);
-#endif // MAME_BUS_SEGA8_SLOT_H
+#endif // MAME_BUS_SEGA8_SEGA8_SLOT_H
diff --git a/src/devices/bus/segaai/segaai_exp.h b/src/devices/bus/segaai/segaai_exp.h
index c1d96166a11..2eef6014261 100644
--- a/src/devices/bus/segaai/segaai_exp.h
+++ b/src/devices/bus/segaai/segaai_exp.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Wilbert Pol
-#ifndef MAME_BUS_SEGAAI_EXP_H
-#define MAME_BUS_SEGAAI_EXP_H
+#ifndef MAME_BUS_SEGAAI_SEGAAI_EXP_H
+#define MAME_BUS_SEGAAI_SEGAAI_EXP_H
#pragma once
@@ -60,4 +60,4 @@ private:
// slot interfaces
void segaai_exp(device_slot_interface &device);
-#endif
+#endif // MAME_BUS_SEGAAI_SEGAAI_EXP_H
diff --git a/src/devices/bus/segaai/segaai_slot.h b/src/devices/bus/segaai/segaai_slot.h
index 3ce496a2b1f..ce1e1d76c07 100644
--- a/src/devices/bus/segaai/segaai_slot.h
+++ b/src/devices/bus/segaai/segaai_slot.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Wilbert Pol
-#ifndef MAME_BUS_SEGAAI_SLOT_H
-#define MAME_BUS_SEGAAI_SLOT_H
+#ifndef MAME_BUS_SEGAAI_SEGAAI_SLOT_H
+#define MAME_BUS_SEGAAI_SEGAAI_SLOT_H
#pragma once
@@ -70,4 +70,4 @@ private:
void segaai_cards(device_slot_interface &device);
-#endif
+#endif // MAME_BUS_SEGAAI_SEGAAI_SLOT_H
diff --git a/src/devices/bus/sg1000_exp/kblink.h b/src/devices/bus/sg1000_exp/kblink.h
index 6c667b60b1a..f8c84faa214 100644
--- a/src/devices/bus/sg1000_exp/kblink.h
+++ b/src/devices/bus/sg1000_exp/kblink.h
@@ -9,8 +9,8 @@ is supported by the game F-16 Fighting Falcon for its 2 players mode.
**********************************************************************/
-#ifndef MAME_BUS_SG1000_EXP_SK1100_KBLINK_H
-#define MAME_BUS_SG1000_EXP_SK1100_KBLINK_H
+#ifndef MAME_BUS_SG1000_EXP_KBLINK_H
+#define MAME_BUS_SG1000_EXP_KBLINK_H
#pragma once
@@ -81,4 +81,4 @@ private:
DECLARE_DEVICE_TYPE(SK1100_LINK_CABLE, sk1100_link_cable_device)
-#endif // MAME_BUS_SG1000_EXP_SK1100_KBLINK_H
+#endif // MAME_BUS_SG1000_EXP_KBLINK_H
diff --git a/src/devices/bus/sg1000_exp/sk1100prn.h b/src/devices/bus/sg1000_exp/sk1100prn.h
index a0d8bb83cae..9dfcfca5a6c 100644
--- a/src/devices/bus/sg1000_exp/sk1100prn.h
+++ b/src/devices/bus/sg1000_exp/sk1100prn.h
@@ -9,8 +9,8 @@
**********************************************************************/
-#ifndef MAME_BUS_SG1000_EXP_SK1100_PRN_H
-#define MAME_BUS_SG1000_EXP_SK1100_PRN_H
+#ifndef MAME_BUS_SG1000_EXP_SK1100PRN_H
+#define MAME_BUS_SG1000_EXP_SK1100PRN_H
#pragma once
@@ -84,5 +84,4 @@ DECLARE_DEVICE_TYPE(SK1100_PRINTER_PORT, sk1100_printer_port_device)
void sk1100_printer_port_devices(device_slot_interface &device);
-
-#endif // MAME_BUS_SG1000_EXP_SK1100_PRN_H
+#endif // MAME_BUS_SG1000_EXP_SK1100PRN_H
diff --git a/src/devices/bus/sms_ctrl/rs232adapt.h b/src/devices/bus/sms_ctrl/rs232adapt.h
index ae98dbb8dc5..27335514b51 100644
--- a/src/devices/bus/sms_ctrl/rs232adapt.h
+++ b/src/devices/bus/sms_ctrl/rs232adapt.h
@@ -5,8 +5,8 @@
Mega Drive RS-232 Adapter emulation
**********************************************************************/
-#ifndef MAME_BUS_SMS_CTRL_RS232_H
-#define MAME_BUS_SMS_CTRL_RS232_H
+#ifndef MAME_BUS_SMS_CTRL_RS232ADAPT_H
+#define MAME_BUS_SMS_CTRL_RS232ADAPT_H
#pragma once
@@ -15,4 +15,4 @@
DECLARE_DEVICE_TYPE(SMS_RS232, device_sms_control_interface)
-#endif // MAME_BUS_SMS_CTRL_RS232_H
+#endif // MAME_BUS_SMS_CTRL_RS232ADAPT_H
diff --git a/src/devices/bus/sms_ctrl/sportsjp.h b/src/devices/bus/sms_ctrl/sportsjp.h
index 016605c5d2e..9947a717d0f 100644
--- a/src/devices/bus/sms_ctrl/sportsjp.h
+++ b/src/devices/bus/sms_ctrl/sportsjp.h
@@ -5,8 +5,8 @@
Sega Master System "Sports Pad" (Japanese model) emulation
**********************************************************************/
-#ifndef MAME_BUS_SMS_CTROL_SPORTSJP_H
-#define MAME_BUS_SMS_CTROL_SPORTSJP_H
+#ifndef MAME_BUS_SMS_CTRL_SPORTSJP_H
+#define MAME_BUS_SMS_CTRL_SPORTSJP_H
#pragma once
@@ -15,4 +15,4 @@
DECLARE_DEVICE_TYPE(SMS_SPORTS_PAD_JP, device_sms_control_interface)
-#endif // MAME_BUS_SMS_CTROL_SPORTSJP_H
+#endif // MAME_BUS_SMS_CTRL_SPORTSJP_H
diff --git a/src/devices/bus/snes_ctrl/sscope.h b/src/devices/bus/snes_ctrl/sscope.h
index 2af2329749b..3c4d718c010 100644
--- a/src/devices/bus/snes_ctrl/sscope.h
+++ b/src/devices/bus/snes_ctrl/sscope.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_SNES_CTRL_SUPERSCOPE_H
-#define MAME_BUS_SNES_CTRL_SUPERSCOPE_H
+#ifndef MAME_BUS_SNES_CTRL_SSCOPE_H
+#define MAME_BUS_SNES_CTRL_SSCOPE_H
#pragma once
@@ -55,4 +55,4 @@ private:
// device type definition
DECLARE_DEVICE_TYPE(SNES_SUPERSCOPE, snes_sscope_device)
-#endif // MAME_BUS_SNES_CTRL_SUPERSCOPE_H
+#endif // MAME_BUS_SNES_CTRL_SSCOPE_H
diff --git a/src/devices/bus/spectrum/floppyone.h b/src/devices/bus/spectrum/floppyone.h
index 7992f0c7aea..e77fb61d5be 100644
--- a/src/devices/bus/spectrum/floppyone.h
+++ b/src/devices/bus/spectrum/floppyone.h
@@ -6,14 +6,16 @@
(c) 1984/5 R.P.Gush
*********************************************************************/
-#ifndef MAME_BUS_SPECTRUM_FLPONE_H
-#define MAME_BUS_SPECTRUM_FLPONE_H
+#ifndef MAME_BUS_SPECTRUM_FLOPPYONE_H
+#define MAME_BUS_SPECTRUM_FLOPPYONE_H
#include "exp.h"
-#include "imagedev/floppy.h"
-#include "machine/wd_fdc.h"
+
#include "bus/centronics/ctronics.h"
#include "bus/rs232/rs232.h"
+#include "imagedev/floppy.h"
+#include "machine/wd_fdc.h"
+
//**************************************************************************
// TYPE DEFINITIONS
@@ -76,5 +78,4 @@ protected:
// device type definition
DECLARE_DEVICE_TYPE(SPECTRUM_FLPONE, spectrum_flpone_device)
-
-#endif // MAME_BUS_SPECTRUM_FLPONE_H
+#endif // MAME_BUS_SPECTRUM_FLOPPYONE_H
diff --git a/src/devices/bus/spectrum/nemoide.h b/src/devices/bus/spectrum/nemoide.h
index 441f3c9514a..b2af6963064 100644
--- a/src/devices/bus/spectrum/nemoide.h
+++ b/src/devices/bus/spectrum/nemoide.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Andrei I. Holub
-#ifndef MAME_SINCLAIR_NEMOIDE_H
-#define MAME_SINCLAIR_NEMOIDE_H
+#ifndef MAME_BUS_SPECTRUM_NEMOIDE_H
+#define MAME_BUS_SPECTRUM_NEMOIDE_H
#pragma once
@@ -11,4 +11,4 @@
DECLARE_DEVICE_TYPE(ZXBUS_NEMOIDE, device_zxbus_card_interface)
-#endif // MAME_SINCLAIR_NEMOIDE_H
+#endif // MAME_BUS_SPECTRUM_NEMOIDE_H
diff --git a/src/devices/bus/spectrum/neogs.h b/src/devices/bus/spectrum/neogs.h
index 79170356690..6045520e1f7 100644
--- a/src/devices/bus/spectrum/neogs.h
+++ b/src/devices/bus/spectrum/neogs.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Andrei I. Holub
-#ifndef MAME_SINCLAIR_NEOGS_H
-#define MAME_SINCLAIR_NEOGS_H
+#ifndef MAME_BUS_SPECTRUM_NEOGS_H
+#define MAME_BUS_SPECTRUM_NEOGS_H
#pragma once
@@ -11,4 +11,4 @@
DECLARE_DEVICE_TYPE(ZXBUS_NEOGS, device_zxbus_card_interface)
-#endif // MAME_SINCLAIR_NEOGS_H
+#endif // MAME_BUS_SPECTRUM_NEOGS_H
diff --git a/src/devices/bus/spectrum/smuc.h b/src/devices/bus/spectrum/smuc.h
index 87de5539783..93eadd904a3 100644
--- a/src/devices/bus/spectrum/smuc.h
+++ b/src/devices/bus/spectrum/smuc.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Andrei I. Holub
-#ifndef MAME_SINCLAIR_SMUC_H
-#define MAME_SINCLAIR_SMUC_H
+#ifndef MAME_BUS_SPECTRUM_SMUC_H
+#define MAME_BUS_SPECTRUM_SMUC_H
#pragma once
@@ -11,4 +11,4 @@
DECLARE_DEVICE_TYPE(ZXBUS_SMUC, device_zxbus_card_interface)
-#endif // MAME_SINCLAIR_SMUC_H
+#endif // MAME_BUS_SPECTRUM_SMUC_H
diff --git a/src/devices/bus/ss50/dc5.h b/src/devices/bus/ss50/dc5.h
index f795e6d5b13..05ca3e7004f 100644
--- a/src/devices/bus/ss50/dc5.h
+++ b/src/devices/bus/ss50/dc5.h
@@ -5,11 +5,11 @@
SWTPC SS30 DC5 Floppy Disk Controller
**********************************************************************/
-#ifndef MAME_DEVICE_BUS_SS50_DC5_H
-#define MAME_DEVICE_BUS_SS50_DC5_H
+#ifndef MAME_BUS_SS50_DC5_H
+#define MAME_BUS_SS50_DC5_H
#include "interface.h"
DECLARE_DEVICE_TYPE(SS50_DC5, ss50_card_interface)
-#endif // MAME_DEVICE_BUS_SS50_DC5_H
+#endif // MAME_BUS_SS50_DC5_H
diff --git a/src/devices/bus/ss50/mpc.h b/src/devices/bus/ss50/mpc.h
index 3cf864dc3b3..73cf175af8e 100644
--- a/src/devices/bus/ss50/mpc.h
+++ b/src/devices/bus/ss50/mpc.h
@@ -5,11 +5,11 @@
SWTPC MP-C Serial Control Interface
**********************************************************************/
-#ifndef MAME_DEVICE_BUS_SS50_MPC_H
-#define MAME_DEVICE_BUS_SS50_MPC_H
+#ifndef MAME_BUS_SS50_MPC_H
+#define MAME_BUS_SS50_MPC_H
#include "interface.h"
DECLARE_DEVICE_TYPE(SS50_MPC, ss50_card_interface)
-#endif // MAME_DEVICE_BUS_SS50_MPC_H
+#endif // MAME_BUS_SS50_MPC_H
diff --git a/src/devices/bus/ss50/mps.h b/src/devices/bus/ss50/mps.h
index e381efcfa0a..66e3bccb7d6 100644
--- a/src/devices/bus/ss50/mps.h
+++ b/src/devices/bus/ss50/mps.h
@@ -5,11 +5,11 @@
SWTPC MP-S Serial Interface
**********************************************************************/
-#ifndef MAME_DEVICE_BUS_SS50_MPS_H
-#define MAME_DEVICE_BUS_SS50_MPS_H
+#ifndef MAME_BUS_SS50_MPS_H
+#define MAME_BUS_SS50_MPS_H
#include "interface.h"
DECLARE_DEVICE_TYPE(SS50_MPS, ss50_card_interface)
-#endif // MAME_DEVICE_BUS_SS50_MPS_H
+#endif // MAME_BUS_SS50_MPS_H
diff --git a/src/devices/bus/ss50/mps2.h b/src/devices/bus/ss50/mps2.h
index a415a2dbe46..e8fe9b51f50 100644
--- a/src/devices/bus/ss50/mps2.h
+++ b/src/devices/bus/ss50/mps2.h
@@ -5,11 +5,11 @@
SWTPC MP-S2 Dual Serial Interface
**********************************************************************/
-#ifndef MAME_DEVICE_BUS_SS50_MPS2_H
-#define MAME_DEVICE_BUS_SS50_MPS2_H
+#ifndef MAME_BUS_SS50_MPS2_H
+#define MAME_BUS_SS50_MPS2_H
#include "interface.h"
DECLARE_DEVICE_TYPE(SS50_MPS2, ss50_card_interface)
-#endif // MAME_DEVICE_BUS_SS50_MPS2_H
+#endif // MAME_BUS_SS50_MPS2_H
diff --git a/src/devices/bus/ss50/mpt.h b/src/devices/bus/ss50/mpt.h
index a9344f7873a..bd8a375480c 100644
--- a/src/devices/bus/ss50/mpt.h
+++ b/src/devices/bus/ss50/mpt.h
@@ -5,11 +5,11 @@
SWTPC MP-T Timer / counter
**********************************************************************/
-#ifndef MAME_DEVICE_BUS_SS50_MPT_H
-#define MAME_DEVICE_BUS_SS50_MPT_H
+#ifndef MAME_BUS_SS50_MPT_H
+#define MAME_BUS_SS50_MPT_H
#include "interface.h"
DECLARE_DEVICE_TYPE(SS50_MPT, ss50_card_interface)
-#endif // MAME_DEVICE_BUS_SS50_MPT_H
+#endif // MAME_BUS_SS50_MPT_H
diff --git a/src/devices/bus/ss50/piaide.h b/src/devices/bus/ss50/piaide.h
index 51fa31b58be..a16d8480870 100644
--- a/src/devices/bus/ss50/piaide.h
+++ b/src/devices/bus/ss50/piaide.h
@@ -5,11 +5,11 @@
PIA IDE Hard Disk Interface
**********************************************************************/
-#ifndef MAME_DEVICE_BUS_SS50_PIAIDE_H
-#define MAME_DEVICE_BUS_SS50_PIAIDE_H
+#ifndef MAME_BUS_SS50_PIAIDE_H
+#define MAME_BUS_SS50_PIAIDE_H
#include "interface.h"
DECLARE_DEVICE_TYPE(SS50_PIAIDE, ss50_card_interface)
-#endif // MAME_DEVICE_BUS_SS50_PIAIDE_H
+#endif // MAME_BUS_SS50_PIAIDE_H
diff --git a/src/devices/bus/sunkbd/hlekbd.h b/src/devices/bus/sunkbd/hlekbd.h
index 12677678e75..e53fe2f13ef 100644
--- a/src/devices/bus/sunkbd/hlekbd.h
+++ b/src/devices/bus/sunkbd/hlekbd.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Vas Crabb
-#ifndef MAME_DEVICES_SUNKBD_HLEKBD_H
-#define MAME_DEVICES_SUNKBD_HLEKBD_H
+#ifndef MAME_BUS_SUNKBD_HLEKBD_H
+#define MAME_BUS_SUNKBD_HLEKBD_H
#pragma once
@@ -114,4 +114,4 @@ DECLARE_DEVICE_TYPE_NS(SUN_TYPE5_GB_HLE_KEYBOARD, bus::sunkbd, hle_device_base)
DECLARE_DEVICE_TYPE_NS(SUN_TYPE5_SE_HLE_KEYBOARD, bus::sunkbd, hle_device_base)
DECLARE_DEVICE_TYPE_NS(SUN_TYPE5_JP_HLE_KEYBOARD, bus::sunkbd, hle_device_base)
-#endif // MAME_DEVICES_SUNKBD_HLEKBD_H
+#endif // MAME_BUS_SUNKBD_HLEKBD_H
diff --git a/src/devices/bus/sunmouse/hlemouse.h b/src/devices/bus/sunmouse/hlemouse.h
index b025dd28d97..270aa0d408a 100644
--- a/src/devices/bus/sunmouse/hlemouse.h
+++ b/src/devices/bus/sunmouse/hlemouse.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Vas Crabb
-#ifndef MAME_DEVICES_SUNMOUSE_HLEMOUSE_H
-#define MAME_DEVICES_SUNMOUSE_HLEMOUSE_H
+#ifndef MAME_BUS_SUNMOUSE_HLEMOUSE_H
+#define MAME_BUS_SUNMOUSE_HLEMOUSE_H
#pragma once
@@ -79,4 +79,4 @@ public:
DECLARE_DEVICE_TYPE_NS(SUN_1200BAUD_HLE_MOUSE, bus::sunmouse, hle_1200baud_device)
DECLARE_DEVICE_TYPE_NS(SUN_4800BAUD_HLE_MOUSE, bus::sunmouse, hle_4800baud_device)
-#endif // MAME_DEVICES_SUNMOUSE_HLEMOUSE_H
+#endif // MAME_BUS_SUNMOUSE_HLEMOUSE_H
diff --git a/src/devices/bus/supracan/rom.h b/src/devices/bus/supracan/rom.h
index 2f8abc900df..80f4fd42ed4 100644
--- a/src/devices/bus/supracan/rom.h
+++ b/src/devices/bus/supracan/rom.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:
-#ifndef MAME_BUS_SUPERACAN_ROM_H
-#define MAME_BUS_SUPERACAN_ROM_H
+#ifndef MAME_BUS_SUPRACAN_ROM_H
+#define MAME_BUS_SUPRACAN_ROM_H
#pragma once
@@ -43,4 +43,4 @@ private:
DECLARE_DEVICE_TYPE(SUPERACAN_ROM_STD, superacan_rom_device)
-#endif // MAME_BUS_SUPERACAN_ROM_H
+#endif // MAME_BUS_SUPRACAN_ROM_H
diff --git a/src/devices/bus/supracan/slot.h b/src/devices/bus/supracan/slot.h
index a9982603add..6b3f308d64f 100644
--- a/src/devices/bus/supracan/slot.h
+++ b/src/devices/bus/supracan/slot.h
@@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:
-#ifndef MAME_BUS_SUPERACAN_SLOT_H
-#define MAME_BUS_SUPERACAN_SLOT_H
+#ifndef MAME_BUS_SUPRACAN_SLOT_H
+#define MAME_BUS_SUPRACAN_SLOT_H
#include "imagedev/cartrom.h"
@@ -87,4 +87,4 @@ protected:
DECLARE_DEVICE_TYPE(SUPERACAN_CART_SLOT, superacan_cart_slot_device)
-#endif // MAME_BUS_SUPERACAN_SLOT_H
+#endif // MAME_BUS_SUPRACAN_SLOT_H
diff --git a/src/devices/bus/tanbus/keyboard/keyboard.h b/src/devices/bus/tanbus/keyboard/keyboard.h
index 4c12e12be8a..cb4020f22b3 100644
--- a/src/devices/bus/tanbus/keyboard/keyboard.h
+++ b/src/devices/bus/tanbus/keyboard/keyboard.h
@@ -6,8 +6,8 @@
**********************************************************************/
-#ifndef MAME_BUS_TANBUS_KEYBOARD_H
-#define MAME_BUS_TANBUS_KEYBOARD_H
+#ifndef MAME_BUS_TANBUS_KEYBOARD_KEYBOARD_H
+#define MAME_BUS_TANBUS_KEYBOARD_KEYBOARD_H
#pragma once
@@ -79,4 +79,4 @@ DECLARE_DEVICE_TYPE(MICROTAN_KBD_SLOT, microtan_kbd_slot_device)
void microtan_kbd_devices(device_slot_interface &device);
-#endif // MAME_BUS_TANBUS_KEYBOARD_H
+#endif // MAME_BUS_TANBUS_KEYBOARD_KEYBOARD_H
diff --git a/src/devices/bus/ti8x/teeconn.h b/src/devices/bus/ti8x/teeconn.h
index 4b3aa2bd4cf..83db867a507 100644
--- a/src/devices/bus/ti8x/teeconn.h
+++ b/src/devices/bus/ti8x/teeconn.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Vas Crabb
-#ifndef MAME_DEVICES_BUS_TI8X_TEECONN_H
-#define MAME_DEVICES_BUS_TI8X_TEECONN_H
+#ifndef MAME_BUS_TI8X_TEECONN_H
+#define MAME_BUS_TI8X_TEECONN_H
#pragma once
@@ -10,4 +10,4 @@
DECLARE_DEVICE_TYPE(TI8X_TEE_CONNECTOR, device_ti8x_link_port_interface)
-#endif // MAME_DEVICES_BUS_TI8X_TEECONN_H
+#endif // MAME_BUS_TI8X_TEECONN_H
diff --git a/src/devices/bus/ti8x/ti8x.h b/src/devices/bus/ti8x/ti8x.h
index 3bf95c0c270..ca82e9191d0 100644
--- a/src/devices/bus/ti8x/ti8x.h
+++ b/src/devices/bus/ti8x/ti8x.h
@@ -32,8 +32,8 @@
output. This makes implementing things like the tee connector easier.
*/
-#ifndef MAME_DEVICES_BUS_TI8X_TI8X_H
-#define MAME_DEVICES_BUS_TI8X_TI8X_H
+#ifndef MAME_BUS_TI8X_TI8X_H
+#define MAME_BUS_TI8X_TI8X_H
#pragma once
@@ -200,4 +200,4 @@ private:
void default_ti8x_link_devices(device_slot_interface &device);
-#endif // MAME_DEVICES_BUS_TI8X_TI8X_H
+#endif // MAME_BUS_TI8X_TI8X_H
diff --git a/src/devices/bus/ti8x/tispeaker.h b/src/devices/bus/ti8x/tispeaker.h
index 7219c229213..0173630d48b 100644
--- a/src/devices/bus/ti8x/tispeaker.h
+++ b/src/devices/bus/ti8x/tispeaker.h
@@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Vas Crabb
-#ifndef MAME_DEVICES_BUS_TI8X_TISPEAKER_H
-#define MAME_DEVICES_BUS_TI8X_TISPEAKER_H
+#ifndef MAME_BUS_TI8X_TISPEAKER_H
+#define MAME_BUS_TI8X_TISPEAKER_H
#pragma once
@@ -11,4 +11,4 @@
DECLARE_DEVICE_TYPE(TI8X_SPEAKER_STEREO, device_ti8x_link_port_interface)
DECLARE_DEVICE_TYPE(TI8X_SPEAKER_MONO, device_ti8x_link_port_interface)
-#endif // MAME_DEVICES_BUS_TI8X_TISPEAKER_H
+#endif // MAME_BUS_TI8X_TISPEAKER_H
diff --git a/src/devices/cpu/s2650/s2650.cpp b/src/devices/cpu/s2650/s2650.cpp
index 6369b6ab468..6196dd67c47 100644
--- a/src/devices/cpu/s2650/s2650.cpp
+++ b/src/devices/cpu/s2650/s2650.cpp
@@ -137,30 +137,6 @@ static const uint8_t ccc[0x200] = {
0x84,0x84,0x84,0x84,0x84,0x84,0x84,0x84
};
-/***************************************************************
- * handy table to build PC relative offsets
- * from HR (holding register)
- ***************************************************************/
-static const int S2650_relative[0x100] =
-{
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- -64,-63,-62,-61,-60,-59,-58,-57,-56,-55,-54,-53,-52,-51,-50,-49,
- -48,-47,-46,-45,-44,-43,-42,-41,-40,-39,-38,-37,-36,-35,-34,-33,
- -32,-31,-30,-29,-28,-27,-26,-25,-24,-23,-22,-21,-20,-19,-18,-17,
- -16,-15,-14,-13,-12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1,
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- -64,-63,-62,-61,-60,-59,-58,-57,-56,-55,-54,-53,-52,-51,-50,-49,
- -48,-47,-46,-45,-44,-43,-42,-41,-40,-39,-38,-37,-36,-35,-34,-33,
- -32,-31,-30,-29,-28,-27,-26,-25,-24,-23,-22,-21,-20,-19,-18,-17,
- -16,-15,-14,-13,-12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1,
-};
-
/***************************************************************
* macros for CPU registers/flags
@@ -248,7 +224,7 @@ inline int s2650_device::check_irq_line()
/* Say hi */
int vector = m_intack_handler();
/* build effective address within first 8K page */
- m_ea = S2650_relative[vector] & PMSK;
+ m_ea = util::sext(vector, 7) & PMSK;
if (vector & 0x80) /* indirect bit set ? */
{
int addr = m_ea;
@@ -317,12 +293,12 @@ inline uint8_t s2650_device::ARG()
{ \
uint8_t hr = ARG(); /* get 'holding register' */ \
/* build effective address within current 8K page */ \
- m_ea = page + ((m_iar + S2650_relative[hr]) & PMSK); \
+ m_ea = page + ((m_iar + util::sext(hr, 7)) & PMSK); \
if (hr & 0x80) { /* indirect bit set ? */ \
- int addr = m_ea; \
- m_icount -= 6; \
+ int addr = m_ea; \
+ m_icount -= 6; \
/* build indirect 32K address */ \
- m_ea = RDMEM(addr) << 8; \
+ m_ea = RDMEM(addr) << 8; \
if( (++addr & PMSK) == 0 ) addr -= PLEN; /* page wrap */\
m_ea = (m_ea + RDMEM(addr)) & AMSK; \
} \
@@ -336,12 +312,12 @@ inline uint8_t s2650_device::ARG()
{ \
uint8_t hr = ARG(); /* get 'holding register' */ \
/* build effective address from 0 */ \
- m_ea = (S2650_relative[hr] & PMSK); \
+ m_ea = (util::sext(hr, 7) & PMSK); \
if (hr & 0x80) { /* indirect bit set ? */ \
- int addr = m_ea; \
- m_icount -= 6; \
+ int addr = m_ea; \
+ m_icount -= 6; \
/* build indirect 32K address */ \
- m_ea = RDMEM(addr) << 8; \
+ m_ea = RDMEM(addr) << 8; \
if( (++addr & PMSK) == 0 ) addr -= PLEN; /* page wrap */\
m_ea = (m_ea + RDMEM(addr)) & AMSK; \
} \