From ea5a1b849df6e5085a92957ad387f9e653674415 Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Tue, 11 Mar 2014 17:13:31 +1000
Subject: Combine GAUDIN and GAUDOUT into a single GAUDIO module. Simplify
GAUDIN (now GAUDIO RECORD) api. Update audio demo's to match. Port Win32
driver to new audio api.
---
boards/base/Olimex-SAM7EX256-GE12/board.mk | 2 +-
boards/base/Olimex-SAM7EX256-GE12/readme.txt | 2 +-
boards/base/Olimex-SAM7EX256-GE8/board.mk | 2 +-
.../base/Olimex-SAM7EX256-GE8/gaudin_lld_board.h | 33 ----------------------
.../Olimex-SAM7EX256-GE8/gaudio_record_board.h | 33 ++++++++++++++++++++++
boards/base/Olimex-SAM7EX256-GE8/readme.txt | 2 +-
boards/base/Win32/board.mk | 2 +-
7 files changed, 38 insertions(+), 38 deletions(-)
delete mode 100644 boards/base/Olimex-SAM7EX256-GE8/gaudin_lld_board.h
create mode 100644 boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h
(limited to 'boards')
diff --git a/boards/base/Olimex-SAM7EX256-GE12/board.mk b/boards/base/Olimex-SAM7EX256-GE12/board.mk
index a1eae818..2ef53142 100644
--- a/boards/base/Olimex-SAM7EX256-GE12/board.mk
+++ b/boards/base/Olimex-SAM7EX256-GE12/board.mk
@@ -5,4 +5,4 @@ include $(GFXLIB)/drivers/gdisp/Nokia6610GE12/gdisp_lld.mk
include $(GFXLIB)/drivers/gadc/AT91SAM7/gadc_lld.mk
include $(GFXLIB)/drivers/ginput/dial/GADC/ginput_lld.mk
include $(GFXLIB)/drivers/ginput/toggle/Pal/ginput_lld.mk
-include $(GFXLIB)/drivers/audio/gadc/driver.mk
+include $(GFXLIB)/drivers/gaudio/gadc/driver.mk
diff --git a/boards/base/Olimex-SAM7EX256-GE12/readme.txt b/boards/base/Olimex-SAM7EX256-GE12/readme.txt
index ebf1497a..83e32ee8 100644
--- a/boards/base/Olimex-SAM7EX256-GE12/readme.txt
+++ b/boards/base/Olimex-SAM7EX256-GE12/readme.txt
@@ -6,7 +6,7 @@ On this board uGFX currently supports:
- GADC via the AT91SAM7 driver
- GINPUT-dials via the GADC driver
- GINPUT-toggles via the Pal driver
- - GAUDIN via the GADC driver
+ - GAUDIO recording via the GADC driver
Note there are two variants of this board - one with the GE8 display
and one with the GE12 display. This one is for the GE12 display.
diff --git a/boards/base/Olimex-SAM7EX256-GE8/board.mk b/boards/base/Olimex-SAM7EX256-GE8/board.mk
index a60d9355..249cfc2d 100644
--- a/boards/base/Olimex-SAM7EX256-GE8/board.mk
+++ b/boards/base/Olimex-SAM7EX256-GE8/board.mk
@@ -5,4 +5,4 @@ include $(GFXLIB)/drivers/gdisp/Nokia6610GE8/gdisp_lld.mk
include $(GFXLIB)/drivers/gadc/AT91SAM7/gadc_lld.mk
include $(GFXLIB)/drivers/ginput/dial/GADC/ginput_lld.mk
include $(GFXLIB)/drivers/ginput/toggle/Pal/ginput_lld.mk
-include $(GFXLIB)/drivers/audio/gadc/driver.mk
+include $(GFXLIB)/drivers/gaudio/gadc/driver.mk
diff --git a/boards/base/Olimex-SAM7EX256-GE8/gaudin_lld_board.h b/boards/base/Olimex-SAM7EX256-GE8/gaudin_lld_board.h
deleted file mode 100644
index 632f0659..00000000
--- a/boards/base/Olimex-SAM7EX256-GE8/gaudin_lld_board.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is subject to the terms of the GFX License. If a copy of
- * the license was not distributed with this file, you can obtain one at:
- *
- * http://ugfx.org/license.html
- */
-
-/**
- * @file boards/base/Olimex-SAM7EX256-GE8/gaudin_lld_board.h
- * @brief GAUDIN Driver board config file for the Olimex SAM7EX256 board
- */
-
-#ifndef _GAUDIN_LLD_BOARD_H
-#define _GAUDIN_LLD_BOARD_H
-
-/*===========================================================================*/
-/* Audio inputs on this board */
-/*===========================================================================*/
-
-#define GAUDIN_NUM_CHANNELS 1
-
-/**
- * The list of audio channels and their uses
- */
-#define GAUDIN_MICROPHONE 0
-
-#ifdef GAUDIN_LLD_IMPLEMENTATION
- static uint32_t gaudin_lld_physdevs[GAUDIN_NUM_CHANNELS] = {
- GADC_PHYSDEV_MICROPHONE,
- };
-#endif
-
-#endif /* _GAUDIN_LLD_BOARD_H */
diff --git a/boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h b/boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h
new file mode 100644
index 00000000..cdea5e06
--- /dev/null
+++ b/boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h
@@ -0,0 +1,33 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ * http://ugfx.org/license.html
+ */
+
+/**
+ * @file boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h
+ * @brief GAUDIO Record Driver board config file for the Olimex SAM7EX256 board
+ */
+
+#ifndef _GAUDIO_RECORD_BOARD_H
+#define _GAUDIO_RECORD_BOARD_H
+
+/*===========================================================================*/
+/* Audio inputs on this board */
+/*===========================================================================*/
+
+#define GAUDIO_RECORD_NUM_CHANNELS 1
+
+/**
+ * The list of audio channels and their uses
+ */
+#define GAUDIO_RECORD_MICROPHONE 0
+
+#ifdef GAUDIO_RECORD_IMPLEMENTATION
+ static uint32_t gaudin_lld_physdevs[GAUDIO_RECORD_NUM_CHANNELS] = {
+ GADC_PHYSDEV_MICROPHONE,
+ };
+#endif
+
+#endif /* _GAUDIO_RECORD_BOARD_H */
diff --git a/boards/base/Olimex-SAM7EX256-GE8/readme.txt b/boards/base/Olimex-SAM7EX256-GE8/readme.txt
index 01b3f8b4..f613dee3 100644
--- a/boards/base/Olimex-SAM7EX256-GE8/readme.txt
+++ b/boards/base/Olimex-SAM7EX256-GE8/readme.txt
@@ -6,7 +6,7 @@ On this board uGFX currently supports:
- GADC via the AT91SAM7 driver
- GINPUT-dials via the GADC driver
- GINPUT-toggles via the Pal driver
- - GAUDIN via the GADC driver
+ - GAUDIO recording via the GADC driver
Note there are two variants of this board - one with the GE8 display
and one with the GE12 display. This one is for the GE8 display.
diff --git a/boards/base/Win32/board.mk b/boards/base/Win32/board.mk
index 5f624f3d..69d09100 100644
--- a/boards/base/Win32/board.mk
+++ b/boards/base/Win32/board.mk
@@ -2,4 +2,4 @@ GFXINC += $(GFXLIB)/boards/base/Win32
GFXSRC +=
include $(GFXLIB)/drivers/multiple/Win32/driver.mk
-include $(GFXLIB)/drivers/audio/Win32/driver.mk
+include $(GFXLIB)/drivers/gaudio/Win32/driver.mk
--
cgit v1.2.3