diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-04-19 17:52:14 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-04-19 17:52:14 +0000 |
| commit | 64b80721c9669b3a0e00e77f1a6b04f4a4053c82 (patch) | |
| tree | 2dd843717c0576cb1122436809932afbe7c50c0b | |
| parent | 38fa2b80515c47c54d69af5adf5746174706f14e (diff) | |
| download | nuttx-64b80721c9669b3a0e00e77f1a6b04f4a4053c82.tar.gz nuttx-64b80721c9669b3a0e00e77f1a6b04f4a4053c82.tar.bz2 nuttx-64b80721c9669b3a0e00e77f1a6b04f4a4053c82.zip | |
Some STM32 bugfixes from Mike Smith
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4635 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | apps/README.txt | 8 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/Make.defs | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_adc.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/apps/README.txt b/apps/README.txt index 6d14c6b14..426658572 100644 --- a/apps/README.txt +++ b/apps/README.txt @@ -50,7 +50,7 @@ ways to do that: Named Applications ------------------ NuttX also supports applications that can be started using a name string. -In this case, zpplication entry points with their requirements are gathered +In this case, application entry points with their requirements are gathered together in two files: - namedapp/namedapp_proto.h Entry points, prototype function @@ -107,7 +107,7 @@ NuttX is configured. .config is included in the toplevel apps/Makefile. As a minimum, this configuration file must define files to add to the CONFIGURED_APPS list like: - CONFIGURED_APPS += vsn/hello vsn/poweroff vsn/jvm + CONFIGURED_APPS += examples/hello vsn/poweroff Named Start-Up main() function ------------------------------ @@ -126,7 +126,7 @@ will call: Example Named Application ------------------------- -An example application skeleton can be found under the vsn/hello +An example application skeleton can be found under the examples/hello sub-directory. This example shows how a named application can be added to the project. One must define: @@ -186,7 +186,7 @@ A: Here are four: directory: a) Copy 'MyBoard' directory to configs/MyBoard. - b) At a symbolic link to MyApplication at apps/external + b) Add a symbolic link to MyApplication at apps/external c) Configure NuttX (usually by: tools/configure.sh MyBoard/MyConfiguration diff --git a/nuttx/arch/arm/src/stm32/Make.defs b/nuttx/arch/arm/src/stm32/Make.defs index df8dedd50..88ac64812 100644 --- a/nuttx/arch/arm/src/stm32/Make.defs +++ b/nuttx/arch/arm/src/stm32/Make.defs @@ -49,7 +49,7 @@ CMN_CSRCS = up_assert.c up_blocktask.c up_copystate.c \ up_usestack.c up_doirq.c up_hardfault.c up_svcall.c ifeq ($(CONFIG_ARMV7M_CMNVECTOR),y) -CMN_ASRCS += up_exception.S stm32_vectors.S +CMN_ASRCS += up_exception.S CMN_CSRCS += up_vectors.c endif diff --git a/nuttx/arch/arm/src/stm32/stm32_adc.c b/nuttx/arch/arm/src/stm32/stm32_adc.c index 043919ddf..29b4aabdd 100644 --- a/nuttx/arch/arm/src/stm32/stm32_adc.c +++ b/nuttx/arch/arm/src/stm32/stm32_adc.c @@ -223,7 +223,7 @@ static struct stm32_dev_s g_adcpriv2 = .irq = STM32_IRQ_ADC, .isr = adc123_interrupt, #endif - .intf = 2; + .intf = 2, .base = STM32_ADC2_BASE, #ifdef ADC2_HAVE_TIMER .trigger = CONFIG_STM32_ADC2_TIMTRIG, |