remove image controller implementation

This commit is contained in:
Fred VanEijk
2024-12-10 10:26:29 -05:00
parent 5032cb28ce
commit 4e135db665
8 changed files with 167 additions and 254 deletions

View File

@@ -60,7 +60,6 @@ entity Microcomputer6809Basic is
sdMOSI : out std_logic;
sdMISO : in std_logic;
sdSCLK : out std_logic;
sd_ctrl_sel : in std_logic;
driveLED : out std_logic :='1'
);
end Microcomputer6809Basic;
@@ -103,11 +102,6 @@ architecture struct of Microcomputer6809Basic is
signal n_interface2CS : std_logic :='1';
signal n_sdCardCS : std_logic :='1';
signal sdCardDataOut_sd : std_logic_vector(7 downto 0);
signal sdCardDataOut_img : std_logic_vector(7 downto 0);
signal driveLED_sd, driveLED_img : std_logic;
signal sdMISO_int : std_logic; -- Add this signal declaration
signal serialClkCount : unsigned(15 downto 0);
signal cpuClkCount : std_logic_vector(5 downto 0);
signal sdClkCount : std_logic_vector(5 downto 0);
@@ -180,7 +174,7 @@ port map
io1 : entity work.SBCTextDisplayRGB
port map (
n_reset => reset_n_internal,
n_reset => N_RESET,
clk => clk,
-- RGB video signals
@@ -232,34 +226,18 @@ sd1 : entity work.sd_controller
port map(
sdCS => sdCS,
sdMOSI => sdMOSI,
sdMISO => sdMISO_int,
sdMISO => sdMISO,
sdSCLK => sdSCLK,
n_wr => n_sdCardCS or cpuClock or n_WR,
n_rd => n_sdCardCS or cpuClock or (not n_WR),
n_reset => reset_n_internal,
n_reset => N_RESET,
dataIn => cpuDataOut,
dataOut => sdCardDataOut_sd,
dataOut => sdCardDataOut,
regAddr => cpuAddress(2 downto 0),
driveLED => driveLED_sd,
driveLED => driveLED,
clk => sdClock -- twice the spi clk
);
-- Add signal assignment outside port map:
sdMISO_int <= sdMISO when sd_ctrl_sel = '0' else '1';
-- New image controller
img1 : entity work.image_controller
port map(
clk => clk,
n_reset => reset_n_internal,
n_rd => n_sdCardCS or n_ioRD,
n_wr => n_sdCardCS or n_ioWR,
dataIn => cpuDataOut,
dataOut => sdCardDataOut_img,
regAddr => cpuAddress(2 downto 0),
driveLED => driveLED_img
);
-- ____________________________________________________________________________________
-- MEMORY READ/WRITE LOGIC GOES HERE
@@ -277,13 +255,6 @@ n_internalRam1CS <= not n_basRomCS; -- Full Internal RAM - 64 K
-- ____________________________________________________________________________________
-- BUS ISOLATION GOES HERE
-- Mux controller outputs based on selection
sdCardDataOut <= sdCardDataOut_img when sd_ctrl_sel = '1' else
sdCardDataOut_sd;
driveLED <= driveLED_img when sd_ctrl_sel = '1' else
driveLED_sd;
cpuDataIn <=
interface1DataOut when n_interface1CS = '0' else