diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-06-17 22:03:20 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-06-17 22:03:20 +0000 |
commit | 8c6ebe6f07cb81ab197850c2af4c75fb50e5f1cb (patch) | |
tree | 87740e93bfb0a2278940052bed3033e8416a1ea2 /nuttx/arch/avr/src/at90usb | |
parent | 1fa5b196fa1600c907dbab13859a4f731e48470d (diff) | |
download | px4-nuttx-8c6ebe6f07cb81ab197850c2af4c75fb50e5f1cb.tar.gz px4-nuttx-8c6ebe6f07cb81ab197850c2af4c75fb50e5f1cb.tar.bz2 px4-nuttx-8c6ebe6f07cb81ab197850c2af4c75fb50e5f1cb.zip |
Fix AVR clock setup; add SPI driver
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3721 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/avr/src/at90usb')
-rw-r--r-- | nuttx/arch/avr/src/at90usb/Make.defs | 4 | ||||
-rw-r--r-- | nuttx/arch/avr/src/at90usb/at90usb_lowinit.c | 5 | ||||
-rw-r--r-- | nuttx/arch/avr/src/at90usb/at90usb_memorymap.h | 6 | ||||
-rw-r--r-- | nuttx/arch/avr/src/at90usb/chip.h | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/nuttx/arch/avr/src/at90usb/Make.defs b/nuttx/arch/avr/src/at90usb/Make.defs index e3559c0dc..706eca544 100644 --- a/nuttx/arch/avr/src/at90usb/Make.defs +++ b/nuttx/arch/avr/src/at90usb/Make.defs @@ -54,6 +54,10 @@ ifeq ($(CONFIG_ARCH_STACKDUMP),y) CMN_CSRCS += up_dumpstate.c endif +ifeq ($(CONFIG_AVR_SPI),y) +CMN_CSRCS += up_spi.c +endif + # Required AT90USB files CHIP_ASRCS = at90usb_exceptions.S diff --git a/nuttx/arch/avr/src/at90usb/at90usb_lowinit.c b/nuttx/arch/avr/src/at90usb/at90usb_lowinit.c index 5f8b2e432..e446fcf13 100644 --- a/nuttx/arch/avr/src/at90usb/at90usb_lowinit.c +++ b/nuttx/arch/avr/src/at90usb/at90usb_lowinit.c @@ -39,6 +39,7 @@ #include <nuttx/config.h> #include <avr/wdt.h> +#include <avr/power.h> #include "at90usb_config.h" #include "up_internal.h" @@ -127,6 +128,10 @@ void up_lowinit(void) up_wdtinit(); + /* Set the system clock divider to 1 */ + + clock_prescale_set(clock_div_1); + /* Initialize a console (probably a serial console) */ up_consoleinit(); diff --git a/nuttx/arch/avr/src/at90usb/at90usb_memorymap.h b/nuttx/arch/avr/src/at90usb/at90usb_memorymap.h index c312a7cca..71635d383 100644 --- a/nuttx/arch/avr/src/at90usb/at90usb_memorymap.h +++ b/nuttx/arch/avr/src/at90usb/at90usb_memorymap.h @@ -46,12 +46,6 @@ * Pre-processor Definitions ************************************************************************************/ -/* Physical memory map */ -# warning "Missing Definitions" - -/* Peripheral Address Map */ -# warning "Missing Definitions" - /************************************************************************************ * Public Types ************************************************************************************/ diff --git a/nuttx/arch/avr/src/at90usb/chip.h b/nuttx/arch/avr/src/at90usb/chip.h index facc65ec1..c5f2c48b3 100644 --- a/nuttx/arch/avr/src/at90usb/chip.h +++ b/nuttx/arch/avr/src/at90usb/chip.h @@ -48,7 +48,7 @@ /* Define features for supported chip in the ATMEGA family */ -#if 0 +#if 1 #else # error "Unsupported AVR chip" #endif |