Skip to content

Commit b545507

Browse files
authored
Merge pull request #2 from reinauer/whitespace
Clean up white space in pld source files
2 parents f831e72 + fcd06ad commit b545507

8 files changed

Lines changed: 44 additions & 44 deletions

File tree

source/u202.pld

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ field addr = [A6..A1];
7272
/* The board configuration is really quite simple. If there's a
7373
write to the configuration register space, the configuration address
7474
is latched and we pass configuration out. If the system is shunted
75-
(eg, in a Zorro II backplane), configuration out goes immediately.
76-
Note that the configuration read registers are actually supplied by
75+
(eg, in a Zorro II backplane), configuration out goes immediately.
76+
Note that the configuration read registers are actually supplied by
7777
the first part of the boot ROM. */
7878

7979
CFGLT = addr:44 & dataspace & FCS & !READ & CFGIN & DS3 & !BERR & !RST
@@ -84,7 +84,7 @@ CFGOUT = CFGLT & !RST & !FCS
8484
# SHUNT;
8585

8686
/* The slave signal is drive from here for any normal access. When it isn't
87-
being driven, it is tri-stated, since the interrupt response logic may
87+
being driven, it is tri-stated, since the interrupt response logic may
8888
also drive SLAVE. */
8989

9090
SLAVEOE = CFGIN & MATCH & dataspace & FCS & !RST;
@@ -104,4 +104,4 @@ CINH.OE = SLAVE;
104104
the decode takes place in U203, including the real A1. */
105105

106106
INTSPC = CFGIN & CFGOUT & FC0 & FC1 & !RST & !A3 & A2;
107-

107+


source/u203.pld

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ intcyc = INTSPC & FC2 & A19 & A18 & A17 & !A1 & READ;
9595
880000 INTREG
9696
840000 SCSI write
9797
800000 SCSI read
98-
000000 ROM
98+
000000 ROM
9999

100100
*/
101101

@@ -112,7 +112,7 @@ ROM = cpucyc & SLAVE & READ & addr:[7fffff..000000]
112112

113113
SCSI = cpucyc & SLAVE & addr:[87ffff..800000];
114114

115-
/* The interrupt register select is actually a latching signal. It should be
115+
/* The interrupt register select is actually a latching signal. It should be
116116
asserted in interrupt register space only after data is valid, and only on
117117
writes. */
118118

@@ -148,7 +148,7 @@ INTSERV = intcyc & INT & INTASS & !FCS
148148
INTPOLL = INTSERV & MTCR
149149
# INTPOLL & FCS;
150150

151-
/* A slave output is generated if we're established that the polling phase is
151+
/* A slave output is generated if we're established that the polling phase is
152152
being answered. */
153153

154154
SLAVE = 'b'1;
@@ -159,4 +159,4 @@ SLAVE.OE = INTPOLL & INTSERV;
159159
INTVEC = INTPOLL & MTCR & SLAVE & DS0;
160160

161161

162-

162+


source/u205.pld

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ PIN 17 = !DTACK ; /* Zorro III termination. */
7070

7171
/** LOGICAL TERMS: **/
7272

73-
/* It takes both MYBUS and MASTER to fully qualify a cycle. If MYBUS is
73+
/* It takes both MYBUS and MASTER to fully qualify a cycle. If MYBUS is
7474
asserted but master not, we're in the process of bus arbitration. If
7575
MASTER is asserted but not MYBUS, the SCSI chip is master of the A4091
7676
bus and waiting for a grant to the Zorro bus. In both of these cases,
@@ -85,13 +85,13 @@ slavecyc = !MYBUS & !MASTER;
8585
/* This is the data output enable control. When data buffers are
8686
pointed toward the board, they can turn on early in the cycle.
8787
This is a write for slave access, a read for DMA access. When
88-
the data buffers are pointed out toward the bus, the have to
89-
wait until DOE to turn on; this is a slave read or DMA write.
88+
the data buffers are pointed out toward the bus, the have to
89+
wait until DOE to turn on; this is a slave read or DMA write.
9090
When the board responds to itself, the buffers are left off. If
91-
the NOZ3 signal is asserted on a write (eg, master driving the
91+
the NOZ3 signal is asserted on a write (eg, master driving the
9292
Zorro III bus), DBOE must be negated immediately. */
9393

94-
DBOE = slavecyc & SLAVE & !READ & FCS
94+
DBOE = slavecyc & SLAVE & !READ & FCS
9595
# slavecyc & SLAVE & READ & FCS & DOE
9696
# mastercyc & !SLAVE & !READ & FCS & DOE & !ABOEH & !NOZ3
9797
# mastercyc & !SLAVE & READ & FCS;
@@ -106,11 +106,11 @@ D2Z = slavecyc & READ & FCS & SLAVE
106106
Z2D = slavecyc & !READ & FCS & SLAVE
107107
# mastercyc & READ & FCS & !SLAVE;
108108

109-
/* For either kind of access, data is latched when DTACK is asserted and
109+
/* For either kind of access, data is latched when DTACK is asserted and
110110
we're in data time. Data is held through the end of the cycle. */
111111

