From b28e95ca1aa2860c0869041c29a3ba27054e5967 Mon Sep 17 00:00:00 2001
From: Kevin O'Connor <kevin@koconnor.net>
Date: Mon, 4 Mar 2019 23:35:11 -0500
Subject: command: Always pass a string to the DECL_CONSTANT() macro

Make it clear that the name of the constant being defined is a string.
When the value being defined is also a string, use a new
DECL_CONSTANT_STR() macro.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
---
 src/avr/adc.c      | 2 +-
 src/avr/hard_pwm.c | 2 +-
 src/avr/main.c     | 2 +-
 src/avr/timer.c    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/avr')

diff --git a/src/avr/adc.c b/src/avr/adc.c
index 3087dce1..8b478d08 100644
--- a/src/avr/adc.c
+++ b/src/avr/adc.c
@@ -36,7 +36,7 @@ static const uint8_t adc_pins[] PROGMEM = {
 enum { ADMUX_DEFAULT = 0x40 };
 enum { ADC_ENABLE = (1<<ADPS0)|(1<<ADPS1)|(1<<ADPS2)|(1<<ADEN)|(1<<ADIF) };
 
-DECL_CONSTANT(ADC_MAX, 1023);
+DECL_CONSTANT("ADC_MAX", 1023);
 
 struct gpio_adc
 gpio_adc_setup(uint8_t pin)
diff --git a/src/avr/hard_pwm.c b/src/avr/hard_pwm.c
index a6609313..01d0bd9e 100644
--- a/src/avr/hard_pwm.c
+++ b/src/avr/hard_pwm.c
@@ -74,7 +74,7 @@ static const struct gpio_pwm_info pwm_regs[] PROGMEM = {
 #endif
 };
 
-DECL_CONSTANT(PWM_MAX, 255);
+DECL_CONSTANT("PWM_MAX", 255);
 
 struct gpio_pwm
 gpio_pwm_setup(uint8_t pin, uint32_t cycle_time, uint8_t val)
diff --git a/src/avr/main.c b/src/avr/main.c
index 57aa3c01..0523af41 100644
--- a/src/avr/main.c
+++ b/src/avr/main.c
@@ -12,7 +12,7 @@
 #include "irq.h" // irq_enable
 #include "sched.h" // sched_main
 
-DECL_CONSTANT(MCU, CONFIG_MCU);
+DECL_CONSTANT_STR("MCU", CONFIG_MCU);
 
 
 /****************************************************************
diff --git a/src/avr/timer.c b/src/avr/timer.c
index e8880a64..fb8738cc 100644
--- a/src/avr/timer.c
+++ b/src/avr/timer.c
@@ -16,7 +16,7 @@
  * Low level timer code
  ****************************************************************/
 
-DECL_CONSTANT(CLOCK_FREQ, CONFIG_CLOCK_FREQ);
+DECL_CONSTANT("CLOCK_FREQ", CONFIG_CLOCK_FREQ);
 
 // Return the number of clock ticks for a given number of microseconds
 uint32_t
-- 
cgit v1.2.3-70-g09d2