From 75f447a9f7d397f0e1c7205d2959ad30c5da2726 Mon Sep 17 00:00:00 2001 From: Shivam Garg Date: Mon, 18 Sep 2017 22:24:40 +0900 Subject: [PATCH] Changed #ifdef CONFIG_AUDIO to CONFIG_AUDIO_ALC5658 in ALC5658 driver files --- os/drivers/audio/alc5658.h | 6 +++--- os/drivers/audio/alc5658reg.h | 5 +++-- os/drivers/audio/alc5658scripts.h | 7 ++++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/os/drivers/audio/alc5658.h b/os/drivers/audio/alc5658.h index 8fba7b2..b1adeb0 100644 --- a/os/drivers/audio/alc5658.h +++ b/os/drivers/audio/alc5658.h @@ -55,6 +55,8 @@ #ifndef __DRIVERS_AUDIO_ALC5658_H #define __DRIVERS_AUDIO_ALC5658_H +#ifdef CONFIG_AUDIO_ALC5658 + /**************************************************************************** * Included Files ****************************************************************************/ @@ -63,8 +65,6 @@ #include #include -#ifdef CONFIG_AUDIO - /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -230,5 +230,5 @@ static void alc5658_configure_ints(FAR struct alc5658_dev_s *priv); static void alc5658_hw_reset(FAR struct alc5658_dev_s *priv); uint16_t alc5658_readreg(FAR struct alc5658_dev_s *priv, uint16_t regaddr); -#endif /* CONFIG_AUDIO */ +#endif /* CONFIG_AUDIO_ALC5658 */ #endif /* __DRIVERS_AUDIO_ALC5658_H */ diff --git a/os/drivers/audio/alc5658reg.h b/os/drivers/audio/alc5658reg.h index 892e55d..f6cffb5 100644 --- a/os/drivers/audio/alc5658reg.h +++ b/os/drivers/audio/alc5658reg.h @@ -18,13 +18,14 @@ #ifndef __DRIVERS_AUDIO_ALC5658REG_H #define __DRIVERS_AUDIO_ALC5658REG_H +#ifdef CONFIG_AUDIO_ALC5658 + /**************************************************************************** * Included Files ****************************************************************************/ #include #include -#ifdef CONFIG_AUDIO /**************************************************************************** * Pre-processor Definitions @@ -123,5 +124,5 @@ typedef enum { ALC5658_0010 = 0x0010, } ALC5658_REG; -#endif /* CONFIG_AUDIO */ +#endif /* CONFIG_AUDIO_ALC5658 */ #endif /* __DRIVERS_AUDIO_ALC5658REG_H */ diff --git a/os/drivers/audio/alc5658scripts.h b/os/drivers/audio/alc5658scripts.h index d12487d..8470feb 100644 --- a/os/drivers/audio/alc5658scripts.h +++ b/os/drivers/audio/alc5658scripts.h @@ -18,14 +18,15 @@ #ifndef __DRIVERS_AUDIO_ALC5658SCRIPTS_H #define __DRIVERS_AUDIO_ALC5658SCRIPTS_H + +#ifdef CONFIG_AUDIO_ALC5658 + /**************************************************************************** * Included Files ****************************************************************************/ #include "alc5658reg.h" -#ifdef CONFIG_AUDIO - /* TYPEDEFS */ typedef struct { ALC5658_REG addr; @@ -394,5 +395,5 @@ t_codec_dump_entry codec_dump_script[] = { {ALC5658_0010, "ALC5658_0010"}, }; -#endif /* CONFIG_AUDIO */ +#endif /* CONFIG_AUDIO_ALC5658 */ #endif /* __DRIVERS_AUDIO_ALC5658SCRIPTS_H */ -- 2.7.4