From ae749249a1259c4ba9b775057e01bd2c0974450e Mon Sep 17 00:00:00 2001
From: sorgelig <pour.garbage@gmail.com>
Date: Wed, 22 Jan 2020 00:56:01 +0800
Subject: [PATCH] Some fixes and tweaks.

---
 MacPlus.sv | 6 +++---
 ncr5380.v  | 2 +-
 scsi.v     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/MacPlus.sv b/MacPlus.sv
index 4bd3a40..8b60dd4 100644
--- a/MacPlus.sv
+++ b/MacPlus.sv
@@ -144,8 +144,8 @@ localparam CONF_STR = {
 	"F0,DSK,Mount Pri Floppy;",
 	"F1,DSK,Mount Sec Floppy;",
 	"-;",
-	"S0,VHD,Mount HDD - SCSI2;",
-	"S1,VHD,Mount HDD - SCSI6 (boot);",
+	"S0,VHD,Mount HDD-0(#2);",
+	"S1,VHD,Mount HDD-1(#6);",
 	"-;",
 	"O8,Aspect ratio,4:3,16:9;",
 	"O9A,Memory,512KB,1MB,4MB;",
@@ -250,7 +250,7 @@ always @(posedge clk_sys) begin
 	end
 end
 
-hps_io #(.STRLEN($size(CONF_STR)>>3)) hps_io
+hps_io #(.STRLEN($size(CONF_STR)>>3), .VDNUM(2)) hps_io
 (
 	.clk_sys(clk_sys),
 	.HPS_BUS(HPS_BUS),
diff --git a/ncr5380.v b/ncr5380.v
index 54c4916..d18c144 100644
--- a/ncr5380.v
+++ b/ncr5380.v
@@ -268,7 +268,7 @@ module ncr5380
    
 	assign io_lba      = (scsi2_bsy) ? io_lba_2 : io_lba_6;
 	assign sd_buff_din = (scsi2_bsy) ? sd_buff_din_2 : sd_buff_din_6;
-	assign sd_req_type = 16'h0000;	// Not used atm. Could be used for CD-ROM sector requests later. ElectronAsh.
+	assign io_req_type = 16'h0000;	// Not used atm. Could be used for CD-ROM sector requests later. ElectronAsh.
 	
 	
    // input signals from target 2
diff --git a/scsi.v b/scsi.v
index 71b8284..83d4255 100644
--- a/scsi.v
+++ b/scsi.v
@@ -38,7 +38,7 @@ module scsi
 
    
 // SCSI device id
-parameter ID = 0; 
+parameter [7:0] ID = 0; 
 
 `define PHASE_IDLE        3'd0
 `define PHASE_CMD_IN      3'd1