mister-devel/Gameboy_MiSTer
1
0
Fork 0
mirror of https://github.com/MiSTer-devel/Gameboy_MiSTer.git synced 2026-04-26 03:04:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #183 from paulb-nl/sgb_mlt

Browse Source 
SGB: Fix joypad id decrement, MBC5: RAM enable is 8 bits
This commit is contained in:
Alexey Melnikov
2021-11-02 02:33:25 +08:00
committed by GitHub
parent 5084751906 62a515ada5
commit dd03f9a445
2 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtl/mappers/mbc5.v
View File

@@ -75,7 +75,7 @@ always @(posedge clk_sys) begin
end else if(ce_cpu) begin
if (cart_wr & ~cart_a15) begin
case(cart_addr[14:13])
2'b00: mbc_ram_enable <= (cart_di[3:0] == 4'ha); //RAM enable/disable
2'b00: mbc_ram_enable <= (cart_di == 8'h0A); //RAM enable/disable
2'b01: if (cart_addr[12])
mbc_rom_bank_reg[8] <= cart_di[0]; //ROM bank register 3000-3FFF High bit
else

33
rtl/sgb.v
View File

@@ -354,7 +354,7 @@ end
0Dh Joypad 3
0Ch Joypad 4
Setting P15 & P14 to high will decrement the joypad id if multiplayer
Setting P15 from low to high will decrement the joypad id if multiplayer
is enabled with MLT_REQ.
2 player: 0F,0E. 4 player: 0F,0E,0D,0C
@@ -362,33 +362,18 @@ end
*/
reg [1:0] joypad_id;
reg joypad_id_out;
reg joylock;
always @(posedge clk_sys) begin
if (reset) begin
joylock <= 0;
joypad_id_out <= 0;
joypad_id <= 0;
end else if (ce) begin
if (sgb_en & ~joylock & (~old_p15 | ~old_p14) & p15 & p14) begin
joylock <= 1'b1;
joypad_id_out <= 1'b1;
joypad_id <= (joypad_id - 1'b1) | ~mlt_ctrl;
end
if (old_p15 & ~p15 & p14) begin
joylock <= ~joylock;
end
if (~p15 | ~p14) begin
joypad_id_out <= 0;
if (sgb_en & ~old_p15 & p15) begin
joypad_id <= (joypad_id + 1'b1) & mlt_ctrl;
end
end
end
assign joy_do = joypad_id_out ? {2'b11,joypad_id} : joy_data;
assign joy_do = (sgb_en & p15 & p14) ? ~{2'b00,joypad_id} : joy_data;
wire [3:0] joy_dir = ~{ joystick[2], joystick[3], joystick[1], joystick[0] } | {4{p14}};
wire [3:0] joy_buttons = ~{ joystick[7], joystick[6], joystick[5], joystick[4] } | {4{p15}};
@@ -396,10 +381,10 @@ wire [3:0] joy_data = joy_dir & joy_buttons;
wire [7:0] joystick =
(~sgb_en | ~mlt_ctrl[0]) ? (joystick_0 | joystick_1) :
(joypad_id == 2'b11) ? joystick_0 :
(joypad_id == 2'b10) ? joystick_1 :
(joypad_id == 2'b01) ? joystick_2 :
joystick_3;
(joypad_id == 2'd0) ? joystick_0 :
(joypad_id == 2'd1) ? joystick_1 :
(joypad_id == 2'd2) ? joystick_2 :
joystick_3;
wire lcd_off = !lcd_on || (lcd_mode == 2'd01);
reg old_lcd_off;