diff --git a/CoCo3.sv b/CoCo3.sv index 71c0465..9f9538f 100644 --- a/CoCo3.sv +++ b/CoCo3.sv @@ -193,7 +193,7 @@ localparam CONF_STR = { "COCO3;UART19200:9600:4800:2400:1200:300;", "-;", //"OCD,Multi-Pak Slot,Orch 90,ECB / Cart,Disk;", - "OCD,Multi-Pak Slot,Orc 90,ECB / Cart,Disk;", + "OCD,Multi-Pak Slot,(Slot3) ECB /Cart,(Slot 4) Disk;", "-;", "H2S0,DSK,Load Disk Drive 0;", "H2S1,DSK,Load Disk Drive 1;", @@ -562,7 +562,7 @@ wire AMW_ACK; wire cpu_speed = status[11]; -wire [1:0] mpi = (status[13:12]==2'b00) ? 2'b00 : status[13:12]==2'b01 ? 2'b10 : status[13:12]==2'b10 ? 2'b11 : 2'b00; +wire [1:0] mpi = (status[13:12]==2'b00) ? 2'b10: 2'b11; wire video=status[14]; wire cartint=status[16]; wire sg4v6 = status[21]; diff --git a/docs/CoCo3FPGA.docx b/docs/CoCo3FPGA.docx index 6a160bb..038738e 100644 Binary files a/docs/CoCo3FPGA.docx and b/docs/CoCo3FPGA.docx differ diff --git a/docs/CoCo3FPGA.pdf b/docs/CoCo3FPGA.pdf index 2a56e73..0bdfcc7 100644 Binary files a/docs/CoCo3FPGA.pdf and b/docs/CoCo3FPGA.pdf differ diff --git a/docs/~$Co3FPGA.docx b/docs/~$Co3FPGA.docx deleted file mode 100644 index 0a19552..0000000 Binary files a/docs/~$Co3FPGA.docx and /dev/null differ diff --git a/rtl/coco3fpga.sv b/rtl/coco3fpga.sv index 90208cf..e13dfc1 100644 --- a/rtl/coco3fpga.sv +++ b/rtl/coco3fpga.sv @@ -779,7 +779,6 @@ assign FLASH_CE_S = ROM_SEL ? 1'b1: wire [7:0] COCO3_ROM_DATA; wire [7:0] COCO3_DISK_ROM_DATA; -wire [7:0] ORCH90_ROM_DATA; localparam [1:0] BOOT0 = 2'd0; localparam [1:0] BOOT1 = 2'd1; @@ -790,8 +789,6 @@ localparam [5:0] BOOT = 6'd0; wire COCO3_ROM_WRITE = (ioctl_index[7:0] == {BOOT0, BOOT}) & ioctl_wr; wire COCO3_DISKROM_WRITE = (ioctl_index[7:0] == {BOOT1, BOOT}) & ioctl_wr; -wire COCO3_ORCH90_ROM_WRITE = (ioctl_index[7:0] == {BOOT2, BOOT}) & ioctl_wr; - COCO_ROM_32K CC3_ROM( @@ -812,21 +809,10 @@ COCO_ROM_8K CC3_DISK_ROM( .WRITE(COCO3_DISKROM_WRITE) ); -COCO_ROM_8K CC3_ORCH90_ROM( -.ADDR(FLASH_ADDRESS[12:0]), -.DATA(ORCH90_ROM_DATA), -.CLK(~clk_sys), -.WR_ADDR(ioctl_addr[12:0]), -.WR_DATA(ioctl_data[7:0]), -.WRITE(COCO3_ORCH90_ROM_WRITE) -); - - assign FLASH_DATA = ENA_PAK ? CART_DATA: (FLASH_ADDRESS[15] == 1'b0) ? COCO3_ROM_DATA: (FLASH_ADDRESS[15:13] == 3'b100) ? COCO3_DISK_ROM_DATA: - (FLASH_ADDRESS[15:13] == 3'b101) ? ORCH90_ROM_DATA: 8'b00000000; diff --git a/rtl/rom/coco_rom_16.vhd b/rtl/rom/coco_rom_16.vhd index 8f231c7..ae2bde3 100644 --- a/rtl/rom/coco_rom_16.vhd +++ b/rtl/rom/coco_rom_16.vhd @@ -77,14 +77,14 @@ architecture RTL of COCO_ROM_16 is type ROM_ARRAY is array(0 to 15) of std_logic_vector(7 downto 0); signal ROM : ROM_ARRAY:= ( -// Clear $71 [Warm Start Flag] +-- Clear $71 [Warm Start Flag] x"80",x"07",x"00",x"71",x"00", -- valid, nc, nc, nc, nc, nc, nc, a24 -- a23, a22, a21, a20, a19, a18, a17, a16 -- a15, a14, a13, a12, a11, a10, a09, a08 -- a07, a06, a05, a04, a03, a02, a01, a00 -- d07, d06, d05, d04, d03, d02, d01, d00 -// Set $C000 <- $55 [Clear D in DK identifier in rom] +-- Set $C000 <- $55 [Clear D in DK identifier in rom] x"80",x"07",x"C0",x"00",x"55", -- valid, nc, nc, nc, nc, nc, nc, a24 -- a23, a22, a21, a20, a19, a18, a17, a16 -- a15, a14, a13, a12, a11, a10, a09, a08