Skip to content

Commit d63d2d7

Browse files
author
Ronny Hansen
committed
Refactor and cleanup to remove LINTER warnings
1 parent 2103dc3 commit d63d2d7

File tree

15 files changed

+230
-315
lines changed

15 files changed

+230
-315
lines changed

Verilog/CPU-BOARD-3202/circuit/BIF_BCTL_6.v

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@ module BIF_BCTL_6 (
145145
wire s_bperr50_n;
146146
wire s_block25_n;
147147
wire s_bdry75_n;
148-
wire s_act_n;
149-
wire s_dore_n;
150148
wire s_mem_n;
151149
wire s_cact25_n;
152150
wire s_eiod_n;
@@ -270,9 +268,9 @@ module BIF_BCTL_6 (
270268
.MOFF_n (s_moff_n), // I7 - MOFF_n
271269

272270
.SEM_n (s_sem_n), // Q0_n - SEM_n
273-
.ACT_n (s_act_n), // Q1_n - ACT_n (n.c.)
274-
.DOREF_n(s_dore_n), // Q2_n - DOREF_n (n.c.)
275-
.MEM_n (s_mem_n), // Q3_n - MEM_n (n.c.)
271+
.ACT_n (), // Q1_n - ACT_n (n.c.)
272+
.DOREF_n(), // Q2_n - DOREF_n (n.c.)
273+
.MEM_n (s_mem_n), // Q3_n - MEM_n
276274
.REF_n (s_ref_n), // Q4_n - REF_n
277275
.IOD_n (s_iod_n), // Q5_n - IOD_n
278276
.GNT_n (s_gnt_n), // Q6_n - GNT_n

Verilog/CPU-BOARD-3202/circuit/BIF_BCTL_BDRV_7.v

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,10 @@ module BIF_BCTL_BDRV_7 (
240240
assign s_berror_n = s_tout ? s_Y2[2] : 1'b1;
241241
assign s_bdry_n = s_tout ? s_Y2[3] : 1'b1;
242242

243+
// The following 2 lines is to make LINTER quiet as s_Y1[3] is unused/not connected
244+
(* keep = "true", DONT_TOUCH = "true" *) wire unused_s_Y1_bit;
245+
assign unused_s_Y1_bit = s_Y1[3];
246+
243247

244248
TTL_74241 CHIP_3A (
245249
.A1 (s_A1[3:0]),

Verilog/CPU-BOARD-3202/circuit/CPU_15.v

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ module CPU_15 (
106106
output IONI, //! Interrupt System ON
107107
output RRF_n, //! Output RRF signal from CPU to CYCLE
108108
output ECCR, //! ECC Register Detected for IOX
109+
output HIT, //! Cache hit
110+
output LEV0, //! Level 0 active
109111

110112
output LED1 //! Cache enabled ?
111113
);
@@ -346,6 +348,8 @@ module CPU_15 (
346348
assign IONI = s_ioni;
347349
assign RRF_n = s_rrf_n;
348350
assign ECCR = s_eccr;
351+
assign HIT = s_hit;
352+
assign LEV0 = s_lev0;
349353

350354
assign LED1 = s_led1;
351355

Verilog/CPU-BOARD-3202/circuit/CPU_MMU_CACHE_25.v

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,17 @@ module CPU_MMU_CACHE_25 (
5858
wire [10:0] s_ca_10_0;
5959
wire [ 1:0] s_hit_1_0_n;
6060
wire s_wca_n;
61-
wire s_led1;
6261
wire s_brk_n;
6362
wire s_wcinh_n;
6463
wire s_used_n;
6564
wire s_con;
6665
wire s_con_n;
6766
wire s_cclr_n;
68-
wire s_oubi;
6967
wire s_hit;
7068
wire s_dt_n;
7169
wire s_lshadow;
7270
wire s_cyd;
7371
wire s_cwr;
74-
wire s_oubd;
7572
wire s_uclk;
7673
wire s_rt_n;
7774
wire s_pd2;
@@ -203,6 +200,8 @@ module CPU_MMU_CACHE_25 (
203200
.IHIT_n() //.Q3_n(s_ihit) // IHIT_n not connected
204201
);
205202

203+
assign s_21f_in[3:2] = 2'b00;
204+
206205
Am9150 CHIP_21F (
207206
.clk (sysclk), // Clock input (BLOCK RAM MUST HAVE CLOCK)
208207
.address (s_ca_10_0[9:0]),

Verilog/CPU-BOARD-3202/circuit/IO_37.v

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ module IO_37(
1818
input BDRY50_n,
1919
input BRK_n,
2020
input CLK,
21+
input CONSOLE_n,
2122
input [4:0] CSCOMM_4_0,
2223
input [4:0] CSIDBS_4_0,
2324
input [1:0] CSMIS_1_0,
@@ -26,7 +27,6 @@ module IO_37(
2627
input EAUTO_n,
2728
input EORF_n,
2829
input HIT,
29-
input I1P,
3030
input ICONTIN_n,
3131
input ILOAD_n,
3232
input [7:0] INR_7_0,
@@ -50,7 +50,6 @@ module IO_37(
5050
input XTAL1,
5151
input XTAL2,
5252
input XTR,
53-
input CONSOLE_n,
5453

5554
// Input and Output signals
5655
input [7:0] IDB_7_0_IN,
@@ -143,7 +142,6 @@ module IO_37(
143142
wire s_swmcl_n;
144143
wire s_rinr_n;
145144
wire s_ceuart_n;
146-
wire s_i1p;
147145
wire s_lcs_n;
148146
wire s_refrq_n;
149147
wire s_epans_n;
@@ -229,7 +227,6 @@ module IO_37(
229227
assign s_xtal2 = XTAL2;
230228
assign s_ioni = IONI;
231229
assign s_swmcl_n = SWMCL_n;
232-
assign s_i1p = I1P;
233230
assign s_lcs_n = LCS_n;
234231
assign s_ref_n = REF_n;
235232
assign s_uclk = UCLK;
@@ -355,33 +352,33 @@ module IO_37(
355352
.sysclk(sysclk), // System clock in FPGA
356353
.sys_rst_n(sys_rst_n), // System reset in FPGA
357354

358-
.BAUD_RATE_SWITCH(BAUD_RATE_SWITCH),
355+
// Input signals
359356
.CEUART_n(s_ceuart_n),
360357
.CLK(s_clk),
361358
.CONSOLE_n(s_uart_console_n),
362-
.DA_n(s_da_n),
363359
.EAUTO_n(s_eauto_n),
364360
.EIOR_n(s_eior_n),
365-
.I1P(s_i1p),
366-
.IDB_7_0_IN(s_idb_7_0_in[7:0]),
367-
.IDB_15_0_OUT(s_idb_15_0_uart_out[15:0]),
368361
.LCS_n(s_lcs_n),
369362
.LOCK_n(s_lock_n),
370363
.MIS_1_0(s_csmis_1_0[1:0]),
371-
372-
/* verilator lint_off PINMISSING */
373-
/* verilator lint_off PINCONNECTEMPTY */
374-
.O1P(), //O1P is unused
375-
.O2P(), //O2P is unused
376-
/* verilator lint_on PINCONNECTEMPTY */
377-
/* verilator lint_on PINMISSING */
378-
379364
.PPOSC(s_pposc),
380365
.RUART_n(s_ruart_n),
366+
.XTR(s_xtr),
367+
368+
// RS232 RX/TX signals
381369
.RXD(s_rxd),
382-
.TBMT_n(s_tbmt_n),
383370
.TXD(s_txd),
384-
.XTR(s_xtr)
371+
372+
// Baud dare settings
373+
.BAUD_RATE_SWITCH(BAUD_RATE_SWITCH),
374+
375+
// Input and output signals
376+
.IDB_7_0_IN(s_idb_7_0_in[7:0]),
377+
.IDB_15_0_OUT(s_idb_15_0_uart_out[15:0]),
378+
379+
// Output signals
380+
.DA_n(s_da_n),
381+
.TBMT_n(s_tbmt_n)
385382
);
386383

387384

Verilog/CPU-BOARD-3202/circuit/IO_PANCAL_40.v

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ module IO_PANCAL_40 (
4545
*******************************************************************************/
4646
wire [ 4:0] s_dp_5_1_n;
4747
wire [ 4:0] s_ground_bus;
48-
wire [ 3:0] s_bus_4_bit;
4948
wire [ 4:0] s_stat_4_0;
5049
wire [ 1:0] s_pcr_1_0;
5150
wire [15:0] s_idb_15_0_out;
@@ -60,17 +59,12 @@ module IO_PANCAL_40 (
6059
wire s_lev0;
6160
wire s_emp_n;
6261
wire s_panos;
63-
wire s_ck;
6462
wire s_rmm_n;
6563
wire [15:0] s_idb_15_0_chip_out;
6664

6765
wire s_pres;
6866
wire s_read;
6967

70-
/*******************************************************************************
71-
** The module functionality is described here **
72-
*******************************************************************************/
73-
7468
/*******************************************************************************
7569
** Here all input connections are defined **
7670
*******************************************************************************/

Verilog/CPU-BOARD-3202/circuit/IO_UART_42.v

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ module IO_UART_42 (
3030
input RXD, //! RS232 Receive
3131
output TXD, //! RS232 Transmit
3232

33-
// Current loop signals
34-
input I1P, //! Current Loop Input 1
35-
output O1P, //! Current Loop Output 1
36-
output O2P, //! Current Loop Output 2
37-
3833
// Baud rate settings
3934
input [3:0] BAUD_RATE_SWITCH, //! Baud rate switch
4035

@@ -66,7 +61,6 @@ module IO_UART_42 (
6661
wire s_eauto_n;
6762
wire s_eiorn_n;
6863
wire s_gnd;
69-
wire s_i1p;
7064
wire s_lcs_n;
7165
wire s_lock_n;
7266
wire s_pposc;
@@ -85,7 +79,6 @@ module IO_UART_42 (
8579
** Here all input connections are defined **
8680
*******************************************************************************/
8781
assign s_mis_1_0[1:0] = MIS_1_0;
88-
assign s_i1p = I1P;
8982
assign s_lock_n = LOCK_n;
9083
assign s_ceuart_n = CEUART_n;
9184
assign s_xtr = XTR;
@@ -108,8 +101,6 @@ module IO_UART_42 (
108101
assign s_io_idb_15_0_out[10:5] = 6'b0;
109102

110103
assign TXD = s_txd;
111-
assign O1P = s_txd;
112-
assign O2P = s_txd;
113104

114105
// Both DA and TBMT are pulled high
115106
// DA_n (or /RXRDY from UART) signal is only valid when the receiver is enabled
@@ -123,7 +114,7 @@ module IO_UART_42 (
123114
** Here all in-lined components are defined **
124115
*******************************************************************************/
125116
assign s_gnd = 1'b0;
126-
assign s_rx = s_i1p | s_rxd;
117+
assign s_rx = s_rxd;
127118

128119

129120
AM29C821 CHIP_33G (

Verilog/CPU-BOARD-3202/circuit/MEM_43.v

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,8 @@ module MEM_43 (
8282
wire [17:0] s_ram_dd_17_0_in; // INPUT TO MEM_DATA
8383
wire [17:0] s_ram_dd_17_0_out; // OUTPUT FROM MEM_DATA
8484

85-
wire [19:0] s_lbd_19_0;
86-
8785
wire [23:0] s_lbd_23_0_in; // RAM DATA 16 bits and ADDRESS 24 bits
88-
wire [23:0] s_lbd_23_0_out; // RAM DATA 16 bits
86+
wire [15:0] s_lbd_15_0_out; // RAM DATA 16 bits
8987

9088
wire s_bcgnt50;
9189
wire s_bcgnt50r_n;
@@ -156,7 +154,7 @@ module MEM_43 (
156154
*******************************************************************************/
157155
assign s_bus_bd[4:0] = BD_23_19_n;
158156
assign s_bus_ppn[4:0] = PPN_23_19;
159-
assign s_lbd_23_0_in[23:0] = LBD_23_0_IN;
157+
assign s_lbd_23_0_in[23:0] = LBD_23_0_IN[23:0];
160158
assign s_ibinput_n = IBINPUT_n;
161159
assign s_pd3 = PD3;
162160
assign s_dbapr = DBAPR;
@@ -199,7 +197,7 @@ module MEM_43 (
199197
assign MOFF_n = s_moff_n;
200198
assign MOR25_n = s_mor25_n;
201199
assign MWRITE_n = s_mwrite_n;
202-
assign LBD_23_0_OUT = s_lbd_23_0_out;
200+
assign LBD_23_0_OUT = {8'b00000000, s_lbd_15_0_out};
203201

204202

205203
/*******************************************************************************
@@ -315,7 +313,7 @@ module MEM_43 (
315313
// Output signals
316314
.DD_17_0_OUT(s_data_dd_out[17:0]),
317315
.HIERR(s_hierr),
318-
.LBD_15_0_OUT(s_lbd_23_0_out[15:0]),
316+
.LBD_15_0_OUT(s_lbd_15_0_out[15:0]),
319317
.LED4(LED4),
320318
.LERR_n(s_lerr_n),
321319
.LOERR(s_loerr),

Verilog/CPU-BOARD-3202/circuit/MEM_DATA_46.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module MEM_DATA_46 (
2424
input [15:0] LBD_15_0_IN,
2525
output [15:0] LBD_15_0_OUT,
2626

27-
output [17:0] DD_17_0_IN,
27+
input [17:0] DD_17_0_IN,
2828
output [17:0] DD_17_0_OUT,
2929

3030
// Output signals

0 commit comments

Comments
 (0)