Some fixes and tweaks.

This commit is contained in:
sorgelig 2020-01-22 00:56:01 +08:00
parent e956ad2f37
commit ae749249a1
3 changed files with 5 additions and 5 deletions

View File

@ -144,8 +144,8 @@ localparam CONF_STR = {
"F0,DSK,Mount Pri Floppy;", "F0,DSK,Mount Pri Floppy;",
"F1,DSK,Mount Sec Floppy;", "F1,DSK,Mount Sec Floppy;",
"-;", "-;",
"S0,VHD,Mount HDD - SCSI2;", "S0,VHD,Mount HDD-0(#2);",
"S1,VHD,Mount HDD - SCSI6 (boot);", "S1,VHD,Mount HDD-1(#6);",
"-;", "-;",
"O8,Aspect ratio,4:3,16:9;", "O8,Aspect ratio,4:3,16:9;",
"O9A,Memory,512KB,1MB,4MB;", "O9A,Memory,512KB,1MB,4MB;",
@ -250,7 +250,7 @@ always @(posedge clk_sys) begin
end end
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), .clk_sys(clk_sys),
.HPS_BUS(HPS_BUS), .HPS_BUS(HPS_BUS),

View File

@ -268,7 +268,7 @@ module ncr5380
assign io_lba = (scsi2_bsy) ? io_lba_2 : io_lba_6; 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_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 // input signals from target 2

2
scsi.v
View File

@ -38,7 +38,7 @@ module scsi
// SCSI device id // SCSI device id
parameter ID = 0; parameter [7:0] ID = 0;
`define PHASE_IDLE 3'd0 `define PHASE_IDLE 3'd0
`define PHASE_CMD_IN 3'd1 `define PHASE_CMD_IN 3'd1