diff options
author | 2014-01-19 15:51:25 +0000 | |
---|---|---|
committer | 2014-01-19 15:51:25 +0000 | |
commit | 4dc77142f9c23512693f87e1b16ce18c7b298ce0 (patch) | |
tree | 212719103166c2f72097802aa0dc7ce6bd150f98 /nl_examples/test.c | |
parent | c1158bbabff1ad095c6453ae4ab538ec2c305f3d (diff) |
Major renaming of netlist device macros, like
NETDEV_ALIAS ==> ALIAS
NETDEV_R ==> RES
NETDEV_C ==> CAP
Diffstat (limited to 'nl_examples/test.c')
-rw-r--r-- | nl_examples/test.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/nl_examples/test.c b/nl_examples/test.c index ae5f9a4a51f..a76c4b88c8c 100644 --- a/nl_examples/test.c +++ b/nl_examples/test.c @@ -9,13 +9,13 @@ NETLIST_START(bjt) /* Standard stuff */ - NETDEV_CLOCK(clk) - NETDEV_PARAM(clk.FREQ, 1000) // 1000 Hz - NETDEV_SOLVER(Solver) - NETDEV_PARAM(Solver.FREQ, 48000) + CLOCK(clk) + PARAM(clk.FREQ, 1000) // 1000 Hz + SOLVER(Solver) + PARAM(Solver.FREQ, 48000) - NETDEV_ANALOG_INPUT(V3, 3) - NETDEV_ANALOG_INPUT(STOPG, 0) + ANALOG_INPUT(V3, 3) + ANALOG_INPUT(STOPG, 0) NET_ALIAS(SRSTQ, RYf.2) NET_ALIAS(SRST, RYc.2) NET_C(antenna, GND) @@ -23,15 +23,15 @@ NETLIST_START(bjt) TTL_7404_INVERT(e4d, STOPG) - NETDEV_R(RYf, 50) // output impedance - NETDEV_R(RYc, 50) // output impedance + RES(RYf, 50) // output impedance + RES(RYc, 50) // output impedance TTL_7404_INVERT(c9f, RYc.2) TTL_7404_INVERT(c9c, RYf.2) NET_C(c9f.Q, RYf.1) NET_C(c9c.Q, RYc.1) - NETDEV_SWITCH2(coinsw, RYc.2, RYf.2) + SWITCH2(coinsw, RYc.2, RYf.2) NET_C(coinsw.Q, GND) @@ -40,8 +40,8 @@ NETLIST_START(bjt) NETDEV_QNPN(Q3, BC237B) NET_ALIAS(antenna, Q3.B) NET_C(GND, Q3.E) - NETDEV_R(RX5, 100) - NETDEV_C(CX1, 100) + RES(RX5, 100) + CAP(CX1, 100) NET_C(RX5.1, CX1.1) NET_C(RX5.1, Q3.C) NET_C(RX5.2, GND) @@ -50,20 +50,20 @@ NETLIST_START(bjt) NET_C(Q1.B, RX5.1) NET_C(Q1.E, GND) - NETDEV_D(D3, 1N914) + DIODE(D3, 1N914) NET_C(D3.A, Q1.C) NET_C(D3.K, SRSTQ) - NETDEV_D(D2, 1N914) - NETDEV_R(RX4, 220) + DIODE(D2, 1N914) + RES(RX4, 220) NET_C(D2.K, e4d.Q) NET_C(D2.A, RX4.1) NET_C(RX4.2, Q3.C) - NETDEV_R(RX1, 100) - NETDEV_R(RX2, 100) - NETDEV_R(RX3, 330) - NETDEV_C(CX2, CAP_U(0.1)) + RES(RX1, 100) + RES(RX2, 100) + RES(RX3, 330) + CAP(CX2, CAP_U(0.1)) NET_C(RX3.2, D3.A) NET_C(RX3.1, RX1.2) @@ -80,7 +80,7 @@ NETLIST_START(bjt) NET_C(RX2.1, D2.A) - //NETDEV_LOG(logB, Q1.B) - //NETDEV_LOG(logC, Q1.C) + //LOG(logB, Q1.B) + //LOG(logC, Q1.C) NETLIST_END() |