aboutsummaryrefslogtreecommitdiffstats
path: root/src/gaudio
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2015-01-21 17:26:24 +1000
committerinmarket <andrewh@inmarket.com.au>2015-01-21 17:26:24 +1000
commitfa8167b94d13e94a6cb953e7f549a89f155f77c6 (patch)
tree8c33f78c45ca72ac2653327607f1d7caed668c5e /src/gaudio
parent34939386d7390b0876973a1969f336b814313a22 (diff)
downloaduGFX-fa8167b94d13e94a6cb953e7f549a89f155f77c6.tar.gz
uGFX-fa8167b94d13e94a6cb953e7f549a89f155f77c6.tar.bz2
uGFX-fa8167b94d13e94a6cb953e7f549a89f155f77c6.zip
Big file rename to reduce problems with brain-dead IDE's that don't handle project file hierarchies well.
Naming is more consistent with the new scheme. May affect some third party drivers (header file renames).
Diffstat (limited to 'src/gaudio')
-rw-r--r--src/gaudio/gaudio.c (renamed from src/gaudio/gaudio_gaudio.c)12
-rw-r--r--src/gaudio/gaudio.h (renamed from src/gaudio/sys_defs.h)2
-rw-r--r--src/gaudio/gaudio.mk1
-rw-r--r--src/gaudio/gaudio_driver_play.h (renamed from src/gaudio/driver_play.h)2
-rw-r--r--src/gaudio/gaudio_driver_record.h (renamed from src/gaudio/driver_record.h)2
-rw-r--r--src/gaudio/gaudio_options.h (renamed from src/gaudio/sys_options.h)2
-rw-r--r--src/gaudio/gaudio_rules.h (renamed from src/gaudio/sys_rules.h)2
-rw-r--r--src/gaudio/sys_make.mk1
8 files changed, 8 insertions, 16 deletions
diff --git a/src/gaudio/gaudio_gaudio.c b/src/gaudio/gaudio.c
index bb12e6d2..0abc9382 100644
--- a/src/gaudio/gaudio_gaudio.c
+++ b/src/gaudio/gaudio.c
@@ -5,19 +5,12 @@
* http://ugfx.org/license.html
*/
-/**
- * @file src/gaudio/gaudio_gaudio.c
- * @brief GAUDIO sub-system code.
- *
- * @addtogroup GAUDIO
- * @{
- */
#include "gfx.h"
#if GFX_USE_GAUDIO
#if GAUDIO_NEED_PLAY
- #include "driver_play.h"
+ #include "gaudio_driver_play.h"
static gfxQueueASync playList;
static gfxSem playComplete;
@@ -32,7 +25,7 @@
#endif
#if GAUDIO_NEED_RECORD
- #include "driver_record.h"
+ #include "gaudio_driver_record.h"
static gfxQueueGSync recordList;
static uint16_t recordFlags;
@@ -280,4 +273,3 @@ void _gaudioDeinit(void)
#endif
#endif /* GFX_USE_GAUDIO */
-/** @} */
diff --git a/src/gaudio/sys_defs.h b/src/gaudio/gaudio.h
index 5a43af18..23403b15 100644
--- a/src/gaudio/sys_defs.h
+++ b/src/gaudio/gaudio.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gaudio/sys_defs.h
+ * @file src/gaudio/gaudio.h
*
* @addtogroup GAUDIO
*
diff --git a/src/gaudio/gaudio.mk b/src/gaudio/gaudio.mk
new file mode 100644
index 00000000..438892c0
--- /dev/null
+++ b/src/gaudio/gaudio.mk
@@ -0,0 +1 @@
+GFXSRC += $(GFXLIB)/src/gaudio/gaudio.c
diff --git a/src/gaudio/driver_play.h b/src/gaudio/gaudio_driver_play.h
index 343a0fed..fced1210 100644
--- a/src/gaudio/driver_play.h
+++ b/src/gaudio/gaudio_driver_play.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gaudio/driver_play.h
+ * @file src/gaudio/gaudio_driver_play.h
* @brief GAUDIO - Audio play driver header file.
*
* @defgroup Driver Driver
diff --git a/src/gaudio/driver_record.h b/src/gaudio/gaudio_driver_record.h
index 20136dd7..280be5d1 100644
--- a/src/gaudio/driver_record.h
+++ b/src/gaudio/gaudio_driver_record.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gaudio/driver_record.h
+ * @file src/gaudio/gaudio_driver_record.h
* @brief GAUDIO - Audio Recording driver header file.
*
* @defgroup Driver Driver
diff --git a/src/gaudio/sys_options.h b/src/gaudio/gaudio_options.h
index eb903424..d6dfb105 100644
--- a/src/gaudio/sys_options.h
+++ b/src/gaudio/gaudio_options.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gaudio/sys_options.h
+ * @file src/gaudio/gaudio_options.h
* @brief GAUDIO - Audio subsystem options header file.
*
* @addtogroup GAUDIO
diff --git a/src/gaudio/sys_rules.h b/src/gaudio/gaudio_rules.h
index 4786fa5f..2dbad17d 100644
--- a/src/gaudio/sys_rules.h
+++ b/src/gaudio/gaudio_rules.h
@@ -6,7 +6,7 @@
*/
/**
- * @file src/gaudio/sys_rules.h
+ * @file src/gaudio/gaudio_rules.h
* @brief GAUDIO safety rules header file.
*
* @addtogroup GAUDIO
diff --git a/src/gaudio/sys_make.mk b/src/gaudio/sys_make.mk
deleted file mode 100644
index ea02e010..00000000
--- a/src/gaudio/sys_make.mk
+++ /dev/null
@@ -1 +0,0 @@
-GFXSRC += $(GFXLIB)/src/gaudio/gaudio_gaudio.c