summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib
diff options
context:
space:
mode:
authorGravatarGravatar Vas Crabb <vas@vastheman.com>2019-11-24 13:52:11 +1100
committerGravatarGravatar Vas Crabb <vas@vastheman.com>2019-11-24 13:52:11 +1100
commite64edf6c7127fb8291a157026f3ac72e38c78d80 (patch)
tree092564456a138ad98775b989ea6073e4c75a7abd /src/lib
parent6e8748952730a23a507c415c92398205238d1367 (diff)
srcclean and indentation cleanup (nw)
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/netlist/devices/nld_7442.h16
-rw-r--r--src/lib/netlist/devices/nld_tms4800.h4
-rw-r--r--src/lib/netlist/nl_base.h6
-rw-r--r--src/lib/netlist/nl_errstr.h10
-rw-r--r--src/lib/netlist/nl_setup.h2
-rw-r--r--src/lib/netlist/plib/pexception.h4
6 files changed, 21 insertions, 21 deletions
diff --git a/src/lib/netlist/devices/nld_7442.h b/src/lib/netlist/devices/nld_7442.h
index f8e2abe72ae..faf3aa1e93b 100644
--- a/src/lib/netlist/devices/nld_7442.h
+++ b/src/lib/netlist/devices/nld_7442.h
@@ -48,16 +48,16 @@
#include "netlist/nl_setup.h"
-#define TTL_7442(name, cA, cB, cC, cD) \
- NET_REGISTER_DEV(TTL_7442, name) \
- NET_CONNECT(name, GND, GND) \
- NET_CONNECT(name, VCC, VCC) \
- NET_CONNECT(name, A, cA) \
- NET_CONNECT(name, B, cB) \
- NET_CONNECT(name, C, cC) \
+#define TTL_7442(name, cA, cB, cC, cD) \
+ NET_REGISTER_DEV(TTL_7442, name) \
+ NET_CONNECT(name, GND, GND) \
+ NET_CONNECT(name, VCC, VCC) \
+ NET_CONNECT(name, A, cA) \
+ NET_CONNECT(name, B, cB) \
+ NET_CONNECT(name, C, cC) \
NET_CONNECT(name, D, cD)
-#define TTL_7442_DIP(name) \
+#define TTL_7442_DIP(name) \
NET_REGISTER_DEV(TTL_7442_DIP, name)
#endif /* NLD_7442_H_ */
diff --git a/src/lib/netlist/devices/nld_tms4800.h b/src/lib/netlist/devices/nld_tms4800.h
index 8a70fdd78aa..14d7d40dc64 100644
--- a/src/lib/netlist/devices/nld_tms4800.h
+++ b/src/lib/netlist/devices/nld_tms4800.h
@@ -45,8 +45,8 @@
NET_CONNECT(name, A7, cA7) \
NET_CONNECT(name, A8, cA8) \
NET_CONNECT(name, A9, cA9) \
- NET_CONNECT(name, A10, cA10) \
- NET_CONNECT(name, VCC, VCC) \
+ NET_CONNECT(name, A10, cA10) \
+ NET_CONNECT(name, VCC, VCC) \
NET_CONNECT(name, GND, GND)
#define ROM_TMS4800_DIP(name) \
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 2c53aab7a9c..fc0416a3dbb 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -1561,10 +1561,10 @@ namespace netlist
private:
void reset();
- nlmempool m_pool; // must be deleted last!
+ nlmempool m_pool; // must be deleted last!
pstring m_name;
- unique_pool_ptr<netlist_t> m_netlist;
+ unique_pool_ptr<netlist_t> m_netlist;
plib::unique_ptr<plib::dynlib> m_lib; // external lib needs to be loaded as long as netlist exists
plib::state_manager_t m_state;
plib::unique_ptr<callbacks_t> m_callbacks;
@@ -1694,7 +1694,7 @@ namespace netlist
template <bool KEEP_STATS>
void process_queue_stats(netlist_time delta) noexcept;
- netlist_state_t & m_state;
+ netlist_state_t & m_state;
devices::NETLIB_NAME(solver) * m_solver;
// mostly rw
diff --git a/src/lib/netlist/nl_errstr.h b/src/lib/netlist/nl_errstr.h
index a18d07ffb01..a6bf39374d7 100644
--- a/src/lib/netlist/nl_errstr.h
+++ b/src/lib/netlist/nl_errstr.h
@@ -44,11 +44,11 @@ namespace netlist
PERRMSGV(MF_UNEXPECTED_NETLIST_END, 0, "Unexpected NETLIST_END")
PERRMSGV(MF_UNEXPECTED_END_OF_FILE, 0, "Unexpected end of file, missing NETLIST_END")
PERRMSGV(MF_UNEXPECTED_NETLIST_START, 0, "Unexpected NETLIST_START")
- PERRMSGV(MF_EXPECTED_IDENTIFIER_GOT_1, 1, "Expected an identifier, but got {1}")
- PERRMSGV(MF_EXPECTED_COMMA_OR_RP_1, 1, "Expected comma or right parenthesis but found <{1}>")
- PERRMSGV(MF_DIPPINS_EQUAL_NUMBER_1, 1, "DIPPINS requires equal number of pins to DIPPINS, first pin is {}")
- PERRMSGV(MF_PARAM_NOT_FP_1, 1, "Parameter value <{1}> not floating point")
- PERRMSGV(MF_TT_LINE_WITHOUT_HEAD, 0, "TT_LINE found without TT_HEAD")
+ PERRMSGV(MF_EXPECTED_IDENTIFIER_GOT_1, 1, "Expected an identifier, but got {1}")
+ PERRMSGV(MF_EXPECTED_COMMA_OR_RP_1, 1, "Expected comma or right parenthesis but found <{1}>")
+ PERRMSGV(MF_DIPPINS_EQUAL_NUMBER_1, 1, "DIPPINS requires equal number of pins to DIPPINS, first pin is {}")
+ PERRMSGV(MF_PARAM_NOT_FP_1, 1, "Parameter value <{1}> not floating point")
+ PERRMSGV(MF_TT_LINE_WITHOUT_HEAD, 0, "TT_LINE found without TT_HEAD")
// nl_setup.cpp
diff --git a/src/lib/netlist/nl_setup.h b/src/lib/netlist/nl_setup.h
index 00974f93fd0..c8f1b4b2250 100644
--- a/src/lib/netlist/nl_setup.h
+++ b/src/lib/netlist/nl_setup.h
@@ -448,7 +448,7 @@ namespace netlist
devices::nld_netlistparams *m_netlist_params;
std::unordered_map<pstring, param_ref_t> m_params;
std::unordered_map<detail::core_terminal_t *,
- devices::nld_base_proxy *> m_proxies;
+ devices::nld_base_proxy *> m_proxies;
unsigned m_proxy_cnt;
};
diff --git a/src/lib/netlist/plib/pexception.h b/src/lib/netlist/plib/pexception.h
index f237f06e759..22b67925b7e 100644
--- a/src/lib/netlist/plib/pexception.h
+++ b/src/lib/netlist/plib/pexception.h
@@ -13,10 +13,10 @@
#include <exception>
-#define passert_always(expr) \
+#define passert_always(expr) \
((expr) ? static_cast<void>(0) : plib::passert_fail (#expr, __FILE__, __LINE__, nullptr))
-#define passert_always_msg(expr, msg) \
+#define passert_always_msg(expr, msg) \
((expr) ? static_cast<void>(0) : plib::passert_fail (#expr, __FILE__, __LINE__, msg))
namespace plib {