diff --git a/rtl/UART_6551/uart_6551.v b/rtl/UART_6551/uart_6551.v index d9fee07..ec5a8b3 100644 --- a/rtl/UART_6551/uart_6551.v +++ b/rtl/UART_6551/uart_6551.v @@ -308,8 +308,12 @@ end assign TX_CLK = (CTL_REG[3:0] == 4'h0) ? XTAL_CLK_IN: TX_CLK_REG; -assign RX_CLK = (CTL_REG[4] == 1'b0) ? RX_CLK_IN: - TX_CLK; +// Receiver clock. CTL bit 4 = 0 selects the external RxC input, which used to +// be the fixed 1.8475 MHz enable (115,200 baud): a program writing CTL=$0F +// (19,200, bit 4 clear -- the FujiNet HDB-DOS L3 cart) then transmitted at +// 19,200 but received at 115,200. RxC is taken from the baud generator +// instead; for CTL[3:0]=0 that is the same 1.8475 MHz clock as before. +assign RX_CLK = TX_CLK; assign RESET_X = RESET_NX ? 1'b0: RESET_N; diff --git a/rtl/coco3fpga.sv b/rtl/coco3fpga.sv index 5800d75..9c25df1 100644 --- a/rtl/coco3fpga.sv +++ b/rtl/coco3fpga.sv @@ -896,10 +896,11 @@ assign SDC_EN_CS = ({MPI_SCS, ADDRESS[15:5]} == 13'b0111111111010) ? 1'b1: 1'b0; `endif -//assign RS232_EN = ({MPI_SCS, ADDRESS[15:2]} == 16'b0011111111011010) ? 1'b1: //FF68-FF6B - Now in slot 1 -// 1'b0 ; - -assign RS232_EN = ({MPI_SCS[0], ADDRESS[15:2]} == 15'b111111111011010) ? 1'b1: //FF68-FF6B - Now in slot 2 and 4 +// FF68-FF6B: the RS-232 Pak decodes these itself from the address bus; the +// Multi-Pak's SCS only covers FF40-FF5F. Gating on MPI_SCS (slot 1 originally, +// later slots 2 and 4) left the 6551 unreachable with a cart in slot 3, e.g. +// the FujiNet HDB-DOS SY6551 cart, which can only boot from slot 3. +assign RS232_EN = (ADDRESS[15:2] == 14'b11111111011010) ? 1'b1: //FF68-FF6B, any slot 1'b0; assign SLOT3_HW = ({SWITCH[2:1], ADDRESS[15:5]} == 13'b1011111111010) ? 1'b1: // FF40-FF5F Ensure this only appears in slot 3 PHYSICALLY