F_CLOCK changed to F_USB to be more descriptive, and applicable on future architecture ports.
This commit is contained in:
		
							parent
							
								
									c7f4752d6b
								
							
						
					
					
						commit
						aba7932a5c
					
				
					 77 changed files with 508 additions and 503 deletions
				
			
		| 
						 | 
				
			
			@ -79,8 +79,8 @@ BOARD = USBKEY
 | 
			
		|||
#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
 | 
			
		||||
#     automatically to create a 32-bit value in your source code.
 | 
			
		||||
#
 | 
			
		||||
#     This will be an integer division of F_CLOCK below, as it is sourced by
 | 
			
		||||
#     F_CLOCK after it has run through any CPU prescalers. Note that this value
 | 
			
		||||
#     This will be an integer division of F_USB below, as it is sourced by
 | 
			
		||||
#     F_USB after it has run through any CPU prescalers. Note that this value
 | 
			
		||||
#     does not *change* the processor frequency - it should merely be updated to
 | 
			
		||||
#     reflect the processor speed set externally so that the code can use accurate
 | 
			
		||||
#     software delays.
 | 
			
		||||
| 
						 | 
				
			
			@ -88,7 +88,7 @@ F_CPU = 8000000
 | 
			
		|||
 | 
			
		||||
 | 
			
		||||
# Input clock frequency.
 | 
			
		||||
#     This will define a symbol, F_CLOCK, in all source code files equal to the
 | 
			
		||||
#     This will define a symbol, F_USB, in all source code files equal to the
 | 
			
		||||
#     input clock frequency (before any prescaling is performed) in Hz. 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
 | 
			
		||||
| 
						 | 
				
			
			@ -98,7 +98,7 @@ F_CPU = 8000000
 | 
			
		|||
#
 | 
			
		||||
#     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 = $(F_CPU)
 | 
			
		||||
F_USB = $(F_CPU)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Output format. (can be srec, ihex, binary)
 | 
			
		||||
| 
						 | 
				
			
			@ -179,20 +179,20 @@ CSTANDARD = -std=c99
 | 
			
		|||
 | 
			
		||||
# Place -D or -U options here for C sources
 | 
			
		||||
CDEFS  = -DF_CPU=$(F_CPU)UL
 | 
			
		||||
CDEFS += -DF_CLOCK=$(F_CLOCK)UL
 | 
			
		||||
CDEFS += -DF_USB=$(F_USB)UL
 | 
			
		||||
CDEFS += -DBOARD=BOARD_$(BOARD) -DARCH=ARCH_$(ARCH)
 | 
			
		||||
CDEFS += $(LUFA_OPTS)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Place -D or -U options here for ASM sources
 | 
			
		||||
ADEFS  = -DF_CPU=$(F_CPU)
 | 
			
		||||
ADEFS += -DF_CLOCK=$(F_CLOCK)UL
 | 
			
		||||
ADEFS += -DF_USB=$(F_USB)UL
 | 
			
		||||
ADEFS += -DBOARD=BOARD_$(BOARD)
 | 
			
		||||
ADEFS += $(LUFA_OPTS)
 | 
			
		||||
 | 
			
		||||
# Place -D or -U options here for C++ sources
 | 
			
		||||
CPPDEFS  = -DF_CPU=$(F_CPU)UL
 | 
			
		||||
CPPDEFS += -DF_CLOCK=$(F_CLOCK)UL
 | 
			
		||||
CPPDEFS += -DF_USB=$(F_USB)UL
 | 
			
		||||
CPPDEFS += -DBOARD=BOARD_$(BOARD)
 | 
			
		||||
CPPDEFS += $(LUFA_OPTS)
 | 
			
		||||
#CPPDEFS += -D__STDC_LIMIT_MACROS
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue