From d3f2220be48d1a4a7b2b90316dd78237b3f2a6c6 Mon Sep 17 00:00:00 2001 From: Keith Au Date: Fri, 28 Feb 2020 15:53:27 +0800 Subject: [PATCH] added xua_api.h for extern declaration of get/set_usb_to/from_device_rate/res APIs and removed from c/xc files --- lib_xua/api/xua_api.h | 18 ++++++++++++++++++ lib_xua/src/core/buffer/decouple/decouple.xc | 7 +------ lib_xua/src/core/endpoint0/xua_endpoint0.c | 9 ++------- 3 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 lib_xua/api/xua_api.h diff --git a/lib_xua/api/xua_api.h b/lib_xua/api/xua_api.h new file mode 100644 index 00000000..f3d3c735 --- /dev/null +++ b/lib_xua/api/xua_api.h @@ -0,0 +1,18 @@ +// Copyright (c) 2017-2020, XMOS Ltd, All rights reserved + +#ifndef __XUA_API_H__ +#define __XUA_API_H__ + +#if __XC__ +extern void set_usb_to_device_rate(uint32_t rate); +extern void set_device_to_usb_rate(uint32_t rate); +extern void set_usb_to_device_bit_res(uint32_t rate); +extern void set_device_to_usb_bit_res(uint32_t rate); +#endif + +extern uint32_t get_usb_to_device_rate(); +extern uint32_t get_device_to_usb_rate(); +extern uint32_t get_usb_to_device_bit_res(); +extern uint32_t get_device_to_usb_bit_res(); + +#endif //__XUA_API_H__ diff --git a/lib_xua/src/core/buffer/decouple/decouple.xc b/lib_xua/src/core/buffer/decouple/decouple.xc index d501ad9f..ae6d8ed5 100644 --- a/lib_xua/src/core/buffer/decouple/decouple.xc +++ b/lib_xua/src/core/buffer/decouple/decouple.xc @@ -7,6 +7,7 @@ #include "interrupt.h" #include "xua_commands.h" #include "xud.h" +#include "xua_api.h" #ifdef NATIVE_DSD #include "usbaudio20.h" /* Defines from the USB Audio 2.0 Specifications */ @@ -17,12 +18,6 @@ #endif #define MAX(x,y) ((x)>(y) ? (x) : (y)) -#if(defined XUA_USB_DESCRIPTOR_OVERWRITE_RATE_RES) -extern uint32_t get_usb_to_device_rate(); -extern uint32_t get_device_to_usb_rate(); -extern uint32_t get_usb_to_device_bit_res(); -extern uint32_t get_device_to_usb_bit_res(); -#endif /* TODO use SLOTSIZE to potentially save memory */ /* Note we could improve on this, for one subslot is set to 4 */ diff --git a/lib_xua/src/core/endpoint0/xua_endpoint0.c b/lib_xua/src/core/endpoint0/xua_endpoint0.c index 972f4a61..0a5dbcac 100755 --- a/lib_xua/src/core/endpoint0/xua_endpoint0.c +++ b/lib_xua/src/core/endpoint0/xua_endpoint0.c @@ -29,6 +29,8 @@ #include "dsd_support.h" #endif +#include "xua_api.h" + #ifndef __XC__ /* Support for xCORE channels in C */ #define null 0 @@ -65,13 +67,6 @@ extern void device_reboot(void); #include "xua_hid.h" #endif -#if(defined XUA_USB_DESCRIPTOR_OVERWRITE_RATE_RES) -extern uint32_t get_usb_to_device_rate(); -extern uint32_t get_device_to_usb_rate(); -extern uint32_t get_usb_to_device_bit_res(); -extern uint32_t get_device_to_usb_bit_res(); -#endif - unsigned int DFU_mode_active = 0; // 0 - App active, 1 - DFU active /* Global volume and mute tables */