summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/netlist
diff options
context:
space:
mode:
author couriersud <couriersud@gmx.org>2017-02-19 00:31:56 +0100
committer couriersud <couriersud@gmx.org>2017-02-19 01:00:48 +0100
commit2acad1f854dc256ef5ae7f62814b9445ad816446 (patch)
tree76ada248b164996f9e944934d5fa457a6909b495 /src/lib/netlist
parent65806114b06babe52bd529f10360b6fa6a8773b5 (diff)
Add prodigy to mamenl build. Fix clang5 warnings. (nw)
Diffstat (limited to 'src/lib/netlist')
-rw-r--r--src/lib/netlist/build/makefile1
-rw-r--r--src/lib/netlist/devices/nld_2102A.cpp2
-rw-r--r--src/lib/netlist/nl_base.h3
-rw-r--r--src/lib/netlist/nl_config.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/netlist/build/makefile b/src/lib/netlist/build/makefile
index 843af2838c3..51c770778e4 100644
--- a/src/lib/netlist/build/makefile
+++ b/src/lib/netlist/build/makefile
@@ -93,6 +93,7 @@ NLOBJS := \
$(NLOBJ)/devices/nld_74123.o \
$(NLOBJ)/devices/nld_74153.o \
$(NLOBJ)/devices/nld_74161.o \
+ $(NLOBJ)/devices/nld_74164.o \
$(NLOBJ)/devices/nld_74165.o \
$(NLOBJ)/devices/nld_74166.o \
$(NLOBJ)/devices/nld_74174.o \
diff --git a/src/lib/netlist/devices/nld_2102A.cpp b/src/lib/netlist/devices/nld_2102A.cpp
index 3b7d32f6322..5296bf2d029 100644
--- a/src/lib/netlist/devices/nld_2102A.cpp
+++ b/src/lib/netlist/devices/nld_2102A.cpp
@@ -75,7 +75,7 @@ namespace netlist
unsigned a = 0;
for (std::size_t i=0; i<10; i++)
{
- a |= m_A[i]() << i;
+ a |= (m_A[i]() << i);
}
const unsigned byte = ADDR2BYTE(a);
const unsigned bit = ADDR2BIT(a);
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 1984380e583..9f2ecd098cd 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -29,8 +29,7 @@
// ----------------------------------------------------------------------------------------
/*! netlist_sig_t is the type used for logic signals. */
-//using netlist_sig_t = std::uint32_t;
-using netlist_sig_t = std::uint8_t;
+using netlist_sig_t = std::uint32_t;
//============================================================
// MACROS / New Syntax
diff --git a/src/lib/netlist/nl_config.h b/src/lib/netlist/nl_config.h
index 47a1c9131d7..04afe2aebf6 100644
--- a/src/lib/netlist/nl_config.h
+++ b/src/lib/netlist/nl_config.h
@@ -37,7 +37,7 @@
* setting param USE_DEACTIVATE for the device.
*/
-#define USE_TRUTHTABLE_7448 (1)
+#define USE_TRUTHTABLE_7448 (0)
// How many times do we try to resolve links (connections)
#define NL_MAX_LINK_RESOLVE_LOOPS (100)