diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-10-30 18:25:10 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-10-30 18:25:10 +0000 |
| commit | e89dca25707d246a88bb7ba3241a998213c476ee (patch) | |
| tree | 2906cdb6d1e8d8e33e2cc9477d3e340f47e6b028 /nuttx/arch | |
| parent | 7200d0c88ba2c4095b038b27c712397d5658e92a (diff) | |
| download | px4-nuttx-e89dca25707d246a88bb7ba3241a998213c476ee.tar.gz px4-nuttx-e89dca25707d246a88bb7ba3241a998213c476ee.tar.bz2 px4-nuttx-e89dca25707d246a88bb7ba3241a998213c476ee.zip | |
Early debug changes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3061 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch')
| -rw-r--r-- | nuttx/arch/avr/src/at32uc3/at32uc3_gpio.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/avr/src/avr32/up_nommuhead.S | 15 |
2 files changed, 7 insertions, 10 deletions
diff --git a/nuttx/arch/avr/src/at32uc3/at32uc3_gpio.c b/nuttx/arch/avr/src/at32uc3/at32uc3_gpio.c index 4ca7b7b2e..2a2948f87 100644 --- a/nuttx/arch/avr/src/at32uc3/at32uc3_gpio.c +++ b/nuttx/arch/avr/src/at32uc3/at32uc3_gpio.c @@ -143,7 +143,7 @@ int at32uc3_configgpio(uint16_t cfgset) putreg32(pinmask, base + AVR32_GPIO_PUERC_OFFSET); putreg32(pinmask, base + AVR32_GPIO_IERC_OFFSET); putreg32(pinmask, base + AVR32_GPIO_IMR0C_OFFSET); - putreg32(pinmask, base + AVR32_GPIO_IMR0C_OFFSET); + putreg32(pinmask, base + AVR32_GPIO_IMR1C_OFFSET); putreg32(pinmask, base + AVR32_GPIO_GFERC_OFFSET); /* Is this a GPIO? Or a peripheral */ diff --git a/nuttx/arch/avr/src/avr32/up_nommuhead.S b/nuttx/arch/avr/src/avr32/up_nommuhead.S index 1c747fa40..3f4321df0 100644 --- a/nuttx/arch/avr/src/avr32/up_nommuhead.S +++ b/nuttx/arch/avr/src/avr32/up_nommuhead.S @@ -80,12 +80,11 @@ __start: * by the IDLE thread when threading is enabled. */ - lddpc r0, .Lstackbase - ld.w sp, r0[0] + lddpc sp, .Lstackbase /* Set up the vector base address so interrupts can be enabled. */ - lda.w r0, .Lvectortab + lda.w r0, vectortab mtsr AVR32_EVBA, r0 /* Enable exception processing */ @@ -130,18 +129,16 @@ __start: /* Perform low-level initialization */ - mcall up_lowinit + mcall .Lup_lowinit /* Then jump to OS entry (will not return) */ - lddpc pc, .Los_start + lda.w pc, os_start .Lstackbase: .word _ebss+CONFIG_IDLETHREAD_STACKSIZE-4 -.Lvectortab: - .word vectortab -.Los_start: - .word os_start +.Lup_lowinit: + .word up_lowinit .size __start, .-__start /* This global variable is unsigned long g_heapbase and is |