aboutsummaryrefslogtreecommitdiffstats
path: root/Projects/Magstripe
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-02-26 05:48:47 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-02-26 05:48:47 +0000
commit99145a8d7c88d9af065cfb7f5e8507d5b65ff811 (patch)
tree80b407b9114c1fe6727b40e7b7e0caf6fefc0ea1 /Projects/Magstripe
parentfa456ce531b75e2dd3c7c0ecb971e3ede36f5d35 (diff)
downloadlufa-99145a8d7c88d9af065cfb7f5e8507d5b65ff811.tar.gz
lufa-99145a8d7c88d9af065cfb7f5e8507d5b65ff811.tar.bz2
lufa-99145a8d7c88d9af065cfb7f5e8507d5b65ff811.zip
Makefiles and library modified to add a new F_CLOCK constant to give the unprescaled master input clock frequency, so that the correct PLL mask can be determined even when the CPU (F_CPU) clock rate is prescaled outside the normal input range of the PLL.
Started to clean up the AVRISP Programmer project code, donated by Opendous Inc.
Diffstat (limited to 'Projects/Magstripe')
-rw-r--r--Projects/Magstripe/makefile19
1 files changed, 17 insertions, 2 deletions
diff --git a/Projects/Magstripe/makefile b/Projects/Magstripe/makefile
index 2ea5536fb..109976090 100644
--- a/Projects/Magstripe/makefile
+++ b/Projects/Magstripe/makefile
@@ -90,6 +90,20 @@ BOARD = USBKEY
F_CPU = 16000000
+# Input clock frequency.
+# This will define a symbol, F_CLOCK, in all source code files equal to the
+# input clock frequency (before any prescaling is performed). This value may
+# differ from F_CPU if prescaling is used on the latter, and is required as the
+# raw input clock is fed directly to the PLL sections of the AVR for high speed
+# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
+# at the end, this will be done automatically to create a 32-bit value in your
+# source code.
+#
+# If no clock division is performed on the input clock inside the AVR (via the
+# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
+F_CLOCK = 8000000
+
+
# Output format. (can be srec, ihex, binary)
FORMAT = ihex
@@ -160,8 +174,9 @@ CSTANDARD = -std=gnu99
# Place -D or -U options here for C sources
-CDEFS = -DF_CPU=$(F_CPU)UL -DBOARD=BOARD_$(BOARD) -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS
-CDEFS += -DUSB_DEVICE_ONLY -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD)
+CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY
+CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
CDEFS += -DMAG_T1_CLOCK="(1 << 0)"
CDEFS += -DMAG_T1_DATA="(1 << 1)"