From 4cba634a12b80be9076e5bb5feafcb91c9e6b4e3 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 30 Aug 2017 07:05:30 -0600 Subject: [PATCH] Mostly cosmetic changes from review of last PR. Also same inappropriate use of _info changes to configurable debug macros. Remember folks, if it has a _ or __ in front, it is not intended for use outside of the header file. It is an internal private definition. --- configs/nucleo-l432kc/src/stm32_spi.c | 4 +-- configs/nucleo-l452re/include/board.h | 1 - configs/nucleo-l452re/src/stm32_adc.c | 38 ++++++++++++++--------- configs/nucleo-l452re/src/stm32_bringup.c | 4 +-- configs/nucleo-l452re/src/stm32_dac.c | 4 +-- 5 files changed, 29 insertions(+), 22 deletions(-) diff --git a/configs/nucleo-l432kc/src/stm32_spi.c b/configs/nucleo-l432kc/src/stm32_spi.c index cb1732dbe2e..d69c3a2dff9 100644 --- a/configs/nucleo-l432kc/src/stm32_spi.c +++ b/configs/nucleo-l432kc/src/stm32_spi.c @@ -89,7 +89,7 @@ void stm32l4_spiinitialize(void) stm32l4_configgpio(GPIO_SPI_CS_SD_CARD); #endif - _info("SPI1 initialized\n"); + spiinfo("SPI1 initialized\n"); #endif #ifdef CONFIG_STM32L4_SPI2 @@ -99,7 +99,7 @@ void stm32l4_spiinitialize(void) /* Setup CS, EN & IRQ line IOs */ - _info("SPI2 initialized\n"); + spiinfo("SPI2 initialized\n"); #endif } diff --git a/configs/nucleo-l452re/include/board.h b/configs/nucleo-l452re/include/board.h index b891fb272a5..ac47e3dc7a6 100644 --- a/configs/nucleo-l452re/include/board.h +++ b/configs/nucleo-l452re/include/board.h @@ -219,7 +219,6 @@ #define ADC1_MEASURE_CHANNEL 9 #define GPIO_MEASURE_ADC (GPIO_ADC1_IN9) - /* Quadrature encoder * Default is to use timer 5 (32-bit) and encoder on PA0/PA1 */ diff --git a/configs/nucleo-l452re/src/stm32_adc.c b/configs/nucleo-l452re/src/stm32_adc.c index 292b653780e..34ebb25e93a 100644 --- a/configs/nucleo-l452re/src/stm32_adc.c +++ b/configs/nucleo-l452re/src/stm32_adc.c @@ -61,6 +61,7 @@ /* STM32 chip specific calibration values *******************************************/ /* Voltage used for calibration of internal analog reference voltage (Vrefint) */ + #if defined(CONFIG_ARCH_CHIP_STM32F7) \ || defined(CONFIG_ARCH_CHIP_STM32F4) \ || defined(CONFIG_ARCH_CHIP_STM32F0) @@ -78,6 +79,7 @@ * should nevertheless be verified from data-sheet when porting this * file to a new chip. */ + #if defined(CONFIG_ARCH_CHIP_STM32F7) # define STM32_VREFINT_CAL (*(uint16_t *)((uint32_t)0x1ff0f44a)) #elif defined(CONFIG_ARCH_CHIP_STM32F4) @@ -93,9 +95,11 @@ /* Internal temperature sensor calibration locations. Taken from * STM32L452 datasheet. */ + #if defined(CONFIG_ARCH_CHIP_STM32L4) /* TS ADC raw data acquired at a temperature of 30 °C (± 5 °C) */ + # define STM32_TSENSE_TSCAL1 (*(int16_t *)((uint32_t)0x1fff75a8)) /* TS ADC raw data acquired at a temperature of 130 °C (± 5 °C) */ @@ -167,7 +171,7 @@ int stm32l4_adc_measure_voltages(uint32_t *vrefint, uint32_t *vbat, uint32_t *ve fd = open("/dev/adc0", O_RDONLY); if (fd < 0) { - _err("Cannot open ADC converter\n"); + aerr("ERROR: Cannot open ADC converter\n"); ret = fd; goto out; } @@ -175,7 +179,7 @@ int stm32l4_adc_measure_voltages(uint32_t *vrefint, uint32_t *vbat, uint32_t *ve ret = ioctl(fd, ANIOC_TRIGGER, 0); if (ret < 0) { - _err("Cannot trigger ADC conversion\n"); + aerr("ERROR: Cannot trigger ADC conversion\n"); goto out_close; } @@ -186,16 +190,16 @@ int stm32l4_adc_measure_voltages(uint32_t *vrefint, uint32_t *vbat, uint32_t *ve ret = -errval; if (errval != EINTR) { - _err("read failed: %d\n", errval); + aerr("ERROR: read failed: %d\n", errval); goto out_close; } - _info("Interrupted read...\n"); + ainfo("Interrupted read...\n"); goto out_close; } else if (nbytes == 0) { - _err("No data read\n"); + aerr("ERROR: No data read\n"); ret = ERROR; goto out_close; } @@ -203,20 +207,20 @@ int stm32l4_adc_measure_voltages(uint32_t *vrefint, uint32_t *vbat, uint32_t *ve nsamples = nbytes / sizeof(struct adc_msg_s); if (nsamples * sizeof(struct adc_msg_s) != nbytes) { - _info("Read size=%ld is not a multiple of sample size=%d, Ignoring\n", + ainfo("Read size=%ld is not a multiple of sample size=%d, Ignoring\n", (long)nbytes, sizeof(struct adc_msg_s)); } else { int i; int32_t tsense; - _info("Sample (nsamples = %d):\n", nsamples); + ainfo("Sample (nsamples = %d):\n", nsamples); *vrefint = *vbat = *vext = 0; for (i = 0; i < nsamples ; i++) { - _info("%d: channel: %d value: %d\n", + ainfo("%d: channel: %d value: %d\n", i+1, sample[i].am_channel, sample[i].am_data); /* Add the raw value to entropy pool. */ @@ -229,8 +233,9 @@ int stm32l4_adc_measure_voltages(uint32_t *vrefint, uint32_t *vbat, uint32_t *ve /* Calculate corrected Vrefint with factory calibration value. */ *vrefint = STM32_VREFINT_MVOLTS * STM32_VREFINT_CAL / sample[i].am_data; - _info("VREFINT: %d -> %u mV\n", sample[i].am_data, *vrefint); + ainfo("VREFINT: %d -> %u mV\n", sample[i].am_data, *vrefint); break; + case ADC1_INTERNAL_TSENSE_CHANNEL: /* Calculate final temperature. Sensor precision is ±2 °C, * so it does not matter much if we use integer type here. @@ -238,18 +243,21 @@ int stm32l4_adc_measure_voltages(uint32_t *vrefint, uint32_t *vbat, uint32_t *ve tsense = (110 - 30) * (sample[i].am_data - STM32_TSENSE_TSCAL1) / (STM32_TSENSE_TSCAL2 - STM32_TSENSE_TSCAL1) + 30; - _info("TSENSE: %d -> %d °C\n", sample[i].am_data, tsense); + ainfo("TSENSE: %d -> %d °C\n", sample[i].am_data, tsense); break; + case ADC1_INTERNAL_VBATDIV3_CHANNEL: *vbat = 3 * sample[i].am_data; - _info("VBAT/3: %d -> %u mV\n", sample[i].am_data, *vbat); + ainfo("VBAT/3: %d -> %u mV\n", sample[i].am_data, *vbat); break; + case ADC1_MEASURE_CHANNEL: *vext = sample[i].am_data; - _info("External channel: %d\n", *vext); + ainfo("External channel: %d\n", *vext); break; + default: - _err("ADC got value from unknown channel %d\n", sample[i].am_channel); + aerr("ERROR: ADC got value from unknown channel %d\n", sample[i].am_channel); break; } } @@ -289,7 +297,7 @@ int stm32l4_adc_setup(void) g_adc = stm32l4_adc_initialize(1, g_chanlist, ADC1_NCHANNELS); if (g_adc == NULL) { - _err("Failed to get ADC interface\n"); + aerr("ERROR: Failed to get ADC interface\n"); return -ENODEV; } @@ -298,7 +306,7 @@ int stm32l4_adc_setup(void) ret = adc_register("/dev/adc0", g_adc); if (ret < 0) { - _err("adc_register failed: %d\n", ret); + aerr("ERROR: adc_register failed: %d\n", ret); return ret; } #endif diff --git a/configs/nucleo-l452re/src/stm32_bringup.c b/configs/nucleo-l452re/src/stm32_bringup.c index bcc426139ae..1eed61443a1 100644 --- a/configs/nucleo-l452re/src/stm32_bringup.c +++ b/configs/nucleo-l452re/src/stm32_bringup.c @@ -113,13 +113,13 @@ int stm32_bringup(void) #endif #ifdef CONFIG_DAC - _info("Initializing DAC\n"); + ainfo("Initializing DAC\n"); (void)stm32l4_dac_setup(); #endif #ifdef CONFIG_ADC - _info("Initializing ADC\n"); + ainfo("Initializing ADC\n"); (void)stm32l4_adc_setup(); #endif diff --git a/configs/nucleo-l452re/src/stm32_dac.c b/configs/nucleo-l452re/src/stm32_dac.c index efde2cd3516..9a259bb7e0b 100644 --- a/configs/nucleo-l452re/src/stm32_dac.c +++ b/configs/nucleo-l452re/src/stm32_dac.c @@ -74,7 +74,7 @@ int stm32l4_dac_setup(void) g_dac = stm32l4_dacinitialize(0); if (g_dac == NULL) { - _err("Failed to get DAC interface\n"); + aerr("ERROR: Failed to get DAC interface\n"); return -ENODEV; } @@ -83,7 +83,7 @@ int stm32l4_dac_setup(void) ret = dac_register("/dev/dac0", g_dac); if (ret < 0) { - _err("dac_register failed: %d\n", ret); + aerr("ERROR: dac_register failed: %d\n", ret); return ret; } #endif