Renaming generic-sounding filenames to indicate "audio".
Change-Id: Iba6403a3493379c39d22d23b438f028efc2e15b7
diff --git a/modules/usbaudio/Android.mk b/modules/usbaudio/Android.mk
index ec8a8c0..446281d 100644
--- a/modules/usbaudio/Android.mk
+++ b/modules/usbaudio/Android.mk
@@ -22,8 +22,8 @@
audio_hw.c \
alsa_device_profile.c \
alsa_device_proxy.c \
- logging.c \
- format.c
+ audio_logging.c \
+ audio_format.c
LOCAL_C_INCLUDES += \
external/tinyalsa/include \
$(call include-path-for, audio-utils)
diff --git a/modules/usbaudio/alsa_device_profile.c b/modules/usbaudio/alsa_device_profile.c
index 8e84471..6397b28 100644
--- a/modules/usbaudio/alsa_device_profile.c
+++ b/modules/usbaudio/alsa_device_profile.c
@@ -26,8 +26,8 @@
#include <log/log.h>
#include "alsa_device_profile.h"
-#include "format.h"
-#include "logging.h"
+#include "audio_format.h"
+#include "audio_logging.h"
#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
diff --git a/modules/usbaudio/alsa_device_proxy.c b/modules/usbaudio/alsa_device_proxy.c
index 081c05b..902a6d2 100644
--- a/modules/usbaudio/alsa_device_proxy.c
+++ b/modules/usbaudio/alsa_device_proxy.c
@@ -22,7 +22,7 @@
#include "alsa_device_proxy.h"
-#include "logging.h"
+#include "audio_logging.h"
#define DEFAULT_PERIOD_SIZE 1024
#define DEFAULT_PERIOD_COUNT 2
diff --git a/modules/usbaudio/format.c b/modules/usbaudio/audio_format.c
similarity index 99%
rename from modules/usbaudio/format.c
rename to modules/usbaudio/audio_format.c
index 701e4c6..63b1ba8 100644
--- a/modules/usbaudio/format.c
+++ b/modules/usbaudio/audio_format.c
@@ -17,7 +17,7 @@
#define LOG_TAG "audio_format"
/*#define LOG_NDEBUG 0*/
-#include "format.h"
+#include "audio_format.h"
#include <tinyalsa/asoundlib.h>
diff --git a/modules/usbaudio/format.h b/modules/usbaudio/audio_format.h
similarity index 77%
rename from modules/usbaudio/format.h
rename to modules/usbaudio/audio_format.h
index 0d41c3a..712ef67 100644
--- a/modules/usbaudio/format.h
+++ b/modules/usbaudio/audio_format.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_FORMAT_H
-#define ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_FORMAT_H
+#ifndef ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_AUDIO_FORMAT_H
+#define ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_AUDIO_FORMAT_H
#include <system/audio.h>
@@ -23,4 +23,4 @@
enum pcm_format get_pcm_format_for_mask(struct pcm_mask* mask);
-#endif /* ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_FORMAT_H */
+#endif /* ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_AUDIO_FORMAT_H */
diff --git a/modules/usbaudio/audio_hw.c b/modules/usbaudio/audio_hw.c
index 0346408..d668787 100644
--- a/modules/usbaudio/audio_hw.c
+++ b/modules/usbaudio/audio_hw.c
@@ -51,7 +51,7 @@
#include "alsa_device_profile.h"
#include "alsa_device_proxy.h"
-#include "logging.h"
+#include "audio_logging.h"
#define DEFAULT_INPUT_BUFFER_SIZE_MS 20
diff --git a/modules/usbaudio/logging.c b/modules/usbaudio/audio_logging.c
similarity index 99%
rename from modules/usbaudio/logging.c
rename to modules/usbaudio/audio_logging.c
index d3f7abf..77fbd51 100644
--- a/modules/usbaudio/logging.c
+++ b/modules/usbaudio/audio_logging.c
@@ -21,7 +21,7 @@
#include <log/log.h>
-#include "logging.h"
+#include "audio_logging.h"
#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
diff --git a/modules/usbaudio/logging.h b/modules/usbaudio/audio_logging.h
similarity index 79%
rename from modules/usbaudio/logging.h
rename to modules/usbaudio/audio_logging.h
index b5640ed..082e8b2 100644
--- a/modules/usbaudio/logging.h
+++ b/modules/usbaudio/audio_logging.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_LOGGING_H
-#define ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_LOGGING_H
+#ifndef ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_AUDIO_LOGGING_H
+#define ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_AUDIO_LOGGING_H
#include <tinyalsa/asoundlib.h>
@@ -23,4 +23,4 @@
void log_pcm_params(struct pcm_params * alsa_hw_params);
void log_pcm_config(struct pcm_config * config, const char* label);
-#endif /* ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_LOGGING_H */
+#endif /* ANDROID_HARDWARE_LIBHARDWARE_MODULES_USBAUDIO_AUDIO_LOGGING_H */