summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/formats/p2000t_cas.cpp62
-rw-r--r--src/lib/formats/vg5k_cas.cpp2
-rw-r--r--src/lib/netlist/core/nets.h4
-rw-r--r--src/lib/netlist/macro/nlm_cd4xxx_lib.cpp18
-rw-r--r--src/lib/netlist/plib/gmres.h4
-rw-r--r--src/lib/netlist/plib/ptimed_queue.h2
6 files changed, 46 insertions, 46 deletions
diff --git a/src/lib/formats/p2000t_cas.cpp b/src/lib/formats/p2000t_cas.cpp
index e3351dc99dc..6a858e486c4 100644
--- a/src/lib/formats/p2000t_cas.cpp
+++ b/src/lib/formats/p2000t_cas.cpp
@@ -153,7 +153,7 @@ struct P2000T_Header
std::ostream &operator<<(std::ostream &os, P2000T_Header const &hdr)
{
return os << "File: " << std::string(hdr.file_name, 8) << '.'
- << std::string(hdr.ext, 3) << " " << hdr.file_length;
+ << std::string(hdr.ext, 3) << " " << hdr.file_length;
}
static cassette_image::error p2000t_cas_identify(cassette_image *cass, struct CassetteOptions *opts)
@@ -189,27 +189,27 @@ void update_chksum(uint16_t *de, bool bit)
}
/*
- A transition on a clock boundary from low to high is a 1.
- A transition on a clock boundary from high to low is a 0
- An intermediate transition halfway between the clock boundary
- can occur when there are consecutive 0s or 1s. See the example
- below where the clock is marked by a |
-
-
- 1 0 1 1 0 0
- RDA: _|----|____|--__|----|__--|__--
- RDC: _|-___|-___|-___|-___|-___|-___
- ^ ^
- |-- clock signal |-- intermediate transition.
-
- This signal can be written by a simple algorithm where the first bit
- is always false (transition to low, half clock). Now only one bit is needed
- to determine what the next partial clock should look like.
-
- This works because we are always guaranteed that a block starts with 0xAA,
- and hence will ALWAYS find a signal like this on tape: _-- (low, high, high)
- after a gap. This is guaranteed when the tape is moving forward as well as
- backwards.
+ A transition on a clock boundary from low to high is a 1.
+ A transition on a clock boundary from high to low is a 0
+ An intermediate transition halfway between the clock boundary
+ can occur when there are consecutive 0s or 1s. See the example
+ below where the clock is marked by a |
+
+
+ 1 0 1 1 0 0
+ RDA: _|----|____|--__|----|__--|__--
+ RDC: _|-___|-___|-___|-___|-___|-___
+ ^ ^
+ |-- clock signal |-- intermediate transition.
+
+ This signal can be written by a simple algorithm where the first bit
+ is always false (transition to low, half clock). Now only one bit is needed
+ to determine what the next partial clock should look like.
+
+ This works because we are always guaranteed that a block starts with 0xAA,
+ and hence will ALWAYS find a signal like this on tape: _-- (low, high, high)
+ after a gap. This is guaranteed when the tape is moving forward as well as
+ backwards.
*/
cassette_image::error p2000t_put_bit(cassette_image *cass, double *time_index, bool bit)
{
@@ -263,17 +263,17 @@ static cassette_image::error p2000t_cas_load(cassette_image *cassette)
constexpr int CAS_BLOCK = 1280;
/*
- The cas format is pretty simple. it consists of a sequence of blocks,
- where a block consists of the following:
+ The cas format is pretty simple. it consists of a sequence of blocks,
+ where a block consists of the following:
- [0-256] P2000 memory address 0x6000 - 0x6100
- .... Nonsense (keyboard status etc.)
- 0x30 P200T_Header
- 0x50
- ... Nonsense..
- [0-1024] Data block
+ [0-256] P2000 memory address 0x6000 - 0x6100
+ .... Nonsense (keyboard status etc.)
+ 0x30 P200T_Header
+ 0x50
+ ... Nonsense..
+ [0-1024] Data block
- This means that one block gets stored in 1280 bytes.
+ This means that one block gets stored in 1280 bytes.
*/
if (image_size % CAS_BLOCK != 0)
{
diff --git a/src/lib/formats/vg5k_cas.cpp b/src/lib/formats/vg5k_cas.cpp
index 97d7421f622..45d3680618c 100644
--- a/src/lib/formats/vg5k_cas.cpp
+++ b/src/lib/formats/vg5k_cas.cpp
@@ -234,5 +234,5 @@ static const struct CassetteFormat vg5k_k7_format =
CASSETTE_FORMATLIST_START(vg5k_cassette_formats)
CASSETTE_FORMAT(vg5k_k7_format)
- CASSETTE_FORMAT(wavfile_format)
+ CASSETTE_FORMAT(wavfile_format)
CASSETTE_FORMATLIST_END
diff --git a/src/lib/netlist/core/nets.h b/src/lib/netlist/core/nets.h
index 8b1e81e7e24..8fe7ab6bb3c 100644
--- a/src/lib/netlist/core/nets.h
+++ b/src/lib/netlist/core/nets.h
@@ -21,7 +21,7 @@
// no action will be taken. This is academically cleaner, but slower than
// allowing this to happen and filter it during during "process".
-#define AVOID_NOOP_QUEUE_PUSHES (0)
+#define AVOID_NOOP_QUEUE_PUSHES (0)
namespace netlist
{
@@ -160,7 +160,7 @@ namespace netlist
if (m_in_queue == queue_status::DELAYED_DUE_TO_INACTIVE)
{
#if (AVOID_NOOP_QUEUE_PUSHES)
- if (m_next_scheduled_time > exec().time()
+ if (m_next_scheduled_time > exec().time()
&& (m_cur_Q != m_new_Q))
#else
if (m_next_scheduled_time > exec().time())
diff --git a/src/lib/netlist/macro/nlm_cd4xxx_lib.cpp b/src/lib/netlist/macro/nlm_cd4xxx_lib.cpp
index 51034eb3498..ad0ff1fbe5b 100644
--- a/src/lib/netlist/macro/nlm_cd4xxx_lib.cpp
+++ b/src/lib/netlist/macro/nlm_cd4xxx_lib.cpp
@@ -490,15 +490,15 @@ static NETLIST_START(CD4049_DIP)
NET_C(A.VSS, B.VSS, C.VSS, D.VSS, E.VSS, F.VSS)
//DIPPINS( /* +--------------+ */
- // A.VDD, /* VCC |1 ++ 16| NC */ NC.I,
- // A.G, /*G=/A |2 15| L=/F*/ F.L,
- // A.A, /* A |3 14| F */ F.F,
- // B.H, /*H=/B |4 13| NC */ NC.I,
- // B.B, /* B |5 4049 12| K=/E*/ E.K,
- // C.I, /*I=/C |6 11| E */ E.E,
- // C.C, /* C |7 10| J=/D*/ D.J,
- // A.VSS, /* VSS |8 9| D */ D.D
- // /* +--------------+ */
+ // A.VDD, /* VCC |1 ++ 16| NC */ NC.I,
+ // A.G, /*G=/A |2 15| L=/F*/ F.L,
+ // A.A, /* A |3 14| F */ F.F,
+ // B.H, /*H=/B |4 13| NC */ NC.I,
+ // B.B, /* B |5 4049 12| K=/E*/ E.K,
+ // C.I, /*I=/C |6 11| E */ E.E,
+ // C.C, /* C |7 10| J=/D*/ D.J,
+ // A.VSS, /* VSS |8 9| D */ D.D
+ // /* +--------------+ */
//)
DIPPINS( /* +--------------+ */
A.VDD, /* VCC |1 ++ 16| NC */ NC.I,
diff --git a/src/lib/netlist/plib/gmres.h b/src/lib/netlist/plib/gmres.h
index 16fcd1b3f4b..bb296833238 100644
--- a/src/lib/netlist/plib/gmres.h
+++ b/src/lib/netlist/plib/gmres.h
@@ -288,7 +288,7 @@ namespace plib
}
else
//rho_delta = accuracy * plib::sqrt(vec_mult2<FT>(n, rhs))
- // + 1e-4 * std::sqrt(n);
+ // + 1e-4 * std::sqrt(n);
rho_delta = accuracy * plib::sqrt(narrow_cast<FT>(n));
//
@@ -399,7 +399,7 @@ namespace plib
}
//for (std::size_t i = 0; i <= k; i++)
- // vec_add_mult_scalar(n, x, m_v[i], m_y[i]);
+ // vec_add_mult_scalar(n, x, m_v[i], m_y[i]);
return true;
}
return false;
diff --git a/src/lib/netlist/plib/ptimed_queue.h b/src/lib/netlist/plib/ptimed_queue.h
index 9df8a8fcd83..1807625b6b3 100644
--- a/src/lib/netlist/plib/ptimed_queue.h
+++ b/src/lib/netlist/plib/ptimed_queue.h
@@ -341,4 +341,4 @@ namespace plib {
} // namespace plib
#endif // PTIMED_QUEUE_H_
-#include <cstdlib>
+#include <cstdlib>