fix F_CTRL_EN management #781 #778

src/vhdl/expansion_port_controller.vhdl

@@ -75,6 +75,7 @@ ENTITY expansion_port_controller IS
     -- Expansion port pins
     ------------------------------------------------------------------------
     cart_ctrl_dir : out std_logic := '1';
+    cart_ctrl_en : out std_logic := '0'; -- required for R4/R5/R6
     cart_haddr_dir : out std_logic := '1';
     cart_laddr_dir : out std_logic := '1';
     cart_addr_en : out std_logic := '0';
@@ -419,6 +420,9 @@ begin
             -- direction for a fraction of a 1MHz cycle, but we need to better
             -- understand the performance of the buffers to know what latency
             -- is required.
+            -- XXX On R4/R5/R6 only the R/W line might need to be read instead
+            -- of written to.  Note has been logged for R7 board design to
+            -- make R/W open-collector and have a separate read sense on it.
             report "EXROM: Tri-stating cart_exrom,game, setting cart_ctrl_dir=0";
             reprobe_exrom <= '0';
             cart_ctrl_dir <= '0';

src/vhdl/mega65r2.vhdl

@@ -652,6 +652,7 @@ begin
       -- Expansion/cartridge port
       ----------------------------------------------------------------------
       cart_ctrl_dir => cart_ctrl_dir,
+      cart_ctrl_en => cart_ctrl_en,
       cart_haddr_dir => cart_haddr_dir,
       cart_laddr_dir => cart_laddr_dir,
       cart_data_dir => cart_data_dir,

src/vhdl/mega65r3.vhdl

@@ -74,7 +74,7 @@ entity container is
          -- Expansion/cartridge port
          ----------------------------------------------------------------------
          cart_ctrl_dir : out std_logic;
-         cart_ctrl_en : out std_logic := '0';
+         cart_ctrl_en : out std_logic;
          cart_haddr_dir : out std_logic;
          cart_laddr_dir : out std_logic;
          cart_data_en : out std_logic;
@@ -782,6 +782,7 @@ begin
       -- Expansion/cartridge port
       ----------------------------------------------------------------------
       cart_ctrl_dir => cart_ctrl_dir,
+      cart_ctrl_en => cart_ctrl_en,
       cart_haddr_dir => cart_haddr_dir,
       cart_laddr_dir => cart_laddr_dir,
       cart_data_dir => cart_data_dir,

src/vhdl/mega65r4.vhdl

@@ -83,6 +83,7 @@ entity container is
          -- Expansion/cartridge port
          ----------------------------------------------------------------------
          cart_ctrl_dir : out std_logic;
+         cart_ctrl_en : out std_logic;
          cart_haddr_dir : out std_logic;
          cart_laddr_dir : out std_logic;
          cart_data_en : out std_logic;
@@ -931,6 +932,7 @@ begin
       -- Expansion/cartridge port
       ----------------------------------------------------------------------
       cart_ctrl_dir => cart_ctrl_dir,
+      cart_ctrl_en => cart_ctrl_en,
       cart_haddr_dir => cart_haddr_dir,
       cart_laddr_dir => cart_laddr_dir,
       cart_data_dir => cart_data_dir,

src/vhdl/mega65r5.vhdl

@@ -82,6 +82,7 @@ entity container is
          -- Expansion/cartridge port
          ----------------------------------------------------------------------
          cart_ctrl_dir : out std_logic;
+         cart_ctrl_en : out std_logic;
          cart_haddr_dir : out std_logic;
          cart_laddr_dir : out std_logic;
          cart_data_en : out std_logic;
@@ -963,6 +964,7 @@ begin
       -- Expansion/cartridge port
       ----------------------------------------------------------------------
       cart_ctrl_dir => cart_ctrl_dir,
+      cart_ctrl_en => cart_ctrl_en,
       cart_haddr_dir => cart_haddr_dir,
       cart_laddr_dir => cart_laddr_dir,
       cart_data_dir => cart_data_dir,

src/vhdl/mega65r6.vhdl

@@ -82,6 +82,7 @@ entity container is
          -- Expansion/cartridge port
          ----------------------------------------------------------------------
          cart_ctrl_dir : out std_logic;
+         cart_ctrl_en : out std_logic;
          cart_haddr_dir : out std_logic;
          cart_laddr_dir : out std_logic;
          cart_data_en : out std_logic;
@@ -957,6 +958,7 @@ begin
       -- Expansion/cartridge port
       ----------------------------------------------------------------------
       cart_ctrl_dir => cart_ctrl_dir,
+      cart_ctrl_en => cart_ctrl_en,
       cart_haddr_dir => cart_haddr_dir,
       cart_laddr_dir => cart_laddr_dir,
       cart_data_dir => cart_data_dir,

src/vhdl/slow_devices.vhdl

@@ -89,6 +89,7 @@ ENTITY slow_devices IS
     -- C64-compatible cartridge/expansion port
     ------------------------------------------------------------------------
     cart_ctrl_dir : out std_logic;
+    cart_ctrl_en : out std_logic;
     cart_haddr_dir : out std_logic;
     cart_laddr_dir : out std_logic;
     cart_data_dir : out std_logic;
@@ -219,6 +220,7 @@ begin
     cart_access_read_strobe => cart_access_read_strobe,
 
     cart_ctrl_dir => cart_ctrl_dir,
+    cart_ctrl_en => cart_ctrl_en,
     cart_haddr_dir => cart_haddr_dir,
     cart_laddr_dir => cart_laddr_dir,
     cart_data_dir => cart_data_dir,