Fix up small error in main osc startup delay and replace more custom defines with standard Atmel defines

This commit is contained in:
d18c7db 2010-03-04 08:15:59 +00:00
parent 9e84fd5b73
commit 0aa4cfc2f1
5 changed files with 21 additions and 35 deletions

View file

@ -20,12 +20,6 @@
#define PWM_CH_MODE_PRESCALER(x) ((x)<<0)
#define PWM_CHANNEL(x) (1<<(x))
#define TC_CMR_TCCLKS_TIMER_CLOCK1 (0<<0)
#define TC_CMR_TCCLKS_TIMER_CLOCK2 (1<<0)
#define TC_CMR_TCCLKS_TIMER_CLOCK3 (2<<0)
#define TC_CMR_TCCLKS_TIMER_CLOCK4 (3<<0)
#define TC_CMR_TCCLKS_TIMER_CLOCK5 (4<<0)
#define ADC_CHAN_LF 4
#define ADC_CHAN_HF 5
#define ADC_MODE_PRESCALE(x) ((x)<<8)
@ -40,23 +34,14 @@
#define SSC_FRAME_MODE_BITS_IN_WORD(x) (((x)-1)<<0)
#define MC_FLASH_COMMAND_KEY ((0x5a)<<24)
#define MC_FLASH_STATUS_READY (1<<0)
#define MC_FLASH_STATUS_LOCKE (1<<2)
#define MC_FLASH_STATUS_PROGE (1<<3)
#define MC_FLASH_MODE_FLASH_WAIT_STATES(x) ((x)<<8)
#define MC_FLASH_MODE_MASTER_CLK_IN_MHZ(x) (((x)+((x)/2))<<16)
#define MC_FLASH_COMMAND_PAGEN(x) ((x)<<8)
#define RST_CONTROL_KEY (0xa5<<24)
#define PMC_MAIN_OSC_ENABLE (1<<0)
#define PMC_MAIN_OSC_STABILIZED (1<<0)
#define PMC_MAIN_OSC_PLL_LOCK (1<<2)
#define PMC_MAIN_OSC_MCK_READY (1<<3)
#define PMC_MAIN_OSC_STARTUP_DELAY(x) ((x)<<8)
#define PMC_PLL_DIVISOR(x) (x)
#define PMC_CLK_PRESCALE_DIV_2 (1<<2)
#define PMC_PLL_MULTIPLIER(x) (((x)-1)<<16)
#define PMC_PLL_COUNT_BEFORE_LOCK(x) ((x)<<8)
#define PMC_PLL_FREQUENCY_RANGE(x) ((x)<<14)