From 784daf12f7856cb11746621498c7a5aed79971ac Mon Sep 17 00:00:00 2001
From: Gyorgy Szombathelyi <gyurco@freemail.hu>
Date: Mon, 11 May 2020 20:40:57 +0200
Subject: [PATCH] BBC: silence some warnings

---
 cores/bbc/rtl/bbc.v      | 14 +++++++-------
 cores/bbc/rtl/keyboard.v |  2 +-
 cores/bbc/rtl/ps2_intf.v |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cores/bbc/rtl/bbc.v b/cores/bbc/rtl/bbc.v
index d4bf22a..463a3b0 100644
--- a/cores/bbc/rtl/bbc.v
+++ b/cores/bbc/rtl/bbc.v
@@ -217,11 +217,11 @@ wire     [7:0] user_via_pb_oe;
 // MMC
 // SDCLK is driven from either PB1 or CB1 depending on the SR Mode
 wire   sdclk_int = user_via_pb_oe[1] ? user_via_pb_out[1] : 
-						(user_via_cb1_oe ? user_via_cb1_out : 1);
+						(user_via_cb1_oe ? user_via_cb1_out : 1'b1);
 assign SDCLK = sdclk_int;
 assign user_via_cb1_in = sdclk_int;
 // SDMOSI is always driven from PB0
-assign SDMOSI = user_via_pb_oe[0] ? user_via_pb_out[0] : 1;
+assign SDMOSI = user_via_pb_oe[0] ? user_via_pb_out[0] : 1'b1;
 // SDMISO is always read from CB2
 assign user_via_cb2_in = SDMISO;
 assign SDSS = 0;
@@ -551,25 +551,25 @@ always @(crtc_ma or crtc_ra or disp_addr_offs)
          begin
 
 //  Mode 3 - restart at 0x4000
-         process_3_aa = crtc_ma[11:8] + 8;   
+         process_3_aa = crtc_ma[11:8] + 4'd8;
          end
       2'b 01:
          begin
 
 //  Mode 6 - restart at 0x6000
-         process_3_aa = crtc_ma[11:8] + 12;   
+         process_3_aa = crtc_ma[11:8] + 4'd12;
          end
       2'b 10:
          begin
 
 //  Mode 0,1,2 - restart at 0x3000
-         process_3_aa = crtc_ma[11:8] + 6;   
+         process_3_aa = crtc_ma[11:8] + 4'd6;
          end
       2'b 11:
          begin
 
 //  Mode 4,5 - restart at 0x5800
-         process_3_aa = crtc_ma[11:8] + 11;   
+         process_3_aa = crtc_ma[11:8] + 4'd11;
          end
       default:
          ;
@@ -627,7 +627,7 @@ assign cpu_di = ram_enable === 1'b 1 ? MEM_DI :
 	adc_enable === 1'b 1 ? adc_do : 
 	//tube_enable === 1'b 1 ? tube_do : 
 	//adlc_enable === 1'b 1 ? bbcddr_out :
-	'd0; 
+	8'd0;
 	
 //  un-decoded locations are pulled down by RP1
 assign cpu_irq_n = ~sys_via_irq & ~user_via_irq; // & tube_irq_n;
diff --git a/cores/bbc/rtl/keyboard.v b/cores/bbc/rtl/keyboard.v
index 27b1d3e..aba3587 100644
--- a/cores/bbc/rtl/keyboard.v
+++ b/cores/bbc/rtl/keyboard.v
@@ -100,7 +100,7 @@ always @(posedge CLOCK) begin
         end  else if (CLKEN_1MHZ === 1'b 1 ) begin
 
             //  Otherwise increment the counter once per 1 MHz tick
-            col <= col + 1;
+            col <= col + 1'd1;
 			
         end
     end
diff --git a/cores/bbc/rtl/ps2_intf.v b/cores/bbc/rtl/ps2_intf.v
index dec0cf5..2fd2310 100644
--- a/cores/bbc/rtl/ps2_intf.v
+++ b/cores/bbc/rtl/ps2_intf.v
@@ -128,7 +128,7 @@ always @(posedge CLK) begin
                 if (ps2_dat_in === 1'b 0) begin
 
                     //  This is a start bit
-                    bit_count <= bit_count + 'd1;
+                    bit_count <= bit_count + 1'd1;
                 end
 
                 //  Running.  8-bit data comes in LSb first followed by
@@ -139,7 +139,7 @@ always @(posedge CLK) begin
                 if (bit_count < 10) begin
 
                     //  Shift in data and parity (9 bits)
-                    bit_count <= bit_count + 1;
+                    bit_count <= bit_count + 1'd1;
                     shiftreg <= {ps2_dat_in, shiftreg[8:1]};
                     parity <= parity ^ ps2_dat_in;
                     //  Calculate parity