diff options
Diffstat (limited to 'os')
| -rw-r--r-- | os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x.mk | 2 | ||||
| -rw-r--r-- | os/common/startup/ARMCMx/compilers/GCC/mk/startup_kl2x.mk | 2 | ||||
| -rw-r--r-- | os/hal/ports/KINETIS/LLD/hal_adc_lld.c | 5 | 
3 files changed, 5 insertions, 4 deletions
diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x.mk index 410e607..0c2ec7d 100644 --- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x.mk +++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_k20x.mk @@ -2,7 +2,7 @@  STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c \
               $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.c
 -STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.s
 +STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v7m.S
  STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
               $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/K20x \
 diff --git a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_kl2x.mk b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_kl2x.mk index ada23f6..ca67f10 100644 --- a/os/common/startup/ARMCMx/compilers/GCC/mk/startup_kl2x.mk +++ b/os/common/startup/ARMCMx/compilers/GCC/mk/startup_kl2x.mk @@ -2,7 +2,7 @@  STARTUPSRC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt1.c \
               $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/vectors.c
 -STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.s
 +STARTUPASM = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/crt0_v6m.S
  STARTUPINC = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC \
               $(CHIBIOS_CONTRIB)/os/common/startup/ARMCMx/devices/KL2x \
 diff --git a/os/hal/ports/KINETIS/LLD/hal_adc_lld.c b/os/hal/ports/KINETIS/LLD/hal_adc_lld.c index c0904c8..56ae4c3 100644 --- a/os/hal/ports/KINETIS/LLD/hal_adc_lld.c +++ b/os/hal/ports/KINETIS/LLD/hal_adc_lld.c @@ -104,12 +104,13 @@ OSAL_IRQ_HANDLER(KINETIS_ADC0_IRQ_VECTOR) {    /*  At the end of the buffer then we may be finished */
    if (adcp->current_index == adcp->number_of_samples) {
 +    /* We are never finished in circular mode */ +    more = ADCD1.grpp->circular; +      _adc_isr_full_code(&ADCD1);
      adcp->current_index = 0;
 -    /* We are never finished in circular mode */
 -    more = ADCD1.grpp->circular;
    }
    if (more) {
  | 
