aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Caudle <stephen@caudle.info>2015-09-14 11:08:53 -0400
committerStephen Caudle <stephen@caudle.info>2015-09-14 11:08:53 -0400
commit9ad49f5077b1cfbce07715119629e1ddc26bf2d3 (patch)
tree09f89bc4859246a681181d3051efbe2cba25deeb
parent2e554f3ef5e1e3d7b6d04457cee27dd79618e345 (diff)
downloadChibiOS-Contrib-9ad49f5077b1cfbce07715119629e1ddc26bf2d3.tar.gz
ChibiOS-Contrib-9ad49f5077b1cfbce07715119629e1ddc26bf2d3.tar.bz2
ChibiOS-Contrib-9ad49f5077b1cfbce07715119629e1ddc26bf2d3.zip
Add missing braces and fix copyright
-rw-r--r--os/hal/ports/NRF51/NRF51822/adc_lld.c3
-rw-r--r--testhal/NRF51/NRF51822/ADC/main.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/os/hal/ports/NRF51/NRF51822/adc_lld.c b/os/hal/ports/NRF51/NRF51822/adc_lld.c
index 0c28cb0..7f3413c 100644
--- a/os/hal/ports/NRF51/NRF51822/adc_lld.c
+++ b/os/hal/ports/NRF51/NRF51822/adc_lld.c
@@ -171,11 +171,12 @@ void adc_lld_stop(ADCDriver *adcp) {
if (adcp->state == ADC_READY) {
#if NRF51_ADC_USE_ADC1
- if (&ADCD1 == adcp)
+ if (&ADCD1 == adcp) {
nvicDisableVector(ADC_IRQn);
adcp->adc->INTENCLR = ADC_INTENCLR_END_Clear << ADC_INTENCLR_END_Pos;
adc_lld_stop_conversion(adcp);
+ }
#endif
}
}
diff --git a/testhal/NRF51/NRF51822/ADC/main.c b/testhal/NRF51/NRF51822/ADC/main.c
index d413c85..6371a61 100644
--- a/testhal/NRF51/NRF51822/ADC/main.c
+++ b/testhal/NRF51/NRF51822/ADC/main.c
@@ -1,5 +1,5 @@
/*
- ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+ Copyright (C) 2015 Stephen Caudle
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.