Update to main to removed proprocessor error

This commit is contained in:
Ross Owen
2012-08-30 14:38:13 +01:00
parent 99cdee6e2b
commit c5698ae94b
2 changed files with 0 additions and 6 deletions

View File

@@ -20,8 +20,6 @@
#include "devicedefines.h" #include "devicedefines.h"
#include "SpdifTransmit.h" #include "SpdifTransmit.h"
extern out port p_test;
unsigned g_adcVal = 0; unsigned g_adcVal = 0;
//#define RAMP_CHECK 1 //#define RAMP_CHECK 1
@@ -81,7 +79,6 @@ unsigned deliver(chanend c_out, chanend ?c_spd_out, unsigned divide, chanend ?c_
unsigned prev=0; unsigned prev=0;
int started = 0; int started = 0;
#endif #endif
unsigned test = 0;
#if NUM_USB_CHAN_IN > 0 #if NUM_USB_CHAN_IN > 0

View File

@@ -109,8 +109,6 @@ on stdcore[0] : clock clk_mst_spd = XS1_CLKBLK_1;
#ifdef ARCH_L #ifdef ARCH_L
#ifdef PORT_USB_RESET #ifdef PORT_USB_RESET
on stdcore[0] : out port p_usb_rst = PORT_USB_RESET; on stdcore[0] : out port p_usb_rst = PORT_USB_RESET;
#else
#error Need a USB Reset port for L series
#endif #endif
/* L Series also needs a clock for this port */ /* L Series also needs a clock for this port */
clock clk = XS1_CLKBLK_4; clock clk = XS1_CLKBLK_4;
@@ -120,7 +118,6 @@ clock clk = XS1_CLKBLK_4;
#define clk null #define clk null
#endif #endif
/* Endpoint type tables for XUD */ /* Endpoint type tables for XUD */
XUD_EpType epTypeTableOut[NUM_EP_OUT] = { XUD_EPTYPE_CTL | XUD_STATUS_ENABLE, XUD_EpType epTypeTableOut[NUM_EP_OUT] = { XUD_EPTYPE_CTL | XUD_STATUS_ENABLE,
XUD_EPTYPE_ISO, /* Audio */ XUD_EPTYPE_ISO, /* Audio */