Skip to content

Commit bfc4386

Browse files
authored
Fixed warnings for Mapper 42 & 81 (#425)
1 parent 418fd2e commit bfc4386

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

rtl/mappers/generic.sv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ always @(posedge clk) begin
738738
case (flags[7:0])
739739
70: {prg_bank, chr_bank} <= prg_din;
740740
78: {chr_bank, mirroring, prg_bank[2:0]} <= prg_din;
741-
81: {prg_bank[1:0], chr_bank[1:0]} <= prg_din;
741+
81: {prg_bank[1:0], chr_bank[1:0]} <= prg_din[3:0];
742742
152: {mirroring, prg_bank[2:0], chr_bank} <= prg_din;
743743
endcase
744744
end

rtl/mappers/misc.sv

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,7 @@ end else if (ce) begin
864864
// 16'hc000: outer_bank <= prg_din[5:0] //outer bank register (submapper 1 only)
865865
16'he000: prg_bank <= prg_din[2:0]; //prg bank register
866866
endcase
867-
42: case(prg_ain & 16'he003)
867+
default: case(prg_ain & 16'he003)
868868
16'h8000: chr_bank <= prg_din[3:0];
869869
16'he000: prg_bank <= prg_din[3:0];
870870
16'he001: mirroring <= prg_din[3];
@@ -874,14 +874,14 @@ end else if (ce) begin
874874
if (irq_enable)
875875
case(mapper)
876876
40: irq_counter <= irq_counter + 13'd1;
877-
42: irq_counter <= irq_counter + 15'd1;
877+
default: irq_counter <= irq_counter + 15'd1;
878878
endcase
879879
else begin
880880
irq_counter <= 0;
881881
end
882882
case(mapper) //IRQ will self-acknowledge when counter overflows
883883
40: irq <= irq_counter[12];
884-
42: irq <= &irq_counter[14:13];
884+
default: irq <= &irq_counter[14:13];
885885
endcase
886886
end
887887

@@ -900,21 +900,22 @@ always @* begin
900900
3'b101: prg_sel = 3'h5;
901901
3'b110: prg_sel = prg_bank;
902902
3'b111: prg_sel = 3'h7;
903+
default: prg_sel = 0;
903904
endcase
904905
// Mapper 42
905906
// 6000-7FFF: Selectable
906907
// 8000-9FFF: bank #0Ch
907908
// A000-BFFF: bank #0Dh
908909
// C000-DFFF: bank #0Eh
909910
// E000-FFFF: bank #0Fh
910-
42: case(prg_ain[15:13])
911-
3'b011: prg_sel = prg_bank; // $6000-$7FFF
912-
3'b100: prg_sel = 4'hC;
913-
3'b101: prg_sel = 4'hD;
914-
3'b110: prg_sel = 4'hE;
915-
3'b111: prg_sel = 4'hF;
916-
default: prg_sel = 0;
917-
endcase
911+
default: case(prg_ain[15:13])
912+
3'b011: prg_sel = prg_bank; // $6000-$7FFF
913+
3'b100: prg_sel = 4'hC;
914+
3'b101: prg_sel = 4'hD;
915+
3'b110: prg_sel = 4'hE;
916+
3'b111: prg_sel = 4'hF;
917+
default: prg_sel = 0;
918+
endcase
918919
endcase
919920
end
920921

0 commit comments

Comments
 (0)