diff --git a/MC6809CpuMon.bit b/MC6809CpuMon.bit index d222eae..69d85fa 100644 Binary files a/MC6809CpuMon.bit and b/MC6809CpuMon.bit differ diff --git a/firmware/AtomBusMon.c b/firmware/AtomBusMon.c index 44f774e..17239b4 100644 --- a/firmware/AtomBusMon.c +++ b/firmware/AtomBusMon.c @@ -10,7 +10,7 @@ * VERSION and NAME are used in the start-up message ********************************************************/ -#define VERSION "0.52" +#define VERSION "0.53" #if (CPU == Z80) #define NAME "ICE-T80" diff --git a/src/MC6809ECpuMon.vhd b/src/MC6809ECpuMon.vhd index 14c0d8b..3988ea2 100644 --- a/src/MC6809ECpuMon.vhd +++ b/src/MC6809ECpuMon.vhd @@ -29,13 +29,13 @@ entity MC6809ECpuMon is clock49 : in std_logic; -- A locally generated test clock - -- 1.8457 MHz in E Mode (6809E) so it can drive E (PIN34) - -- 7.3728 MHz in Normal Mode (6809) so it can drive XTAL (PIN39) + -- 1.8457 MHz in E Mode (6809E) so it can drive E (PIN34) + -- 7.3728 MHz in Normal Mode (6809) so it can drive EXTAL (PIN38) clock_test : out std_logic; -- 6809/6809E mode selection -- Jumper is between pins B1 and D1 - -- Jumper off is 6809 mode, where a 4x clock should be fed into XTAL (PIN39) + -- Jumper off is 6809 mode, where a 4x clock should be fed into EXTAL (PIN38) -- Jumper on is 6909E mode, where a 1x clock should be fed into E (PIN34) EMode_n : in std_logic; @@ -319,14 +319,14 @@ begin MRDY <= '1' when EMode_n = '0' else PIN36; PIN38 <= LIC when EMode_n = '0' else 'Z'; - EXTAL <= PIN38 when EMode_n = '0' else '0'; + EXTAL <= '0' when EMode_n = '0' else PIN38; TSC <= PIN39 when EMode_n = '0' else '0'; XTAL <= '0' when EMode_n = '0' else PIN39; -- A locally generated test clock - -- 1.8457 MHz in E Mode (6809E) so it can drive E (PIN34) - -- 7.3728 MHz in Normal Mode (6809) so it can drive XTAL (PIN39) + -- 1.8457 MHz in E Mode (6809E) so it can drive E (PIN34) + -- 7.3728 MHz in Normal Mode (6809) so it can drive EXTAL (PIN38) clock_test <= clk_count(1) when EMode_n = '0' else clock7_3728; -- Main clocks @@ -334,9 +334,9 @@ begin busmon_clk <= E; -- Quadrature clock generator, unused in 6809E mode - quadrature_gen : process(XTAL) + quadrature_gen : process(EXTAL) begin - if rising_edge(XTAL) then + if rising_edge(EXTAL) then if (MRDY = '1') then if (quadrature = "00") then quadrature <= "01";