forked from PAWPAW-Mirror/lib_xua
Remove inconsequential changes on ios branch
This commit is contained in:
@@ -63,10 +63,10 @@ extern void device_reboot(void);
|
|||||||
unsigned deliver(chanend c_out, chanend ?c_spd_out, unsigned divide, chanend ?c_dig_rx)
|
unsigned deliver(chanend c_out, chanend ?c_spd_out, unsigned divide, chanend ?c_dig_rx)
|
||||||
{
|
{
|
||||||
unsigned sample;
|
unsigned sample;
|
||||||
#if NUM_USB_CHAN_OUT > 0
|
#if NUM_USB_CHAN_OUT > 0
|
||||||
unsigned samplesOut[NUM_USB_CHAN_OUT];
|
unsigned samplesOut[NUM_USB_CHAN_OUT];
|
||||||
#endif
|
#endif
|
||||||
#if NUM_USB_CHAN_IN > 0
|
#if NUM_USB_CHAN_IN > 0
|
||||||
unsigned samplesIn[NUM_USB_CHAN_IN];
|
unsigned samplesIn[NUM_USB_CHAN_IN];
|
||||||
unsigned samplesInPrev[NUM_USB_CHAN_IN];
|
unsigned samplesInPrev[NUM_USB_CHAN_IN];
|
||||||
#endif
|
#endif
|
||||||
@@ -208,7 +208,7 @@ unsigned deliver(chanend c_out, chanend ?c_spd_out, unsigned divide, chanend ?c_
|
|||||||
tmp += 33;
|
tmp += 33;
|
||||||
|
|
||||||
#if (I2S_CHANS_DAC != 0)
|
#if (I2S_CHANS_DAC != 0)
|
||||||
#pragma loop unroll
|
#pragma loop unroll
|
||||||
for(int i = 0; i < I2S_WIRES_DAC; i++)
|
for(int i = 0; i < I2S_WIRES_DAC; i++)
|
||||||
{
|
{
|
||||||
p_i2s_dac[i] @ tmp <: 0;
|
p_i2s_dac[i] @ tmp <: 0;
|
||||||
@@ -376,7 +376,7 @@ unsigned deliver(chanend c_out, chanend ?c_spd_out, unsigned divide, chanend ?c_
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(SPDIF) && (NUM_USB_CHAN_OUT > 0)
|
#if defined(SPDIF) && (NUM_USB_CHAN_OUT > 0)
|
||||||
outuint(c_spd_out, samplesOut[SPDIF_TX_INDEX]); /* Forward sample to SPDIF txt thread */
|
outuint(c_spd_out, samplesOut[SPDIF_TX_INDEX]); /* Forward sample to SPDIF txt thread */
|
||||||
sample = samplesOut[SPDIF_TX_INDEX + 1];
|
sample = samplesOut[SPDIF_TX_INDEX + 1];
|
||||||
outuint(c_spd_out, sample); /* Forward sample to SPDIF txt thread */
|
outuint(c_spd_out, sample); /* Forward sample to SPDIF txt thread */
|
||||||
|
|||||||
@@ -1129,13 +1129,13 @@ unsigned char cfgDesc_Audio2[] =
|
|||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
/* DFU 1.0 Run-Time DFU Functional Descriptor */
|
/* DFU 1.0 Run-Time DFU Functional Descriptor */
|
||||||
0x07,
|
0x07,
|
||||||
0x21,
|
0x21,
|
||||||
0x07,
|
0x07,
|
||||||
0xFA,
|
0xFA,
|
||||||
0x00,
|
0x00,
|
||||||
0x40,
|
0x40,
|
||||||
0x00,
|
0x00
|
||||||
#else
|
#else
|
||||||
/* DFU 1.1 Run-Time DFU Functional Descriptor */
|
/* DFU 1.1 Run-Time DFU Functional Descriptor */
|
||||||
0x09, /* 0 Size */
|
0x09, /* 0 Size */
|
||||||
@@ -1618,7 +1618,7 @@ unsigned char cfgDesc_Audio1[] =
|
|||||||
0xFE, /* 5 bInterfaceClass : DFU. (field size 1 bytes) */
|
0xFE, /* 5 bInterfaceClass : DFU. (field size 1 bytes) */
|
||||||
0x01, /* 6 bInterfaceSubclass : (field size 1 bytes) */
|
0x01, /* 6 bInterfaceSubclass : (field size 1 bytes) */
|
||||||
0x01, /* 7 bInterfaceProtocol : Unused. (field size 1 bytes) */
|
0x01, /* 7 bInterfaceProtocol : Unused. (field size 1 bytes) */
|
||||||
8, /* 8 iInterface : Unused. (field size 1 bytes) */
|
8, /* 8 iInterface : Unused. (field size 1 bytes) */
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
/* DFU 1.0 Run-Time DFU Functional Descriptor */
|
/* DFU 1.0 Run-Time DFU Functional Descriptor */
|
||||||
|
|||||||
@@ -198,7 +198,6 @@ void Endpoint0( chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* Set up channel mapping default */
|
/* Set up channel mapping default */
|
||||||
for (int i = 0; i < NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN; i++)
|
for (int i = 0; i < NUM_USB_CHAN_OUT + NUM_USB_CHAN_IN; i++)
|
||||||
{
|
{
|
||||||
@@ -810,13 +809,11 @@ void Endpoint0( chanend c_ep0_out, chanend c_ep0_in, chanend c_audioControl,
|
|||||||
the general case of a functional stall */
|
the general case of a functional stall */
|
||||||
XUD_SetStall_Out(0);
|
XUD_SetStall_Out(0);
|
||||||
XUD_SetStall_In(0);
|
XUD_SetStall_In(0);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (retVal < 0)
|
if (retVal < 0)
|
||||||
{
|
{
|
||||||
g_curUsbSpeed = XUD_ResetEndpoint(ep0_in, ep0_out);
|
g_curUsbSpeed = XUD_ResetEndpoint(ep0_in, ep0_out);
|
||||||
//printstrln("Resetting");
|
|
||||||
|
|
||||||
g_config = 0;
|
g_config = 0;
|
||||||
|
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
* Build: 920238b18f6b0967226369682640e1b063865f02
|
* Build: 920238b18f6b0967226369682640e1b063865f02
|
||||||
* File: decouple.xc
|
* File: decouple.xc
|
||||||
*
|
*
|
||||||
* The copyrights, all other intellectual and industrial
|
* The copyrights, all other intellectual and industrial
|
||||||
* property rights are retained by XMOS and/or its licensors.
|
* property rights are retained by XMOS and/or its licensors.
|
||||||
* Terms and conditions covering the use of this code can
|
* Terms and conditions covering the use of this code can
|
||||||
* be found in the Xmos End User License Agreement.
|
* be found in the Xmos End User License Agreement.
|
||||||
*
|
*
|
||||||
@@ -13,10 +13,10 @@
|
|||||||
*
|
*
|
||||||
* In the case where this code is a modification of existing code
|
* In the case where this code is a modification of existing code
|
||||||
* under a separate license, the separate license terms are shown
|
* under a separate license, the separate license terms are shown
|
||||||
* below. The modifications to the code are still covered by the
|
* below. The modifications to the code are still covered by the
|
||||||
* copyright notice above.
|
* copyright notice above.
|
||||||
*
|
*
|
||||||
**/
|
**/
|
||||||
#include <xs1.h>
|
#include <xs1.h>
|
||||||
#include <print.h>
|
#include <print.h>
|
||||||
#include "xc_ptr.h"
|
#include "xc_ptr.h"
|
||||||
|
|||||||
@@ -641,4 +641,5 @@ void buffer(register chanend c_aud_out, register chanend c_aud_in, chanend c_aud
|
|||||||
}
|
}
|
||||||
|
|
||||||
set_thread_fast_mode_off();
|
set_thread_fast_mode_off();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user