summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2019-04-12 01:49:57 +1000
committer Vas Crabb <vas@vastheman.com>2019-04-12 01:49:57 +1000
commitf70f31731cddfe0f96b74fa82a3a07a51b17411e (patch)
tree49b646154d79db316d9450663a1a63e7283f085c /src/lib/formats
parent3aaae04942b9dd28de2232049d63a8871666ecaa (diff)
(nw) suppress side effects, standardise #include guards
Diffstat (limited to 'src/lib/formats')
-rw-r--r--src/lib/formats/2d_dsk.h7
-rw-r--r--src/lib/formats/a26_cas.h7
-rw-r--r--src/lib/formats/a5105_dsk.h10
-rw-r--r--src/lib/formats/abc800_dsk.h10
-rw-r--r--src/lib/formats/abcfd2_dsk.h10
-rw-r--r--src/lib/formats/ace_tap.h7
-rw-r--r--src/lib/formats/acorn_dsk.h7
-rw-r--r--src/lib/formats/adam_cas.h7
-rw-r--r--src/lib/formats/adam_dsk.h10
-rw-r--r--src/lib/formats/afs_dsk.h7
-rw-r--r--src/lib/formats/agat840k_hle_dsk.h7
-rw-r--r--src/lib/formats/ami_dsk.h7
-rw-r--r--src/lib/formats/ap2_dsk.h107
-rw-r--r--src/lib/formats/ap_dsk35.h7
-rw-r--r--src/lib/formats/apd_dsk.h10
-rw-r--r--src/lib/formats/apf_apt.h9
-rw-r--r--src/lib/formats/apollo_dsk.h10
-rw-r--r--src/lib/formats/applix_dsk.h10
-rw-r--r--src/lib/formats/apridisk.h7
-rw-r--r--src/lib/formats/asst128_dsk.h7
-rw-r--r--src/lib/formats/atari_dsk.h7
-rw-r--r--src/lib/formats/atom_dsk.h8
-rw-r--r--src/lib/formats/atom_tap.h7
-rw-r--r--src/lib/formats/basicdsk.h7
-rw-r--r--src/lib/formats/bw12_dsk.h10
-rw-r--r--src/lib/formats/bw2_dsk.h10
-rw-r--r--src/lib/formats/c3040_dsk.h9
-rw-r--r--src/lib/formats/c4040_dsk.h9
-rw-r--r--src/lib/formats/c8280_dsk.h10
-rw-r--r--src/lib/formats/camplynx_cas.h5
-rw-r--r--src/lib/formats/camplynx_dsk.h10
-rw-r--r--src/lib/formats/cassimg.h13
-rw-r--r--src/lib/formats/cbm_crt.cpp8
-rw-r--r--src/lib/formats/cbm_crt.h17
-rw-r--r--src/lib/formats/cbm_tap.h7
-rw-r--r--src/lib/formats/ccvf_dsk.h19
-rw-r--r--src/lib/formats/cd90_640_dsk.h7
-rw-r--r--src/lib/formats/cgen_cas.h7
-rw-r--r--src/lib/formats/cgenie_dsk.h7
-rw-r--r--src/lib/formats/coco_cas.h7
-rw-r--r--src/lib/formats/comx35_dsk.h10
-rw-r--r--src/lib/formats/concept_dsk.h7
-rw-r--r--src/lib/formats/coupedsk.h7
-rw-r--r--src/lib/formats/cpis_dsk.h7
-rw-r--r--src/lib/formats/cqm_dsk.h7
-rw-r--r--src/lib/formats/csw_cas.h7
-rw-r--r--src/lib/formats/d64_dsk.h15
-rw-r--r--src/lib/formats/d71_dsk.h12
-rw-r--r--src/lib/formats/d80_dsk.h12
-rw-r--r--src/lib/formats/d81_dsk.h10
-rw-r--r--src/lib/formats/d82_dsk.h12
-rw-r--r--src/lib/formats/d88_dsk.h7
-rw-r--r--src/lib/formats/dcp_dsk.h7
-rw-r--r--src/lib/formats/dfi_dsk.h8
-rw-r--r--src/lib/formats/dim_dsk.h7
-rw-r--r--src/lib/formats/dip_dsk.h7
-rw-r--r--src/lib/formats/dmk_dsk.h7
-rw-r--r--src/lib/formats/dmv_dsk.h10
-rw-r--r--src/lib/formats/dsk_dsk.h7
-rw-r--r--src/lib/formats/ep64_dsk.h10
-rw-r--r--src/lib/formats/esq16_dsk.h7
-rw-r--r--src/lib/formats/esq8_dsk.h7
-rw-r--r--src/lib/formats/excali64_dsk.h10
-rw-r--r--src/lib/formats/fc100_cas.h5
-rw-r--r--src/lib/formats/fdd_dsk.h7
-rw-r--r--src/lib/formats/flex_dsk.h10
-rw-r--r--src/lib/formats/flopimg.h30
-rw-r--r--src/lib/formats/fm7_cas.h7
-rw-r--r--src/lib/formats/fmsx_cas.h7
-rw-r--r--src/lib/formats/fmtowns_dsk.h11
-rw-r--r--src/lib/formats/fsd_dsk.h7
-rw-r--r--src/lib/formats/g64_dsk.h10
-rw-r--r--src/lib/formats/gtp_cas.h7
-rw-r--r--src/lib/formats/guab_dsk.h7
-rw-r--r--src/lib/formats/hect_dsk.h8
-rw-r--r--src/lib/formats/hect_tap.h7
-rw-r--r--src/lib/formats/hector_minidisc.h7
-rw-r--r--src/lib/formats/hp_ipc_dsk.h10
-rw-r--r--src/lib/formats/hpi_dsk.h10
-rw-r--r--src/lib/formats/hti_tape.cpp2
-rw-r--r--src/lib/formats/hti_tape.h19
-rw-r--r--src/lib/formats/hxchfe_dsk.cpp2
-rw-r--r--src/lib/formats/hxchfe_dsk.h65
-rw-r--r--src/lib/formats/hxcmfm_dsk.h7
-rw-r--r--src/lib/formats/imageutl.h197
-rw-r--r--src/lib/formats/imd_dsk.h7
-rw-r--r--src/lib/formats/ioprocs.h12
-rw-r--r--src/lib/formats/ipf_dsk.h10
-rw-r--r--src/lib/formats/iq151_dsk.h10
-rw-r--r--src/lib/formats/itt3030_dsk.h10
-rw-r--r--src/lib/formats/jfd_dsk.h10
-rw-r--r--src/lib/formats/jvc_dsk.h7
-rw-r--r--src/lib/formats/kaypro_dsk.h7
-rw-r--r--src/lib/formats/kc85_dsk.h7
-rw-r--r--src/lib/formats/kc_cas.h7
-rw-r--r--src/lib/formats/kim1_cas.h7
-rw-r--r--src/lib/formats/lviv_lvt.h7
-rw-r--r--src/lib/formats/m20_dsk.h7
-rw-r--r--src/lib/formats/m5_dsk.h7
-rw-r--r--src/lib/formats/mbee_cas.h5
-rw-r--r--src/lib/formats/mfi_dsk.h8
-rw-r--r--src/lib/formats/mfm_hd.h7
-rw-r--r--src/lib/formats/mm_dsk.h7
-rw-r--r--src/lib/formats/ms0515_dsk.h10
-rw-r--r--src/lib/formats/msx_dsk.h10
-rw-r--r--src/lib/formats/mtx_dsk.h7
-rw-r--r--src/lib/formats/mz_cas.h7
-rw-r--r--src/lib/formats/nanos_dsk.h7
-rw-r--r--src/lib/formats/nascom_dsk.h7
-rw-r--r--src/lib/formats/naslite_dsk.h10
-rw-r--r--src/lib/formats/nes_dsk.h7
-rw-r--r--src/lib/formats/nfd_dsk.h7
-rw-r--r--src/lib/formats/opd_dsk.h7
-rw-r--r--src/lib/formats/orao_cas.h7
-rw-r--r--src/lib/formats/oric_dsk.h7
-rw-r--r--src/lib/formats/oric_tap.h7
-rw-r--r--src/lib/formats/p6001_cas.h7
-rw-r--r--src/lib/formats/pasti_dsk.h8
-rw-r--r--src/lib/formats/pc98_dsk.h7
-rw-r--r--src/lib/formats/pc98fdi_dsk.h7
-rw-r--r--src/lib/formats/pc_dsk.h7
-rw-r--r--src/lib/formats/phc25_cas.h5
-rw-r--r--src/lib/formats/pk8020_dsk.h7
-rw-r--r--src/lib/formats/pmd_cas.h7
-rw-r--r--src/lib/formats/poly_dsk.h7
-rw-r--r--src/lib/formats/ppg_dsk.h10
-rw-r--r--src/lib/formats/primoptp.h7
-rw-r--r--src/lib/formats/pyldin_dsk.h10
-rw-r--r--src/lib/formats/ql_dsk.h10
-rw-r--r--src/lib/formats/rk_cas.h7
-rw-r--r--src/lib/formats/rx50_dsk.h7
-rw-r--r--src/lib/formats/sc3000_bit.h7
-rw-r--r--src/lib/formats/sdf_dsk.h7
-rw-r--r--src/lib/formats/sf7000_dsk.h10
-rw-r--r--src/lib/formats/smx_dsk.h10
-rw-r--r--src/lib/formats/sol_cas.h5
-rw-r--r--src/lib/formats/sorc_cas.h5
-rw-r--r--src/lib/formats/sorc_dsk.h7
-rw-r--r--src/lib/formats/sord_cas.h7
-rw-r--r--src/lib/formats/spc1000_cas.h5
-rw-r--r--src/lib/formats/st_dsk.h7
-rw-r--r--src/lib/formats/svi_cas.h7
-rw-r--r--src/lib/formats/svi_dsk.h7
-rw-r--r--src/lib/formats/tandy2k_dsk.h10
-rw-r--r--src/lib/formats/td0_dsk.h8
-rw-r--r--src/lib/formats/thom_cas.h7
-rw-r--r--src/lib/formats/thom_dsk.h8
-rw-r--r--src/lib/formats/ti99_dsk.h11
-rw-r--r--src/lib/formats/tiki100_dsk.h10
-rw-r--r--src/lib/formats/trd_dsk.h7
-rw-r--r--src/lib/formats/trs80_dsk.h7
-rw-r--r--src/lib/formats/trs_cas.h7
-rw-r--r--src/lib/formats/tvc_cas.h7
-rw-r--r--src/lib/formats/tvc_dsk.h10
-rw-r--r--src/lib/formats/tzx_cas.h7
-rw-r--r--src/lib/formats/uef_cas.h7
-rw-r--r--src/lib/formats/upd765_dsk.h7
-rw-r--r--src/lib/formats/vdk_dsk.h7
-rw-r--r--src/lib/formats/vector06_dsk.h7
-rw-r--r--src/lib/formats/vg5k_cas.h7
-rw-r--r--src/lib/formats/victor9k_dsk.h7
-rw-r--r--src/lib/formats/vt_cas.h7
-rw-r--r--src/lib/formats/wavfile.h7
-rw-r--r--src/lib/formats/wd177x_dsk.h7
-rw-r--r--src/lib/formats/x07_cas.h7
-rw-r--r--src/lib/formats/x1_tap.h7
-rw-r--r--src/lib/formats/xdf_dsk.h10
-rw-r--r--src/lib/formats/zx81_p.h7
168 files changed, 957 insertions, 764 deletions
diff --git a/src/lib/formats/2d_dsk.h b/src/lib/formats/2d_dsk.h
index 95ee8dbbf20..b5c1a61c256 100644
--- a/src/lib/formats/2d_dsk.h
+++ b/src/lib/formats/2d_dsk.h
@@ -7,12 +7,11 @@
Disk image format
***************************************************************************/
+#ifndef MAME_FORMATS_2D_DSK_H
+#define MAME_FORMATS_2D_DSK_H
#pragma once
-#ifndef __2D_DSK_H__
-#define __2D_DSK_H__
-
#include "wd177x_dsk.h"
class _2d_format : public wd177x_format
@@ -30,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_2D_FORMAT;
-#endif // __2D_DSK_H__
+#endif // MAME_FORMATS_2D_DSK_H
diff --git a/src/lib/formats/a26_cas.h b/src/lib/formats/a26_cas.h
index 809d5980bfe..445c0cb9e5c 100644
--- a/src/lib/formats/a26_cas.h
+++ b/src/lib/formats/a26_cas.h
@@ -5,12 +5,13 @@
Format code for a2600 SuperCharger cassette files
*/
+#ifndef MAME_FORMATS_A26_CAS_H
+#define MAME_FORMATS_A26_CAS_H
-#ifndef A26_CAS_H
-#define A26_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(a26_cassette_formats);
-#endif /* A26_CAS_H */
+#endif // MAME_FORMATS_A26_CAS_H
diff --git a/src/lib/formats/a5105_dsk.h b/src/lib/formats/a5105_dsk.h
index cfe7a2f6a0e..a2e8532ec56 100644
--- a/src/lib/formats/a5105_dsk.h
+++ b/src/lib/formats/a5105_dsk.h
@@ -7,13 +7,15 @@
a5105 format
*********************************************************************/
+#ifndef MAME_FORMATS_A5105_DSK_H
+#define MAME_FORMATS_A5105_DSK_H
-#ifndef A5105_DSK_H_
-#define A5105_DSK_H_
+#pragma once
#include "upd765_dsk.h"
-class a5105_format : public upd765_format {
+class a5105_format : public upd765_format
+{
public:
a5105_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_A5105_FORMAT;
-#endif
+#endif // MAME_FORMATS_A5105_DSK_H
diff --git a/src/lib/formats/abc800_dsk.h b/src/lib/formats/abc800_dsk.h
index a2b5bc3b33b..90ad8627e8f 100644
--- a/src/lib/formats/abc800_dsk.h
+++ b/src/lib/formats/abc800_dsk.h
@@ -7,13 +7,15 @@
Luxor ABC 830/832/834/838 disk image formats
*********************************************************************/
+#ifndef MAME_FORMATS_ABC800_DSK_H
+#define MAME_FORMATS_ABC800_DSK_H
-#ifndef ABC800_DSK_H_
-#define ABC800_DSK_H_
+#pragma once
#include "wd177x_dsk.h"
-class abc800_format : public wd177x_format {
+class abc800_format : public wd177x_format
+{
public:
abc800_format();
@@ -30,4 +32,4 @@ private:
extern const floppy_format_type FLOPPY_ABC800_FORMAT;
-#endif
+#endif // MAME_FORMATS_ABC800_DSK_H
diff --git a/src/lib/formats/abcfd2_dsk.h b/src/lib/formats/abcfd2_dsk.h
index b9eacfb55ba..174e0c29286 100644
--- a/src/lib/formats/abcfd2_dsk.h
+++ b/src/lib/formats/abcfd2_dsk.h
@@ -7,13 +7,15 @@
Scandia Metric ABC FD2 disk image formats
*********************************************************************/
+#ifndef MAME_FORMATS_ABCFD2_DSK_H
+#define MAME_FORMATS_ABCFD2_DSK_H
-#ifndef ABC_FD2_DSK_H_
-#define ABC_FD2_DSK_H_
+#pragma once
#include "wd177x_dsk.h"
-class abc_fd2_format : public wd177x_format {
+class abc_fd2_format : public wd177x_format
+{
public:
abc_fd2_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_ABC_FD2_FORMAT;
-#endif
+#endif // MAME_FORMATS_ABCFD2_DSK_H
diff --git a/src/lib/formats/ace_tap.h b/src/lib/formats/ace_tap.h
index 0113fdf6484..664b9876c29 100644
--- a/src/lib/formats/ace_tap.h
+++ b/src/lib/formats/ace_tap.h
@@ -7,9 +7,8 @@
Format code for Jupiter Ace cassette files
*********************************************************************/
-
-#ifndef ACE_TAP_H
-#define ACE_TAP_H
+#ifndef MAME_FORMATS_ACE_TAP_H
+#define MAME_FORMATS_ACE_TAP_H
#include "cassimg.h"
@@ -29,4 +28,4 @@ struct ace_tape_t
CASSETTE_FORMATLIST_EXTERN(ace_cassette_formats);
-#endif /* ACE_TAP_H */
+#endif // MAME_FORMATS_ACE_TAP_H
diff --git a/src/lib/formats/acorn_dsk.h b/src/lib/formats/acorn_dsk.h
index 2c71e4ee344..352ae3625d3 100644
--- a/src/lib/formats/acorn_dsk.h
+++ b/src/lib/formats/acorn_dsk.h
@@ -7,12 +7,11 @@
Disk image formats
***************************************************************************/
+#ifndef MAME_FORMATS_ACORN_DSK_H
+#define MAME_FORMATS_ACORN_DSK_H
#pragma once
-#ifndef ACORN_DSK_H
-#define ACORN_DSK_H
-
#include "flopimg.h"
#include "wd177x_dsk.h"
@@ -136,4 +135,4 @@ extern const floppy_format_type FLOPPY_ACORN_ADFS_NEW_FORMAT;
extern const floppy_format_type FLOPPY_OPUS_DDOS_FORMAT;
extern const floppy_format_type FLOPPY_OPUS_DDCPM_FORMAT;
-#endif // ACORN_DSK_H
+#endif // MAME_FORMATS_ACORN_DSK_H
diff --git a/src/lib/formats/adam_cas.h b/src/lib/formats/adam_cas.h
index 68ac57af5e9..aa9c917fdd3 100644
--- a/src/lib/formats/adam_cas.h
+++ b/src/lib/formats/adam_cas.h
@@ -7,12 +7,13 @@
Format code for Coleco Adam .ddp cassette files.
*********************************************************************/
+#ifndef MAME_FORMATS_ADAM_CAS_H
+#define MAME_FORMATS_ADAM_CAS_H
-#ifndef __ADAM_CAS_H
-#define __ADAM_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(coleco_adam_cassette_formats);
-#endif
+#endif // MAME_FORMATS_ADAM_CAS_H
diff --git a/src/lib/formats/adam_dsk.h b/src/lib/formats/adam_dsk.h
index 0f378edcb58..0ac28d0522f 100644
--- a/src/lib/formats/adam_dsk.h
+++ b/src/lib/formats/adam_dsk.h
@@ -7,13 +7,15 @@
Coleco Adam disk image format
*********************************************************************/
+#ifndef MAME_FORMATS_ADAM_DSK_H
+#define MAME_FORMATS_ADAM_DSK_H
-#ifndef ADAM_DSK_H_
-#define ADAM_DSK_H_
+#pragma once
#include "wd177x_dsk.h"
-class adam_format : public wd177x_format {
+class adam_format : public wd177x_format
+{
public:
adam_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_ADAM_FORMAT;
-#endif
+#endif // MAME_FORMATS_ADAM_DSK_H
diff --git a/src/lib/formats/afs_dsk.h b/src/lib/formats/afs_dsk.h
index e9afc3e699f..f1859615ade 100644
--- a/src/lib/formats/afs_dsk.h
+++ b/src/lib/formats/afs_dsk.h
@@ -7,11 +7,12 @@
Disk image formats
***************************************************************************/
+#ifndef MAME_FORMATS_AFS_DSK_H
+#define MAME_FORMATS_AFS_DSK_H
#pragma once
-#ifndef __AFS_DSK_H__
-#define __AFS_DSK_H__
+#pragma once
#include "wd177x_dsk.h"
@@ -34,4 +35,4 @@ private:
extern const floppy_format_type FLOPPY_AFS_FORMAT;
-#endif // __AFS_DSK_H__
+#endif // MAME_FORMATS_AFS_DSK_H
diff --git a/src/lib/formats/agat840k_hle_dsk.h b/src/lib/formats/agat840k_hle_dsk.h
index dad245e3335..6e8ad4036ee 100644
--- a/src/lib/formats/agat840k_hle_dsk.h
+++ b/src/lib/formats/agat840k_hle_dsk.h
@@ -5,13 +5,14 @@
formats/agat840k_hle_dsk.h
*********************************************************************/
+#ifndef MAME_FORMATS_AGAT840K_HLE_DSK_H
+#define MAME_FORMATS_AGAT840K_HLE_DSK_H
-#ifndef AGAT840K_HLE_DSK_H_
-#define AGAT840K_HLE_DSK_H_
+#pragma once
#include "flopimg.h"
#include "formats/basicdsk.h"
LEGACY_FLOPPY_OPTIONS_EXTERN(agat840k_hle);
-#endif /* AGAT840K_HLE_DSK_H_ */
+#endif // MAME_FORMATS_AGAT840K_HLE_DSK_H
diff --git a/src/lib/formats/ami_dsk.h b/src/lib/formats/ami_dsk.h
index 3fcddff023e..899e612415a 100644
--- a/src/lib/formats/ami_dsk.h
+++ b/src/lib/formats/ami_dsk.h
@@ -7,9 +7,10 @@
Amiga disk images
*********************************************************************/
+#ifndef MAME_FORMATS_AMI_DSK_H
+#define MAME_FORMATS_AMI_DSK_H
-#ifndef AMI_DSK_H_
-#define AMI_DSK_H_
+#pragma once
#include "flopimg.h"
@@ -34,4 +35,4 @@ private:
extern const floppy_format_type FLOPPY_ADF_FORMAT;
-#endif /*AMI_DSK_H_*/
+#endif // MAME_FORMATS_AMI_DSK_H
diff --git a/src/lib/formats/ap2_dsk.h b/src/lib/formats/ap2_dsk.h
index 91c12ba40c6..54433a001b8 100644
--- a/src/lib/formats/ap2_dsk.h
+++ b/src/lib/formats/ap2_dsk.h
@@ -7,9 +7,10 @@
Apple II disk images
*********************************************************************/
+#ifndef MAME_FORMATS_AP2_DSK_H
+#define MAME_FORMATS_AP2_DSK_H
-#ifndef AP2_DISK_H
-#define AP2_DISK_H
+#pragma once
#include "flopimg.h"
@@ -20,11 +21,11 @@
***************************************************************************/
-#define APPLE2_NIBBLE_SIZE 416
+#define APPLE2_NIBBLE_SIZE 416
#define APPLE2_SMALL_NIBBLE_SIZE 374
-#define APPLE2_TRACK_COUNT 35
-#define APPLE2_SECTOR_COUNT 16
-#define APPLE2_SECTOR_SIZE 256
+#define APPLE2_TRACK_COUNT 35
+#define APPLE2_SECTOR_COUNT 16
+#define APPLE2_SECTOR_SIZE 256
@@ -37,24 +38,24 @@ LEGACY_FLOPPY_OPTIONS_EXTERN(apple2);
class a2_16sect_format : public floppy_image_format_t
{
public:
- a2_16sect_format();
+ a2_16sect_format();
- virtual int identify(io_generic *io, uint32_t form_factor) override;
- virtual bool load(io_generic *io, uint32_t form_factor, floppy_image *image) override;
- virtual bool save(io_generic *io, floppy_image *image) override;
+ virtual int identify(io_generic *io, uint32_t form_factor) override;
+ virtual bool load(io_generic *io, uint32_t form_factor, floppy_image *image) override;
+ virtual bool save(io_generic *io, floppy_image *image) override;
- virtual const char *name() const override;
- virtual const char *description() const override;
- virtual const char *extensions() const override;
- virtual bool supports_save() const override;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+ virtual bool supports_save() const override;
private:
- static const desc_e mac_gcr[];
+ static const desc_e mac_gcr[];
- uint8_t gb(const uint8_t *buf, int ts, int &pos, int &wrap);
- void update_chk(const uint8_t *data, int size, uint32_t &chk);
+ uint8_t gb(const uint8_t *buf, int ts, int &pos, int &wrap);
+ void update_chk(const uint8_t *data, int size, uint32_t &chk);
- bool m_prodos_order;
+ bool m_prodos_order;
};
extern const floppy_format_type FLOPPY_A216S_FORMAT;
@@ -62,22 +63,22 @@ extern const floppy_format_type FLOPPY_A216S_FORMAT;
class a2_rwts18_format : public floppy_image_format_t
{
public:
- a2_rwts18_format();
+ a2_rwts18_format();
- virtual int identify(io_generic *io, uint32_t form_factor) override;
- virtual bool load(io_generic *io, uint32_t form_factor, floppy_image *image) override;
- virtual bool save(io_generic *io, floppy_image *image) override;
+ virtual int identify(io_generic *io, uint32_t form_factor) override;
+ virtual bool load(io_generic *io, uint32_t form_factor, floppy_image *image) override;
+ virtual bool save(io_generic *io, floppy_image *image) override;
- virtual const char *name() const override;
- virtual const char *description() const override;
- virtual const char *extensions() const override;
- virtual bool supports_save() const override;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+ virtual bool supports_save() const override;
private:
- static const desc_e mac_gcr[];
+ static const desc_e mac_gcr[];
- uint8_t gb(const uint8_t *buf, int ts, int &pos, int &wrap);
- void update_chk(const uint8_t *data, int size, uint32_t &chk);
+ uint8_t gb(const uint8_t *buf, int ts, int &pos, int &wrap);
+ void update_chk(const uint8_t *data, int size, uint32_t &chk);
};
extern const floppy_format_type FLOPPY_RWTS18_FORMAT;
@@ -86,18 +87,18 @@ extern const floppy_format_type FLOPPY_RWTS18_FORMAT;
class a2_edd_format : public floppy_image_format_t
{
public:
- a2_edd_format();
+ a2_edd_format();
- virtual int identify(io_generic *io, uint32_t form_factor) override;
- virtual bool load(io_generic *io, uint32_t form_factor, floppy_image *image) override;
- virtual bool supports_save() const override;
+ virtual int identify(io_generic *io, uint32_t form_factor) override;
+ virtual bool load(io_generic *io, uint32_t form_factor, floppy_image *image) override;
+ virtual bool supports_save() const override;
- virtual const char *name() const override;
- virtual const char *description() const override;
- virtual const char *extensions() const override;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
- static uint8_t pick(const uint8_t *data, int pos);
+ static uint8_t pick(const uint8_t *data, int pos);
};
extern const floppy_format_type FLOPPY_EDD_FORMAT;
@@ -105,27 +106,27 @@ extern const floppy_format_type FLOPPY_EDD_FORMAT;
class a2_woz_format : public floppy_image_format_t
{
public:
- a2_woz_format();
+ a2_woz_format();
- virtual int identify(io_generic *io, uint32_t form_factor) override;
- virtual bool load(io_generic *io, uint32_t form_factor, floppy_image *image) override;
- virtual bool supports_save() const override;
+ virtual int identify(io_generic *io, uint32_t form_factor) override;
+ virtual bool load(io_generic *io, uint32_t form_factor, floppy_image *image) override;
+ virtual bool supports_save() const override;
- virtual const char *name() const override;
- virtual const char *description() const override;
- virtual const char *extensions() const override;
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
private:
- static const uint8_t signature[8];
- static const uint8_t signature2[8];
-
- static uint32_t r32(const std::vector<uint8_t> &data, uint32_t offset);
- static uint16_t r16(const std::vector<uint8_t> &data, uint32_t offset);
- static uint8_t r8(const std::vector<uint8_t> &data, uint32_t offset);
- static uint32_t crc32r(const uint8_t *data, uint32_t size);
- static uint32_t find_tag(const std::vector<uint8_t> &data, uint32_t tag);
+ static const uint8_t signature[8];
+ static const uint8_t signature2[8];
+
+ static uint32_t r32(const std::vector<uint8_t> &data, uint32_t offset);
+ static uint16_t r16(const std::vector<uint8_t> &data, uint32_t offset);
+ static uint8_t r8(const std::vector<uint8_t> &data, uint32_t offset);
+ static uint32_t crc32r(const uint8_t *data, uint32_t size);
+ static uint32_t find_tag(const std::vector<uint8_t> &data, uint32_t tag);
};
extern const floppy_format_type FLOPPY_WOZ_FORMAT;
-#endif /* AP2_DISK_H */
+#endif // MAME_FORMATS_AP2_DSK_H
diff --git a/src/lib/formats/ap_dsk35.h b/src/lib/formats/ap_dsk35.h
index 6e7b2d583c5..8b3a8bbc1d3 100644
--- a/src/lib/formats/ap_dsk35.h
+++ b/src/lib/formats/ap_dsk35.h
@@ -7,9 +7,10 @@
Apple 3.5" disk images
*********************************************************************/
+#ifndef MAME_FORMATS_AP_DSK35_H
+#define MAME_FORMATS_AP_DSK35_H
-#ifndef AP_DSK35_H
-#define AP_DSK35_H
+#pragma once
#include "flopimg.h"
@@ -46,4 +47,4 @@ private:
extern const floppy_format_type FLOPPY_DC42_FORMAT;
-#endif /* AP_DSK35_H */
+#endif // MAME_FORMATS_AP_DSK35_H
diff --git a/src/lib/formats/apd_dsk.h b/src/lib/formats/apd_dsk.h
index 3bf40055a7b..343d45eb51d 100644
--- a/src/lib/formats/apd_dsk.h
+++ b/src/lib/formats/apd_dsk.h
@@ -7,13 +7,15 @@
Archimedes Protected Disk Image format
*********************************************************************/
+#ifndef MAME_FORMATS_APD_DSK_H
+#define MAME_FORMATS_APD_DSK_H
-#ifndef APD_DSK_H_
-#define APD_DSK_H_
+#pragma once
#include "flopimg.h"
-class apd_format : public floppy_image_format_t {
+class apd_format : public floppy_image_format_t
+{
public:
apd_format();
@@ -28,4 +30,4 @@ public:
extern const floppy_format_type FLOPPY_APD_FORMAT;
-#endif
+#endif // MAME_FORMATS_APD_DSK_H
diff --git a/src/lib/formats/apf_apt.h b/src/lib/formats/apf_apt.h
index ef8694ff47d..9bfe301a7b5 100644
--- a/src/lib/formats/apf_apt.h
+++ b/src/lib/formats/apf_apt.h
@@ -1,11 +1,12 @@
// license:BSD-3-Clause
// copyright-holders: Original author, Robbbert
-#ifndef APFCAS_H
-#define APFCAS_H
+#ifndef MAME_FORMATS_APF_APT_H
+#define MAME_FORMATS_APF_APT_H
+
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(apf_cassette_formats);
-
-#endif /* APFCAS_H */
+#endif // MAME_FORMATS_APF_APT_H
diff --git a/src/lib/formats/apollo_dsk.h b/src/lib/formats/apollo_dsk.h
index 47de0373d23..048a2438cc5 100644
--- a/src/lib/formats/apollo_dsk.h
+++ b/src/lib/formats/apollo_dsk.h
@@ -7,13 +7,15 @@
apollo format
*********************************************************************/
+#ifndef MAME_FORMATS_APOLLO_DSK_H
+#define MAME_FORMATS_APOLLO_DSK_H
-#ifndef APOLLO_DSK_H_
-#define APOLLO_DSK_H_
+#pragma once
#include "upd765_dsk.h"
-class apollo_format : public upd765_format {
+class apollo_format : public upd765_format
+{
public:
apollo_format();
@@ -28,4 +30,4 @@ private:
extern const floppy_format_type FLOPPY_APOLLO_FORMAT;
-#endif
+#endif // MAME_FORMATS_APOLLO_DSK_H
diff --git a/src/lib/formats/applix_dsk.h b/src/lib/formats/applix_dsk.h
index c56213ade74..6086d55fe57 100644
--- a/src/lib/formats/applix_dsk.h
+++ b/src/lib/formats/applix_dsk.h
@@ -7,13 +7,15 @@
Applix disk image format
*********************************************************************/
+#ifndef MAME_FORMATS_APPLIX_DSK_H
+#define MAME_FORMATS_APPLIX_DSK_H
-#ifndef APPLIX_DSK_H_
-#define APPLIX_DSK_H_
+#pragma once
#include "wd177x_dsk.h"
-class applix_format : public wd177x_format {
+class applix_format : public wd177x_format
+{
public:
applix_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_APPLIX_FORMAT;
-#endif
+#endif // MAME_FORMATS_APPLIX_DSK_H
diff --git a/src/lib/formats/apridisk.h b/src/lib/formats/apridisk.h
index 1155a0b4a9a..125b71451a5 100644
--- a/src/lib/formats/apridisk.h
+++ b/src/lib/formats/apridisk.h
@@ -7,12 +7,11 @@
Disk image format for the ACT Apricot
***************************************************************************/
+#ifndef MAME_FORMATS_APRIDISK_H
+#define MAME_FORMATS_APRIDISK_H
#pragma once
-#ifndef __APRIDISK_H__
-#define __APRIDISK_H__
-
#include "flopimg.h"
class apridisk_format : public floppy_image_format_t
@@ -54,4 +53,4 @@ private:
extern const floppy_format_type FLOPPY_APRIDISK_FORMAT;
-#endif // __APRIDISK_H__
+#endif // MAME_FORMATS_APRIDISK_H
diff --git a/src/lib/formats/asst128_dsk.h b/src/lib/formats/asst128_dsk.h
index b19aab50f27..532bdb97c4b 100644
--- a/src/lib/formats/asst128_dsk.h
+++ b/src/lib/formats/asst128_dsk.h
@@ -7,9 +7,10 @@
asst128 format
*********************************************************************/
+#ifndef MAME_FORMATS_ASST128_DSK_H
+#define MAME_FORMATS_ASST128_DSK_H
-#ifndef ASST128_DSK_H_
-#define ASST128_DSK_H_
+#pragma once
#include "upd765_dsk.h"
@@ -27,4 +28,4 @@ private:
extern const floppy_format_type FLOPPY_ASST128_FORMAT;
-#endif
+#endif // MAME_FORMATS_ASST128_DSK_H
diff --git a/src/lib/formats/atari_dsk.h b/src/lib/formats/atari_dsk.h
index 3ae04603e67..7f9a5bd194e 100644
--- a/src/lib/formats/atari_dsk.h
+++ b/src/lib/formats/atari_dsk.h
@@ -7,12 +7,13 @@
Atari disk images
*********************************************************************/
+#ifndef MAME_FORMATS_ATARI_DSK_H
+#define MAME_FORMATS_ATARI_DSK_H
-#ifndef ATARI_DSK_H
-#define ATARI_DSK_H
+#pragma once
#include "flopimg.h"
LEGACY_FLOPPY_OPTIONS_EXTERN(atari_only);
-#endif /* ATARI_DSK_H */
+#endif // MAME_FORMATS_ATARI_DSK_H
diff --git a/src/lib/formats/atom_dsk.h b/src/lib/formats/atom_dsk.h
index 03a4a0688f3..ef9cfa28d85 100644
--- a/src/lib/formats/atom_dsk.h
+++ b/src/lib/formats/atom_dsk.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Carl
-#ifndef __ATOM_DSK_H__
-#define __ATOM_DSK_H__
+#ifndef MAME_FORMATS_ATOM_DSK_H
+#define MAME_FORMATS_ATOM_DSK_H
+
+#pragma once
#include "flopimg.h"
#include "wd177x_dsk.h"
@@ -21,4 +23,4 @@ private:
extern const floppy_format_type FLOPPY_ATOM_FORMAT;
-#endif
+#endif // MAME_FORMATS_ATOM_DSK_H
diff --git a/src/lib/formats/atom_tap.h b/src/lib/formats/atom_tap.h
index b8e62aa1726..393466d3d7f 100644
--- a/src/lib/formats/atom_tap.h
+++ b/src/lib/formats/atom_tap.h
@@ -7,14 +7,13 @@
Cassette code for Acorn Atom tap files
*********************************************************************/
+#ifndef MAME_FORMATS_ATOM_TAP_H
+#define MAME_FORMATS_ATOM_TAP_H
#pragma once
-#ifndef __ATOM_TAP__
-#define __ATOM_TAP__
-
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(atom_cassette_formats);
-#endif
+#endif // MAME_FORMATS_ATOM_TAP_H
diff --git a/src/lib/formats/basicdsk.h b/src/lib/formats/basicdsk.h
index eae442993e3..dabe9afc278 100644
--- a/src/lib/formats/basicdsk.h
+++ b/src/lib/formats/basicdsk.h
@@ -7,9 +7,10 @@
Floppy format code for basic disks
*********************************************************************/
+#ifndef MAME_FORMATS_BASICDSK_H
+#define MAME_FORMATS_BASICDSK_H
-#ifndef BASICDSK_H
-#define BASICDSK_H
+#pragma once
#include "flopimg.h"
@@ -34,4 +35,4 @@ floperr_t basicdsk_construct(floppy_image_legacy *floppy, const struct basicdsk_
FLOPPY_IDENTIFY(basicdsk_identify_default);
FLOPPY_CONSTRUCT(basicdsk_construct_default);
-#endif /* BASICDSK_H */
+#endif // MAME_FORMATS_BASICDSK_H
diff --git a/src/lib/formats/bw12_dsk.h b/src/lib/formats/bw12_dsk.h
index ca43914ffb0..ac2e370aeb3 100644
--- a/src/lib/formats/bw12_dsk.h
+++ b/src/lib/formats/bw12_dsk.h
@@ -7,13 +7,15 @@
Bonwell 12/14 format
*********************************************************************/
+#ifndef MAME_FORMATS_BW12_DSK_H
+#define MAME_FORMATS_BW12_DSK_H
-#ifndef BW12_DSK_H_
-#define BW12_DSK_H_
+#pragma once
#include "upd765_dsk.h"
-class bw12_format : public upd765_format {
+class bw12_format : public upd765_format
+{
public:
bw12_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_BW12_FORMAT;
-#endif
+#endif // MAME_FORMATS_BW12_DSK_H
diff --git a/src/lib/formats/bw2_dsk.h b/src/lib/formats/bw2_dsk.h
index edf184ca4ae..8a84ef0dd27 100644
--- a/src/lib/formats/bw2_dsk.h
+++ b/src/lib/formats/bw2_dsk.h
@@ -7,13 +7,15 @@
Bondwell 2 format
*********************************************************************/
+#ifndef MAME_FORMATS_BW2_DSK_H
+#define MAME_FORMATS_BW2_DSK_H
-#ifndef BW2_DSK_H_
-#define BW2_DSK_H_
+#pragma once
#include "upd765_dsk.h"
-class bw2_format : public upd765_format {
+class bw2_format : public upd765_format
+{
public:
bw2_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_BW2_FORMAT;
-#endif
+#endif // MAME_FORMATS_BW2_DSK_H
diff --git a/src/lib/formats/c3040_dsk.h b/src/lib/formats/c3040_dsk.h
index 4a549abad13..c5897a52f2b 100644
--- a/src/lib/formats/c3040_dsk.h
+++ b/src/lib/formats/c3040_dsk.h
@@ -7,9 +7,10 @@
Commodore 3040 sector disk image format
*********************************************************************/
+#ifndef MAME_FORMATS_C3040_DSK_H
+#define MAME_FORMATS_C3040_DSK_H
-#ifndef C3040_DSK_H_
-#define C3040_DSK_H_
+#pragma once
#include "d64_dsk.h"
@@ -35,6 +36,4 @@ protected:
extern const floppy_format_type FLOPPY_C3040_FORMAT;
-
-
-#endif
+#endif // MAME_FORMATS_C3040_DSK_H
diff --git a/src/lib/formats/c4040_dsk.h b/src/lib/formats/c4040_dsk.h
index 08d62ca3e23..9fe29b399c2 100644
--- a/src/lib/formats/c4040_dsk.h
+++ b/src/lib/formats/c4040_dsk.h
@@ -7,9 +7,10 @@
Commodore 4040 sector disk image format
*********************************************************************/
+#ifndef MAME_FORMATS_C4040_DSK_H
+#define MAME_FORMATS_C4040_DSK_H
-#ifndef C4040_DSK_H_
-#define C4040_DSK_H_
+#pragma once
#include "d64_dsk.h"
@@ -33,6 +34,4 @@ protected:
extern const floppy_format_type FLOPPY_C4040_FORMAT;
-
-
-#endif
+#endif // MAME_FORMATS_C4040_DSK_H
diff --git a/src/lib/formats/c8280_dsk.h b/src/lib/formats/c8280_dsk.h
index b30ea667241..c7a9fc2b44e 100644
--- a/src/lib/formats/c8280_dsk.h
+++ b/src/lib/formats/c8280_dsk.h
@@ -7,13 +7,15 @@
Commodore 8280 disk image format
*********************************************************************/
+#ifndef MAME_FORMATS_C8280_DSK_H
+#define MAME_FORMATS_C8280_DSK_H
-#ifndef C8280_DSK_H_
-#define C8280_DSK_H_
+#pragma once
#include "wd177x_dsk.h"
-class c8280_format : public wd177x_format {
+class c8280_format : public wd177x_format
+{
public:
c8280_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_C8280_FORMAT;
-#endif
+#endif // MAME_FORMATS_C8280_DSK_H
diff --git a/src/lib/formats/camplynx_cas.h b/src/lib/formats/camplynx_cas.h
index d8148682edf..0263a5d063e 100644
--- a/src/lib/formats/camplynx_cas.h
+++ b/src/lib/formats/camplynx_cas.h
@@ -7,9 +7,14 @@
Format code for Camputers Lynx cassette images (TAP format)
*********************************************************************/
+#ifndef MAME_FORMATS_CAMPLYNX_CAS_H
+#define MAME_FORMATS_CAMPLYNX_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(lynx48k_cassette_formats);
CASSETTE_FORMATLIST_EXTERN(lynx128k_cassette_formats);
+
+#endif // MAME_FORMATS_CAMPLYNX_CAS_H
diff --git a/src/lib/formats/camplynx_dsk.h b/src/lib/formats/camplynx_dsk.h
index ccbc7015d5b..f1ec996040a 100644
--- a/src/lib/formats/camplynx_dsk.h
+++ b/src/lib/formats/camplynx_dsk.h
@@ -7,13 +7,15 @@
Camputers Lynx disk image format
*********************************************************************/
+#ifndef MAME_FORMATS_CAMPLYNX_DSK_H
+#define MAME_FORMATS_CAMPLYNX_DSK_H
-#ifndef CAMPLYNX_DSK_H_
-#define CAMPLYNX_DSK_H_
+#pragma once
#include "wd177x_dsk.h"
-class camplynx_format : public wd177x_format {
+class camplynx_format : public wd177x_format
+{
public:
camplynx_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_CAMPLYNX_FORMAT;
-#endif
+#endif // MAME_FORMATS_CAMPLYNX_DSK_H
diff --git a/src/lib/formats/cassimg.h b/src/lib/formats/cassimg.h
index 88c2080114f..9ac2dad988b 100644
--- a/src/lib/formats/cassimg.h
+++ b/src/lib/formats/cassimg.h
@@ -7,13 +7,18 @@
Cassette tape image abstraction code
*********************************************************************/
+#ifndef MAME_FORMATS_CASSIMG_H
+#define MAME_FORMATS_CASSIMG_H
-#ifndef CASSIMG_H
-#define CASSIMG_H
+#pragma once
+
+#include "ioprocs.h"
#include "osdcore.h"
#include "coretmpl.h"
-#include "ioprocs.h"
+
+#include <string>
+#include <vector>
#ifndef LOG_FORMATS
#define LOG_FORMATS if (0) printf
@@ -224,4 +229,4 @@ cassette_image::error cassette_legacy_identify(cassette_image *cassette, struct
cassette_image::error cassette_legacy_construct(cassette_image *cassette,
const struct CassetteLegacyWaveFiller *legacy_args);
-#endif /* CASSIMG_H */
+#endif // MAME_FORMATS_CASSIMG_H
diff --git a/src/lib/formats/cbm_crt.cpp b/src/lib/formats/cbm_crt.cpp
index 05bd56d5c38..ae67b8c7f1b 100644
--- a/src/lib/formats/cbm_crt.cpp
+++ b/src/lib/formats/cbm_crt.cpp
@@ -52,6 +52,14 @@
#define LOG 0
+#define CRT_SIGNATURE "C64 CARTRIDGE "
+
+#define CRT_HEADER_LENGTH 0x40
+#define CRT_CHIP_LENGTH 0x10
+
+#define UNSUPPORTED "standard"
+
+
// slot names for the C64 cartridge types
static char const *const CRT_C64_SLOT_NAMES[_CRT_C64_COUNT] =
{
diff --git a/src/lib/formats/cbm_crt.h b/src/lib/formats/cbm_crt.h
index 2a5e5331a8a..c3fea3db799 100644
--- a/src/lib/formats/cbm_crt.h
+++ b/src/lib/formats/cbm_crt.h
@@ -7,28 +7,18 @@
Commodore C64 cartridge images
*********************************************************************/
+#ifndef MAME_FORMATS_CBM_CRT_H
+#define MAME_FORMATS_CBM_CRT_H
#pragma once
-#ifndef __CBM_CRT__
-#define __CBM_CRT__
-
#include "formats/imageutl.h"
-
//**************************************************************************
// MACROS/CONSTANTS
//**************************************************************************
-#define CRT_SIGNATURE "C64 CARTRIDGE "
-
-#define CRT_HEADER_LENGTH 0x40
-#define CRT_CHIP_LENGTH 0x10
-
-#define UNSUPPORTED "standard"
-
-
// C64 cartridge types
enum
{
@@ -139,5 +129,4 @@ std::string cbm_crt_get_card(util::core_file &file);
bool cbm_crt_read_header(util::core_file &file, size_t *roml_size, size_t *romh_size, int *exrom, int *game);
bool cbm_crt_read_data(util::core_file &file, uint8_t *roml, uint8_t *romh);
-
-#endif
+#endif // MAME_FORMATS_CBM_CRT_H
diff --git a/src/lib/formats/cbm_tap.h b/src/lib/formats/cbm_tap.h
index d8043cd883e..7125dd698c7 100644
--- a/src/lib/formats/cbm_tap.h
+++ b/src/lib/formats/cbm_tap.h
@@ -7,12 +7,13 @@
Format code for CBM .tap files
*********************************************************************/
+#ifndef MAME_FORMATS_CBM_TAP_H
+#define MAME_FORMATS_CBM_TAP_H
-#ifndef CBM_TAP_H
-#define CBM_TAP_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(cbm_cassette_formats);
-#endif /* CBM_TAP_H */
+#endif // MAME_FORMATS_CBM_TAP_H
diff --git a/src/lib/formats/ccvf_dsk.h b/src/lib/formats/ccvf_dsk.h
index 39922485b5c..d101172b5b9 100644
--- a/src/lib/formats/ccvf_dsk.h
+++ b/src/lib/formats/ccvf_dsk.h
@@ -7,17 +7,20 @@
Compucolor Virtual Floppy Disk Image format
*********************************************************************/
+#ifndef MAME_FORMATS_CCVF_DSK_H
+#define MAME_FORMATS_CCVF_DSK_H
-#ifndef CCVF_DSK_H_
-#define CCVF_DSK_H_
+#pragma once
#include "flopimg.h"
-class ccvf_format : public floppy_image_format_t {
+class ccvf_format : public floppy_image_format_t
+{
public:
- struct format {
- uint32_t form_factor; // See floppy_image for possible values
- uint32_t variant; // See floppy_image for possible values
+ struct format
+ {
+ uint32_t form_factor; // See floppy_image for possible values
+ uint32_t variant; // See floppy_image for possible values
int cell_size; // See floppy_image_format_t for details
int sector_count;
@@ -50,6 +53,4 @@ protected:
extern const floppy_format_type FLOPPY_CCVF_FORMAT;
-
-
-#endif
+#endif // MAME_FORMATS_CCVF_DSK_H
diff --git a/src/lib/formats/cd90_640_dsk.h b/src/lib/formats/cd90_640_dsk.h
index 489942788be..5324698f498 100644
--- a/src/lib/formats/cd90_640_dsk.h
+++ b/src/lib/formats/cd90_640_dsk.h
@@ -7,12 +7,11 @@
Disk image format
***************************************************************************/
+#ifndef MAME_FORMATS_CD90_640_DSK_H
+#define MAME_FORMATS_CD90_640_DSK_H
#pragma once
-#ifndef __CD90_640_DSK_H__
-#define __CD90_640_DSK_H__
-
#include "wd177x_dsk.h"
class cd90_640_format : public wd177x_format
@@ -30,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_CD90_640_FORMAT;
-#endif // __CD90_640_DSK_H__
+#endif // MAME_FORMATS_CD90_640_DSK_H
diff --git a/src/lib/formats/cgen_cas.h b/src/lib/formats/cgen_cas.h
index 6e419e9d47c..f2cfeb7aabe 100644
--- a/src/lib/formats/cgen_cas.h
+++ b/src/lib/formats/cgen_cas.h
@@ -7,12 +7,13 @@
Format code for EACA Colour Genie .cas cassette files.
*********************************************************************/
+#ifndef MAME_FORMATS_CGEN_CAS_H
+#define MAME_FORMATS_CGEN_CAS_H
-#ifndef __CGEN_CAS_H
-#define __CGEN_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(cgenie_cassette_formats);
-#endif /* __CGEN_CAS_H */
+#endif // MAME_FORMATS_CGEN_CAS_H
diff --git a/src/lib/formats/cgenie_dsk.h b/src/lib/formats/cgenie_dsk.h
index 0cd402225d9..3bbbccf4762 100644
--- a/src/lib/formats/cgenie_dsk.h
+++ b/src/lib/formats/cgenie_dsk.h
@@ -7,12 +7,11 @@
Disk image format
***************************************************************************/
+#ifndef MAME_FORMATS_CGENIE_DSK_H
+#define MAME_FORMATS_CGENIE_DSK_H
#pragma once
-#ifndef __CGENIE_DSK_H__
-#define __CGENIE_DSK_H__
-
#include "wd177x_dsk.h"
class cgenie_format : public wd177x_format
@@ -34,4 +33,4 @@ private:
extern const floppy_format_type FLOPPY_CGENIE_FORMAT;
-#endif // __CGENIE_DSK_H__
+#endif // MAME_FORMATS_CGENIE_DSK_H
diff --git a/src/lib/formats/coco_cas.h b/src/lib/formats/coco_cas.h
index 07de1dc1a50..0cd6f32e97d 100644
--- a/src/lib/formats/coco_cas.h
+++ b/src/lib/formats/coco_cas.h
@@ -7,13 +7,14 @@
Format code for CoCo CAS (*.cas) files
*********************************************************************/
+#ifndef MAME_FORMATS_COCO_CAS_H
+#define MAME_FORMATS_COCO_CAS_H
-#ifndef COCO_CAS_H
-#define COCO_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(coco_cassette_formats);
CASSETTE_FORMATLIST_EXTERN(alice32_cassette_formats);
-#endif /* COCO_CAS_H */
+#endif // MAME_FORMATS_COCO_CAS_H
diff --git a/src/lib/formats/comx35_dsk.h b/src/lib/formats/comx35_dsk.h
index 1dc91806e3c..d5e2b961535 100644
--- a/src/lib/formats/comx35_dsk.h
+++ b/src/lib/formats/comx35_dsk.h
@@ -7,13 +7,15 @@
COMX-35 disk image format
*********************************************************************/
+#ifndef MAME_FORMATS_COMX35_DSK_H
+#define MAME_FORMATS_COMX35_DSK_H
-#ifndef COMX35_DSK_H_
-#define COMX35_DSK_H_
+#pragma once
#include "wd177x_dsk.h"
-class comx35_format : public wd177x_format {
+class comx35_format : public wd177x_format
+{
public:
comx35_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_COMX35_FORMAT;
-#endif
+#endif // MAME_FORMATS_COMX35_DSK_H
diff --git a/src/lib/formats/concept_dsk.h b/src/lib/formats/concept_dsk.h
index d762bcb64c0..ad6e8d63514 100644
--- a/src/lib/formats/concept_dsk.h
+++ b/src/lib/formats/concept_dsk.h
@@ -7,9 +7,8 @@
Formats for Corvus Concept
*********************************************************************/
-
-#ifndef CONCEPT_DSK_H_
-#define CONCEPT_DSK_H_
+#ifndef MAME_FORMATS_CONCEPT_DSK_H
+#define MAME_FORMATS_CONCEPT_DSK_H
#include "flopimg.h"
@@ -35,4 +34,4 @@ private:
extern const floppy_format_type FLOPPY_CONCEPT_525DSDD_FORMAT;
-#endif /* CONCEPT_DSK_H_ */
+#endif // MAME_FORMATS_CONCEPT_DSK_H
diff --git a/src/lib/formats/coupedsk.h b/src/lib/formats/coupedsk.h
index 52d619ff6cd..190ec0b27b1 100644
--- a/src/lib/formats/coupedsk.h
+++ b/src/lib/formats/coupedsk.h
@@ -7,9 +7,10 @@
SAM Coupe disk image formats
**************************************************************************/
+#ifndef MAME_FORMATS_COUPEDSK_H
+#define MAME_FORMATS_COUPEDSK_H
-#ifndef __COUPEDSK_H__
-#define __COUPEDSK_H__
+#pragma once
#include "flopimg.h"
@@ -32,4 +33,4 @@ public:
extern const floppy_format_type FLOPPY_MGT_FORMAT;
-#endif /* __COUPEDSK_H__ */
+#endif // MAME_FORMATS_COUPEDSK_H
diff --git a/src/lib/formats/cpis_dsk.h b/src/lib/formats/cpis_dsk.h
index 98d303c85fe..5328f5f3ca6 100644
--- a/src/lib/formats/cpis_dsk.h
+++ b/src/lib/formats/cpis_dsk.h
@@ -7,9 +7,10 @@
Telenova Compis disk images
*********************************************************************/
+#ifndef MAME_FORMATS_CPIS_DSK_H
+#define MAME_FORMATS_CPIS_DSK_H
-#ifndef CPIS_DSK_H
-#define CPIS_DSK_H
+#pragma once
#include "upd765_dsk.h"
@@ -27,4 +28,4 @@ private:
extern const floppy_format_type FLOPPY_CPIS_FORMAT;
-#endif /* CPIS_DSK_H */
+#endif // MAME_FORMATS_CPIS_DSK_H
diff --git a/src/lib/formats/cqm_dsk.h b/src/lib/formats/cqm_dsk.h
index 7ae12ccff2b..b8e590d9021 100644
--- a/src/lib/formats/cqm_dsk.h
+++ b/src/lib/formats/cqm_dsk.h
@@ -7,9 +7,10 @@
CopyQM disk images
*********************************************************************/
+#ifndef MAME_FORMATS_CQM_DSK_H
+#define MAME_FORMATS_CQM_DSK_H
-#ifndef CQM_DSK_H_
-#define CQM_DSK_H_
+#pragma once
#include "flopimg.h"
@@ -30,4 +31,4 @@ public:
extern const floppy_format_type FLOPPY_CQM_FORMAT;
-#endif /* CQM_DSK_H_ */
+#endif // MAME_FORMATS_CQM_DSK_H
diff --git a/src/lib/formats/csw_cas.h b/src/lib/formats/csw_cas.h
index cdc36001c60..e6e5a62d764 100644
--- a/src/lib/formats/csw_cas.h
+++ b/src/lib/formats/csw_cas.h
@@ -5,9 +5,10 @@
Format code for csw cassette files
*/
+#ifndef MAME_FORMATS_CSW_CAS_H
+#define MAME_FORMATS_CSW_CAS_H
-#ifndef CSW_CAS_H
-#define CSW_CAS_H
+#pragma once
#include "cassimg.h"
@@ -16,4 +17,4 @@ extern const struct CassetteFormat csw_cassette_format;
CASSETTE_FORMATLIST_EXTERN(csw_cassette_formats);
CASSETTE_FORMATLIST_EXTERN(bbc_cassette_formats);
-#endif /* CSW_CAS_H */
+#endif // MAME_FORMATS_CSW_CAS_H
diff --git a/src/lib/formats/d64_dsk.h b/src/lib/formats/d64_dsk.h
index 28726332fa3..c91f116795f 100644
--- a/src/lib/formats/d64_dsk.h
+++ b/src/lib/formats/d64_dsk.h
@@ -7,15 +7,18 @@
Commodore 4040/1541/1551 sector disk image format
*********************************************************************/
+#ifndef MAME_FORMATS_D64_DSK_H
+#define MAME_FORMATS_D64_DSK_H
-#ifndef D64_DSK_H_
-#define D64_DSK_H_
+#pragma once
#include "flopimg.h"
-class d64_format : public floppy_image_format_t {
+class d64_format : public floppy_image_format_t
+{
public:
- struct format {
+ struct format
+ {
uint32_t form_factor; // See floppy_image for possible values
uint32_t variant; // See floppy_image for possible values
@@ -81,6 +84,4 @@ protected:
extern const floppy_format_type FLOPPY_D64_FORMAT;
-
-
-#endif
+#endif // MAME_FORMATS_D64_DSK_H
diff --git a/src/lib/formats/d71_dsk.h b/src/lib/formats/d71_dsk.h
index eff2cff2c2a..efe39da3b4f 100644
--- a/src/lib/formats/d71_dsk.h
+++ b/src/lib/formats/d71_dsk.h
@@ -7,13 +7,15 @@
Commodore 1571 sector disk image format
*********************************************************************/
+#ifndef MAME_FORMATS_D71_DSK_H
+#define MAME_FORMATS_D71_DSK_H
-#ifndef D71_DSK_H_
-#define D71_DSK_H_
+#pragma once
#include "d64_dsk.h"
-class d71_format : public d64_format {
+class d71_format : public d64_format
+{
public:
d71_format();
@@ -27,6 +29,4 @@ protected:
extern const floppy_format_type FLOPPY_D71_FORMAT;
-
-
-#endif
+#endif // MAME_FORMATS_D71_DSK_H
diff --git a/src/lib/formats/d80_dsk.h b/src/lib/formats/d80_dsk.h
index 4f6482efffe..b1150ff992a 100644
--- a/src/lib/formats/d80_dsk.h
+++ b/src/lib/formats/d80_dsk.h
@@ -7,13 +7,15 @@
Commodore 8050 sector disk image format
*********************************************************************/
+#ifndef MAME_FORMATS_D80_DSK_H
+#define MAME_FORMATS_D80_DSK_H
-#ifndef D80_DSK_H_
-#define D80_DSK_H_
+#pragma once
#include "d64_dsk.h"
-class d80_format : public d64_format {
+class d80_format : public d64_format
+{
public:
d80_format();
d80_format(const format *formats);
@@ -41,6 +43,4 @@ protected:
extern const floppy_format_type FLOPPY_D80_FORMAT;
-
-
-#endif
+#endif // MAME_FORMATS_D80_DSK_H
diff --git a/src/lib/formats/d81_dsk.h b/src/lib/formats/d81_dsk.h
index 80c95b2a91d..00d99807c0e 100644
--- a/src/lib/formats/d81_dsk.h
+++ b/src/lib/formats/d81_dsk.h
@@ -7,13 +7,15 @@
Commodore 1581 disk image format
*********************************************************************/
+#ifndef MAME_FORMATS_D81_DSK_H
+#define MAME_FORMATS_D81_DSK_H
-#ifndef D81_DSK_H_
-#define D81_DSK_H_
+#pragma once
#include "wd177x_dsk.h"
-class d81_format : public wd177x_format {
+class d81_format : public wd177x_format
+{
public:
d81_format();
@@ -29,4 +31,4 @@ private:
extern const floppy_format_type FLOPPY_D81_FORMAT;
-#endif
+#endif // MAME_FORMATS_D81_DSK_H
diff --git a/src/lib/formats/d82_dsk.h b/src/lib/formats/d82_dsk.h
index 8919deee775..d2d189ebe0c 100644
--- a/src/lib/formats/d82_dsk.h
+++ b/src/lib/formats/d82_dsk.h
@@ -7,13 +7,15 @@
Commodore 8250/SFD-1001 sector disk image format
*********************************************************************/
+#ifndef MAME_FORMATS_D82_DSK_H
+#define MAME_FORMATS_D82_DSK_H
-#ifndef D82_DSK_H_
-#define D82_DSK_H_
+#pragma once
#include "d80_dsk.h"
-class d82_format : public d80_format {
+class d82_format : public d80_format
+{
public:
d82_format();
@@ -27,6 +29,4 @@ protected:
extern const floppy_format_type FLOPPY_D82_FORMAT;
-
-
-#endif
+#endif // MAME_FORMATS_D82_DSK_H
diff --git a/src/lib/formats/d88_dsk.h b/src/lib/formats/d88_dsk.h
index 5ba52c4fe45..f769aa9f85e 100644
--- a/src/lib/formats/d88_dsk.h
+++ b/src/lib/formats/d88_dsk.h
@@ -7,9 +7,10 @@
D88 disk images
*********************************************************************/
+#ifndef MAME_FORMATS_D88_DSK_H
+#define MAME_FORMATS_D88_DSK_H
-#ifndef D88_DSK_H
-#define D88_DSK_H
+#pragma once
#include "flopimg.h"
@@ -31,4 +32,4 @@ public:
extern const floppy_format_type FLOPPY_D88_FORMAT;
-#endif /* D88_DSK_H */
+#endif // MAME_FORMATS_D88_DSK_H
diff --git a/src/lib/formats/dcp_dsk.h b/src/lib/formats/dcp_dsk.h
index 940a8aca931..3ecfab71f61 100644
--- a/src/lib/formats/dcp_dsk.h
+++ b/src/lib/formats/dcp_dsk.h
@@ -7,9 +7,10 @@
PC98 DCP & DCU disk images
*********************************************************************/
+#ifndef MAME_FORMATS_DCP_DSK_H
+#define MAME_FORMATS_DCP_DSK_H
-#ifndef DCP_DSK_H
-#define DCP_DSK_H
+#pragma once
#include "flopimg.h"
@@ -30,4 +31,4 @@ public:
extern const floppy_format_type FLOPPY_DCP_FORMAT;
-#endif /* PC98DCP_DSK_H */
+#endif // MAME_FORMATS_DCP_DSK_H
diff --git a/src/lib/formats/dfi_dsk.h b/src/lib/formats/dfi_dsk.h
index 030776a9b4f..6dd56aa623c 100644
--- a/src/lib/formats/dfi_dsk.h
+++ b/src/lib/formats/dfi_dsk.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef DFI_DSK_H
-#define DFI_DSK_H
+#ifndef MAME_FORMATS_DFI_DSK_H
+#define MAME_FORMATS_DFI_DSK_H
+
+#pragma once
#include "flopimg.h"
@@ -22,4 +24,4 @@ public:
extern const floppy_format_type FLOPPY_DFI_FORMAT;
-#endif /* DFI_DSK_H */
+#endif // MAME_FORMATS_DFI_DSK_H
diff --git a/src/lib/formats/dim_dsk.h b/src/lib/formats/dim_dsk.h
index 3529c84253d..b1c3d60a801 100644
--- a/src/lib/formats/dim_dsk.h
+++ b/src/lib/formats/dim_dsk.h
@@ -7,9 +7,10 @@
DIM disk images
*********************************************************************/
+#ifndef MAME_FORMATS_DIM_DSK_H
+#define MAME_FORMATS_DIM_DSK_H
-#ifndef DIM_DSK_H
-#define DIM_DSK_H
+#pragma once
#include "flopimg.h"
@@ -36,4 +37,4 @@ public:
extern const floppy_format_type FLOPPY_DIM_FORMAT;
-#endif /* DIM_DSK_H */
+#endif // MAME_FORMATS_DIM_DSK_H
diff --git a/src/lib/formats/dip_dsk.h b/src/lib/formats/dip_dsk.h
index 2f392ff8ab2..b504c73fbb0 100644
--- a/src/lib/formats/dip_dsk.h
+++ b/src/lib/formats/dip_dsk.h
@@ -7,9 +7,10 @@
PC98DIP disk images
*********************************************************************/
+#ifndef MAME_FORMATS_DIP_DSK_H
+#define MAME_FORMATS_DIP_DSK_H
-#ifndef DIP_DSK_H
-#define DIP_DSK_H
+#pragma once
#include "flopimg.h"
@@ -30,4 +31,4 @@ public:
extern const floppy_format_type FLOPPY_DIP_FORMAT;
-#endif /* DIP_DSK_H */
+#endif // MAME_FORMATS_DIP_DSK_H
diff --git a/src/lib/formats/dmk_dsk.h b/src/lib/formats/dmk_dsk.h
index 6b15000baab..44993f8df32 100644
--- a/src/lib/formats/dmk_dsk.h
+++ b/src/lib/formats/dmk_dsk.h
@@ -7,9 +7,10 @@
DMK disk images
*********************************************************************/
+#ifndef MAME_FORMATS_DMK_DSK_H
+#define MAME_FORMATS_DMK_DSK_H
-#ifndef DMK_DSK_H
-#define DMK_DSK_H
+#pragma once
#include "flopimg.h"
@@ -32,4 +33,4 @@ public:
extern const floppy_format_type FLOPPY_DMK_FORMAT;
-#endif /* DMK_DSK_H */
+#endif // MAME_FORMATS_DMK_DSK_H
diff --git a/src/lib/formats/dmv_dsk.h b/src/lib/formats/dmv_dsk.h
index 022a6e1e489..035eed0db50 100644
--- a/src/lib/formats/dmv_dsk.h
+++ b/src/lib/formats/dmv_dsk.h
@@ -7,13 +7,15 @@
NCR Decision Mate V format
*********************************************************************/
+#ifndef MAME_FORMATS_DMV_DSK_H
+#define MAME_FORMATS_DMV_DSK_H
-#ifndef DMV_DSK_H_
-#define DMV_DSK_H_
+#pragma once
#include "upd765_dsk.h"
-class dmv_format : public upd765_format {
+class dmv_format : public upd765_format
+{
public:
dmv_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_DMV_FORMAT;
-#endif /* DMV_DSK_H_ */
+#endif // MAME_FORMATS_DMV_DSK_H
diff --git a/src/lib/formats/dsk_dsk.h b/src/lib/formats/dsk_dsk.h
index 61af930fdb5..e6b289a3cca 100644
--- a/src/lib/formats/dsk_dsk.h
+++ b/src/lib/formats/dsk_dsk.h
@@ -7,9 +7,10 @@
CPC DSK disk images
*********************************************************************/
+#ifndef MAME_FORMATS_DSK_DSK_H
+#define MAME_FORMATS_DSK_DSK_H
-#ifndef CPCDSK_DSK_H
-#define CPCDSK_DSK_H
+#pragma once
#include "flopimg.h"
@@ -29,4 +30,4 @@ public:
extern const floppy_format_type FLOPPY_DSK_FORMAT;
-#endif /* CPCDSK_DSK_H */
+#endif // MAME_FORMATS_DSK_DSK_H
diff --git a/src/lib/formats/ep64_dsk.h b/src/lib/formats/ep64_dsk.h
index 47d05594964..07acca4a217 100644
--- a/src/lib/formats/ep64_dsk.h
+++ b/src/lib/formats/ep64_dsk.h
@@ -7,13 +7,15 @@
Enterprise Sixty Four disk image format
*********************************************************************/
+#ifndef MAME_FORMATS_EP64_DSK_H
+#define MAME_FORMATS_EP64_DSK_H
-#ifndef EP64_DSK_H_
-#define EP64_DSK_H_
+#pragma once
#include "wd177x_dsk.h"
-class ep64_format : public wd177x_format {
+class ep64_format : public wd177x_format
+{
public:
ep64_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_EP64_FORMAT;
-#endif
+#endif // MAME_FORMATS_EP64_DSK_H
diff --git a/src/lib/formats/esq16_dsk.h b/src/lib/formats/esq16_dsk.h
index 76c210fd60d..91bd03b8151 100644
--- a/src/lib/formats/esq16_dsk.h
+++ b/src/lib/formats/esq16_dsk.h
@@ -9,9 +9,10 @@
Disk is PC MFM, 80 tracks, double-sided, with 10 sectors per track
*********************************************************************/
+#ifndef MAME_FORMATS_ESQ16_DSK_H
+#define MAME_FORMATS_ESQ16_DSK_H
-#ifndef ESQ16_DSK_H_
-#define ESQ16_DSK_H_
+#pragma once
#include "flopimg.h"
@@ -37,4 +38,4 @@ private:
extern const floppy_format_type FLOPPY_ESQIMG_FORMAT;
-#endif /* ESQ16_DSK_H_ */
+#endif // MAME_FORMATS_ESQ16_DSK_H
diff --git a/src/lib/formats/esq8_dsk.h b/src/lib/formats/esq8_dsk.h
index d5925805f30..af0cb46eecd 100644
--- a/src/lib/formats/esq8_dsk.h
+++ b/src/lib/formats/esq8_dsk.h
@@ -11,9 +11,10 @@
Sectors 0-4 are 1024 bytes, sector 5 is 512 bytes
*********************************************************************/
+#ifndef MAME_FORMATS_ESQ8_DSK_H
+#define MAME_FORMATS_ESQ8_DSK_H
-#ifndef ESQ8_DSK_H_
-#define ESQ8_DSK_H_
+#pragma once
#include "flopimg.h"
@@ -39,4 +40,4 @@ private:
extern const floppy_format_type FLOPPY_ESQ8IMG_FORMAT;
-#endif /* ESQ8_DSK_H_ */
+#endif // MAME_FORMATS_ESQ8_DSK_H
diff --git a/src/lib/formats/excali64_dsk.h b/src/lib/formats/excali64_dsk.h
index c2800d18875..03d4cb3b237 100644
--- a/src/lib/formats/excali64_dsk.h
+++ b/src/lib/formats/excali64_dsk.h
@@ -7,13 +7,15 @@
Excalibur 64 disk image format
*********************************************************************/
+#ifndef MAME_FORMATS_EXCALI64_DSK_H
+#define MAME_FORMATS_EXCALI64_DSK_H
-#ifndef EXCALI64_DSK_H_
-#define EXCALI64_DSK_H_
+#pragma once
#include "wd177x_dsk.h"
-class excali64_format : public wd177x_format {
+class excali64_format : public wd177x_format
+{
public:
excali64_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_EXCALI64_FORMAT;
-#endif
+#endif // MAME_FORMATS_EXCALI64_DSK_H
diff --git a/src/lib/formats/fc100_cas.h b/src/lib/formats/fc100_cas.h
index 1d7b667cf4d..79f52691f77 100644
--- a/src/lib/formats/fc100_cas.h
+++ b/src/lib/formats/fc100_cas.h
@@ -7,8 +7,13 @@
Format code for Goldstar FC-100 cassette images (CAS format)
*********************************************************************/
+#ifndef MAME_FORMATS_FC100_CAS_H
+#define MAME_FORMATS_FC100_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(fc100_cassette_formats);
+
+#endif // MAME_FORMATS_FC100_CAS_H
diff --git a/src/lib/formats/fdd_dsk.h b/src/lib/formats/fdd_dsk.h
index f73e18cd696..86a43d5d0ee 100644
--- a/src/lib/formats/fdd_dsk.h
+++ b/src/lib/formats/fdd_dsk.h
@@ -7,9 +7,10 @@
PC98 FDD disk images
*********************************************************************/
+#ifndef MAME_FORMATS_FDD_DSK_H
+#define MAME_FORMATS_FDD_DSK_H
-#ifndef FDD_DSK_H
-#define FDD_DSK_H
+#pragma once
#include "flopimg.h"
@@ -30,4 +31,4 @@ public:
extern const floppy_format_type FLOPPY_FDD_FORMAT;
-#endif /* FDD_DSK_H */
+#endif // MAME_FORMATS_FDD_DSK_H
diff --git a/src/lib/formats/flex_dsk.h b/src/lib/formats/flex_dsk.h
index c40e0fbda15..7e2f7c3d8e3 100644
--- a/src/lib/formats/flex_dsk.h
+++ b/src/lib/formats/flex_dsk.h
@@ -5,13 +5,15 @@
*
* Created on: 24/06/2014
*/
+#ifndef MAME_FORMATS_FLEX_DSK_H
+#define MAME_FORMATS_FLEX_DSK_H
-#ifndef FLEX_DSK_H_
-#define FLEX_DSK_H_
+#pragma once
#include "flopimg.h"
-class flex_format : public floppy_image_format_t {
+class flex_format : public floppy_image_format_t
+{
public:
flex_format();
@@ -45,4 +47,4 @@ private:
extern const floppy_format_type FLOPPY_FLEX_FORMAT;
-#endif /* FLEX_DSK_H_ */
+#endif // MAME_FORMATS_FLEX_DSK_H
diff --git a/src/lib/formats/flopimg.h b/src/lib/formats/flopimg.h
index b7f4d542db2..be824a46ed1 100644
--- a/src/lib/formats/flopimg.h
+++ b/src/lib/formats/flopimg.h
@@ -7,15 +7,18 @@
Floppy disk image abstraction code
*********************************************************************/
+#ifndef MAME_FORMATS_FLOPIMG_H
+#define MAME_FORMATS_FLOPIMG_H
-#ifndef FLOPIMG_H
-#define FLOPIMG_H
+#pragma once
#include "osdcore.h"
#include "ioprocs.h"
#include "opresolv.h"
#include "coretmpl.h"
+#include <vector>
+
#ifndef LOG_FORMATS
#define LOG_FORMATS if (0) printf
#endif
@@ -170,8 +173,7 @@ floperr_t floppy_create(void *fp, const struct io_procs *procs, const struct Flo
void floppy_close(floppy_image_legacy *floppy);
/* useful for identifying a floppy image */
-floperr_t floppy_identify(void *fp, const struct io_procs *procs, const char *extension,
- const struct FloppyFormat *formats, int *identified_format);
+floperr_t floppy_identify(void *fp, const struct io_procs *procs, const char *extension, const struct FloppyFormat *formats, int *identified_format);
/* functions useful within format constructors */
void *floppy_tag(floppy_image_legacy *floppy);
@@ -292,7 +294,8 @@ protected:
//! Optional, you can always do things by hand, but useful nevertheless.
//! A vector of these structures describes one track.
- struct desc_e {
+ struct desc_e
+ {
int type, //!< An opcode
p1, //!< first param
p2; //!< second param
@@ -361,7 +364,8 @@ protected:
};
//! Sector data description
- struct desc_s {
+ struct desc_s
+ {
int size; //!< Sector size, int bytes
const uint8_t *data; //!< Sector data
uint8_t sector_id; //!< Sector ID
@@ -489,14 +493,16 @@ protected:
void generate_bitstream_from_track(int track, int head, int cell_size, uint8_t *trackbuf, int &track_size, floppy_image *image, int subtrack = 0);
//! Defines a standard sector for extracting.
- struct desc_xs {
+ struct desc_xs
+ {
int track, //!< Track for this sector
head, //!< Head for this sector
size; //!< Size of this sector
const uint8_t *data; //!< Data within this sector
};
- struct desc_pc_sector {
+ struct desc_pc_sector
+ {
uint8_t track, head, sector, size;
int actual_size;
uint8_t *data;
@@ -588,7 +594,8 @@ private:
enum { MAX_CRC_COUNT = 64 };
//! Holds data used internally for generating CRCs.
- struct gen_crc_info {
+ struct gen_crc_info
+ {
int type, //!< Type of CRC
start, //!< Start position
end, //!< End position
@@ -772,7 +779,8 @@ private:
uint32_t form_factor, variant;
- struct track_info {
+ struct track_info
+ {
std::vector<uint32_t> cell_data;
uint32_t write_splice;
@@ -784,4 +792,4 @@ private:
std::vector<std::vector<track_info> > track_array;
};
-#endif /* FLOPIMG_H */
+#endif // MAME_FORMATS_FLOPIMG_H
diff --git a/src/lib/formats/fm7_cas.h b/src/lib/formats/fm7_cas.h
index 6c528f71882..dfb2d896df7 100644
--- a/src/lib/formats/fm7_cas.h
+++ b/src/lib/formats/fm7_cas.h
@@ -3,12 +3,13 @@
/*
* Fujitsu FM-7 cassette format handling
*/
+#ifndef MAME_FORMATS_FM7_CAS_H
+#define MAME_FORMATS_FM7_CAS_H
-#ifndef FM7_CAS_H_
-#define FM7_CAS_H_
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN( fm7_cassette_formats );
-#endif /*FM7_CAS_H_*/
+#endif // MAME_FORMATS_FM7_CAS_H
diff --git a/src/lib/formats/fmsx_cas.h b/src/lib/formats/fmsx_cas.h
index 3dc53b1dce4..d6a6269c0b1 100644
--- a/src/lib/formats/fmsx_cas.h
+++ b/src/lib/formats/fmsx_cas.h
@@ -7,12 +7,13 @@
Format code for MSX cassette files
*********************************************************************/
+#ifndef MAME_FORMATS_FMSX_CAS_H
+#define MAME_FORMATS_FMSX_CAS_H
-#ifndef FMSX_CAS_H
-#define FMSX_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(fmsx_cassette_formats);
-#endif /* FMSX_CAS_H */
+#endif // MAME_FORMATS_FMSX_CAS_H
diff --git a/src/lib/formats/fmtowns_dsk.h b/src/lib/formats/fmtowns_dsk.h
index 4bf20990ec9..9fc136bb078 100644
--- a/src/lib/formats/fmtowns_dsk.h
+++ b/src/lib/formats/fmtowns_dsk.h
@@ -5,13 +5,15 @@
*
* Created on: 23/03/2014
*/
+#ifndef MAME_FORMATS_FMTOWNS_DSK_H
+#define MAME_FORMATS_FMTOWNS_DSK_H
-#ifndef FMTOWNS_DSK_H_
-#define FMTOWNS_DSK_H_
+#pragma once
#include "wd177x_dsk.h"
-class fmtowns_format : public wd177x_format {
+class fmtowns_format : public wd177x_format
+{
public:
fmtowns_format();
@@ -25,5 +27,4 @@ private:
extern const floppy_format_type FLOPPY_FMTOWNS_FORMAT;
-
-#endif /* FMTOWNS_DSK_H_ */
+#endif // MAME_FORMATS_FMTOWNS_DSK_H
diff --git a/src/lib/formats/fsd_dsk.h b/src/lib/formats/fsd_dsk.h
index 8a472016cc6..0eddbb3f5d7 100644
--- a/src/lib/formats/fsd_dsk.h
+++ b/src/lib/formats/fsd_dsk.h
@@ -7,12 +7,11 @@
Disk image formats
***************************************************************************/
+#ifndef MAME_FORMATS_FSD_DSK_H
+#define MAME_FORMATS_FSD_DSK_H
#pragma once
-#ifndef __FSD_DSK_H__
-#define __FSD_DSK_H__
-
#include "flopimg.h"
#include "wd177x_dsk.h"
@@ -40,4 +39,4 @@ public:
extern const floppy_format_type FLOPPY_FSD_FORMAT;
-#endif // __FSD_DSK_H__
+#endif // MAME_FORMATS_FSD_DSK_H
diff --git a/src/lib/formats/g64_dsk.h b/src/lib/formats/g64_dsk.h
index e0966f8690e..1c032a09759 100644
--- a/src/lib/formats/g64_dsk.h
+++ b/src/lib/formats/g64_dsk.h
@@ -7,14 +7,16 @@
Commodore 1541/1571 GCR disk image format
*********************************************************************/
+#ifndef MAME_FORMATS_G64_DSK_H
+#define MAME_FORMATS_G64_DSK_H
-#ifndef G64_DSK_H_
-#define G64_DSK_H_
+#pragma once
#include "flopimg.h"
#include "imageutl.h"
-class g64_format : public floppy_image_format_t {
+class g64_format : public floppy_image_format_t
+{
public:
g64_format();
@@ -50,4 +52,4 @@ protected:
extern const floppy_format_type FLOPPY_G64_FORMAT;
-#endif
+#endif // MAME_FORMATS_G64_DSK_H
diff --git a/src/lib/formats/gtp_cas.h b/src/lib/formats/gtp_cas.h
index aba3031dbec..6e660c4a81c 100644
--- a/src/lib/formats/gtp_cas.h
+++ b/src/lib/formats/gtp_cas.h
@@ -6,12 +6,13 @@
Format code for gtp cassette files
*/
+#ifndef MAME_FORMATS_GTP_CAS_H
+#define MAME_FORMATS_GTP_CAS_H
-#ifndef GTP_CAS_H
-#define GTP_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(gtp_cassette_formats);
-#endif /* GTP_CAS_H */
+#endif // MAME_FORMATS_GTP_CAS_H
diff --git a/src/lib/formats/guab_dsk.h b/src/lib/formats/guab_dsk.h
index 3fe6e2a670e..771baa2bf75 100644
--- a/src/lib/formats/guab_dsk.h
+++ b/src/lib/formats/guab_dsk.h
@@ -7,12 +7,11 @@
Disk image format
***************************************************************************/
+#ifndef MAME_FORMATS_GUAB_DSK_H
+#define MAME_FORMATS_GUAB_DSK_H
#pragma once
-#ifndef __GUAB_DSK_H__
-#define __GUAB_DSK_H__
-
#include "wd177x_dsk.h"
class guab_format : public wd177x_format
@@ -30,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_GUAB_FORMAT;
-#endif // __GUAB_DSK_H__
+#endif // MAME_FORMATS_GUAB_DSK_H
diff --git a/src/lib/formats/hect_dsk.h b/src/lib/formats/hect_dsk.h
index 7ff95f76edc..c8c185d316b 100644
--- a/src/lib/formats/hect_dsk.h
+++ b/src/lib/formats/hect_dsk.h
@@ -7,9 +7,10 @@
Hector disk images
*********************************************************************/
+#ifndef MAME_FORMATS_HECT_DSK_H
+#define MAME_FORMATS_HECT_DSK_H
-#ifndef HECT_DSK_H
-#define HECT_DSK_H
+#pragma once
#include "flopimg.h"
@@ -18,4 +19,5 @@
LEGACY_FLOPPY_OPTIONS_EXTERN(hector_disc2);
LEGACY_FLOPPY_OPTIONS_EXTERN(hector_minidisc);
-#endif /* HECT_DSK_H */
+
+#endif // MAME_FORMATS_HECT_DSK_H
diff --git a/src/lib/formats/hect_tap.h b/src/lib/formats/hect_tap.h
index 67e0a0b2bd1..9058053f2a1 100644
--- a/src/lib/formats/hect_tap.h
+++ b/src/lib/formats/hect_tap.h
@@ -7,12 +7,13 @@
Format code for Micronique cassette files
*********************************************************************/
+#ifndef MAME_FORMATS_HECT_TAP_H
+#define MAME_FORMATS_HECT_TAP_H
-#ifndef HECT_TAP_H
-#define HECT_TAP_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(hector_cassette_formats);
-#endif /* HECT_TAP_H */
+#endif // MAME_FORMATS_HECT_TAP_H
diff --git a/src/lib/formats/hector_minidisc.h b/src/lib/formats/hector_minidisc.h
index 54162508dd8..a47fbea49d8 100644
--- a/src/lib/formats/hector_minidisc.h
+++ b/src/lib/formats/hector_minidisc.h
@@ -7,12 +7,11 @@
Disk image format
***************************************************************************/
+#ifndef MAME_FORMATS_HECTOR_MINIDISC_H
+#define MAME_FORMATS_HECTOR_MINIDISC_H
#pragma once
-#ifndef __HMD_DSK_H__
-#define __HMD_DSK_H__
-
#include "upd765_dsk.h"
class hmd_format : public upd765_format
@@ -30,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_HMD_FORMAT;
-#endif // __HMD_DSK_H__
+#endif // MAME_FORMATS_HECTOR_MINIDISC_H
diff --git a/src/lib/formats/hp_ipc_dsk.h b/src/lib/formats/hp_ipc_dsk.h
index ebe7b808598..9643b853230 100644
--- a/src/lib/formats/hp_ipc_dsk.h
+++ b/src/lib/formats/hp_ipc_dsk.h
@@ -7,13 +7,15 @@
hp_ipc format
*********************************************************************/
+#ifndef MAME_FORMATS_HP_IPC_DSK_H
+#define MAME_FORMATS_HP_IPC_DSK_H
-#ifndef HP_IPC_DSK_H_
-#define HP_IPC_DSK_H_
+#pragma once
#include "wd177x_dsk.h"
-class hp_ipc_format : public wd177x_format {
+class hp_ipc_format : public wd177x_format
+{
public:
hp_ipc_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_HP_IPC_FORMAT;
-#endif
+#endif // MAME_FORMATS_HP_IPC_DSK_H
diff --git a/src/lib/formats/hpi_dsk.h b/src/lib/formats/hpi_dsk.h
index 287f37fd302..565a22dea58 100644
--- a/src/lib/formats/hpi_dsk.h
+++ b/src/lib/formats/hpi_dsk.h
@@ -7,14 +7,16 @@
"HPI" disk format
*********************************************************************/
+#ifndef MAME_FORMATS_HPI_DSK_H
+#define MAME_FORMATS_HPI_DSK_H
#pragma once
-#ifndef _HPI_DSK_H_
-#define _HPI_DSK_H_
-
#include "flopimg.h"
+#include <array>
+#include <vector>
+
// Geometry constants
constexpr unsigned HPI_TRACKS = 77;
constexpr unsigned HPI_HEADS = 2;
@@ -53,4 +55,4 @@ private:
extern const floppy_format_type FLOPPY_HPI_FORMAT;
-#endif /* _HPI_DSK_H_ */
+#endif // MAME_FORMATS_HPI_DSK_H
diff --git a/src/lib/formats/hti_tape.cpp b/src/lib/formats/hti_tape.cpp
index f046ea0c130..64fec17ec08 100644
--- a/src/lib/formats/hti_tape.cpp
+++ b/src/lib/formats/hti_tape.cpp
@@ -7,8 +7,10 @@
*********************************************************************/
#include "hti_tape.h"
+
#include "imageutl.h"
+
static constexpr uint32_t FILE_MAGIC = 0x5441434f; // Magic value at start of image file: "TACO"
// *** Position of tape holes ***
diff --git a/src/lib/formats/hti_tape.h b/src/lib/formats/hti_tape.h
index 4c5e5ed3279..93a8cbac43e 100644
--- a/src/lib/formats/hti_tape.h
+++ b/src/lib/formats/hti_tape.h
@@ -8,16 +8,17 @@
and HP 85 systems.
*********************************************************************/
-
-#ifndef _HTI_TAPE_H_
-#define _HTI_TAPE_H_
+#ifndef MAME_FORMATS_HTI_TAPE_H
+#define MAME_FORMATS_HTI_TAPE_H
#pragma once
-#include <map>
#include "ioprocs.h"
-class hti_format_t {
+#include <map>
+
+class hti_format_t
+{
public:
hti_format_t();
@@ -73,17 +74,19 @@ public:
// Return position of next data word in a given direction
bool next_data(unsigned track_no , tape_pos_t pos , bool forward , bool inclusive , track_iterator_t& it);
- typedef enum {
+ enum adv_res_t
+ {
ADV_NO_MORE_DATA,
ADV_CONT_DATA,
ADV_DISCONT_DATA
- } adv_res_t;
+ };
// Advance an iterator to next word of data
adv_res_t adv_it(unsigned track_no , bool forward , track_iterator_t& it);
// Scan for beginning of next gap in a given direction
bool next_gap(unsigned track_no , tape_pos_t& pos , bool forward , tape_pos_t min_gap);
+
private:
// Content of tape tracks
tape_track_t m_tracks[ 2 ];
@@ -96,4 +99,4 @@ private:
static void ensure_a_lt_b(tape_pos_t& a , tape_pos_t& b);
};
-#endif /* _HTI_TAPE_H_ */
+#endif // MAME_FORMATS_HTI_TAPE_H
diff --git a/src/lib/formats/hxchfe_dsk.cpp b/src/lib/formats/hxchfe_dsk.cpp
index 57990c606d6..3e972463c93 100644
--- a/src/lib/formats/hxchfe_dsk.cpp
+++ b/src/lib/formats/hxchfe_dsk.cpp
@@ -101,6 +101,8 @@
#include "hxchfe_dsk.h"
+#define HFE_FORMAT_HEADER "HXCPICFE"
+
#define HEADER_LENGTH 512
#define TRACK_TABLE_LENGTH 1024
diff --git a/src/lib/formats/hxchfe_dsk.h b/src/lib/formats/hxchfe_dsk.h
index af4652ca9bf..75dd4c3c371 100644
--- a/src/lib/formats/hxchfe_dsk.h
+++ b/src/lib/formats/hxchfe_dsk.h
@@ -7,45 +7,44 @@
HxC Floppy Emulator HFE file format
*********************************************************************/
+#ifndef MAME_FORMATS_HXCHFE_DSK_H
+#define MAME_FORMATS_HXCHFE_DSK_H
-#ifndef HXCHFE_DSK_H
-#define HXCHFE_DSK_H
+#pragma once
#include "flopimg.h"
-#define HFE_FORMAT_HEADER "HXCPICFE"
-
-enum encoding_t
-{
- ISOIBM_MFM_ENCODING = 0x00,
- AMIGA_MFM_ENCODING,
- ISOIBM_FM_ENCODING,
- EMU_FM_ENCODING,
- UNKNOWN_ENCODING = 0xff
-};
-
-enum floppymode_t
-{
- IBMPC_DD_FLOPPYMODE = 00,
- IBMPC_HD_FLOPPYMODE,
- ATARIST_DD_FLOPPYMODE,
- ATARIST_HD_FLOPPYMODE,
- AMIGA_DD_FLOPPYMODE,
- AMIGA_HD_FLOPPYMODE,
- CPC_DD_FLOPPYMODE,
- GENERIC_SHUGART_DD_FLOPPYMODE,
- IBMPC_ED_FLOPPYMODE,
- MSX2_DD_FLOPPYMODE,
- C64_DD_FLOPPYMODE,
- EMU_SHUGART_FLOPPYMODE,
- S950_DD_FLOPPYMODE,
- S950_HD_FLOPPYMODE,
- DISABLE_FLOPPYMODE = 0xfe
-};
-
class hfe_format : public floppy_image_format_t
{
public:
+ enum encoding_t
+ {
+ ISOIBM_MFM_ENCODING = 0x00,
+ AMIGA_MFM_ENCODING,
+ ISOIBM_FM_ENCODING,
+ EMU_FM_ENCODING,
+ UNKNOWN_ENCODING = 0xff
+ };
+
+ enum floppymode_t
+ {
+ IBMPC_DD_FLOPPYMODE = 00,
+ IBMPC_HD_FLOPPYMODE,
+ ATARIST_DD_FLOPPYMODE,
+ ATARIST_HD_FLOPPYMODE,
+ AMIGA_DD_FLOPPYMODE,
+ AMIGA_HD_FLOPPYMODE,
+ CPC_DD_FLOPPYMODE,
+ GENERIC_SHUGART_DD_FLOPPYMODE,
+ IBMPC_ED_FLOPPYMODE,
+ MSX2_DD_FLOPPYMODE,
+ C64_DD_FLOPPYMODE,
+ EMU_SHUGART_FLOPPYMODE,
+ S950_DD_FLOPPYMODE,
+ S950_HD_FLOPPYMODE,
+ DISABLE_FLOPPYMODE = 0xfe
+ };
+
hfe_format();
virtual int identify(io_generic *io, uint32_t form_factor) override;
@@ -88,4 +87,4 @@ private:
extern const floppy_format_type FLOPPY_HFE_FORMAT;
-#endif /* HXCHFE_DSK_H */
+#endif // MAME_FORMATS_HXCHFE_DSK_H
diff --git a/src/lib/formats/hxcmfm_dsk.h b/src/lib/formats/hxcmfm_dsk.h
index eb2f8ae245b..6616794f1ed 100644
--- a/src/lib/formats/hxcmfm_dsk.h
+++ b/src/lib/formats/hxcmfm_dsk.h
@@ -7,9 +7,10 @@
HxC Floppy Emulator disk images
*********************************************************************/
+#ifndef MAME_FORMATS_HXCMFM_DSK_H
+#define MAME_FORMATS_HXCMFM_DSK_H
-#ifndef HXCMFM_DSK_H
-#define HXCMFM_DSK_H
+#pragma once
#include "flopimg.h"
@@ -30,4 +31,4 @@ public:
extern const floppy_format_type FLOPPY_MFM_FORMAT;
-#endif /* HXCMFM_DSK_H */
+#endif // MAME_FORMATS_HXCMFM_DSK_H
diff --git a/src/lib/formats/imageutl.h b/src/lib/formats/imageutl.h
index 67359d312b2..f04624a46db 100644
--- a/src/lib/formats/imageutl.h
+++ b/src/lib/formats/imageutl.h
@@ -7,12 +7,11 @@
Image related utilities
***************************************************************************/
+#ifndef MAME_FORMATS_IMAGEUTL_H
+#define MAME_FORMATS_IMAGEUTL_H
#pragma once
-#ifndef __IMAGEUTL_H__
-#define __IMAGEUTL_H__
-
#include "osdcore.h"
/* -----------------------------------------------------------------------
@@ -25,102 +24,102 @@ unsigned short ccitt_crc16_one( unsigned short crc, const unsigned char data );
* Alignment-friendly integer placement
* ----------------------------------------------------------------------- */
-static inline void place_integer_be(void *ptr, size_t offset, size_t size, uint64_t value)
+inline void place_integer_be(void *ptr, size_t offset, size_t size, uint64_t value)
{
uint8_t *byte_ptr = ((uint8_t *) ptr) + offset;
uint16_t val16;
uint32_t val32;
- switch(size)
+ switch (size)
{
- case 2:
- val16 = big_endianize_int16((uint16_t) value);
- memcpy(byte_ptr, &val16, sizeof(val16));
- break;
-
- case 4:
- val32 = big_endianize_int32((uint32_t) value);
- memcpy(byte_ptr, &val32, sizeof(val32));
- break;
-
- default:
- if (size >= 1) byte_ptr[0] = (uint8_t) (value >> ((size - 1) * 8));
- if (size >= 2) byte_ptr[1] = (uint8_t) (value >> ((size - 2) * 8));
- if (size >= 3) byte_ptr[2] = (uint8_t) (value >> ((size - 3) * 8));
- if (size >= 4) byte_ptr[3] = (uint8_t) (value >> ((size - 4) * 8));
- if (size >= 5) byte_ptr[4] = (uint8_t) (value >> ((size - 5) * 8));
- if (size >= 6) byte_ptr[5] = (uint8_t) (value >> ((size - 6) * 8));
- if (size >= 7) byte_ptr[6] = (uint8_t) (value >> ((size - 7) * 8));
- if (size >= 8) byte_ptr[7] = (uint8_t) (value >> ((size - 8) * 8));
- break;
+ case 2:
+ val16 = big_endianize_int16((uint16_t) value);
+ memcpy(byte_ptr, &val16, sizeof(val16));
+ break;
+
+ case 4:
+ val32 = big_endianize_int32((uint32_t) value);
+ memcpy(byte_ptr, &val32, sizeof(val32));
+ break;
+
+ default:
+ if (size >= 1) byte_ptr[0] = (uint8_t) (value >> ((size - 1) * 8));
+ if (size >= 2) byte_ptr[1] = (uint8_t) (value >> ((size - 2) * 8));
+ if (size >= 3) byte_ptr[2] = (uint8_t) (value >> ((size - 3) * 8));
+ if (size >= 4) byte_ptr[3] = (uint8_t) (value >> ((size - 4) * 8));
+ if (size >= 5) byte_ptr[4] = (uint8_t) (value >> ((size - 5) * 8));
+ if (size >= 6) byte_ptr[5] = (uint8_t) (value >> ((size - 6) * 8));
+ if (size >= 7) byte_ptr[6] = (uint8_t) (value >> ((size - 7) * 8));
+ if (size >= 8) byte_ptr[7] = (uint8_t) (value >> ((size - 8) * 8));
+ break;
}
}
-static inline uint64_t pick_integer_be(const void *ptr, size_t offset, size_t size)
+inline uint64_t pick_integer_be(const void *ptr, size_t offset, size_t size)
{
uint64_t result = 0;
const uint8_t *byte_ptr = ((const uint8_t *) ptr) + offset;
uint16_t val16;
uint32_t val32;
- switch(size)
+ switch (size)
{
- case 1:
- result = *byte_ptr;
- break;
-
- case 2:
- memcpy(&val16, byte_ptr, sizeof(val16));
- result = big_endianize_int16(val16);
- break;
-
- case 4:
- memcpy(&val32, byte_ptr, sizeof(val32));
- result = big_endianize_int32(val32);
- break;
-
- default:
- if (size >= 1) result |= ((uint64_t) byte_ptr[0]) << ((size - 1) * 8);
- if (size >= 2) result |= ((uint64_t) byte_ptr[1]) << ((size - 2) * 8);
- if (size >= 3) result |= ((uint64_t) byte_ptr[2]) << ((size - 3) * 8);
- if (size >= 4) result |= ((uint64_t) byte_ptr[3]) << ((size - 4) * 8);
- if (size >= 5) result |= ((uint64_t) byte_ptr[4]) << ((size - 5) * 8);
- if (size >= 6) result |= ((uint64_t) byte_ptr[5]) << ((size - 6) * 8);
- if (size >= 7) result |= ((uint64_t) byte_ptr[6]) << ((size - 7) * 8);
- if (size >= 8) result |= ((uint64_t) byte_ptr[7]) << ((size - 8) * 8);
- break;
+ case 1:
+ result = *byte_ptr;
+ break;
+
+ case 2:
+ memcpy(&val16, byte_ptr, sizeof(val16));
+ result = big_endianize_int16(val16);
+ break;
+
+ case 4:
+ memcpy(&val32, byte_ptr, sizeof(val32));
+ result = big_endianize_int32(val32);
+ break;
+
+ default:
+ if (size >= 1) result |= ((uint64_t) byte_ptr[0]) << ((size - 1) * 8);
+ if (size >= 2) result |= ((uint64_t) byte_ptr[1]) << ((size - 2) * 8);
+ if (size >= 3) result |= ((uint64_t) byte_ptr[2]) << ((size - 3) * 8);
+ if (size >= 4) result |= ((uint64_t) byte_ptr[3]) << ((size - 4) * 8);
+ if (size >= 5) result |= ((uint64_t) byte_ptr[4]) << ((size - 5) * 8);
+ if (size >= 6) result |= ((uint64_t) byte_ptr[5]) << ((size - 6) * 8);
+ if (size >= 7) result |= ((uint64_t) byte_ptr[6]) << ((size - 7) * 8);
+ if (size >= 8) result |= ((uint64_t) byte_ptr[7]) << ((size - 8) * 8);
+ break;
}
return result;
}
-static inline void place_integer_le(void *ptr, size_t offset, size_t size, uint64_t value)
+inline void place_integer_le(void *ptr, size_t offset, size_t size, uint64_t value)
{
uint8_t *byte_ptr = ((uint8_t *) ptr) + offset;
uint16_t val16;
uint32_t val32;
- switch(size)
+ switch (size)
{
- case 2:
- val16 = little_endianize_int16((uint16_t) value);
- memcpy(byte_ptr, &val16, sizeof(val16));
- break;
-
- case 4:
- val32 = little_endianize_int32((uint32_t) value);
- memcpy(byte_ptr, &val32, sizeof(val32));
- break;
-
- default:
- if (size >= 1) byte_ptr[0] = (uint8_t) (value >> (0 * 8));
- if (size >= 2) byte_ptr[1] = (uint8_t) (value >> (1 * 8));
- if (size >= 3) byte_ptr[2] = (uint8_t) (value >> (2 * 8));
- if (size >= 4) byte_ptr[3] = (uint8_t) (value >> (3 * 8));
- if (size >= 5) byte_ptr[4] = (uint8_t) (value >> (4 * 8));
- if (size >= 6) byte_ptr[5] = (uint8_t) (value >> (5 * 8));
- if (size >= 7) byte_ptr[6] = (uint8_t) (value >> (6 * 8));
- if (size >= 8) byte_ptr[7] = (uint8_t) (value >> (7 * 8));
- break;
+ case 2:
+ val16 = little_endianize_int16((uint16_t) value);
+ memcpy(byte_ptr, &val16, sizeof(val16));
+ break;
+
+ case 4:
+ val32 = little_endianize_int32((uint32_t) value);
+ memcpy(byte_ptr, &val32, sizeof(val32));
+ break;
+
+ default:
+ if (size >= 1) byte_ptr[0] = (uint8_t) (value >> (0 * 8));
+ if (size >= 2) byte_ptr[1] = (uint8_t) (value >> (1 * 8));
+ if (size >= 3) byte_ptr[2] = (uint8_t) (value >> (2 * 8));
+ if (size >= 4) byte_ptr[3] = (uint8_t) (value >> (3 * 8));
+ if (size >= 5) byte_ptr[4] = (uint8_t) (value >> (4 * 8));
+ if (size >= 6) byte_ptr[5] = (uint8_t) (value >> (5 * 8));
+ if (size >= 7) byte_ptr[6] = (uint8_t) (value >> (6 * 8));
+ if (size >= 8) byte_ptr[7] = (uint8_t) (value >> (7 * 8));
+ break;
}
}
@@ -131,32 +130,32 @@ static inline uint64_t pick_integer_le(const void *ptr, size_t offset, size_t si
uint16_t val16;
uint32_t val32;
- switch(size)
+ switch (size)
{
- case 1:
- result = *byte_ptr;
- break;
-
- case 2:
- memcpy(&val16, byte_ptr, sizeof(val16));
- result = little_endianize_int16(val16);
- break;
-
- case 4:
- memcpy(&val32, byte_ptr, sizeof(val32));
- result = little_endianize_int32(val32);
- break;
-
- default:
- if (size >= 1) result |= ((uint64_t) byte_ptr[0]) << (0 * 8);
- if (size >= 2) result |= ((uint64_t) byte_ptr[1]) << (1 * 8);
- if (size >= 3) result |= ((uint64_t) byte_ptr[2]) << (2 * 8);
- if (size >= 4) result |= ((uint64_t) byte_ptr[3]) << (3 * 8);
- if (size >= 5) result |= ((uint64_t) byte_ptr[4]) << (4 * 8);
- if (size >= 6) result |= ((uint64_t) byte_ptr[5]) << (5 * 8);
- if (size >= 7) result |= ((uint64_t) byte_ptr[6]) << (6 * 8);
- if (size >= 8) result |= ((uint64_t) byte_ptr[7]) << (7 * 8);
- break;
+ case 1:
+ result = *byte_ptr;
+ break;
+
+ case 2:
+ memcpy(&val16, byte_ptr, sizeof(val16));
+ result = little_endianize_int16(val16);
+ break;
+
+ case 4:
+ memcpy(&val32, byte_ptr, sizeof(val32));
+ result = little_endianize_int32(val32);
+ break;
+
+ default:
+ if (size >= 1) result |= ((uint64_t) byte_ptr[0]) << (0 * 8);
+ if (size >= 2) result |= ((uint64_t) byte_ptr[1]) << (1 * 8);
+ if (size >= 3) result |= ((uint64_t) byte_ptr[2]) << (2 * 8);
+ if (size >= 4) result |= ((uint64_t) byte_ptr[3]) << (3 * 8);
+ if (size >= 5) result |= ((uint64_t) byte_ptr[4]) << (4 * 8);
+ if (size >= 6) result |= ((uint64_t) byte_ptr[5]) << (5 * 8);
+ if (size >= 7) result |= ((uint64_t) byte_ptr[6]) << (6 * 8);
+ if (size >= 8) result |= ((uint64_t) byte_ptr[7]) << (7 * 8);
+ break;
}
return result;
}
@@ -175,4 +174,4 @@ int compute_log2(int val);
bool image_find_extension(const char *extensions, const char *ext);
void image_specify_extension(char *buffer, size_t buffer_len, const char *extension);
-#endif /* __IMAGEUTL_H__ */
+#endif // MAME_FORMATS_IMAGEUTL_H
diff --git a/src/lib/formats/imd_dsk.h b/src/lib/formats/imd_dsk.h
index 306fd544c7e..39e43329969 100644
--- a/src/lib/formats/imd_dsk.h
+++ b/src/lib/formats/imd_dsk.h
@@ -7,9 +7,8 @@
IMD disk images
*********************************************************************/
-
-#ifndef IMD_DSK_H
-#define IMD_DSK_H
+#ifndef MAME_FORMATS_IMD_DSK_H
+#define MAME_FORMATS_IMD_DSK_H
#include "flopimg.h"
@@ -33,4 +32,4 @@ private:
extern const floppy_format_type FLOPPY_IMD_FORMAT;
-#endif /* IMD_DSK_H */
+#endif // MAME_FORMATS_IMD_DSK_H
diff --git a/src/lib/formats/ioprocs.h b/src/lib/formats/ioprocs.h
index ac032d5e1f3..c569e52dd2b 100644
--- a/src/lib/formats/ioprocs.h
+++ b/src/lib/formats/ioprocs.h
@@ -7,10 +7,12 @@
File IO abstraction layer
*********************************************************************/
+#ifndef MAME_FORMATS_IOPROCS_H
+#define MAME_FORMATS_IOPROCS_H
-#ifndef IOPROCS_H
-#define IOPROCS_H
+#pragma once
+#include <stdint.h>
#include <stdlib.h>
@@ -59,14 +61,10 @@ extern const struct io_procs corefile_ioprocs_noclose;
***************************************************************************/
-
-
void io_generic_close(struct io_generic *genio);
void io_generic_read(struct io_generic *genio, void *buffer, uint64_t offset, size_t length);
void io_generic_write(struct io_generic *genio, const void *buffer, uint64_t offset, size_t length);
void io_generic_write_filler(struct io_generic *genio, uint8_t filler, uint64_t offset, size_t length);
uint64_t io_generic_size(struct io_generic *genio);
-
-
-#endif /* IOPROCS_H */
+#endif // MAME_FORMATS_IOPROCS_H
diff --git a/src/lib/formats/ipf_dsk.h b/src/lib/formats/ipf_dsk.h
index d4f5fcb6ac5..7db2415afd4 100644
--- a/src/lib/formats/ipf_dsk.h
+++ b/src/lib/formats/ipf_dsk.h
@@ -1,10 +1,14 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef IPF_DSK_H_
-#define IPF_DSK_H_
+#ifndef MAME_FORMATS_IPF_DSK_H
+#define MAME_FORMATS_IPF_DSK_H
+
+#pragma once
#include "flopimg.h"
+#include <vector>
+
class ipf_format : public floppy_image_format_t
{
public:
@@ -86,4 +90,4 @@ private:
extern const floppy_format_type FLOPPY_IPF_FORMAT;
-#endif /*IPF_DSK_H_*/
+#endif // MAME_FORMATS_IPF_DSK_H
diff --git a/src/lib/formats/iq151_dsk.h b/src/lib/formats/iq151_dsk.h
index 472cbaf64f9..8ad1253d113 100644
--- a/src/lib/formats/iq151_dsk.h
+++ b/src/lib/formats/iq151_dsk.h
@@ -7,13 +7,15 @@
iq151 format
*********************************************************************/
+#ifndef MAME_FORMATS_IQ151_DSK_H
+#define MAME_FORMATS_IQ151_DSK_H
-#ifndef IQ151_DSK_H_
-#define IQ151_DSK_H_
+#pragma once
#include "upd765_dsk.h"
-class iq151_format : public upd765_format {
+class iq151_format : public upd765_format
+{
public:
iq151_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_IQ151_FORMAT;
-#endif
+#endif // MAME_FORMATS_IQ151_DSK_H
diff --git a/src/lib/formats/itt3030_dsk.h b/src/lib/formats/itt3030_dsk.h
index 49ee5ed95b3..7239f2619b7 100644
--- a/src/lib/formats/itt3030_dsk.h
+++ b/src/lib/formats/itt3030_dsk.h
@@ -7,13 +7,15 @@
ITT3030 disk image format
*********************************************************************/
+#ifndef MAME_FORMATS_ITT3030_DSK_H
+#define MAME_FORMATS_ITT3030_DSK_H
-#ifndef ITT3030_DSK_H_
-#define ITT3030_DSK_H_
+#pragma once
#include "wd177x_dsk.h"
-class itt3030_format : public wd177x_format {
+class itt3030_format : public wd177x_format
+{
public:
itt3030_format();
@@ -28,4 +30,4 @@ private:
extern const floppy_format_type FLOPPY_ITT3030_FORMAT;
-#endif
+#endif // MAME_FORMATS_ITT3030_DSK_H
diff --git a/src/lib/formats/jfd_dsk.h b/src/lib/formats/jfd_dsk.h
index 38374bfb97c..50db9f9caa5 100644
--- a/src/lib/formats/jfd_dsk.h
+++ b/src/lib/formats/jfd_dsk.h
@@ -7,13 +7,15 @@
JASPP Floppy Disk image format
*********************************************************************/
+#ifndef MAME_FORMATS_JFD_DSK_H
+#define MAME_FORMATS_JFD_DSK_H
-#ifndef JFD_DSK_H_
-#define JFD_DSK_H_
+#pragma once
#include "flopimg.h"
-class jfd_format : public floppy_image_format_t {
+class jfd_format : public floppy_image_format_t
+{
public:
jfd_format();
@@ -28,4 +30,4 @@ public:
extern const floppy_format_type FLOPPY_JFD_FORMAT;
-#endif
+#endif // MAME_FORMATS_JFD_DSK_H
diff --git a/src/lib/formats/jvc_dsk.h b/src/lib/formats/jvc_dsk.h
index bb74fbf8ac4..cbf1f341cde 100644
--- a/src/lib/formats/jvc_dsk.h
+++ b/src/lib/formats/jvc_dsk.h
@@ -9,12 +9,11 @@
Named after its creator, Jeff Vavasour
***************************************************************************/
+#ifndef MAME_FORMATS_JVC_DSK_H
+#define MAME_FORMATS_JVC_DSK_H
#pragma once
-#ifndef __JVC_DSK_H__
-#define __JVC_DSK_H__
-
#include "flopimg.h"
class jvc_format : public floppy_image_format_t
@@ -47,4 +46,4 @@ private:
extern const floppy_format_type FLOPPY_JVC_FORMAT;
-#endif // __JVC_DSK_H__
+#endif // MAME_FORMATS_JVC_DSK_H
diff --git a/src/lib/formats/kaypro_dsk.h b/src/lib/formats/kaypro_dsk.h
index f65b410bcc8..462873781b4 100644
--- a/src/lib/formats/kaypro_dsk.h
+++ b/src/lib/formats/kaypro_dsk.h
@@ -7,9 +7,10 @@
Kaypro disk image format
*********************************************************************/
+#ifndef MAME_FORMATS_KAYPRO_DSK_H
+#define MAME_FORMATS_KAYPRO_DSK_H
-#ifndef KAYPRO_DSK_H_
-#define KAYPRO_DSK_H_
+#pragma once
#include "upd765_dsk.h"
@@ -39,4 +40,4 @@ private:
extern const floppy_format_type FLOPPY_KAYPROII_FORMAT;
extern const floppy_format_type FLOPPY_KAYPRO2X_FORMAT;
-#endif
+#endif // MAME_FORMATS_KAYPRO_DSK_H
diff --git a/src/lib/formats/kc85_dsk.h b/src/lib/formats/kc85_dsk.h
index c941a9e7647..b28ab1e6d98 100644
--- a/src/lib/formats/kc85_dsk.h
+++ b/src/lib/formats/kc85_dsk.h
@@ -7,9 +7,10 @@
kc85 format
*********************************************************************/
+#ifndef MAME_FORMATS_KC85_DSK_H
+#define MAME_FORMATS_KC85_DSK_H
-#ifndef KC85_DSK_H_
-#define KC85_DSK_H_
+#pragma once
#include "upd765_dsk.h"
@@ -27,4 +28,4 @@ private:
extern const floppy_format_type FLOPPY_KC85_FORMAT;
-#endif
+#endif // MAME_FORMATS_KC85_DSK_H
diff --git a/src/lib/formats/kc_cas.h b/src/lib/formats/kc_cas.h
index 52c578ce35e..8144fb6eac8 100644
--- a/src/lib/formats/kc_cas.h
+++ b/src/lib/formats/kc_cas.h
@@ -5,12 +5,13 @@
kc_cas.h
*********************************************************************/
+#ifndef MAME_FORMATS_KC_CAS_H
+#define MAME_FORMATS_KC_CAS_H
-#ifndef KC_CAS_H
-#define KC_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(kc_cassette_formats);
-#endif /* KC_CAS_H */
+#endif // MAME_FORMATS_KC_CAS_H
diff --git a/src/lib/formats/kim1_cas.h b/src/lib/formats/kim1_cas.h
index f8d4f0e0c83..7d0923fc324 100644
--- a/src/lib/formats/kim1_cas.h
+++ b/src/lib/formats/kim1_cas.h
@@ -7,12 +7,13 @@
Format code for KIM-1 cassette files.
*********************************************************************/
+#ifndef MAME_FORMATS_KIM1_CAS_H
+#define MAME_FORMATS_KIM1_CAS_H
-#ifndef __KIM1_CAS_H
-#define __KIM1_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(kim1_cassette_formats);
-#endif /* __KIM1_CAS_H */
+#endif // MAME_FORMATS_KIM1_CAS_H
diff --git a/src/lib/formats/lviv_lvt.h b/src/lib/formats/lviv_lvt.h
index e34e3eb207c..341ca801791 100644
--- a/src/lib/formats/lviv_lvt.h
+++ b/src/lib/formats/lviv_lvt.h
@@ -7,12 +7,13 @@
Format code for Lviv cassette files
*********************************************************************/
+#ifndef MAME_FORMATS_LVIV_LVT_H
+#define MAME_FORMATS_LVIV_LVT_H
-#ifndef LVIV_LVT_H
-#define LVIV_LVT_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(lviv_lvt_format);
-#endif /* LVIV_LVT_H */
+#endif // MAME_FORMATS_LVIV_LVT_H
diff --git a/src/lib/formats/m20_dsk.h b/src/lib/formats/m20_dsk.h
index 231728d6164..fe06d75df22 100644
--- a/src/lib/formats/m20_dsk.h
+++ b/src/lib/formats/m20_dsk.h
@@ -7,9 +7,10 @@
Olivetti M20 floppy-disk images
*********************************************************************/
+#ifndef MAME_FORMATS_M20_DSK_H
+#define MAME_FORMATS_M20_DSK_H
-#ifndef M20_DSK_H
-#define M20_DSK_H
+#pragma once
#include "flopimg.h"
@@ -29,4 +30,4 @@ public:
extern const floppy_format_type FLOPPY_M20_FORMAT;
-#endif /* M20_DSK_H */
+#endif // MAME_FORMATS_M20_DSK_H
diff --git a/src/lib/formats/m5_dsk.h b/src/lib/formats/m5_dsk.h
index 08350c61339..f26d96dffc7 100644
--- a/src/lib/formats/m5_dsk.h
+++ b/src/lib/formats/m5_dsk.h
@@ -7,9 +7,10 @@
sord m5 format
*********************************************************************/
+#ifndef MAME_FORMATS_M5_DSK_H
+#define MAME_FORMATS_M5_DSK_H
-#ifndef M5_DSK_H_
-#define M5_DSK_H_
+#pragma once
#include "upd765_dsk.h"
@@ -27,4 +28,4 @@ private:
extern const floppy_format_type FLOPPY_M5_FORMAT;
-#endif
+#endif // MAME_FORMATS_M5_DSK_H
diff --git a/src/lib/formats/mbee_cas.h b/src/lib/formats/mbee_cas.h
index ebca844c7ca..b1277a53b07 100644
--- a/src/lib/formats/mbee_cas.h
+++ b/src/lib/formats/mbee_cas.h
@@ -7,8 +7,13 @@
Format code for Microbee cassette images
*********************************************************************/
+#ifndef MAME_FORMATS_MBEE_CAS_H
+#define MAME_FORMATS_MBEE_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(mbee_cassette_formats);
+
+#endif // MAME_FORMATS_MBEE_CAS_H
diff --git a/src/lib/formats/mfi_dsk.h b/src/lib/formats/mfi_dsk.h
index e18920bd04d..7cb84e999f0 100644
--- a/src/lib/formats/mfi_dsk.h
+++ b/src/lib/formats/mfi_dsk.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef MFI_DSK_H
-#define MFI_DSK_H
+#ifndef MAME_FORMATS_MFI_DSK_H
+#define MAME_FORMATS_MFI_DSK_H
+
+#pragma once
#include "flopimg.h"
@@ -49,4 +51,4 @@ private:
extern const floppy_format_type FLOPPY_MFI_FORMAT;
-#endif /* MFI_DSK_H */
+#endif // MAME_FORMATS_MFI_DSK_H
diff --git a/src/lib/formats/mfm_hd.h b/src/lib/formats/mfm_hd.h
index cd069acebc0..7d28adc518d 100644
--- a/src/lib/formats/mfm_hd.h
+++ b/src/lib/formats/mfm_hd.h
@@ -10,9 +10,10 @@
February 2012: Rewritten as class
*****************************************************************************/
+#ifndef MAME_FORMATS_MFM_HD_H
+#define MAME_FORMATS_MFM_HD_H
-#ifndef __MFMHDFMT__
-#define __MFMHDFMT__
+#pragma once
#include "chd.h"
@@ -209,4 +210,4 @@ protected:
extern const mfmhd_format_type MFMHD_GEN_FORMAT;
-#endif
+#endif // MAME_FORMATS_MFM_HD_H
diff --git a/src/lib/formats/mm_dsk.h b/src/lib/formats/mm_dsk.h
index 84b29ab259f..aec52093076 100644
--- a/src/lib/formats/mm_dsk.h
+++ b/src/lib/formats/mm_dsk.h
@@ -7,9 +7,10 @@
MikroMikko formats
*********************************************************************/
+#ifndef MAME_FORMATS_MM_DSK_H
+#define MAME_FORMATS_MM_DSK_H
-#ifndef MM_DSK_H_
-#define MM_DSK_H_
+#pragma once
#include "upd765_dsk.h"
@@ -40,4 +41,4 @@ private:
extern const floppy_format_type FLOPPY_MM1_FORMAT;
extern const floppy_format_type FLOPPY_MM2_FORMAT;
-#endif
+#endif // MAME_FORMATS_MM_DSK_H
diff --git a/src/lib/formats/ms0515_dsk.h b/src/lib/formats/ms0515_dsk.h
index 9cd458d9f08..1b6dc2d1e77 100644
--- a/src/lib/formats/ms0515_dsk.h
+++ b/src/lib/formats/ms0515_dsk.h
@@ -7,13 +7,13 @@
ms0515 format
*********************************************************************/
-
-#ifndef MS0515_DSK_H_
-#define MS0515_DSK_H_
+#ifndef MAME_FORMATS_MS0515_DSK_H
+#define MAME_FORMATS_MS0515_DSK_H
#include "wd177x_dsk.h"
-class ms0515_format : public wd177x_format {
+class ms0515_format : public wd177x_format
+{
public:
ms0515_format();
@@ -27,4 +27,4 @@ private:
extern const floppy_format_type FLOPPY_MS0515_FORMAT;
-#endif
+#endif // MAME_FORMATS_MS0515_DSK_H
diff --git a/src/lib/formats/msx_dsk.h b/src/lib/formats/msx_dsk.h
index d776620624d..8b4b941fcf7 100644
--- a/src/lib/formats/msx_dsk.h
+++ b/src/lib/formats/msx_dsk.h
@@ -7,15 +7,17 @@
MSX disk images
*********************************************************************/
+#ifndef MAME_FORMATS_MSX_DSK_H
+#define MAME_FORMATS_MSX_DSK_H
-#ifndef MSX_DSK_H
-#define MSX_DSK_H
+#pragma once
//#include "wd177x_dsk.h"
#include "upd765_dsk.h"
//class msx_format : public wd177x_format {
-class msx_format: public upd765_format {
+class msx_format: public upd765_format
+{
public:
msx_format();
@@ -29,4 +31,4 @@ private:
extern const floppy_format_type FLOPPY_MSX_FORMAT;
-#endif /* MSX_DSK_H */
+#endif // MAME_FORMATS_MSX_DSK_H
diff --git a/src/lib/formats/mtx_dsk.h b/src/lib/formats/mtx_dsk.h
index 86f74bccfc5..2c1509af93d 100644
--- a/src/lib/formats/mtx_dsk.h
+++ b/src/lib/formats/mtx_dsk.h
@@ -7,12 +7,11 @@
Disk image format
***************************************************************************/
+#ifndef MAME_FORMATS_MTX_DSK_H
+#define MAME_FORMATS_MTX_DSK_H
#pragma once
-#ifndef __MTX_DSK_H__
-#define __MTX_DSK_H__
-
#include "wd177x_dsk.h"
class mtx_format : public wd177x_format
@@ -30,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_MTX_FORMAT;
-#endif // __MTX_DSK_H__
+#endif // MAME_FORMATS_MTX_DSK_H
diff --git a/src/lib/formats/mz_cas.h b/src/lib/formats/mz_cas.h
index f1010a111a9..c1256e5027d 100644
--- a/src/lib/formats/mz_cas.h
+++ b/src/lib/formats/mz_cas.h
@@ -7,12 +7,13 @@
Format code for MZ700 cassette files
*********************************************************************/
+#ifndef MAME_FORMATS_MZ_CAS_H
+#define MAME_FORMATS_MZ_CAS_H
-#ifndef MZ_CAS_H
-#define MZ_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(mz700_cassette_formats);
-#endif /* MZ_CAS_H */
+#endif // MAME_FORMATS_MZ_CAS_H
diff --git a/src/lib/formats/nanos_dsk.h b/src/lib/formats/nanos_dsk.h
index 5a638a0782a..444768fbb49 100644
--- a/src/lib/formats/nanos_dsk.h
+++ b/src/lib/formats/nanos_dsk.h
@@ -7,9 +7,10 @@
nanos format
*********************************************************************/
+#ifndef MAME_FORMATS_NANOS_DSK_H
+#define MAME_FORMATS_NANOS_DSK_H
-#ifndef NANOS_DSK_H_
-#define NANOS_DSK_H_
+#pragma once
#include "upd765_dsk.h"
@@ -27,4 +28,4 @@ private:
extern const floppy_format_type FLOPPY_NANOS_FORMAT;
-#endif
+#endif // MAME_FORMATS_NANOS_DSK_H
diff --git a/src/lib/formats/nascom_dsk.h b/src/lib/formats/nascom_dsk.h
index a1c3653cdac..297cdb536eb 100644
--- a/src/lib/formats/nascom_dsk.h
+++ b/src/lib/formats/nascom_dsk.h
@@ -7,12 +7,11 @@
Disk image format
***************************************************************************/
+#ifndef MAME_FORMATS_NASCOM_DSK_H
+#define MAME_FORMATS_NASCOM_DSK_H
#pragma once
-#ifndef __NASCOM_DSK_H__
-#define __NASCOM_DSK_H__
-
#include "wd177x_dsk.h"
class nascom_format : public wd177x_format
@@ -30,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_NASCOM_FORMAT;
-#endif // __NASCOM_DSK_H__
+#endif // MAME_FORMATS_NASCOM_DSK_H
diff --git a/src/lib/formats/naslite_dsk.h b/src/lib/formats/naslite_dsk.h
index 0a3df5535d5..1cad11e1137 100644
--- a/src/lib/formats/naslite_dsk.h
+++ b/src/lib/formats/naslite_dsk.h
@@ -7,13 +7,15 @@
NASLite 1.72MB with funky interleaving format
*********************************************************************/
+#ifndef MAME_FORMATS_NASLITE_DSK_H
+#define MAME_FORMATS_NASLITE_DSK_H
-#ifndef NASLITE_DSK_H_
-#define NASLITE_DSK_H_
+#pragma once
#include "upd765_dsk.h"
-class naslite_format : public upd765_format {
+class naslite_format : public upd765_format
+{
public:
naslite_format();
@@ -29,4 +31,4 @@ protected:
extern const floppy_format_type FLOPPY_NASLITE_FORMAT;
-#endif
+#endif // MAME_FORMATS_NASLITE_DSK_H
diff --git a/src/lib/formats/nes_dsk.h b/src/lib/formats/nes_dsk.h
index 1e56614e673..d222beb03f9 100644
--- a/src/lib/formats/nes_dsk.h
+++ b/src/lib/formats/nes_dsk.h
@@ -7,12 +7,13 @@
NES disk images
*********************************************************************/
+#ifndef MAME_FORMATS_NES_DSK_H
+#define MAME_FORMATS_NES_DSK_H
-#ifndef NES_DSK_H_
-#define NES_DSK_H_
+#pragma once
#include "flopimg.h"
LEGACY_FLOPPY_OPTIONS_EXTERN(nes_only);
-#endif /*NES_DSK_H_*/
+#endif // MAME_FORMATS_NES_DSK_H
diff --git a/src/lib/formats/nfd_dsk.h b/src/lib/formats/nfd_dsk.h
index 9721f23478d..56cf6cdb506 100644
--- a/src/lib/formats/nfd_dsk.h
+++ b/src/lib/formats/nfd_dsk.h
@@ -7,9 +7,10 @@
PC98 NFD disk images
*********************************************************************/
+#ifndef MAME_FORMATS_NFD_DSK_H
+#define MAME_FORMATS_NFD_DSK_H
-#ifndef NFD_DSK_H
-#define NFD_DSK_H
+#pragma once
#include "flopimg.h"
@@ -30,4 +31,4 @@ public:
extern const floppy_format_type FLOPPY_NFD_FORMAT;
-#endif /* NFD_DSK_H */
+#endif // MAME_FORMATS_NFD_DSK_H
diff --git a/src/lib/formats/opd_dsk.h b/src/lib/formats/opd_dsk.h
index 3eb018ca1dc..45e002092d6 100644
--- a/src/lib/formats/opd_dsk.h
+++ b/src/lib/formats/opd_dsk.h
@@ -7,12 +7,11 @@
Opus Discovery disk image formats
***************************************************************************/
+#ifndef MAME_FORMATS_OPD_DSK_H
+#define MAME_FORMATS_OPD_DSK_H
#pragma once
-#ifndef OPD_DSK_H
-#define OPD_DSK_H
-
#include "flopimg.h"
#include "wd177x_dsk.h"
@@ -35,4 +34,4 @@ private:
extern const floppy_format_type FLOPPY_OPD_FORMAT;
-#endif // OPD_DSK_H
+#endif // MAME_FORMATS_OPD_DSK_H
diff --git a/src/lib/formats/orao_cas.h b/src/lib/formats/orao_cas.h
index 588acd05f30..5a8d01e66e2 100644
--- a/src/lib/formats/orao_cas.h
+++ b/src/lib/formats/orao_cas.h
@@ -6,12 +6,13 @@
Format code for orao cassette files
*/
+#ifndef MAME_FORMATS_ORAO_CAS_H
+#define MAME_FORMATS_ORAO_CAS_H
-#ifndef ORAO_CAS_H
-#define ORAO_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(orao_cassette_formats);
-#endif /* ORAO_CAS_H */
+#endif // MAME_FORMATS_ORAO_CAS_H
diff --git a/src/lib/formats/oric_dsk.h b/src/lib/formats/oric_dsk.h
index 23125546931..5104273864b 100644
--- a/src/lib/formats/oric_dsk.h
+++ b/src/lib/formats/oric_dsk.h
@@ -7,9 +7,10 @@
Oric disk images
*********************************************************************/
+#ifndef MAME_FORMATS_ORIC_DSK_H
+#define MAME_FORMATS_ORIC_DSK_H
-#ifndef ORIC_DSK_H
-#define ORIC_DSK_H
+#pragma once
#include "flopimg.h"
@@ -29,4 +30,4 @@ public:
extern const floppy_format_type FLOPPY_ORIC_DSK_FORMAT;
-#endif /* ORIC_DSK_H */
+#endif // MAME_FORMATS_ORIC_DSK_H
diff --git a/src/lib/formats/oric_tap.h b/src/lib/formats/oric_tap.h
index d873495b220..5198c662775 100644
--- a/src/lib/formats/oric_tap.h
+++ b/src/lib/formats/oric_tap.h
@@ -7,12 +7,13 @@
Format code for Oric TAP (*.tap) files
*********************************************************************/
+#ifndef MAME_FORMATS_ORIC_TAP_H
+#define MAME_FORMATS_ORIC_TAP_H
-#ifndef ORIC_TAP_H
-#define ORIC_TAP_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(oric_cassette_formats);
-#endif /* ORIC_TAP_H */
+#endif // MAME_FORMATS_ORIC_TAP_H
diff --git a/src/lib/formats/p6001_cas.h b/src/lib/formats/p6001_cas.h
index fc7ba0af860..c8bcba4b1aa 100644
--- a/src/lib/formats/p6001_cas.h
+++ b/src/lib/formats/p6001_cas.h
@@ -3,12 +3,13 @@
/*
* NEC PC-6001 cassette format handling
*/
+#ifndef MAME_FORMATS_PC6001_CAS_H
+#define MAME_FORMATS_PC6001_CAS_H
-#ifndef PC6001_CAS_H_
-#define PC6001_CAS_H_
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN( pc6001_cassette_formats );
-#endif /*PC6001_CAS_H_*/
+#endif // MAME_FORMATS_PC6001_CAS_H
diff --git a/src/lib/formats/pasti_dsk.h b/src/lib/formats/pasti_dsk.h
index f1fc1a75aaa..a98baffcb90 100644
--- a/src/lib/formats/pasti_dsk.h
+++ b/src/lib/formats/pasti_dsk.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-#ifndef PASTI_DSK_H_
-#define PASTI_DSK_H_
+#ifndef MAME_FORMATS_PASTI_DSK_H
+#define MAME_FORMATS_PASTI_DSK_H
+
+#pragma once
#include "flopimg.h"
@@ -61,4 +63,4 @@ private:
extern const floppy_format_type FLOPPY_PASTI_FORMAT;
-#endif /*PASTI_DSK_H_*/
+#endif // MAME_FORMATS_PASTI_DSK_H
diff --git a/src/lib/formats/pc98_dsk.h b/src/lib/formats/pc98_dsk.h
index d948b19ddcc..f6c0fa2dc95 100644
--- a/src/lib/formats/pc98_dsk.h
+++ b/src/lib/formats/pc98_dsk.h
@@ -7,9 +7,10 @@
PC disk images
*********************************************************************/
+#ifndef MAME_FORMATS_PC98_DSK_H
+#define MAME_FORMATS_PC98_DSK_H
-#ifndef PC98_DSK_H
-#define PC98_DSK_H
+#pragma once
#include "flopimg.h"
#include "upd765_dsk.h"
@@ -32,4 +33,4 @@ private:
extern const floppy_format_type FLOPPY_PC98_FORMAT;
-#endif /* PC_DSK_H */
+#endif // MAME_FORMATS_PC98_DSK_H
diff --git a/src/lib/formats/pc98fdi_dsk.h b/src/lib/formats/pc98fdi_dsk.h
index 46503c81d9c..18c2d9edc7d 100644
--- a/src/lib/formats/pc98fdi_dsk.h
+++ b/src/lib/formats/pc98fdi_dsk.h
@@ -7,9 +7,10 @@
PC98FDI disk images
*********************************************************************/
+#ifndef MAME_FORMATS_PC98FDI_DSK_H
+#define MAME_FORMATS_PC98FDI_DSK_H
-#ifndef PC98FDI_DSK_H
-#define PC98FDI_DSK_H
+#pragma once
#include "flopimg.h"
@@ -30,4 +31,4 @@ public:
extern const floppy_format_type FLOPPY_PC98FDI_FORMAT;
-#endif /* PC98FDI_DSK_H */
+#endif // MAME_FORMATS_PC98FDI_DSK_H
diff --git a/src/lib/formats/pc_dsk.h b/src/lib/formats/pc_dsk.h
index 02b3aa2468b..b4080e1dcc7 100644
--- a/src/lib/formats/pc_dsk.h
+++ b/src/lib/formats/pc_dsk.h
@@ -7,9 +7,10 @@
PC disk images
*********************************************************************/
+#ifndef MAME_FORMATS_PC_DSK_H
+#define MAME_FORMATS_PC_DSK_H
-#ifndef PC_DSK_H
-#define PC_DSK_H
+#pragma once
#include "flopimg.h"
#include "upd765_dsk.h"
@@ -36,4 +37,4 @@ private:
extern const floppy_format_type FLOPPY_PC_FORMAT;
-#endif /* PC_DSK_H */
+#endif // MAME_FORMATS_PC_DSK_H
diff --git a/src/lib/formats/phc25_cas.h b/src/lib/formats/phc25_cas.h
index 82ee5e2f297..3883cb7536c 100644
--- a/src/lib/formats/phc25_cas.h
+++ b/src/lib/formats/phc25_cas.h
@@ -7,8 +7,13 @@
Format code for Sanyo PHC25 cassette images (phc format)
*********************************************************************/
+#ifndef MAME_FORMATS_PHC25_CAS_H
+#define MAME_FORMATS_PHC25_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(phc25_cassette_formats);
+
+#endif // MAME_FORMATS_PHC25_CAS_H
diff --git a/src/lib/formats/pk8020_dsk.h b/src/lib/formats/pk8020_dsk.h
index 7a9da57651a..f6a66a4f797 100644
--- a/src/lib/formats/pk8020_dsk.h
+++ b/src/lib/formats/pk8020_dsk.h
@@ -7,12 +7,11 @@
Disk image format
***************************************************************************/
+#ifndef MAME_FORMATS_PK8020_DSK_H
+#define MAME_FORMATS_PK8020_DSK_H
#pragma once
-#ifndef __PK8020_DSK_H__
-#define __PK8020_DSK_H__
-
#include "wd177x_dsk.h"
class pk8020_format : public wd177x_format
@@ -30,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_PK8020_FORMAT;
-#endif // __PK8020_DSK_H__
+#endif // MAME_FORMATS_PK8020_DSK_H
diff --git a/src/lib/formats/pmd_cas.h b/src/lib/formats/pmd_cas.h
index c2d8a749ef1..09546663845 100644
--- a/src/lib/formats/pmd_cas.h
+++ b/src/lib/formats/pmd_cas.h
@@ -7,12 +7,13 @@
Format code for PMD-85 cassette files
*********************************************************************/
+#ifndef MAME_FORMATS_PMD_CAS_H
+#define MAME_FORMATS_PMD_CAS_H
-#ifndef PMD_CAS_H
-#define PMD_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(pmd85_cassette_formats);
-#endif /* PMD_CAS_H */
+#endif // MAME_FORMATS_PMD_CAS_H
diff --git a/src/lib/formats/poly_dsk.h b/src/lib/formats/poly_dsk.h
index 3c7e96deef4..65b69c69270 100644
--- a/src/lib/formats/poly_dsk.h
+++ b/src/lib/formats/poly_dsk.h
@@ -5,9 +5,10 @@
Poly Disk image formats
***************************************************************************/
+#ifndef MAME_FORMATS_POLY_DSK_H
+#define MAME_FORMATS_POLY_DSK_H
-#ifndef POLY_DSK_H_
-#define POLY_DSK_H_
+#pragma once
#include "flopimg.h"
@@ -26,4 +27,4 @@ public:
extern const floppy_format_type FLOPPY_POLY_CPM_FORMAT;
-#endif /* POLY_DSK_H_ */
+#endif // MAME_FORMATS_POLY_DSK_H
diff --git a/src/lib/formats/ppg_dsk.h b/src/lib/formats/ppg_dsk.h
index 34416578566..2b610133e07 100644
--- a/src/lib/formats/ppg_dsk.h
+++ b/src/lib/formats/ppg_dsk.h
@@ -7,13 +7,15 @@
ppg format
*********************************************************************/
+#ifndef MAME_FORMATS_PPG_DSK_H
+#define MAME_FORMATS_PPG_DSK_H
-#ifndef PPG_DSK_H_
-#define PPG_DSK_H_
+#pragma once
#include "wd177x_dsk.h"
-class ppg_format : public wd177x_format {
+class ppg_format : public wd177x_format
+{
public:
ppg_format();
@@ -29,4 +31,4 @@ private:
extern const floppy_format_type FLOPPY_PPG_FORMAT;
-#endif
+#endif // MAME_FORMATS_PPG_DSK_H
diff --git a/src/lib/formats/primoptp.h b/src/lib/formats/primoptp.h
index d32343dddc6..6747cac07ad 100644
--- a/src/lib/formats/primoptp.h
+++ b/src/lib/formats/primoptp.h
@@ -7,12 +7,13 @@
Format code for Primo cassette files
*********************************************************************/
+#ifndef MAME_FORMATS_PRIMOPTP_H
+#define MAME_FORMATS_PRIMOPTP_H
-#ifndef PRIMOPTP_H
-#define PRIMOPTP_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN( primo_ptp_format );
-#endif /* PRIMOPTP_H */
+#endif // MAME_FORMATS_PRIMOPTP_H
diff --git a/src/lib/formats/pyldin_dsk.h b/src/lib/formats/pyldin_dsk.h
index 9ff5482e974..dcb9302e29a 100644
--- a/src/lib/formats/pyldin_dsk.h
+++ b/src/lib/formats/pyldin_dsk.h
@@ -7,13 +7,15 @@
pyldin format
*********************************************************************/
+#ifndef MAME_FORMATS_PYLDIN_DSK_H
+#define MAME_FORMATS_PYLDIN_DSK_H
-#ifndef PYLDIN_DSK_H_
-#define PYLDIN_DSK_H_
+#pragma once
#include "upd765_dsk.h"
-class pyldin_format : public upd765_format {
+class pyldin_format : public upd765_format
+{
public:
pyldin_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_PYLDIN_FORMAT;
-#endif
+#endif // MAME_FORMATS_PYLDIN_DSK_H
diff --git a/src/lib/formats/ql_dsk.h b/src/lib/formats/ql_dsk.h
index 96003df6984..6ed9f5ec64f 100644
--- a/src/lib/formats/ql_dsk.h
+++ b/src/lib/formats/ql_dsk.h
@@ -7,13 +7,15 @@
Sinclair QL disk image formats
*********************************************************************/
+#ifndef MAME_FORMATS_QL_DSK_H
+#define MAME_FORMATS_QL_DSK_H
-#ifndef QL_DSK_H_
-#define QL_DSK_H_
+#pragma once
#include "wd177x_dsk.h"
-class ql_format : public wd177x_format {
+class ql_format : public wd177x_format
+{
public:
ql_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_QL_FORMAT;
-#endif
+#endif // MAME_FORMATS_QL_DSK_H
diff --git a/src/lib/formats/rk_cas.h b/src/lib/formats/rk_cas.h
index c67b534033e..c0d5b75b38f 100644
--- a/src/lib/formats/rk_cas.h
+++ b/src/lib/formats/rk_cas.h
@@ -6,9 +6,10 @@
Format code for rk cassette files
*/
+#ifndef MAME_FORMATS_RK_CAS_H
+#define MAME_FORMATS_RK_CAS_H
-#ifndef RK_CAS_H
-#define RK_CAS_H
+#pragma once
#include "cassimg.h"
@@ -22,4 +23,4 @@ CASSETTE_FORMATLIST_EXTERN(rkm_cassette_formats);
CASSETTE_FORMATLIST_EXTERN(rkp_cassette_formats);
CASSETTE_FORMATLIST_EXTERN(gam_cassette_formats);
-#endif /* RK_CAS_H */
+#endif // MAME_FORMATS_RK_CAS_H
diff --git a/src/lib/formats/rx50_dsk.h b/src/lib/formats/rx50_dsk.h
index b6d40bceeb8..318e0d02902 100644
--- a/src/lib/formats/rx50_dsk.h
+++ b/src/lib/formats/rx50_dsk.h
@@ -11,9 +11,10 @@
based on lib/formats/esq16_dsk.h
*********************************************************************/
+#ifndef MAME_FORMATS_RX50_DSK_H
+#define MAME_FORMATS_RX50_DSK_H
-#ifndef RX50_DSK_H_
-#define RX50_DSK_H_
+#pragma once
#include "flopimg.h"
@@ -39,4 +40,4 @@ private:
extern const floppy_format_type FLOPPY_RX50IMG_FORMAT;
-#endif /* RX50_DSK_H_ */
+#endif // MAME_FORMATS_RX50_DSK_H
diff --git a/src/lib/formats/sc3000_bit.h b/src/lib/formats/sc3000_bit.h
index aed4b0c08f3..463f6b64d86 100644
--- a/src/lib/formats/sc3000_bit.h
+++ b/src/lib/formats/sc3000_bit.h
@@ -7,14 +7,13 @@
Cassette code for Sega SC-3000 *.bit files
*********************************************************************/
+#ifndef MAME_FORMATS_SC3000_BIT_H
+#define MAME_FORMATS_SC3000_BIT_H
#pragma once
-#ifndef __SC3000_BIT__
-#define __SC3000_BIT__
-
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN( sc3000_cassette_formats );
-#endif
+#endif // MAME_FORMATS_SC3000_BIT_H
diff --git a/src/lib/formats/sdf_dsk.h b/src/lib/formats/sdf_dsk.h
index 219fdce3abe..46b3905d6e7 100644
--- a/src/lib/formats/sdf_dsk.h
+++ b/src/lib/formats/sdf_dsk.h
@@ -8,9 +8,10 @@
his CoCoSDC floppy disk emulator.
*********************************************************************/
+#ifndef MAME_FORMATS_SDF_DSK_H
+#define MAME_FORMATS_SDF_DSK_H
-#ifndef SDF_DSK_H
-#define SDF_DSK_H
+#pragma once
#include "flopimg.h"
@@ -42,4 +43,4 @@ protected:
extern const floppy_format_type FLOPPY_SDF_FORMAT;
-#endif /* SDF_DSK_H */
+#endif // MAME_FORMATS_SDF_DSK_H
diff --git a/src/lib/formats/sf7000_dsk.h b/src/lib/formats/sf7000_dsk.h
index 75f7ff7e314..ae74985c240 100644
--- a/src/lib/formats/sf7000_dsk.h
+++ b/src/lib/formats/sf7000_dsk.h
@@ -7,13 +7,15 @@
sf7000 format
*********************************************************************/
+#ifndef MAME_FORMATS_SF7000_DSK_H
+#define MAME_FORMATS_SF7000_DSK_H
-#ifndef SF7000_DSK_H_
-#define SF7000_DSK_H_
+#pragma once
#include "upd765_dsk.h"
-class sf7000_format : public upd765_format {
+class sf7000_format : public upd765_format
+{
public:
sf7000_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_SF7000_FORMAT;
-#endif
+#endif // MAME_FORMATS_SF7000_DSK_H
diff --git a/src/lib/formats/smx_dsk.h b/src/lib/formats/smx_dsk.h
index 36a3bd251b5..f6fe998c1c3 100644
--- a/src/lib/formats/smx_dsk.h
+++ b/src/lib/formats/smx_dsk.h
@@ -7,13 +7,15 @@
Specialist MX disk images
*********************************************************************/
+#ifndef MAME_FORMATS_SMX_DSK_H
+#define MAME_FORMATS_SMX_DSK_H
-#ifndef SMX_DSK_H_
-#define SMX_DSK_H_
+#pragma once
#include "wd177x_dsk.h"
-class smx_format : public wd177x_format {
+class smx_format : public wd177x_format
+{
public:
smx_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_SMX_FORMAT;
-#endif
+#endif // MAME_FORMATS_SMX_DSK_H
diff --git a/src/lib/formats/sol_cas.h b/src/lib/formats/sol_cas.h
index add6743475d..f029edaa99b 100644
--- a/src/lib/formats/sol_cas.h
+++ b/src/lib/formats/sol_cas.h
@@ -7,8 +7,13 @@
Format code for SOL-20 cassette images
*********************************************************************/
+#ifndef MAME_FORMATS_SOL_CAS_H
+#define MAME_FORMATS_SOL_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(sol20_cassette_formats);
+
+#endif // MAME_FORMATS_SOL_CAS_H
diff --git a/src/lib/formats/sorc_cas.h b/src/lib/formats/sorc_cas.h
index b2716458a88..6a4ef925214 100644
--- a/src/lib/formats/sorc_cas.h
+++ b/src/lib/formats/sorc_cas.h
@@ -7,8 +7,13 @@
Format code for Exidy Sorcerer cassette images
*********************************************************************/
+#ifndef MAME_FORMATS_SORC_CAS_H
+#define MAME_FORMATS_SORC_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(sorcerer_cassette_formats);
+
+#endif // MAME_FORMATS_SORC_CAS_H
diff --git a/src/lib/formats/sorc_dsk.h b/src/lib/formats/sorc_dsk.h
index 413497c07c3..6988fa08b52 100644
--- a/src/lib/formats/sorc_dsk.h
+++ b/src/lib/formats/sorc_dsk.h
@@ -7,9 +7,10 @@
Exidy Sorcerer disk images
*********************************************************************/
+#ifndef MAME_FORMATS_SORC_DSK_H
+#define MAME_FORMATS_SORC_DSK_H
-#ifndef EXI_DSK_H
-#define EXI_DSK_H
+#pragma once
#include "flopimg.h"
@@ -17,4 +18,4 @@
LEGACY_FLOPPY_OPTIONS_EXTERN(sorcerer);
-#endif /* EXI_DSK_H */
+#endif // MAME_FORMATS_SORC_DSK_H
diff --git a/src/lib/formats/sord_cas.h b/src/lib/formats/sord_cas.h
index 6c9141a5065..e9377dc3c90 100644
--- a/src/lib/formats/sord_cas.h
+++ b/src/lib/formats/sord_cas.h
@@ -7,12 +7,13 @@
Format code for Sord M5 cassette files
*********************************************************************/
+#ifndef MAME_FORMATS_SORD_CAS_H
+#define MAME_FORMATS_SORD_CAS_H
-#ifndef SORD_CAS_H
-#define SORD_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(sordm5_cassette_formats);
-#endif /* SORD_CAS_H */
+#endif // MAME_FORMATS_SORD_CAS_H
diff --git a/src/lib/formats/spc1000_cas.h b/src/lib/formats/spc1000_cas.h
index b0dbc80f5dd..b95b7933e07 100644
--- a/src/lib/formats/spc1000_cas.h
+++ b/src/lib/formats/spc1000_cas.h
@@ -7,8 +7,13 @@
Format code for Samsung SPC-1000 cassette images
*********************************************************************/
+#ifndef MAME_FORMATS_SPC1000_CAS_H
+#define MAME_FORMATS_SPC1000_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(spc1000_cassette_formats);
+
+#endif // MAME_FORMATS_SPC1000_CAS_H
diff --git a/src/lib/formats/st_dsk.h b/src/lib/formats/st_dsk.h
index 9245e861eae..44a0827757a 100644
--- a/src/lib/formats/st_dsk.h
+++ b/src/lib/formats/st_dsk.h
@@ -7,9 +7,10 @@
Atari ST 9/10/11 sector-per-track formats
*********************************************************************/
+#ifndef MAME_FORMATS_ST_DSK_H
+#define MAME_FORMATS_ST_DSK_H
-#ifndef ST_DSK_H_
-#define ST_DSK_H_
+#pragma once
#include "flopimg.h"
@@ -54,4 +55,4 @@ private:
extern const floppy_format_type FLOPPY_ST_FORMAT;
extern const floppy_format_type FLOPPY_MSA_FORMAT;
-#endif /*ST_DSK_H_*/
+#endif // MAME_FORMATS_ST_DSK_H
diff --git a/src/lib/formats/svi_cas.h b/src/lib/formats/svi_cas.h
index 2c73b5cfee9..7dd6975b1d4 100644
--- a/src/lib/formats/svi_cas.h
+++ b/src/lib/formats/svi_cas.h
@@ -7,12 +7,13 @@
Format code for SVI cassette files
*********************************************************************/
+#ifndef MAME_FORMATS_SVI_CAS_H
+#define MAME_FORMATS_SVI_CAS_H
-#ifndef SVI_CAS_H
-#define SVI_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(svi_cassette_formats);
-#endif /* SVI_CAS_H */
+#endif // MAME_FORMATS_SVI_CAS_H
diff --git a/src/lib/formats/svi_dsk.h b/src/lib/formats/svi_dsk.h
index f7ffbfeaf5c..bc1487a48fe 100644
--- a/src/lib/formats/svi_dsk.h
+++ b/src/lib/formats/svi_dsk.h
@@ -7,12 +7,11 @@
Disk image format
***************************************************************************/
+#ifndef MAME_FORMATS_SVI_DSK_H
+#define MAME_FORMATS_SVI_DSK_H
#pragma once
-#ifndef __SVI_DSK_H__
-#define __SVI_DSK_H__
-
#include "flopimg.h"
class svi_format : public floppy_image_format_t
@@ -32,4 +31,4 @@ public:
extern const floppy_format_type FLOPPY_SVI_FORMAT;
-#endif // __SVI_DSK_H__
+#endif // MAME_FORMATS_SVI_DSK_H
diff --git a/src/lib/formats/tandy2k_dsk.h b/src/lib/formats/tandy2k_dsk.h
index e69eead2e55..35833ecba6d 100644
--- a/src/lib/formats/tandy2k_dsk.h
+++ b/src/lib/formats/tandy2k_dsk.h
@@ -7,13 +7,15 @@
Tandy 2000 disk format
*********************************************************************/
+#ifndef MAME_FORMATS_TANDY2K_DSK_H
+#define MAME_FORMATS_TANDY2K_DSK_H
-#ifndef BW2_DSK_H_
-#define BW2_DSK_H_
+#pragma once
#include "upd765_dsk.h"
-class tandy2k_format : public upd765_format {
+class tandy2k_format : public upd765_format
+{
public:
tandy2k_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_TANDY_2000_FORMAT;
-#endif
+#endif // MAME_FORMATS_TANDY2K_DSK_H
diff --git a/src/lib/formats/td0_dsk.h b/src/lib/formats/td0_dsk.h
index 2207b993c21..96007fa4314 100644
--- a/src/lib/formats/td0_dsk.h
+++ b/src/lib/formats/td0_dsk.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Miodrag Milanovic
-#ifndef TD0_DSK_H_
-#define TD0_DSK_H_
+#ifndef MAME_FORMATS_TD0_DSK_H
+#define MAME_FORMATS_TD0_DSK_H
+
+#pragma once
#include "flopimg.h"
@@ -23,4 +25,4 @@ public:
extern const floppy_format_type FLOPPY_TD0_FORMAT;
-#endif /* TD0_DSK_H_ */
+#endif // MAME_FORMATS_TD0_DSK_H
diff --git a/src/lib/formats/thom_cas.h b/src/lib/formats/thom_cas.h
index a58646b507f..da0684d1e7c 100644
--- a/src/lib/formats/thom_cas.h
+++ b/src/lib/formats/thom_cas.h
@@ -7,9 +7,10 @@
Thomson 8-bit computers
**********************************************************************/
+#ifndef MAME_FORMATS_THOM_CAS_H
+#define MAME_FORMATS_THOM_CAS_H
-#ifndef THOM_CAS
-#define THOM_CAS
+#pragma once
#include "cassimg.h"
@@ -21,4 +22,4 @@ CASSETTE_FORMATLIST_EXTERN(to7_cassette_formats);
CASSETTE_FORMATLIST_EXTERN(mo5_cassette_formats);
-#endif
+#endif // MAME_FORMATS_THOM_CAS_H
diff --git a/src/lib/formats/thom_dsk.h b/src/lib/formats/thom_dsk.h
index 439365243f5..24bf68f3b38 100644
--- a/src/lib/formats/thom_dsk.h
+++ b/src/lib/formats/thom_dsk.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Miodrag Milanovic
-#ifndef THOM_DSK
-#define THOM_DSK
+#ifndef MAME_FORMATS_THOM_DSK_H
+#define MAME_FORMATS_THOM_DSK_H
+
+#pragma once
#include "flopimg.h"
@@ -13,4 +15,4 @@
LEGACY_FLOPPY_OPTIONS_EXTERN(thomson);
-#endif
+#endif // MAME_FORMATS_THOM_DSK_H
diff --git a/src/lib/formats/ti99_dsk.h b/src/lib/formats/ti99_dsk.h
index d67f38acaae..04ba3e88a14 100644
--- a/src/lib/formats/ti99_dsk.h
+++ b/src/lib/formats/ti99_dsk.h
@@ -9,12 +9,15 @@
Michael Zapf, Sept 2014
*********************************************************************/
+#ifndef MAME_FORMATS_TI99_DSK_H
+#define MAME_FORMATS_TI99_DSK_H
-#ifndef TI99_DSK_H
-#define TI99_DSK_H
+#pragma once
#include "flopimg.h"
-#include <sstream>
+
+#include <string>
+
class ti99_floppy_format : public floppy_image_format_t
{
@@ -107,4 +110,4 @@ private:
extern const floppy_format_type FLOPPY_TI99_TDF_FORMAT;
-#endif /* TI99_DSK_H */
+#endif // MAME_FORMATS_TI99_DSK_H
diff --git a/src/lib/formats/tiki100_dsk.h b/src/lib/formats/tiki100_dsk.h
index 4037ec5fe77..197b114fad3 100644
--- a/src/lib/formats/tiki100_dsk.h
+++ b/src/lib/formats/tiki100_dsk.h
@@ -7,13 +7,15 @@
TIKI 100 disk image format
*********************************************************************/
+#ifndef MAME_FORMATS_TIKI100_DSK_H
+#define MAME_FORMATS_TIKI100_DSK_H
-#ifndef TIKI100_DSK_H_
-#define TIKI100_DSK_H_
+#pragma once
#include "wd177x_dsk.h"
-class tiki100_format : public wd177x_format {
+class tiki100_format : public wd177x_format
+{
public:
tiki100_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_TIKI100_FORMAT;
-#endif
+#endif // MAME_FORMATS_TIKI100_DSK_H
diff --git a/src/lib/formats/trd_dsk.h b/src/lib/formats/trd_dsk.h
index de4b7ff63d5..a33ff489878 100644
--- a/src/lib/formats/trd_dsk.h
+++ b/src/lib/formats/trd_dsk.h
@@ -7,9 +7,10 @@
TRD disk images
*********************************************************************/
+#ifndef MAME_FORMATS_TRD_DSK_H
+#define MAME_FORMATS_TRD_DSK_H
-#ifndef TRD_DSK_H
-#define TRD_DSK_H
+#pragma once
#include "wd177x_dsk.h"
@@ -27,4 +28,4 @@ private:
extern const floppy_format_type FLOPPY_TRD_FORMAT;
-#endif /* TRD_DSK_H */
+#endif // MAME_FORMATS_TRD_DSK_H
diff --git a/src/lib/formats/trs80_dsk.h b/src/lib/formats/trs80_dsk.h
index 73583ca0f48..c5b99a1366b 100644
--- a/src/lib/formats/trs80_dsk.h
+++ b/src/lib/formats/trs80_dsk.h
@@ -7,12 +7,11 @@
JV1 disk image format
***************************************************************************/
+#ifndef MAME_FORMATS_TRS80_DSK_H
+#define MAME_FORMATS_TRS80_DSK_H
#pragma once
-#ifndef __TRS80_DSK_H__
-#define __TRS80_DSK_H__
-
#include "wd177x_dsk.h"
class trs80_format : public wd177x_format
@@ -33,4 +32,4 @@ private:
extern const floppy_format_type FLOPPY_TRS80_FORMAT;
-#endif // __TRS80_DSK_H__
+#endif // MAME_FORMATS_TRS80_DSK_H
diff --git a/src/lib/formats/trs_cas.h b/src/lib/formats/trs_cas.h
index 49e5d8ba605..57954faf30c 100644
--- a/src/lib/formats/trs_cas.h
+++ b/src/lib/formats/trs_cas.h
@@ -7,12 +7,13 @@
Format code for TRS80 (level 2) cassette files.
*********************************************************************/
+#ifndef MAME_FORMATS_TRS_CAS_H
+#define MAME_FORMATS_TRS_CAS_H
-#ifndef __TRS_CAS_H
-#define __TRS_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(trs80l2_cassette_formats);
-#endif /* __TRS_CAS_H */
+#endif // MAME_FORMATS_TRS_CAS_H
diff --git a/src/lib/formats/tvc_cas.h b/src/lib/formats/tvc_cas.h
index ecaec1c97db..a6be85a6166 100644
--- a/src/lib/formats/tvc_cas.h
+++ b/src/lib/formats/tvc_cas.h
@@ -7,12 +7,13 @@
Format code for Videoton TVC cassette files
*********************************************************************/
+#ifndef MAME_FORMATS_TVC_CAS_H
+#define MAME_FORMATS_TVC_CAS_H
-#ifndef TVC_CAS_H
-#define TVC_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(tvc64_cassette_formats);
-#endif /* TVC_CAS_H */
+#endif // MAME_FORMATS_TVC_CAS_H
diff --git a/src/lib/formats/tvc_dsk.h b/src/lib/formats/tvc_dsk.h
index 67df189b3da..e94e3516953 100644
--- a/src/lib/formats/tvc_dsk.h
+++ b/src/lib/formats/tvc_dsk.h
@@ -7,13 +7,15 @@
Videoton TVC HBF format
*********************************************************************/
+#ifndef MAME_FORMATS_TVC_DSK_H
+#define MAME_FORMATS_TVC_DSK_H
-#ifndef TVC_DSK_H_
-#define TVC_DSK_H_
+#pragma once
#include "wd177x_dsk.h"
-class tvc_format : public wd177x_format {
+class tvc_format : public wd177x_format
+{
public:
tvc_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_TVC_FORMAT;
-#endif
+#endif // MAME_FORMATS_TVC_DSK_H
diff --git a/src/lib/formats/tzx_cas.h b/src/lib/formats/tzx_cas.h
index 0041d9383d8..2410ea57523 100644
--- a/src/lib/formats/tzx_cas.h
+++ b/src/lib/formats/tzx_cas.h
@@ -6,9 +6,10 @@
Format code for tzx cassette files
*/
+#ifndef MAME_FORMATS_TZX_CAS_H
+#define MAME_FORMATS_TZX_CAS_H
-#ifndef TZX_CAS_H
-#define TZX_CAS_H
+#pragma once
#include "cassimg.h"
@@ -17,4 +18,4 @@ extern const struct CassetteFormat tzx_cassette_format;
CASSETTE_FORMATLIST_EXTERN(tzx_cassette_formats);
CASSETTE_FORMATLIST_EXTERN(cdt_cassette_formats);
-#endif /* TZX_CAS_H */
+#endif // MAME_FORMATS_TZX_CAS_H
diff --git a/src/lib/formats/uef_cas.h b/src/lib/formats/uef_cas.h
index 34d95b02afe..73aa2fe8ae2 100644
--- a/src/lib/formats/uef_cas.h
+++ b/src/lib/formats/uef_cas.h
@@ -5,9 +5,10 @@
Format code for uef cassette files
*/
+#ifndef MAME_FORMATS_UEF_CAS_H
+#define MAME_FORMATS_UEF_CAS_H
-#ifndef UEF_CAS_H
-#define UEF_CAS_H
+#pragma once
#include "cassimg.h"
@@ -15,4 +16,4 @@ extern const struct CassetteFormat uef_cassette_format;
CASSETTE_FORMATLIST_EXTERN(uef_cassette_formats);
-#endif /* UEF_CAS_H */
+#endif // MAME_FORMATS_UEF_CAS_H
diff --git a/src/lib/formats/upd765_dsk.h b/src/lib/formats/upd765_dsk.h
index 55e03b7f8ac..a1b3f776104 100644
--- a/src/lib/formats/upd765_dsk.h
+++ b/src/lib/formats/upd765_dsk.h
@@ -7,9 +7,10 @@
helper for simple upd765-formatted disk images
*********************************************************************/
+#ifndef MAME_FORMATS_UPD765_DSK_H
+#define MAME_FORMATS_UPD765_DSK_H
-#ifndef UPD765_DSK_H
-#define UPD765_DSK_H
+#pragma once
#include "flopimg.h"
@@ -59,4 +60,4 @@ private:
format const *const formats;
};
-#endif /* UPD765_DSK_H */
+#endif // MAME_FORMATS_UPD765_DSK_H
diff --git a/src/lib/formats/vdk_dsk.h b/src/lib/formats/vdk_dsk.h
index 270c1ff9071..abadc3bf2f6 100644
--- a/src/lib/formats/vdk_dsk.h
+++ b/src/lib/formats/vdk_dsk.h
@@ -9,12 +9,11 @@
Used by Paul Burgin's PC-Dragon emulator
***************************************************************************/
+#ifndef MAME_FORMATS_VDK_DSK_H
+#define MAME_FORMATS_VDK_DSK_H
#pragma once
-#ifndef __VDK_DSK_H__
-#define __VDK_DSK_H__
-
#include "flopimg.h"
class vdk_format : public floppy_image_format_t
@@ -39,4 +38,4 @@ private:
extern const floppy_format_type FLOPPY_VDK_FORMAT;
-#endif // __VDK_DSK_H__
+#endif // MAME_FORMATS_VDK_DSK_H
diff --git a/src/lib/formats/vector06_dsk.h b/src/lib/formats/vector06_dsk.h
index f884d79cf78..a17cacfa04c 100644
--- a/src/lib/formats/vector06_dsk.h
+++ b/src/lib/formats/vector06_dsk.h
@@ -7,12 +7,11 @@
Disk image format
***************************************************************************/
+#ifndef MAME_FORMATS_VECTOR06_DSK_H
+#define MAME_FORMATS_VECTOR06_DSK_H
#pragma once
-#ifndef __VECTOR06_DSK_H__
-#define __VECTOR06_DSK_H__
-
#include "wd177x_dsk.h"
class vector06_format : public wd177x_format
@@ -30,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_VECTOR06_FORMAT;
-#endif // __VECTOR06_DSK_H__
+#endif // MAME_FORMATS_VECTOR06_DSK_H
diff --git a/src/lib/formats/vg5k_cas.h b/src/lib/formats/vg5k_cas.h
index e4ad5d4bbc3..c98f2eee347 100644
--- a/src/lib/formats/vg5k_cas.h
+++ b/src/lib/formats/vg5k_cas.h
@@ -5,12 +5,13 @@
vg5k_cas.h
*********************************************************************/
+#ifndef MAME_FORMATS_VG5K_CAS_H
+#define MAME_FORMATS_VG5K_CAS_H
-#ifndef VG5K_CAS_H
-#define VG5K_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(vg5k_cassette_formats);
-#endif /* VG5K_CAS_H */
+#endif // MAME_FORMATS_VG5K_CAS_H
diff --git a/src/lib/formats/victor9k_dsk.h b/src/lib/formats/victor9k_dsk.h
index 0c3f89c9f59..066e270e78f 100644
--- a/src/lib/formats/victor9k_dsk.h
+++ b/src/lib/formats/victor9k_dsk.h
@@ -7,9 +7,10 @@
Victor 9000 sector disk image format
*********************************************************************/
+#ifndef MAME_FORMATS_VICTOR9K_DSK_H
+#define MAME_FORMATS_VICTOR9K_DSK_H
-#ifndef VICTOR9K_DSK_H_
-#define VICTOR9K_DSK_H_
+#pragma once
#include "flopimg.h"
@@ -64,4 +65,4 @@ FLOPPY_IDENTIFY( victor9k_dsk_identify );
FLOPPY_CONSTRUCT( victor9k_dsk_construct );
-#endif
+#endif // MAME_FORMATS_VICTOR9K_DSK_H
diff --git a/src/lib/formats/vt_cas.h b/src/lib/formats/vt_cas.h
index 5c3277244f5..56f3bc57191 100644
--- a/src/lib/formats/vt_cas.h
+++ b/src/lib/formats/vt_cas.h
@@ -7,13 +7,14 @@
Format code for VTech cassette files
*********************************************************************/
+#ifndef MAME_FORMATS_VT_CAS_H
+#define MAME_FORMATS_VT_CAS_H
-#ifndef VT_CAS_H
-#define VT_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(vtech1_cassette_formats);
CASSETTE_FORMATLIST_EXTERN(vtech2_cassette_formats);
-#endif /* VT_CAS_H */
+#endif // MAME_FORMATS_VT_CAS_H
diff --git a/src/lib/formats/wavfile.h b/src/lib/formats/wavfile.h
index 14c08bb679f..0f48b8378b0 100644
--- a/src/lib/formats/wavfile.h
+++ b/src/lib/formats/wavfile.h
@@ -7,12 +7,13 @@
Format code for wave (*.wav) files
*********************************************************************/
+#ifndef MAME_FORMATS_WAVFILE_H
+#define MAME_FORMATS_WAVFILE_H
-#ifndef WAVFILE_H
-#define WAVFILE_H
+#pragma once
#include "cassimg.h"
extern const struct CassetteFormat wavfile_format;
-#endif /* WAVFILE_H */
+#endif // MAME_FORMATS_WAVFILE_H
diff --git a/src/lib/formats/wd177x_dsk.h b/src/lib/formats/wd177x_dsk.h
index 88b3a511240..1843fcdf0a2 100644
--- a/src/lib/formats/wd177x_dsk.h
+++ b/src/lib/formats/wd177x_dsk.h
@@ -7,9 +7,10 @@
helper for simple wd177x-formatted disk images
*********************************************************************/
+#ifndef MAME_FORMATS_WD177X_DSK_H
+#define MAME_FORMATS_WD177X_DSK_H
-#ifndef WD177X_DSK_H
-#define WD177X_DSK_H
+#pragma once
#include "flopimg.h"
@@ -60,4 +61,4 @@ protected:
void extract_sectors(floppy_image *image, const format &f, desc_s *sdesc, int track, int head);
};
-#endif /* WD177X_DSK_H */
+#endif // MAME_FORMATS_WD177X_DSK_H
diff --git a/src/lib/formats/x07_cas.h b/src/lib/formats/x07_cas.h
index f385f3b4973..d65ac4267a6 100644
--- a/src/lib/formats/x07_cas.h
+++ b/src/lib/formats/x07_cas.h
@@ -7,12 +7,13 @@
Format code for Canon X-07 cassette images
*********************************************************************/
+#ifndef MAME_FORMATS_X07_CAS_H
+#define MAME_FORMATS_X07_CAS_H
-#ifndef X07_CAS_H
-#define X07_CAS_H
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN(x07_cassette_formats);
-#endif /* X07_CAS_H */
+#endif // MAME_FORMATS_X07_CAS_H
diff --git a/src/lib/formats/x1_tap.h b/src/lib/formats/x1_tap.h
index 40f9298d7f7..150f0d482a3 100644
--- a/src/lib/formats/x1_tap.h
+++ b/src/lib/formats/x1_tap.h
@@ -5,12 +5,13 @@
* Sharp X1 TAP image format
*
*/
+#ifndef MAME_FORMATS_X1_TAP_H
+#define MAME_FORMATS_X1_TAP_H
-#ifndef X1_TAP_H_
-#define X1_TAP_H_
+#pragma once
#include "cassimg.h"
CASSETTE_FORMATLIST_EXTERN( x1_cassette_formats );
-#endif /*X1_TAP_H_*/
+#endif // MAME_FORMATS_X1_TAP_H
diff --git a/src/lib/formats/xdf_dsk.h b/src/lib/formats/xdf_dsk.h
index 8ef01c846e4..6e8dc3b8f34 100644
--- a/src/lib/formats/xdf_dsk.h
+++ b/src/lib/formats/xdf_dsk.h
@@ -7,13 +7,15 @@
x68k bare-bones formats
*********************************************************************/
+#ifndef MAME_FORMATS_XDF_DSK_H
+#define MAME_FORMATS_XDF_DSK_H
-#ifndef XDF_DSK_H_
-#define XDF_DSK_H_
+#pragma once
#include "upd765_dsk.h"
-class xdf_format : public upd765_format {
+class xdf_format : public upd765_format
+{
public:
xdf_format();
@@ -27,4 +29,4 @@ private:
extern const floppy_format_type FLOPPY_XDF_FORMAT;
-#endif
+#endif // MAME_FORMATS_XDF_DSK_H
diff --git a/src/lib/formats/zx81_p.h b/src/lib/formats/zx81_p.h
index 36da808c989..a4b4395b1cb 100644
--- a/src/lib/formats/zx81_p.h
+++ b/src/lib/formats/zx81_p.h
@@ -7,9 +7,10 @@
Format code for ZX-81 cassette files
*********************************************************************/
+#ifndef MAME_FORMATS_ZX81_P_H
+#define MAME_FORMATS_ZX81_P_H
-#ifndef ZX81_P_H
-#define ZX81_P_H
+#pragma once
#include "cassimg.h"
@@ -17,4 +18,4 @@ CASSETTE_FORMATLIST_EXTERN(zx81_p_format);
CASSETTE_FORMATLIST_EXTERN(zx81_cassette_formats);
CASSETTE_FORMATLIST_EXTERN(zx80_o_format);
-#endif /* ZX81_P_H */
+#endif // MAME_FORMATS_ZX81_P_H