From f206cfd4426243ce77630c282dad085a2fffd585 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 2 Jul 2011 16:45:04 +0000 Subject: [PATCH] Fix SPI SD card detect logic; Fix AVR USB device interrupt initialization git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3740 42af7a65-404d-4744-a932-0658087f49c3 --- configs/teensy/README.txt | 2 +- configs/teensy/src/up_spi.c | 2 +- configs/teensy/usbstorage/defconfig | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/teensy/README.txt b/configs/teensy/README.txt index 9a5fa3eed9..5b32e21b35 100644 --- a/configs/teensy/README.txt +++ b/configs/teensy/README.txt @@ -183,7 +183,7 @@ Teensy SPI Connection -- ---- -- ------------------------- ------- J2 NAME PIN NAME PAD -- ---- -- ------------------------- ------- - 1 VIN -- Connected to USB +RV + 1 VIN -- Connected to USB +5V 2 GND -- Connected to USB GND 3 3V3 -- Not used --- 4 NC -- Not used diff --git a/configs/teensy/src/up_spi.c b/configs/teensy/src/up_spi.c index 8baacc05fc..2ef0908f2a 100755 --- a/configs/teensy/src/up_spi.c +++ b/configs/teensy/src/up_spi.c @@ -179,7 +179,7 @@ void avr_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool select uint8_t avr_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { uint8_t ret = 0; - uint8_t regval = PORTB; + uint8_t regval = PINB; /* Both the CD and WP pins are pull high by the AT90USB and will be * grounded it a card is inserted or write protected. diff --git a/configs/teensy/usbstorage/defconfig b/configs/teensy/usbstorage/defconfig index 7034c66220..591eaf1913 100755 --- a/configs/teensy/usbstorage/defconfig +++ b/configs/teensy/usbstorage/defconfig @@ -268,9 +268,9 @@ CONFIG_ARCH_LOWPUTC=y CONFIG_RR_INTERVAL=200 CONFIG_SCHED_INSTRUMENTATION=n CONFIG_TASK_NAME_SIZE=0 -CONFIG_START_YEAR=2010 -CONFIG_START_MONTH=6 -CONFIG_START_DAY=17 +CONFIG_START_YEAR=2011 +CONFIG_START_MONTH=7 +CONFIG_START_DAY=2 CONFIG_GREGORIAN_TIME=n CONFIG_JULIAN_TIME=n CONFIG_DEV_CONSOLE=y