From 395c88cb22977bc9a8a863b9069d21d4408dad3d Mon Sep 17 00:00:00 2001
From: Ross Owen <ross@xmos.com>
Date: Tue, 10 Jan 2023 11:27:37 +0000
Subject: [PATCH] - Removed unused mixer variable. - Use of mixer defines
 rather than fixed values

---
 lib_xua/src/core/endpoint0/xua_endpoint0.c    | 5 ++---
 lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib_xua/src/core/endpoint0/xua_endpoint0.c b/lib_xua/src/core/endpoint0/xua_endpoint0.c
index d69fb57e..165356f5 100755
--- a/lib_xua/src/core/endpoint0/xua_endpoint0.c
+++ b/lib_xua/src/core/endpoint0/xua_endpoint0.c
@@ -107,8 +107,7 @@ int volsIn[NUM_USB_CHAN_IN + 1];
 unsigned int mutesIn[NUM_USB_CHAN_IN + 1];
 
 #ifdef MIXER
-unsigned char mixer1Crossbar[18];
-short mixer1Weights[18*8];
+short mixer1Weights[MIX_INPUTS * MAX_MIX_COUNT];
 
 unsigned char channelMap[NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN + MAX_MIX_COUNT];
 unsigned char channelMapAud[NUM_USB_CHAN_OUT];
@@ -427,7 +426,7 @@ void XUA_Endpoint0_init(chanend c_ep0_out, chanend c_ep0_in, NULLABLE_RESOURCE(c
 
 #ifdef MIXER
     /* Set up mixer default state */
-    for (int i = 0; i < 18*8; i++)
+    for (int i = 0; i < MIXER_INPUTS * MAX_MIX_COUNT; i++)
     {
         mixer1Weights[i] = 0x8001; //-inf
     }
diff --git a/lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc b/lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc
index b2085eb7..32fd997a 100644
--- a/lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc
+++ b/lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc
@@ -32,7 +32,6 @@ extern unsigned int mutesIn[];
 
 /* Mixer settings */
 #ifdef MIXER
-extern unsigned char mixer1Crossbar[];
 extern short mixer1Weights[];
 
 /* Device channel mapping */