summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2021-09-26 14:15:42 +1000
committer Vas Crabb <vas@vastheman.com>2021-09-26 14:15:42 +1000
commitb225f4db4a42978ec6d3384716d340cc204c3a56 (patch)
tree925c3a934e542eef41cff9ec3d9a2cd6634a176b /src/lib
parent3066057077c9a1e500f885cc0b1c6bd5dd523b6d (diff)
srcclean in preparation for MAME 0.235, and two small adjustments.
* Reduce repeated directory walking in cleansrc target (substantially improves speed of building the target on Windows). * Disable a validity check using an MSVC language extension when using clang in MSVC ABI mode.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/formats/rpk.cpp84
-rw-r--r--src/lib/formats/rpk.h28
2 files changed, 56 insertions, 56 deletions
diff --git a/src/lib/formats/rpk.cpp b/src/lib/formats/rpk.cpp
index a5b146d74aa..6171b6a4cb0 100644
--- a/src/lib/formats/rpk.cpp
+++ b/src/lib/formats/rpk.cpp
@@ -2,48 +2,48 @@
// copyright-holders:Michael Zapf
/***************************************************************************
- rpk.cpp
+ rpk.cpp
- RPK format support
+ RPK format support
- A RPK file ("rompack") contains a collection of dump files and a layout
- file that defines the kind of circuit board (PCB) used in the cartridge
- and the mapping of dumps to sockets on the board.
+ A RPK file ("rompack") contains a collection of dump files and a layout
+ file that defines the kind of circuit board (PCB) used in the cartridge
+ and the mapping of dumps to sockets on the board.
Example:
- <?xml version="1.0" encoding="utf-8"?>
- <romset>
- <resources>
- <rom id="gromimage" file="ed-assmg.bin" />
- </resources>
- <configuration>
- <pcb type="standard">
- <socket id="grom_socket" uses="gromimage"/>
- </pcb>
- </configuration>
- </romset>
+ <?xml version="1.0" encoding="utf-8"?>
+ <romset>
+ <resources>
+ <rom id="gromimage" file="ed-assmg.bin" />
+ </resources>
+ <configuration>
+ <pcb type="standard">
+ <socket id="grom_socket" uses="gromimage"/>
+ </pcb>
+ </configuration>
+ </romset>
DTD:
- <!ELEMENT romset (resources, configuration)>
- <!ELEMENT resources (rom|ram)+>
- <!ELEMENT rom EMPTY>
- <!ELEMENT ram EMPTY>
- <!ELEMENT configuration (pcb)>
- <!ELEMENT pcb (socket)+>
- <!ELEMENT socket EMPTY>
- <!ATTLIST romset version CDATA #IMPLIED>
- <!ATTLIST rom id ID #REQUIRED
- <!ATTLIST rom file CDATA #REQUIRED>
- <!ATTLIST rom crc CDATA #IMPLIED>
- <!ATTLIST rom sha1 CDATA #IMPLIED>
- <!ATTLIST ram id ID #REQUIRED>
- <!ATTLIST ram type (volatile|persistent) #IMPLIED>
- <!ATTLIST ram store (internal|external) #IMPLIED>
- <!ATTLIST ram file CDATA #IMPLIED>
- <!ATTLIST ram length CDATA #REQUIRED>
- <!ATTLIST pcb type CDATA #REQUIRED>
- <!ATTLIST socket id ID #REQUIRED>
- <!ATTLIST socket uses IDREF #REQUIRED>
+ <!ELEMENT romset (resources, configuration)>
+ <!ELEMENT resources (rom|ram)+>
+ <!ELEMENT rom EMPTY>
+ <!ELEMENT ram EMPTY>
+ <!ELEMENT configuration (pcb)>
+ <!ELEMENT pcb (socket)+>
+ <!ELEMENT socket EMPTY>
+ <!ATTLIST romset version CDATA #IMPLIED>
+ <!ATTLIST rom id ID #REQUIRED
+ <!ATTLIST rom file CDATA #REQUIRED>
+ <!ATTLIST rom crc CDATA #IMPLIED>
+ <!ATTLIST rom sha1 CDATA #IMPLIED>
+ <!ATTLIST ram id ID #REQUIRED>
+ <!ATTLIST ram type (volatile|persistent) #IMPLIED>
+ <!ATTLIST ram store (internal|external) #IMPLIED>
+ <!ATTLIST ram file CDATA #IMPLIED>
+ <!ATTLIST ram length CDATA #REQUIRED>
+ <!ATTLIST pcb type CDATA #REQUIRED>
+ <!ATTLIST socket id ID #REQUIRED>
+ <!ATTLIST socket uses IDREF #REQUIRED>
***************************************************************************/
@@ -55,7 +55,7 @@ namespace
{
/***************************************************************************
- TYPE DEFINITIONS
+ TYPE DEFINITIONS
***************************************************************************/
class rpk_category_impl : public std::error_category
@@ -67,7 +67,7 @@ public:
/***************************************************************************
- GLOBAL VARIABLES
+ GLOBAL VARIABLES
***************************************************************************/
rpk_category_impl const f_rpk_category_instance;
@@ -75,7 +75,7 @@ rpk_category_impl const f_rpk_category_instance;
/***************************************************************************
- RPK READER
+ RPK READER
***************************************************************************/
//-------------------------------------------------
@@ -220,7 +220,7 @@ std::error_condition rpk_reader::read(std::unique_ptr<util::random_read> &&strea
/***************************************************************************
- RPK FILE
+ RPK FILE
***************************************************************************/
//-------------------------------------------------
@@ -347,7 +347,7 @@ std::error_condition rpk_file::add_ram_socket(std::string &&id, const util::xml:
/***************************************************************************
- RPK SOCKET
+ RPK SOCKET
***************************************************************************/
//-------------------------------------------------
@@ -416,7 +416,7 @@ std::error_condition rpk_socket::read_file(std::vector<std::uint8_t> &result) co
/***************************************************************************
- RPK EXCEPTION HANDLING
+ RPK EXCEPTION HANDLING
***************************************************************************/
//-------------------------------------------------
diff --git a/src/lib/formats/rpk.h b/src/lib/formats/rpk.h
index 55b6f0a4839..f6e6360c21c 100644
--- a/src/lib/formats/rpk.h
+++ b/src/lib/formats/rpk.h
@@ -2,9 +2,9 @@
// copyright-holders:Michael Zapf
/***************************************************************************
- rpk.h
+ rpk.h
- RPK format support
+ RPK format support
***************************************************************************/
@@ -22,7 +22,7 @@
/***************************************************************************
- TYPE DEFINITIONS
+ TYPE DEFINITIONS
***************************************************************************/
class rpk_reader;
@@ -57,12 +57,12 @@ public:
std::error_condition read_file(std::vector<std::uint8_t> &result) const;
private:
- rpk_file & m_rpk;
- std::string m_id;
- socket_type m_type;
- std::string m_filename;
- std::optional<util::hash_collection> m_hashes;
- std::uint32_t m_length;
+ rpk_file & m_rpk;
+ std::string m_id;
+ socket_type m_type;
+ std::string m_filename;
+ std::optional<util::hash_collection> m_hashes;
+ std::uint32_t m_length;
};
@@ -87,9 +87,9 @@ public:
const std::list<rpk_socket> &sockets() const { return m_sockets; }
private:
- util::archive_file::ptr m_zipfile;
- int m_pcb_type;
- std::list<rpk_socket> m_sockets;
+ util::archive_file::ptr m_zipfile;
+ int m_pcb_type;
+ std::list<rpk_socket> m_sockets;
// accesors
util::archive_file &zipfile() { return *m_zipfile; }
@@ -127,8 +127,8 @@ public:
std::error_condition read(std::unique_ptr<util::random_read> &&stream, rpk_file::ptr &result) const;
private:
- char const *const * m_pcb_types;
- bool m_supports_ram;
+ char const *const * m_pcb_types;
+ bool m_supports_ram;
};