diff --git a/firmware/AtomBusMon.c b/firmware/AtomBusMon.c index e442d9c..fc4651c 100644 --- a/firmware/AtomBusMon.c +++ b/firmware/AtomBusMon.c @@ -1591,7 +1591,7 @@ void initialize() { STATUS_DDR = MUXSEL_MASK; MUX_DDR = 0; CTRL_PORT = 0; - Serial_Init(57600); + Serial_Init(BAUD); version(); // Update the hardware copy of the breakpoints uploadBreakpoints(); diff --git a/src/MC6809CpuMonALS.vhd b/src/MC6809CpuMonALS.vhd index 7427de2..c8ad03b 100644 --- a/src/MC6809CpuMonALS.vhd +++ b/src/MC6809CpuMonALS.vhd @@ -99,7 +99,7 @@ begin wrapper : entity work.MC6809CpuMon generic map ( - ClkMult => 8, + ClkMult => 12, ClkDiv => 25, ClkPer => 20.000, num_comparators => num_comparators, diff --git a/src/MOS6502CpuMonALS.vhd b/src/MOS6502CpuMonALS.vhd index 68a6b7c..bba075b 100644 --- a/src/MOS6502CpuMonALS.vhd +++ b/src/MOS6502CpuMonALS.vhd @@ -116,7 +116,7 @@ begin generic map ( UseT65Core => UseT65Core, UseAlanDCore => UseAlanDCore, - ClkMult => 8, + ClkMult => 12, ClkDiv => 25, ClkPer => 20.000, num_comparators => num_comparators, diff --git a/src/Z80CpuMonALS.vhd b/src/Z80CpuMonALS.vhd index 862f764..8996238 100644 --- a/src/Z80CpuMonALS.vhd +++ b/src/Z80CpuMonALS.vhd @@ -127,7 +127,7 @@ begin wrapper : entity work.Z80CpuMon generic map ( - ClkMult => 8, + ClkMult => 12, ClkDiv => 25, ClkPer => 20.000, num_comparators => num_comparators, diff --git a/target/common/Makefile.inc b/target/common/Makefile.inc index f8a7cad..1e911f3 100644 --- a/target/common/Makefile.inc +++ b/target/common/Makefile.inc @@ -8,6 +8,10 @@ SHELL := env PATH=$(PATH) /bin/bash # Frequency of the AVR CPU F_CPU ?= 15855484 +# Default Baud Rate of serial interface +# Note: F_CPU / 16 / BAUD need to be close to an integer +BAUD ?= 57600 + # Path of the back anotated block memory map file BMM_FILE ?= memory_bd.bmm @@ -18,7 +22,7 @@ OBJCOPY=avr-objcopy PROG = avr_progmem -CFLAGS=$(CPU_CFLAGS) -DF_CPU=${F_CPU}UL -mmcu=$(MCU) -Wall -Os -mcall-prologues +CFLAGS=$(CPU_CFLAGS) -DF_CPU=${F_CPU}UL -DBAUD=${BAUD} -mmcu=$(MCU) -Wall -Os -mcall-prologues OBJECTS=AtomBusMon.o status.o $(CPU_OBJECTS) diff --git a/target/lx9_dave/ice6502/Makefile b/target/lx9_dave/ice6502/Makefile index 1d8e276..f621795 100644 --- a/target/lx9_dave/ice6502/Makefile +++ b/target/lx9_dave/ice6502/Makefile @@ -11,7 +11,11 @@ PROJECT = MOS6502CpuMonALS TARGET = ice6502 # Frequuency that the AVR runs at -F_CPU = 16000000 +F_CPU = 24000000 + +# Default Baud Rate of serial interface +# Note: F_CPU / 16 / BAUD need to be close to an integer +BAUD = 115200 # Common include files include $(COMMON)/Makefile_$(TARGET).inc diff --git a/target/lx9_dave/ice65c02/Makefile b/target/lx9_dave/ice65c02/Makefile index ae87d2f..1a695b9 100644 --- a/target/lx9_dave/ice65c02/Makefile +++ b/target/lx9_dave/ice65c02/Makefile @@ -11,7 +11,11 @@ PROJECT = MOS6502CpuMonALS TARGET = ice65c02 # Frequuency that the AVR runs at -F_CPU = 16000000 +F_CPU = 24000000 + +# Default Baud Rate of serial interface +# Note: F_CPU / 16 / BAUD need to be close to an integer +BAUD = 115200 # Common include files include $(COMMON)/Makefile_$(TARGET).inc diff --git a/target/lx9_dave/ice6809/Makefile b/target/lx9_dave/ice6809/Makefile index 1e517bd..6eca805 100644 --- a/target/lx9_dave/ice6809/Makefile +++ b/target/lx9_dave/ice6809/Makefile @@ -11,7 +11,11 @@ PROJECT = MC6809CpuMonALS TARGET = ice6809 # Frequuency that the AVR runs at -F_CPU = 16000000 +F_CPU = 24000000 + +# Default Baud Rate of serial interface +# Note: F_CPU / 16 / BAUD need to be close to an integer +BAUD = 115200 # Common include files include $(COMMON)/Makefile_$(TARGET).inc diff --git a/target/lx9_dave/icez80/Makefile b/target/lx9_dave/icez80/Makefile index 5492ac6..b1124b9 100644 --- a/target/lx9_dave/icez80/Makefile +++ b/target/lx9_dave/icez80/Makefile @@ -11,7 +11,11 @@ PROJECT = Z80CpuMonALS TARGET = icez80 # Frequuency that the AVR runs at -F_CPU = 16000000 +F_CPU = 24000000 + +# Default Baud Rate of serial interface +# Note: F_CPU / 16 / BAUD need to be close to an integer +BAUD = 115200 # Common include files include $(COMMON)/Makefile_$(TARGET).inc