Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-04 16:34:53 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

(nw) suppress side effects, standardise #include guards

Browse Source
This commit is contained in:
Vas Crabb 2019-04-12 01:49:57 +10:00
parent 3aaae04942
commit f70f31731c
172 changed files with 957 additions and 767 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nl_examples/nmos_fet.cpp
View File

@ -1,7 +1,7 @@
// license:GPL-2.0+
// copyright-holders:Couriersud
/*
* bjt.c
* nmos_fet.cpp
*
*/

2
src/devices/bus/apricot/expansion/winchester.cpp
View File

@ -136,7 +136,7 @@ READ8_MEMBER( apricot_winchester_device::hdc_data_r )
LOGDATA("hdc_data_r[%04x]\n", m_ram_ptr);
data = m_ram[m_ram_ptr];
if (m_ram_ptr < 0x1fff)
if (!machine().side_effects_disabled() && (m_ram_ptr < 0x1fff))
m_ram_ptr++;
}

3
src/devices/machine/wd1010.cpp
View File

@ -348,7 +348,8 @@ READ8_MEMBER( wd1010_device::read )
LOGREGS("RD STATUS: %02x\n", m_status);
// reading the status register clears the interrupt
set_intrq(0);
if (!machine().side_effects_disabled())
set_intrq(0);
return m_status;
}

7
src/lib/formats/2d_dsk.h
View File

@ -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

7
src/lib/formats/a26_cas.h
View File

@ -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

10
src/lib/formats/a5105_dsk.h
View File

@ -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

10
src/lib/formats/abc800_dsk.h
View File

@ -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

10
src/lib/formats/abcfd2_dsk.h
View File

@ -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

7
src/lib/formats/ace_tap.h
View File

@ -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

7
src/lib/formats/acorn_dsk.h
View File

@ -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

7
src/lib/formats/adam_cas.h
View File

@ -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

10
src/lib/formats/adam_dsk.h
View File

@ -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

7
src/lib/formats/afs_dsk.h
View File

@ -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

7
src/lib/formats/agat840k_hle_dsk.h
View File

@ -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

7
src/lib/formats/ami_dsk.h
View File

@ -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

105
src/lib/formats/ap2_dsk.h
View File

@ -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 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 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

7
src/lib/formats/ap_dsk35.h
View File

@ -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

10
src/lib/formats/apd_dsk.h
View File

@ -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

9
src/lib/formats/apf_apt.h
View File

@ -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

10
src/lib/formats/apollo_dsk.h
View File

@ -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

10
src/lib/formats/applix_dsk.h
View File

@ -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

7
src/lib/formats/apridisk.h
View File

@ -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

7
src/lib/formats/asst128_dsk.h
View File

@ -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

7
src/lib/formats/atari_dsk.h
View File

@ -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

8
src/lib/formats/atom_dsk.h
View File

@ -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

7
src/lib/formats/atom_tap.h
View File

@ -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

7
src/lib/formats/basicdsk.h
View File

@ -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

10
src/lib/formats/bw12_dsk.h
View File

@ -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

10
src/lib/formats/bw2_dsk.h
View File

@ -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

9
src/lib/formats/c3040_dsk.h
View File

@ -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

9
src/lib/formats/c4040_dsk.h
View File

@ -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

10
src/lib/formats/c8280_dsk.h
View File

@ -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

5
src/lib/formats/camplynx_cas.h
View File

@ -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

10
src/lib/formats/camplynx_dsk.h
View File

@ -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

13
src/lib/formats/cassimg.h
View File

@ -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

8
src/lib/formats/cbm_crt.cpp
View File

