diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-01 15:39:34 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-01 15:39:34 -0600 |
commit | 22cdf157c01d76420b790bdbb1d900a41346d53e (patch) | |
tree | 6b11889164de620dc7b6a8691574f7b1c457f970 /nuttx/arch/avr | |
parent | 6c1153d6b32d65888c13c743cfbe994b3c07cab8 (diff) | |
download | px4-nuttx-22cdf157c01d76420b790bdbb1d900a41346d53e.tar.gz px4-nuttx-22cdf157c01d76420b790bdbb1d900a41346d53e.tar.bz2 px4-nuttx-22cdf157c01d76420b790bdbb1d900a41346d53e.zip |
There used to be two ways to pass parameters to new tasks, depending upon the configuration: Either (1) argv[] as created as an array with each string strdup'ed. Or (1) argv[] array and strings were created on the stack before the new task was started. Now, there is only one way, way (1). Way (2) might be slightly more compact, but this is not worth carry the complexity of two different ways of doing the same thing.
Diffstat (limited to 'nuttx/arch/avr')
-rw-r--r-- | nuttx/arch/avr/src/at32uc3/Make.defs | 22 | ||||
-rw-r--r-- | nuttx/arch/avr/src/at90usb/Make.defs | 17 | ||||
-rw-r--r-- | nuttx/arch/avr/src/atmega/Make.defs | 18 | ||||
-rw-r--r-- | nuttx/arch/avr/src/avr/up_stackframe.c | 1 | ||||
-rw-r--r-- | nuttx/arch/avr/src/avr32/up_stackframe.c | 1 |
5 files changed, 30 insertions, 29 deletions
diff --git a/nuttx/arch/avr/src/at32uc3/Make.defs b/nuttx/arch/avr/src/at32uc3/Make.defs index fa1f010cf..0e1a98e2a 100644 --- a/nuttx/arch/avr/src/at32uc3/Make.defs +++ b/nuttx/arch/avr/src/at32uc3/Make.defs @@ -39,14 +39,14 @@ HEAD_ASRC = up_nommuhead.S # Common AVR/AVR32 files -CMN_ASRCS = up_exceptions.S up_fullcontextrestore.S up_switchcontext.S -CMN_CSRCS = up_assert.c up_allocateheap.c up_blocktask.c up_copystate.c \ - up_createstack.c up_mdelay.c up_udelay.c up_exit.c up_idle.c \ - up_initialize.c up_initialstate.c up_interruptcontext.c \ - up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c \ - up_releasepending.c up_releasestack.c up_reprioritizertr.c \ - up_schedulesigaction.c up_sigdeliver.c up_unblocktask.c \ - up_usestack.c up_doirq.c +CMN_ASRCS = up_exceptions.S up_fullcontextrestore.S up_switchcontext.S +CMN_CSRCS = up_assert.c up_allocateheap.c up_blocktask.c up_copystate.c +CMN_CSRCS += up_createstack.c up_mdelay.c up_udelay.c up_exit.c up_idle.c +CMN_CSRCS += up_initialize.c up_initialstate.c up_interruptcontext.c +CMN_CSRCS += up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c +CMN_CSRCS += up_releasepending.c up_releasestack.c up_reprioritizertr.c +CMN_CSRCS += up_schedulesigaction.c up_sigdeliver.c up_stackframe.c +CMN_CSRCS += up_unblocktask.c up_usestack.c up_doirq.c # Configuration-dependent common files @@ -56,9 +56,9 @@ endif # Required AT32UC3 files -CHIP_ASRCS = -CHIP_CSRCS = at32uc3_clkinit.c at32uc3_gpio.c at32uc3_irq.c \ - at32uc3_lowconsole.c at32uc3_lowinit.c at32uc3_serial.c +CHIP_ASRCS = +CHIP_CSRCS = at32uc3_clkinit.c at32uc3_gpio.c at32uc3_irq.c +CHIP_CSRCS += at32uc3_lowconsole.c at32uc3_lowinit.c at32uc3_serial.c # Configuration-dependent AT32UC3 files diff --git a/nuttx/arch/avr/src/at90usb/Make.defs b/nuttx/arch/avr/src/at90usb/Make.defs index fb79d877c..249f345dc 100644 --- a/nuttx/arch/avr/src/at90usb/Make.defs +++ b/nuttx/arch/avr/src/at90usb/Make.defs @@ -39,14 +39,14 @@ HEAD_ASRC = at90usb_head.S # Common AVR files -CMN_ASRCS = up_switchcontext.S -CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c \ - up_createstack.c up_doirq.c up_exit.c up_idle.c up_initialize.c \ - up_initialstate.c up_interruptcontext.c up_irq.c up_lowputs.c \ - up_mdelay.c up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c \ - up_puts.c up_releasepending.c up_releasestack.c \ - up_reprioritizertr.c up_schedulesigaction.c up_sigdeliver.c \ - up_udelay.c up_unblocktask.c up_usestack.c +CMN_ASRCS = up_switchcontext.S +CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c +CMN_CSRCS += up_createstack.c up_doirq.c up_exit.c up_idle.c up_initialize.c +CMN_CSRCS += up_initialstate.c up_interruptcontext.c up_irq.c up_lowputs.c +CMN_CSRCS += up_mdelay.c up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c +CMN_CSRCS += up_puts.c up_releasepending.c up_releasestack.c +CMN_CSRCS += up_reprioritizertr.c up_schedulesigaction.c up_sigdeliver.c +CMN_CSRCS += up_stackframe.c up_udelay.c up_unblocktask.c up_usestack.c # Configuration-dependent common files @@ -80,4 +80,3 @@ endif ifeq ($(CONFIG_AVR_USBDEV),y) CHIP_CSRCS += at90usb_usbdev.c endif - diff --git a/nuttx/arch/avr/src/atmega/Make.defs b/nuttx/arch/avr/src/atmega/Make.defs index 7ffd174e0..73377bd1a 100644 --- a/nuttx/arch/avr/src/atmega/Make.defs +++ b/nuttx/arch/avr/src/atmega/Make.defs @@ -39,14 +39,14 @@ HEAD_ASRC = atmega_head.S # Common AVR files -CMN_ASRCS = up_switchcontext.S -CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c \ - up_createstack.c up_doirq.c up_exit.c up_idle.c up_initialize.c \ - up_initialstate.c up_interruptcontext.c up_irq.c up_lowputs.c \ - up_mdelay.c up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c \ - up_puts.c up_releasepending.c up_releasestack.c \ - up_reprioritizertr.c up_schedulesigaction.c up_sigdeliver.c \ - up_udelay.c up_unblocktask.c up_usestack.c +CMN_ASRCS = up_switchcontext.S +CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c +CMN_CSRCS += up_createstack.c up_doirq.c up_exit.c up_idle.c up_initialize.c +CMN_CSRCS += up_initialstate.c up_interruptcontext.c up_irq.c up_lowputs.c +CMN_CSRCS += up_mdelay.c up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c +CMN_CSRCS += up_puts.c up_releasepending.c up_releasestack.c +CMN_CSRCS += up_reprioritizertr.c up_schedulesigaction.c up_sigdeliver.c +CMN_CSRCS += up_stackframe.c up_udelay.c up_unblocktask.c up_usestack.c # Configuration-dependent common files @@ -78,5 +78,5 @@ endif # Configuration-dependent ATMEGA files ifeq ($(CONFIG_AVR_GPIOIRQ),y) -CHIP_CSRCS += +CHIP_CSRCS += endif diff --git a/nuttx/arch/avr/src/avr/up_stackframe.c b/nuttx/arch/avr/src/avr/up_stackframe.c index 2a09f0550..1dfa238a2 100644 --- a/nuttx/arch/avr/src/avr/up_stackframe.c +++ b/nuttx/arch/avr/src/avr/up_stackframe.c @@ -123,3 +123,4 @@ FAR void *up_stack_frame(FAR struct tcb_s *tcb, size_t frame_size) return (FAR void *)(topaddr + sizeof(uint8_t)); } + diff --git a/nuttx/arch/avr/src/avr32/up_stackframe.c b/nuttx/arch/avr/src/avr32/up_stackframe.c index e53eee5ae..576f83285 100644 --- a/nuttx/arch/avr/src/avr32/up_stackframe.c +++ b/nuttx/arch/avr/src/avr32/up_stackframe.c @@ -138,3 +138,4 @@ FAR void *up_stack_frame(FAR struct tcb_s *tcb, size_t frame_size) return (FAR void *)(topaddr + sizeof(uint32_t)); } + |