OSD: move "Cart Interrupt Disabled" to status[19] / SWITCH[9]
The 20260927 release reused status[16] / SWITCH[4] for "Swap MiSTer Uart" (rs_swap) and dropped the "Cart Interrupt Disabled" item that the cart start-up change wires into the slot 3 CART interrupt. Bring the item back in the Debug menu on a free status bit (OJ, status[19]) and pass it through the unused SWITCH[9]. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
This commit is contained in:
1 parent
4afcebf22a
commit
50d76dd489
2 files changed
+4
-2
No files matched your search
@@ -244,6 +244,7 @@ localparam CONF_STR = {
|
|||||||
"P2OG,Swap MiSTer Uart,RS CART,Default;",
|
"P2OG,Swap MiSTer Uart,RS CART,Default;",
|
||||||
"P2OU,Swap Uart to IO,RS IO,MiSTer;",
|
"P2OU,Swap Uart to IO,RS IO,MiSTer;",
|
||||||
"P2OT,Display Debug,Off,On;",
|
"P2OT,Display Debug,Off,On;",
|
||||||
|
"P2OJ,Cart Interrupt Disabled,OFF,ON;",
|
||||||
"-;",
|
"-;",
|
||||||
"ON,D-Pad Joystick emu,No,Yes;",
|
"ON,D-Pad Joystick emu,No,Yes;",
|
||||||
"O6,Swap Joysticks,Off,On;",
|
"O6,Swap Joysticks,Off,On;",
|
||||||
@@ -651,6 +652,7 @@ wire [2:0] Mem_Size = status[27:25];
|
|||||||
wire SWAP_M_J = status[28];
|
wire SWAP_M_J = status[28];
|
||||||
wire display_debug = status[29];
|
wire display_debug = status[29];
|
||||||
wire UART_INPUT = status[30];
|
wire UART_INPUT = status[30];
|
||||||
|
wire cartint = status[19];
|
||||||
wire digitalJoy = status[23];
|
wire digitalJoy = status[23];
|
||||||
reg [2:0] mpi_d = 2'b00;
|
reg [2:0] mpi_d = 2'b00;
|
||||||
reg first_mpi_chg = 1'b0;
|
reg first_mpi_chg = 1'b0;
|
||||||
@@ -687,7 +689,7 @@ begin
|
|||||||
end
|
end
|
||||||
|
|
||||||
// Set bit 9 to swap serial ports...
|
// Set bit 9 to swap serial ports...
|
||||||
wire [9:0] switch = { 1'b0,UART_INPUT,art,sg4v6,rs_swap,CASS_REW_RECORD,mpi,1'b0};
|
wire [9:0] switch = { cartint,UART_INPUT,art,sg4v6,rs_swap,CASS_REW_RECORD,mpi,1'b0};
|
||||||
|
|
||||||
|
|
||||||
wire reset = RESET | status[0] | buttons[1];
|
wire reset = RESET | status[0] | buttons[1];
|
||||||
|
|||||||
+1
-1
@@ -1850,7 +1850,7 @@ begin
|
|||||||
2'b01:
|
2'b01:
|
||||||
CART_INT_IN_N <= (SER_IRQ);
|
CART_INT_IN_N <= (SER_IRQ);
|
||||||
2'b10:
|
2'b10:
|
||||||
CART_INT_IN_N <= (!CART_INT_IN_N | cart_firq_enable | SWITCH[4]); // SWITCH[4]: OSD "Cart Interrupt Disabled"
|
CART_INT_IN_N <= (!CART_INT_IN_N | cart_firq_enable | SWITCH[9]); // SWITCH[9]: OSD "Cart Interrupt Disabled"
|
||||||
2'b11:
|
2'b11:
|
||||||
CART_INT_IN_N <= (SER_IRQ);
|
CART_INT_IN_N <= (SER_IRQ);
|
||||||
endcase
|
endcase
|
||||||
|
|||||||
Reference in new issue
Block a user