From eae3e4237b2a651199b52f3746be66fe86d60282 Mon Sep 17 00:00:00 2001 From: xross Date: Tue, 10 Oct 2017 15:00:00 +0100 Subject: [PATCH] Initial file tidy-up. Created app_xua_simple. --- CHANGELOG.rst | 15 +++- {lib_xua/src/dfu/doc => doc_dfu}/Makefile | 0 .../dfu/doc => doc_dfu}/building_xmos_dfu.rst | 0 .../src/dfu/doc => doc_dfu}/factory_image.rst | 0 {lib_xua/src/dfu/doc => doc_dfu}/index.rst | 0 {lib_xua/src/dfu/doc => doc_dfu}/overview.rst | 0 .../src/dfu/doc => doc_dfu}/thesycon_dfu.rst | 0 {lib_xua/src/dfu/doc => doc_dfu}/xmos_dfu.rst | 0 examples/app_xua_simple/Makefile | 19 ++++ examples/app_xua_simple/src/app_xua_simple.xc | 68 +++++++++++++++ examples/app_xua_simple/src/customdefines.h | 34 ++++++++ examples/app_xua_simple/src/simulation.xc | 17 ++++ .../app_xua_simple/src/xk-audio-216-mc.xn | 87 +++++++++++++++++++ lib_xua/api/xua.h | 9 ++ .../endpoint0.h => api/xua_endpoint0.h} | 2 +- lib_xua/src/dfu/README.rst | 11 --- lib_xua/src/dfu/module_build_info | 22 ----- lib_xua/src/dfu/module_description | 1 - lib_xua/src/dfu/wscript | 4 - lib_xua/src/queue/README.rst | 9 -- lib_xua/src/queue/module_build_info | 14 --- lib_xua/src/queue/module_description | 1 - lib_xua/src/queue/wscript | 2 - lib_xua/src/usb_audio/endpoint0/endpoint0.c | 16 ++-- lib_xua/src/usb_audio/flashlib_user.c | 2 +- lib_xua/src/usb_audio/main.xc | 10 ++- lib_xua/src/usb_audio/{ => support}/reboot.xc | 0 lib_xua/src/usb_audio/wscript | 9 -- lib_xua/src/{dfu/src => usb_dfu}/dfu.h | 0 lib_xua/src/{dfu/src => usb_dfu}/dfu.xc | 4 + .../src/{dfu/src => usb_dfu}/dfu_interface.h | 0 lib_xua/src/{dfu/src => usb_dfu}/dfu_types.h | 0 .../{dfu/src => usb_dfu}/flash_interface.c | 3 + .../{dfu/src => usb_dfu}/flash_interface.h | 0 lib_xua/src/usb_midi/README | 1 - lib_xua/src/usb_midi/README.rst | 9 -- .../src/usb_midi/{src => }/midi_descriptor.h | 0 lib_xua/src/usb_midi/{src => }/midiinparse.h | 0 lib_xua/src/usb_midi/{src => }/midiinparse.xc | 0 lib_xua/src/usb_midi/{src => }/midioutparse.h | 0 .../src/usb_midi/{src => }/midioutparse.xc | 0 lib_xua/src/usb_midi/module_build_info | 12 --- lib_xua/src/usb_midi/module_description | 1 - lib_xua/src/{queue/src => usb_midi}/queue.h | 0 lib_xua/src/{queue/src => usb_midi}/queue.xc | 0 lib_xua/src/usb_midi/{src => }/usb_midi.h | 0 lib_xua/src/usb_midi/{src => }/usb_midi.xc | 0 .../usb_midi/{src => }/usb_midi_support.xc | 0 lib_xua/src/usb_midi/wscript | 3 - 49 files changed, 270 insertions(+), 115 deletions(-) rename {lib_xua/src/dfu/doc => doc_dfu}/Makefile (100%) rename {lib_xua/src/dfu/doc => doc_dfu}/building_xmos_dfu.rst (100%) rename {lib_xua/src/dfu/doc => doc_dfu}/factory_image.rst (100%) rename {lib_xua/src/dfu/doc => doc_dfu}/index.rst (100%) rename {lib_xua/src/dfu/doc => doc_dfu}/overview.rst (100%) rename {lib_xua/src/dfu/doc => doc_dfu}/thesycon_dfu.rst (100%) rename {lib_xua/src/dfu/doc => doc_dfu}/xmos_dfu.rst (100%) create mode 100644 examples/app_xua_simple/Makefile create mode 100644 examples/app_xua_simple/src/app_xua_simple.xc create mode 100644 examples/app_xua_simple/src/customdefines.h create mode 100644 examples/app_xua_simple/src/simulation.xc create mode 100644 examples/app_xua_simple/src/xk-audio-216-mc.xn create mode 100644 lib_xua/api/xua.h rename lib_xua/{src/usb_audio/endpoint0/endpoint0.h => api/xua_endpoint0.h} (93%) delete mode 100644 lib_xua/src/dfu/README.rst delete mode 100644 lib_xua/src/dfu/module_build_info delete mode 100644 lib_xua/src/dfu/module_description delete mode 100644 lib_xua/src/dfu/wscript delete mode 100644 lib_xua/src/queue/README.rst delete mode 100644 lib_xua/src/queue/module_build_info delete mode 100644 lib_xua/src/queue/module_description delete mode 100644 lib_xua/src/queue/wscript rename lib_xua/src/usb_audio/{ => support}/reboot.xc (100%) delete mode 100644 lib_xua/src/usb_audio/wscript rename lib_xua/src/{dfu/src => usb_dfu}/dfu.h (100%) rename lib_xua/src/{dfu/src => usb_dfu}/dfu.xc (99%) rename lib_xua/src/{dfu/src => usb_dfu}/dfu_interface.h (100%) rename lib_xua/src/{dfu/src => usb_dfu}/dfu_types.h (100%) rename lib_xua/src/{dfu/src => usb_dfu}/flash_interface.c (98%) rename lib_xua/src/{dfu/src => usb_dfu}/flash_interface.h (100%) delete mode 100644 lib_xua/src/usb_midi/README delete mode 100644 lib_xua/src/usb_midi/README.rst rename lib_xua/src/usb_midi/{src => }/midi_descriptor.h (100%) rename lib_xua/src/usb_midi/{src => }/midiinparse.h (100%) rename lib_xua/src/usb_midi/{src => }/midiinparse.xc (100%) rename lib_xua/src/usb_midi/{src => }/midioutparse.h (100%) rename lib_xua/src/usb_midi/{src => }/midioutparse.xc (100%) delete mode 100644 lib_xua/src/usb_midi/module_build_info delete mode 100644 lib_xua/src/usb_midi/module_description rename lib_xua/src/{queue/src => usb_midi}/queue.h (100%) rename lib_xua/src/{queue/src => usb_midi}/queue.xc (100%) rename lib_xua/src/usb_midi/{src => }/usb_midi.h (100%) rename lib_xua/src/usb_midi/{src => }/usb_midi.xc (100%) rename lib_xua/src/usb_midi/{src => }/usb_midi_support.xc (100%) delete mode 100644 lib_xua/src/usb_midi/wscript diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3c2c6110..05c6f795 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,16 @@ -sc_usb_audio Change Log -======================= +lib_xua Change Log +================== + +1.0.0 +----- + - CHANGE: Fork from sc_xud to lib_xud + + +Legacy release history +---------------------- + +(Note: Forked from sc_usb_audio at this point) + 7.5.0 ----- diff --git a/lib_xua/src/dfu/doc/Makefile b/doc_dfu/Makefile similarity index 100% rename from lib_xua/src/dfu/doc/Makefile rename to doc_dfu/Makefile diff --git a/lib_xua/src/dfu/doc/building_xmos_dfu.rst b/doc_dfu/building_xmos_dfu.rst similarity index 100% rename from lib_xua/src/dfu/doc/building_xmos_dfu.rst rename to doc_dfu/building_xmos_dfu.rst diff --git a/lib_xua/src/dfu/doc/factory_image.rst b/doc_dfu/factory_image.rst similarity index 100% rename from lib_xua/src/dfu/doc/factory_image.rst rename to doc_dfu/factory_image.rst diff --git a/lib_xua/src/dfu/doc/index.rst b/doc_dfu/index.rst similarity index 100% rename from lib_xua/src/dfu/doc/index.rst rename to doc_dfu/index.rst diff --git a/lib_xua/src/dfu/doc/overview.rst b/doc_dfu/overview.rst similarity index 100% rename from lib_xua/src/dfu/doc/overview.rst rename to doc_dfu/overview.rst diff --git a/lib_xua/src/dfu/doc/thesycon_dfu.rst b/doc_dfu/thesycon_dfu.rst similarity index 100% rename from lib_xua/src/dfu/doc/thesycon_dfu.rst rename to doc_dfu/thesycon_dfu.rst diff --git a/lib_xua/src/dfu/doc/xmos_dfu.rst b/doc_dfu/xmos_dfu.rst similarity index 100% rename from lib_xua/src/dfu/doc/xmos_dfu.rst rename to doc_dfu/xmos_dfu.rst diff --git a/examples/app_xua_simple/Makefile b/examples/app_xua_simple/Makefile new file mode 100644 index 00000000..fd2e9446 --- /dev/null +++ b/examples/app_xua_simple/Makefile @@ -0,0 +1,19 @@ +APP_NAME = app_xua_simple + +TARGET = xk-audio-216-mc.xn + +# The flags passed to xcc when building the application +XCC_FLAGS = -fcomment-asm -Xmapper --map -Xmapper MAPFILE -O3 -report -fsubword-select -save-temps -g -Wno-unused-function -Wno-timing -DXUD_SERIES_SUPPORT=XUD_X200_SERIES + +# The USED_MODULES variable lists other module used by the application. These +# modules will extend the SOURCE_DIRS, INCLUDE_DIRS and LIB_DIRS variables. +# Modules are expected to be in the directory above the BASE_DIR directory. +USED_MODULES = lib_i2c lib_mic_array lib_logging lib_xua lib_device_control lib_src lib_dsp lib_spi lib_xud + +#============================================================================= +# The following part of the Makefile includes the common build infrastructure +# for compiling XMOS applications. You should not need to edit below here. + +XMOS_MAKE_PATH ?= ../.. +include $(XMOS_MAKE_PATH)/xcommon/module_xcommon/build/Makefile.common + diff --git a/examples/app_xua_simple/src/app_xua_simple.xc b/examples/app_xua_simple/src/app_xua_simple.xc new file mode 100644 index 00000000..c55db343 --- /dev/null +++ b/examples/app_xua_simple/src/app_xua_simple.xc @@ -0,0 +1,68 @@ + +/* A very simple example of a USB audio application (and as such is un-verified) + * + * It uses some tedious blocks from the lib_xua i.e. Endpoint 0, whilst re-implementing simple versions of others i.e. buffering + * + */ + +#include +#include + +#include "xud_device.h" +#include "xua.h" + + +void OutBuffer(chanend c_aud_out) +{ + while(1) + { + + } +} + +void I2S() +{ + while(1) + { + + } +} + + + +/* Endpoint type tables - informs XUD what the transfer types for each Endpoint in use and also + * if the endpoint wishes to be informed of USB bus resets + */ +XUD_EpType epTypeTableOut[] = {XUD_EPTYPE_CTL | XUD_STATUS_ENABLE}; +XUD_EpType epTypeTableIn[] = {XUD_EPTYPE_CTL | XUD_STATUS_ENABLE, XUD_EPTYPE_ISO}; + +int main() +{ + /* Channels for lib_xud */ + chan c_ep_out[2]; + chan c_ep_in[1]; + + chan c_aud_ctl; + + par + { + /* Low level USB device layer core */ + on tile[1]: XUD_Main(c_ep_out, 2, c_ep_in, 1, + null, epTypeTableOut, epTypeTableIn, + null, null, -1 , XUD_SPEED_HS, XUD_PWR_BUS); + + /* Endpoint 0 core from lib_xua */ + /* Note, since we are not using many features we pass in null for quite a few params.. */ + on tile[1]: XUA_Endpoint0(c_ep_out[0], c_ep_in[0], c_aud_ctl, null, null, null, null); + + /* Our own simple buffering and I2S cores */ + on tile[1]: OutBuffer(c_ep_out[1]); + + /* Our own simple I2S driver core */ + on tile[1]: I2S(); + + } + return 0; +} + + diff --git a/examples/app_xua_simple/src/customdefines.h b/examples/app_xua_simple/src/customdefines.h new file mode 100644 index 00000000..4408dede --- /dev/null +++ b/examples/app_xua_simple/src/customdefines.h @@ -0,0 +1,34 @@ +/* Required by lib_xua at the moment. To be replaced with lib_xua_conf.h" + */ + +// Copyright (c) 2016, XMOS Ltd, All rights reserved +#ifndef __custom_defines_h__ +#define __custom_defines_h__ + +#define NUM_USB_CHAN_OUT 2 +#define NUM_USB_CHAN_IN 0 +#define I2S_CHANS_DAC 2 +#define I2S_CHANS_ADC 2 +#define EXCLUDE_USB_AUDIO_MAIN +#define NUM_PDM_MICS 0 +#define XUD_TILE 1 +#define AUDIO_IO_TILE 0 +#define MIXER 0 +#define MCLK_441 (512 * 44100) +#define MCLK_48 (512 * 48000) +#define MIN_FREQ 48000 +#define MAX_FREQ 48000 +#define SPDIF_TX_INDEX 0 +#define VENDOR_STR "XMOS" +#define VENDOR_ID 0x20B1 +#define PRODUCT_STR_A2 "XUA Simple" +#define PRODUCT_STR_A1 "XUA Simple" +#define PID_AUDIO_1 1 +#define PID_AUDIO_2 2 +#define AUDIO_CLASS 2 +#define AUDIO_CLASS_FALLBACK 0 +#define BCD_DEVICE 0x1234 +#define XUA_DFU 0 + +#endif // __custom_defines_h__ + diff --git a/examples/app_xua_simple/src/simulation.xc b/examples/app_xua_simple/src/simulation.xc new file mode 100644 index 00000000..10cd29f3 --- /dev/null +++ b/examples/app_xua_simple/src/simulation.xc @@ -0,0 +1,17 @@ +// Copyright (c) 2016, XMOS Ltd, All rights reserved + +#include +#include "audiohw.h" +#include "customdefines.h" + +void AudioHwConfig(unsigned samFreq, unsigned mClk, chanend ?c_codec, unsigned dsdMode, + unsigned sampRes_DAC, unsigned sampRes_ADC) +{ + // nothing +} + +void AudioHwInit(chanend ?c_codec) +{ + // nothing +} + diff --git a/examples/app_xua_simple/src/xk-audio-216-mc.xn b/examples/app_xua_simple/src/xk-audio-216-mc.xn new file mode 100644 index 00000000..f9c5220f --- /dev/null +++ b/examples/app_xua_simple/src/xk-audio-216-mc.xn @@ -0,0 +1,87 @@ + + + Board + XS2 MC Audio + + tileref tile[2] + tileref usb_tile + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --> + --> + + + + + + + + + --> + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib_xua/api/xua.h b/lib_xua/api/xua.h new file mode 100644 index 00000000..b0f2dcdc --- /dev/null +++ b/lib_xua/api/xua.h @@ -0,0 +1,9 @@ + +#ifndef __XUA_H__ +#define __XUA_H__ + +#include "xua_audio.h" + +#include "xua_endpoint0.h" + +#endif diff --git a/lib_xua/src/usb_audio/endpoint0/endpoint0.h b/lib_xua/api/xua_endpoint0.h similarity index 93% rename from lib_xua/src/usb_audio/endpoint0/endpoint0.h rename to lib_xua/api/xua_endpoint0.h index 2aacdc42..4f913b1d 100644 --- a/lib_xua/src/usb_audio/endpoint0/endpoint0.h +++ b/lib_xua/api/xua_endpoint0.h @@ -22,7 +22,7 @@ * \param c_EANativeTransport_ctrl Optional chanend to be connected to EA Native * endpoint manager if present */ -void Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioCtrl, +void XUA_Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioCtrl, chanend ?c_mix_ctl,chanend ?c_clk_ctl, chanend ?c_EANativeTransport_ctr, client interface i_dfu ?dfuInterface VENDOR_REQUESTS_PARAMS_DEC_); diff --git a/lib_xua/src/dfu/README.rst b/lib_xua/src/dfu/README.rst deleted file mode 100644 index a59b5807..00000000 --- a/lib_xua/src/dfu/README.rst +++ /dev/null @@ -1,11 +0,0 @@ -module_dfu -========== - -:scope: General Use -:description: module_dfu -:keywords: DFU -:boards: XMOS USB Audio Reference Designes - -Code providing firmware upgrade over USB. - -./host provides an example of a host application for DFU. This is written and tested for OSX. LibUSB is used to aid cross-platform porting. diff --git a/lib_xua/src/dfu/module_build_info b/lib_xua/src/dfu/module_build_info deleted file mode 100644 index 41d907a4..00000000 --- a/lib_xua/src/dfu/module_build_info +++ /dev/null @@ -1,22 +0,0 @@ -# This file describes how this module will affect the application -# using it. The file is included in the Makefile of the main application. -# -# The module contributes to the build of the application by extending -# the following variables: -# -# SOURCE_DIRS - directories with source files to be included in the build -# INCLUDE_DIRS - directories to be added to the include path during the build -# LIB_DIRS - directories containing libraries to be linked into the build -# -# Note that all the source files in each directory in SOURCE_DIRS -# will be compiled (you do not need to name the files individually). -# - -MODULE_DIRS = src - -SOURCE_DIRS += $(MODULE_DIRS) -INCLUDE_DIRS += $(MODULE_DIRS) -MODULE_XCC_FLAGS = -Os -mno-dual-issue $(XCC_FLAGS) -MODULE_C_FLAGS = -Os -mno-dual-issue $(XCC_FLAGS) - - diff --git a/lib_xua/src/dfu/module_description b/lib_xua/src/dfu/module_description deleted file mode 100644 index 248e6492..00000000 --- a/lib_xua/src/dfu/module_description +++ /dev/null @@ -1 +0,0 @@ -Code providing firmware upgrade over USB. diff --git a/lib_xua/src/dfu/wscript b/lib_xua/src/dfu/wscript deleted file mode 100644 index a07305f7..00000000 --- a/lib_xua/src/dfu/wscript +++ /dev/null @@ -1,4 +0,0 @@ -def use_module(bld): - sources = bld.path.ant_glob(['src/*.xc', 'src/*.c']) - bld.env.XCC_FLAGS = ['-Os', '-mno-dual-issue'] + bld.env.XCC_FLAGS - bld.module(source=sources, includes=['src']) diff --git a/lib_xua/src/queue/README.rst b/lib_xua/src/queue/README.rst deleted file mode 100644 index 89e53674..00000000 --- a/lib_xua/src/queue/README.rst +++ /dev/null @@ -1,9 +0,0 @@ -Queuing Module For USB Audio Framework -====================================== - -:scope: General Use -:description: queue -:keywords: UAC2 -:boards: - - diff --git a/lib_xua/src/queue/module_build_info b/lib_xua/src/queue/module_build_info deleted file mode 100644 index fb146b9d..00000000 --- a/lib_xua/src/queue/module_build_info +++ /dev/null @@ -1,14 +0,0 @@ -# You can set flags specifically for your module by using the MODULE_XCC_FLAGS -# variable. So the following -# -# MODULE_XCC_FLAGS = $(XCC_FLAGS) -O3 -# -# specifies that everything in the modules should have the application -# build flags with -O3 appended (so the files will build at -# optimization level -O3). -# -# You can also set MODULE_XCC_C_FLAGS, MODULE_XCC_XC_FLAGS etc.. - -MODULE_XCC_XC_FLAGS = $(XCC_XC_FLAGS) - -DEPENDENT_MODULES = diff --git a/lib_xua/src/queue/module_description b/lib_xua/src/queue/module_description deleted file mode 100644 index 00a6de45..00000000 --- a/lib_xua/src/queue/module_description +++ /dev/null @@ -1 +0,0 @@ -One line module description. diff --git a/lib_xua/src/queue/wscript b/lib_xua/src/queue/wscript deleted file mode 100644 index f668b936..00000000 --- a/lib_xua/src/queue/wscript +++ /dev/null @@ -1,2 +0,0 @@ -def use_module(bld): - bld.module(source='src/queue.xc') diff --git a/lib_xua/src/usb_audio/endpoint0/endpoint0.c b/lib_xua/src/usb_audio/endpoint0/endpoint0.c index 3f187b9d..286b515d 100755 --- a/lib_xua/src/usb_audio/endpoint0/endpoint0.c +++ b/lib_xua/src/usb_audio/endpoint0/endpoint0.c @@ -16,7 +16,7 @@ #include "audiostream.h" #include "hostactive.h" #include "vendorrequests.h" -#include "dfu_types.h" +//#include "dfu_types.h" #include "xc_ptr.h" #include "audiorequests.h" #ifdef HID_CONTROLS @@ -52,7 +52,7 @@ #warning DFU_PID not defined, Using PID_AUDIO_2. This is probably fine! #endif -#ifdef DFU +#if (XUA_DFU == 1) #include "dfu.h" #define DFU_IF_NUM INPUT_INTERFACES + OUTPUT_INTERFACES + MIDI_INTERFACES + 1 extern void device_reboot(chanend); @@ -199,7 +199,7 @@ const unsigned g_chanCount_In_HS[INPUT_FORMAT_COUNT] = {HS_STREAM_FORMAT_I }; /* Endpoint 0 function. Handles all requests to the device */ -void Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl, +void XUA_Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl, chanend c_mix_ctl, chanend c_clk_ctl, chanend c_EANativeTransport_ctrl, CLIENT_INTERFACE(i_dfu, dfuInterface) VENDOR_REQUESTS_PARAMS_DEC_) { USB_SetupPacket_t sp; @@ -281,7 +281,7 @@ void Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl, VendorAudioRequestsInit(c_audioControl, c_mix_ctl, c_clk_ctl); #endif -#ifdef DFU +#if (XUA_DFU == 1) /* Check if device has started in DFU mode */ if (DFUReportResetState(null)) { @@ -547,7 +547,7 @@ void Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl, //unsigned request = (sp.bmRequestType.Recipient ) | (sp.bmRequestType.Type << 5); /* TODO Check on return value retval = */ -#ifdef DFU +#if (XUA_DFU == 1) unsigned DFU_IF = INTERFACE_NUMBER_DFU; /* DFU interface number changes based on which mode we are currently running in */ @@ -587,7 +587,7 @@ void Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl, * - Audio endpoint request (Audio 1.0 Sampling freq requests are sent to the endpoint) */ if(((interfaceNum == 0) || (interfaceNum == 1) || (interfaceNum == 2)) -#ifdef DFU +#if (XUA_DFU == 1) && !DFU_mode_active #endif ) @@ -750,8 +750,8 @@ void Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl, cfgDesc_Null, sizeof(cfgDesc_Null), (char**)&g_strTable, sizeof(g_strTable)/sizeof(char *), &sp, g_curUsbSpeed); #endif -#ifdef DFU } +#if (XUA_DFU == 1) else { /* Running in DFU mode - always return same descs for DFU whether HS or FS */ @@ -776,7 +776,7 @@ void Endpoint0(chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl, g_curStreamAlt_Out = 0; g_curStreamAlt_In = 0; -#ifdef DFU +#if (XUA_DFU == 1) if (DFUReportResetState(null)) { if (!DFU_mode_active) diff --git a/lib_xua/src/usb_audio/flashlib_user.c b/lib_xua/src/usb_audio/flashlib_user.c index 29366780..03b03b86 100644 --- a/lib_xua/src/usb_audio/flashlib_user.c +++ b/lib_xua/src/usb_audio/flashlib_user.c @@ -1,5 +1,5 @@ #include "devicedefines.h" -#ifdef DFU +#if (XUD_DFU == 1) #include "uac_hwresources.h" #include #include diff --git a/lib_xua/src/usb_audio/main.xc b/lib_xua/src/usb_audio/main.xc index 12b5ed24..40247b65 100755 --- a/lib_xua/src/usb_audio/main.xc +++ b/lib_xua/src/usb_audio/main.xc @@ -1,3 +1,7 @@ + +#include "devicedefines.h" /* Device specific defines */ +#ifndef EXCLUDE_USB_AUDIO_MAIN + /** * @file main.xc * @brief Top level for XMOS USB 2.0 Audio 2.0 Reference Designs. @@ -14,10 +18,9 @@ #include "xud.h" /* XMOS USB Device Layer defines and functions */ #ifndef NO_USB -#include "endpoint0.h" +#include "xua_endpoint0.h" #endif -#include "devicedefines.h" /* Device specific defines */ #include "uac_hwresources.h" #include "usb_buffer.h" #include "decouple.h" @@ -392,7 +395,7 @@ VENDOR_REQUESTS_PARAMS_DEC_ /* Endpoint 0 Core */ { thread_speed(); - Endpoint0( c_xud_out[0], c_xud_in[0], c_aud_ctl, c_mix_ctl, c_clk_ctl, c_EANativeTransport_ctrl, dfuInterface VENDOR_REQUESTS_PARAMS_); + XUA_Endpoint0( c_xud_out[0], c_xud_in[0], c_aud_ctl, c_mix_ctl, c_clk_ctl, c_EANativeTransport_ctrl, dfuInterface VENDOR_REQUESTS_PARAMS_); } /* Decoupling core */ @@ -496,7 +499,6 @@ void usb_audio_io(chanend ?c_aud_in, chanend ?c_adc, #define USER_MAIN_CORES #endif -#ifndef EXCLUDE_USB_AUDIO_MAIN /* Main for USB Audio Applications */ int main() diff --git a/lib_xua/src/usb_audio/reboot.xc b/lib_xua/src/usb_audio/support/reboot.xc similarity index 100% rename from lib_xua/src/usb_audio/reboot.xc rename to lib_xua/src/usb_audio/support/reboot.xc diff --git a/lib_xua/src/usb_audio/wscript b/lib_xua/src/usb_audio/wscript deleted file mode 100644 index d9f10824..00000000 --- a/lib_xua/src/usb_audio/wscript +++ /dev/null @@ -1,9 +0,0 @@ -def use_module(bld): - # Set file specific flags - for item in ('endpoint0.c', 'dbcalc.xc', 'audiorequests.xc', - 'flashlib_user.c', 'audioports.c', 'audioports.xc'): - bld.env['XCC_FLAGS_{}'.format(item)] = ['-Os', '-mno-dual-issue' - ] + bld.env.XCC_FLAGS - - sources = bld.path.ant_glob(['**/*.xc', '**/*.c', '**/*.S']) - tgen = bld.module(source=sources, includes=['.', 'audio_io']) diff --git a/lib_xua/src/dfu/src/dfu.h b/lib_xua/src/usb_dfu/dfu.h similarity index 100% rename from lib_xua/src/dfu/src/dfu.h rename to lib_xua/src/usb_dfu/dfu.h diff --git a/lib_xua/src/dfu/src/dfu.xc b/lib_xua/src/usb_dfu/dfu.xc similarity index 99% rename from lib_xua/src/dfu/src/dfu.xc rename to lib_xua/src/usb_dfu/dfu.xc index d015083b..c2bee181 100644 --- a/lib_xua/src/dfu/src/dfu.xc +++ b/lib_xua/src/usb_dfu/dfu.xc @@ -1,3 +1,5 @@ +#include "devicedefines.h" +#if (XUA_DFU == 1) #include #include #include "devicedefines.h" @@ -579,3 +581,5 @@ int DFUDeviceRequests(XUD_ep ep0_out, XUD_ep &?ep0_in, USB_SetupPacket_t &sp, ch return returnVal; } #endif /* NO_USB */ + +#endif diff --git a/lib_xua/src/dfu/src/dfu_interface.h b/lib_xua/src/usb_dfu/dfu_interface.h similarity index 100% rename from lib_xua/src/dfu/src/dfu_interface.h rename to lib_xua/src/usb_dfu/dfu_interface.h diff --git a/lib_xua/src/dfu/src/dfu_types.h b/lib_xua/src/usb_dfu/dfu_types.h similarity index 100% rename from lib_xua/src/dfu/src/dfu_types.h rename to lib_xua/src/usb_dfu/dfu_types.h diff --git a/lib_xua/src/dfu/src/flash_interface.c b/lib_xua/src/usb_dfu/flash_interface.c similarity index 98% rename from lib_xua/src/dfu/src/flash_interface.c rename to lib_xua/src/usb_dfu/flash_interface.c index 3ed695fd..9c8c3a73 100755 --- a/lib_xua/src/dfu/src/flash_interface.c +++ b/lib_xua/src/usb_dfu/flash_interface.c @@ -1,3 +1,5 @@ +#include "devicedefines.h" +#if (XUA_DFU == 1) #include #include #include @@ -245,4 +247,5 @@ int flash_cmd_erase_all(void) } return 0; } +#endif diff --git a/lib_xua/src/dfu/src/flash_interface.h b/lib_xua/src/usb_dfu/flash_interface.h similarity index 100% rename from lib_xua/src/dfu/src/flash_interface.h rename to lib_xua/src/usb_dfu/flash_interface.h diff --git a/lib_xua/src/usb_midi/README b/lib_xua/src/usb_midi/README deleted file mode 100644 index 483bfb35..00000000 --- a/lib_xua/src/usb_midi/README +++ /dev/null @@ -1 +0,0 @@ -module README. diff --git a/lib_xua/src/usb_midi/README.rst b/lib_xua/src/usb_midi/README.rst deleted file mode 100644 index d9e33be0..00000000 --- a/lib_xua/src/usb_midi/README.rst +++ /dev/null @@ -1,9 +0,0 @@ -MIDI Module for USB Audio Framework -=================================== - -:scope: General Use -:description: MIDI -:keywords: MIDI -:boards: - - diff --git a/lib_xua/src/usb_midi/src/midi_descriptor.h b/lib_xua/src/usb_midi/midi_descriptor.h similarity index 100% rename from lib_xua/src/usb_midi/src/midi_descriptor.h rename to lib_xua/src/usb_midi/midi_descriptor.h diff --git a/lib_xua/src/usb_midi/src/midiinparse.h b/lib_xua/src/usb_midi/midiinparse.h similarity index 100% rename from lib_xua/src/usb_midi/src/midiinparse.h rename to lib_xua/src/usb_midi/midiinparse.h diff --git a/lib_xua/src/usb_midi/src/midiinparse.xc b/lib_xua/src/usb_midi/midiinparse.xc similarity index 100% rename from lib_xua/src/usb_midi/src/midiinparse.xc rename to lib_xua/src/usb_midi/midiinparse.xc diff --git a/lib_xua/src/usb_midi/src/midioutparse.h b/lib_xua/src/usb_midi/midioutparse.h similarity index 100% rename from lib_xua/src/usb_midi/src/midioutparse.h rename to lib_xua/src/usb_midi/midioutparse.h diff --git a/lib_xua/src/usb_midi/src/midioutparse.xc b/lib_xua/src/usb_midi/midioutparse.xc similarity index 100% rename from lib_xua/src/usb_midi/src/midioutparse.xc rename to lib_xua/src/usb_midi/midioutparse.xc diff --git a/lib_xua/src/usb_midi/module_build_info b/lib_xua/src/usb_midi/module_build_info deleted file mode 100644 index bb4cb582..00000000 --- a/lib_xua/src/usb_midi/module_build_info +++ /dev/null @@ -1,12 +0,0 @@ -# You can set flags specifically for your module by using the MODULE_XCC_FLAGS -# variable. So the following -# -# MODULE_XCC_FLAGS = $(XCC_FLAGS) -O3 -# -# specifies that everything in the modules should have the application -# build flags with -O3 appended (so the files will build at -# optimization level -O3). -# -# You can also set MODULE_XCC_C_FLAGS, MODULE_XCC_XC_FLAGS etc.. - -DEPENDENT_MODULES = module_queue diff --git a/lib_xua/src/usb_midi/module_description b/lib_xua/src/usb_midi/module_description deleted file mode 100644 index 00a6de45..00000000 --- a/lib_xua/src/usb_midi/module_description +++ /dev/null @@ -1 +0,0 @@ -One line module description. diff --git a/lib_xua/src/queue/src/queue.h b/lib_xua/src/usb_midi/queue.h similarity index 100% rename from lib_xua/src/queue/src/queue.h rename to lib_xua/src/usb_midi/queue.h diff --git a/lib_xua/src/queue/src/queue.xc b/lib_xua/src/usb_midi/queue.xc similarity index 100% rename from lib_xua/src/queue/src/queue.xc rename to lib_xua/src/usb_midi/queue.xc diff --git a/lib_xua/src/usb_midi/src/usb_midi.h b/lib_xua/src/usb_midi/usb_midi.h similarity index 100% rename from lib_xua/src/usb_midi/src/usb_midi.h rename to lib_xua/src/usb_midi/usb_midi.h diff --git a/lib_xua/src/usb_midi/src/usb_midi.xc b/lib_xua/src/usb_midi/usb_midi.xc similarity index 100% rename from lib_xua/src/usb_midi/src/usb_midi.xc rename to lib_xua/src/usb_midi/usb_midi.xc diff --git a/lib_xua/src/usb_midi/src/usb_midi_support.xc b/lib_xua/src/usb_midi/usb_midi_support.xc similarity index 100% rename from lib_xua/src/usb_midi/src/usb_midi_support.xc rename to lib_xua/src/usb_midi/usb_midi_support.xc diff --git a/lib_xua/src/usb_midi/wscript b/lib_xua/src/usb_midi/wscript deleted file mode 100644 index 688248fb..00000000 --- a/lib_xua/src/usb_midi/wscript +++ /dev/null @@ -1,3 +0,0 @@ -def use_module(bld): - source = bld.path.ant_glob('src/*.xc') - bld.module(source=source, depends_on='module_queue')