@ -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] =
{

17
src/lib/formats/cbm_crt.h
View File

@ -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

7
src/lib/formats/cbm_tap.h
View File

@ -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

19
src/lib/formats/ccvf_dsk.h
View File

@ -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

7
src/lib/formats/cd90_640_dsk.h
View File

@ -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

7
src/lib/formats/cgen_cas.h
View File

@ -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

7
src/lib/formats/cgenie_dsk.h
View File

@ -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

7
src/lib/formats/coco_cas.h
View File

@ -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

10
src/lib/formats/comx35_dsk.h
View File

@ -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

7
src/lib/formats/concept_dsk.h
View File

@ -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

7
src/lib/formats/coupedsk.h
View File

@ -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

7
src/lib/formats/cpis_dsk.h
View File

@ -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

7
src/lib/formats/cqm_dsk.h
View File

@ -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

7
src/lib/formats/csw_cas.h
View File

@ -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

15
src/lib/formats/d64_dsk.h
View File

@ -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

12
src/lib/formats/d71_dsk.h
View File

@ -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

12
src/lib/formats/d80_dsk.h
View File

@ -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

10
src/lib/formats/d81_dsk.h
View File

@ -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

12
src/lib/formats/d82_dsk.h
View File

@ -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

7
src/lib/formats/d88_dsk.h
View File

@ -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

7
src/lib/formats/dcp_dsk.h
View File

@ -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

8
src/lib/formats/dfi_dsk.h
View File

@ -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

7
src/lib/formats/dim_dsk.h
View File

@ -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

7
src/lib/formats/dip_dsk.h
View File

@ -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

7
src/lib/formats/dmk_dsk.h
View File

@ -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

10
src/lib/formats/dmv_dsk.h
View File

@ -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

7
src/lib/formats/dsk_dsk.h
View File

@ -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

10
src/lib/formats/ep64_dsk.h
View File

@ -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

7
src/lib/formats/esq16_dsk.h
View File

@ -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

7
src/lib/formats/esq8_dsk.h
View File

@ -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

10
src/lib/formats/excali64_dsk.h
View File

@ -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

5
src/lib/formats/fc100_cas.h
View File

@ -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

7
src/lib/formats/fdd_dsk.h
View File

@ -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

10
src/lib/formats/flex_dsk.h
View File

@ -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

30
src/lib/formats/flopimg.h
View File

@ -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

7
src/lib/formats/fm7_cas.h
View File

@ -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

7
src/lib/formats/fmsx_cas.h
View File

@ -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

11
src/lib/formats/fmtowns_dsk.h
View File

@ -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

7
src/lib/formats/fsd_dsk.h
View File

@ -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

10
src/lib/formats/g64_dsk.h
View File

@ -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

7
src/lib/formats/gtp_cas.h
View File

@ -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

7
src/lib/formats/guab_dsk.h
View File

@ -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

8
src/lib/formats/hect_dsk.h
View File

@ -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

7
src/lib/formats/hect_tap.h
View File

@ -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

7
src/lib/formats/hector_minidisc.h
View File

@ -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

10
src/lib/formats/hp_ipc_dsk.h
View File

@ -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

10
src/lib/formats/hpi_dsk.h
View File

@ -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

2
src/lib/formats/hti_tape.cpp
View File

@ -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 ***

19
src/lib/formats/hti_tape.h
View File

@ -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

2
src/lib/formats/hxchfe_dsk.cpp
View File

@ -101,6 +101,8 @@
#include "hxchfe_dsk.h"
#define HFE_FORMAT_HEADER "HXCPICFE"
#define HEADER_LENGTH 512
#define TRACK_TABLE_LENGTH 1024

65
src/lib/formats/hxchfe_dsk.h
View File

@ -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

7
src/lib/formats/hxcmfm_dsk.h
View File

@ -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

177
src/lib/formats/imageutl.h
View File

@ -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 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;
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;
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 1:
result = *byte_ptr;
break;
case 2:
memcpy(&val16, byte_ptr, sizeof(val16));
result = big_endianize_int16(val16);
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;
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;
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 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;
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;
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 1:
result = *byte_ptr;
break;
case 2:
memcpy(&val16, byte_ptr, sizeof(val16));
result = little_endianize_int16(val16);
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;
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;
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

7
src/lib/formats/imd_dsk.h
View File

@ -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

12
src/lib/formats/ioprocs.h
View File

@ -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

10
src/lib/formats/ipf_dsk.h
View File

@ -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

10
src/lib/formats/iq151_dsk.h
View File

@ -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

10
src/lib/formats/itt3030_dsk.h
View File

@ -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

10
src/lib/formats/jfd_dsk.h
View File

@ -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

7
src/lib/formats/jvc_dsk.h
View File

@ -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

7
src/lib/formats/kaypro_dsk.h
View File

@ -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

7
src/lib/formats/kc85_dsk.h
View File

@ -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

7
src/lib/formats/kc_cas.h
View File

@ -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

7
src/lib/formats/kim1_cas.h
View File

@ -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

7
src/lib/formats/lviv_lvt.h
View File

@ -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

Some files were not shown because too many files have changed in this diff Show More