112112
DBLT = slavecyc & FCS & DTACK & DOE & SLAVE
113-
# mastercyc & FCS & DTACK & DOE & !SLAVE
113+
# mastercyc & FCS & DTACK & DOE & !SLAVE
114114
# DBLT & FCS;
115115

116116
/* The address buffer controls. I want addresses going in unless the SCSI
@@ -128,13 +128,13 @@ ABOEH.D = slavecyc
128128
ABOEH.AR = NOZ3;
129129

130130
/* The board needs to generate a DTACK here for slave accesses. Most
131-
of the slave terminations are very simple, since they're either
131+
of the slave terminations are very simple, since they're either
132132
based on a termination signal (SLACK for SCSI, NACK for net or ROM)
133133
or they're instant (interrupt vector R/W). During configuration,
134-
any write should also be instantly terminated, that would be a
134+
any write should also be instantly terminated, that would be a
135135
configuration register write (reads are governed by ROM access). */
136136

137-
DTACK = SLAVE & FCS & DOE & SLACK
137+
DTACK = SLAVE & FCS & DOE & SLACK
138138
# SLAVE & FCS & DOE & INTREG
139139
# SLAVE & FCS & DOE & INTVEC
140140
# SLAVE & FCS & DOE & SID
@@ -143,4 +143,4 @@ DTACK = SLAVE & FCS & DOE & SLACK
143143
# SLAVE & FCS & DOE & DTACK;
144144

145145
DTACK.OE = SLAVE & FCS & !NOZ3;
146-

146+


source/u207.pld

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ stopcnt = !FCS
7575

7676
/** OUTPUT TERMS: **/
7777

78-
/* The interrupt process line is generated based on the SCSI interrupt.
78+
/* The interrupt process line is generated based on the SCSI interrupt.
7979
It can only change between Zorro III cycles. */
8080

8181
INT = !FCS & SINT
@@ -112,4 +112,4 @@ NS3.D = !RST & !stopcnt & NS0 & NS1 & NS2 & !NS3
112112
NACK = ROM & state:a
113113
# NACK & FCS & !RST;
114114
NACK.AR = RST;
115-

115+


source/u303.pld

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ PIN 22 = !RCHNG ; /* Registration is changing. */
6262

6363
/** OUTPUT TERMS: **/
6464

65-
/* The SCSI chip can be given the A3090 bus as soon as there's no activity on it.
65+
/* The SCSI chip can be given the A3090 bus as soon as there's no activity on it.
6666
Hold onto it until the SCSI becomes master. */
67-
/* Not really if granted early the chip will have as asserted then fcs will
67+
/* Not really if granted early the chip will have as asserted then fcs will
6868
assert and when the z bus is granted fcs and addr will assert a the same time */
6969

7070
SBG = !FCS & !DTACK & !RST & SBR & EBG & !BLOCKBG
@@ -83,7 +83,7 @@ BLOCKBG = MASTER
8383
EBR.D = RCHNG & !EBR & !RST;
8484
EBR.AR = RST;
8585

86-
/* A change of registration is necessary whenever a SCSI request comes in
86+
/* A change of registration is necessary whenever a SCSI request comes in
8787
and we're unregistered, or when the MASTER line is dropped and we are
8888
registered. DMASTER is used to block regd & !master period at beginning*/
8989

@@ -112,4 +112,4 @@ MYBUS = REGED & EBG
112112
SSBR.D = SBR;
113113

114114
BMASTER = MASTER;
115-

115+


source/u304.pld

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ PIN 19 = !SSYNC ; /* SCSI access synchronizer. */
6868

6969
/** OUTPUT TERMS: **/
7070

71-
/* The SCSI access cycle begins as soon as we have a DOE and at least one
71+
/* The SCSI access cycle begins as soon as we have a DOE and at least one
7272
data strobe. First thing to do is sync up to this. */
7373

7474
SSYNC.D = SCSI & DOE & !STERM & DS3 & !MYBUS
@@ -91,10 +91,10 @@ DS.D = SSYNC & !STERM & READ
9191
DS.OE = SCSI & !MYBUS;
9292

9393
/* The SCSI chip select needs to be set up to the rising edge of the system
94-
clock. So it's gated out with AS and !CLK. During a DMA, the SCSI chip
94+
clock. So it's gated out with AS and !CLK. During a DMA, the SCSI chip
9595
select is just passed through. */
9696

97-
SREG = AS & !MYBUS & !CLK
97+
SREG = AS & !MYBUS & !CLK
9898
# AS & !MYBUS & SREG
9999
# SCSI & MYBUS & !CLK;
100100

@@ -114,7 +114,7 @@ BA2.OE = SCSI & !MYBUS;
114114

115115
DS3 DS2 DS1 DS0 SIZ1 SIZ0 A1 A0
116116

