Macintosh-HW/MacPlus_MiSTer
1
0
Fork 0
mirror of https://github.com/MiSTer-devel/MacPlus_MiSTer.git synced 2024-06-09 07:29:27 +00:00
Code Issues Projects Releases Wiki Activity

keyboard fixes, serial

Browse Source
This commit is contained in:
Alan Steremberg 2021-03-28 12:32:08 -07:00
parent 86d1090f18
commit 6d6b048cf3
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MacPlus.sv
View File

@ -216,8 +216,8 @@ localparam CONF_STR = {
"ODE,CPU,68000,68010,68020;",
"O4,Memory,1MB,4MB;",
"-;",
"OA,Serial,Off,On;",
"-;",
//"OA,Serial,Off,On;",
//"-;",
"R0,Reset & Apply CPU+Memory;",
"V,v",`BUILD_DATE
};
@ -380,7 +380,8 @@ assign UART_RTS = serialRTS;
assign UART_DTR = UART_DSR;
*/
assign serialIn = ~status[10] ? 0 : UART_RXD;
//assign serialIn = ~status[10] ? 0 : UART_RXD;
assign serialIn = UART_RXD;
assign UART_TXD = serialOut;
//assign UART_RTS = UART_CTS;
assign UART_RTS = serialRTS ;

6
rtl/ps2_kbd.sv
View File

@ -22,7 +22,7 @@ module ps2_kbd
reg [8:0] keymac;
reg key_pending;
reg [21:0] pacetimer;
reg [19:0] pacetimer;
reg inquiry_active;
reg cmd_inquiry;
reg cmd_instant;
@ -68,8 +68,8 @@ always@(posedge clk or posedge reset) begin
end
end
wire tick_long = pacetimer == 22'h3fffff;
wire tick_short = pacetimer == 22'h000fff;
wire tick_long = pacetimer == 20'hfffff;
wire tick_short = pacetimer == 20'h00fff;
/* Delay inquiry responses to after tick_short */
always@(posedge clk or posedge reset) begin