117-
* 0 0 0 0
117+
* 0 0 0 0
118118
0 0 0 1 0 1 1 1
119119
0 0 1 0 0 1 1 0
120120
* 0 0 1 1
@@ -137,7 +137,7 @@ BA2.OE = SCSI & !MYBUS;
137137
it's either byte or longword, trouble if the software does the
138138
wrong kind of write.
139139
*/
140-
140+
141141
SIZ1 = !DS3 & !DS2 & DS1 & DS0
142142
# !DS3 & DS2 & DS1 & !DS0
143143
# !DS3 & DS2 & DS1 & DS0
@@ -167,4 +167,4 @@ A0 = !DS3 & !DS2 & !DS1 & DS0
167167
# !DS3 & DS2 & DS1 & DS0;
168168

169169
A0.OE = SCSI & DOE & !MYBUS;
170-

170+


source/u305.pld

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ PIN 2 = !MYBUS ; /* A3090 has the Zorro III bus. */
5050
PIN 3 = !AS ; /* SCSI address strobe. */
5151
PIN 4 = READ ; /* The Zorro III read cycle. */
5252
PIN 5 = SIZ1 ; /* SCSI transfer size. */
53-
PIN 6 = SIZ0 ;
53+
PIN 6 = SIZ0 ;
5454
PIN 7 = !NOZ3 ; /* Zorro III bus cutoff */
5555
PIN 8 = !MTCR ; /* Zorro III multiple transfer strobe. */
5656
PIN 10 = MASTER ; /* SCSI chip owns A4091 bus. */
@@ -75,12 +75,12 @@ PIN 22 = !DS3 ;
7575

7676
/* The buffered FCS depends on the mode. In non-DMA modes, it's simply
7777
based on the expansion FCS, as long as a SCSI-chip cycle isn't present
78-
(that would indicate DMA awaiting a grant). In DMA, the expansion
79-
FCS starts a cycle, but it can go away before the A4091 SCSI chip cycle
78+
(that would indicate DMA awaiting a grant). In DMA, the expansion
79+
FCS starts a cycle, but it can go away before the A4091 SCSI chip cycle
8080
is complete, so a latching term is added. */
8181

8282

83-
/* With MASTER, I could interlock differently.
83+
/* With MASTER, I could interlock differently.
8484

8585
BFCS = EFCS & !MASTER & !MYBUS
8686
# EFCS & MASTER & MYBUS
@@ -110,7 +110,7 @@ DS3 = READ
110110

111111
DS2 = READ
112112
# !A1 & !SIZ0
113-
# !A1 & A0
113+
# !A1 & A0
114114
# !A1 & SIZ1;
115115

116116
DS1 = READ
@@ -121,10 +121,10 @@ DS1 = READ
121121

122122
DS0 = READ
123123
# A0 & SIZ1 & SIZ0
124-
# !SIZ1 & !SIZ0
124+
# !SIZ1 & !SIZ0
125125
# A1 & A0
126126
# A1 & SIZ1;
127127

128128
[DS3..0].OE = MYBUS & DOE;
129129

130-

130+


source/u306.pld

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ PIN 22 = !CYCZ3 ; /* On-bus Zorro III cycle. */
7777
/** OUTPUT TERMS: **/
7878

7979
/* The Zorro III cycle starts on-bus as soon as it's certain to be a real
80-
cycle that's starting. If just starting, the buffered FCS isn't
80+
cycle that's starting. If just starting, the buffered FCS isn't
8181
asserted but ASQ is. Once on, it stays on until a DTACK is properly
8282
noticed. */
8383

@@ -98,7 +98,7 @@ EFCS.OE = MYBUS & CYCZ3;
9898
NOZ3 = MYBUS & BFCS & !CYCZ3
9999
# RST;
100100

101-
/* The data output enable has to wait until a safe "data phase". This is
101+
/* The data output enable has to wait until a safe "data phase". This is
102102
guaranteed to be two clocks after FCS falls. DCNT is used to time
103103
this from cycle's start. */
104104

@@ -120,8 +120,8 @@ DTSYNC.D = BFCS & !RST & DOE & BDTACK
120120
# BFCS & !RST & DOE & DTSYNC;
121121
DTSYNC.AR = !BFCS;
122122

123-
/* The SCSI termination is based on a synchronized DTACK. I
124-
synchronize DTACK for either slave or master cycle, since the
123+
/* The SCSI termination is based on a synchronized DTACK. I
124+
synchronize DTACK for either slave or master cycle, since the
125125
NCR 53C710 wants the effect of SLACK (which makes a DTACK on slave
126126
to SCSI cycles) reflected on STERM to actually end the cycle. */
127127

@@ -133,7 +133,7 @@ STERM.AR = !BFCS;
133133

134134
CBACK = 'b'0;
135135
CBACK.OE = 'b'0;
136-
136+
137137
/* We _never_ issue an MTCR, since BURST isn't supported. */
138138

139139
MTCR = 'b'0;
@@ -145,4 +145,4 @@ MTCR.OE = 'b'0;
145145

146146
BDTACK = !RST & BFCS & EDTACK
147147
# !RST & BFCS & BDTACK & !STERM;
148-

148+


0 commit comments

Comments
 (0)