laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

Removed remaining use of ARCH_ defines (XUD_SERIES_SUPPORT now used)

Browse Source
This commit is contained in:
Ross Owen
2014-02-05 16:44:25 +00:00
parent 9f5f8080a1
commit 3f11f56de7
3 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module_dfu/module_build_info
View File

@@ -23,14 +23,8 @@ INCLUDE_DIRS += $(MODULE_DIRS)
# #
# $(call SET_XCC_C_FLAGS, mydir1 mydir2, $(XCC_FLAGS) -g -O3) # $(call SET_XCC_C_FLAGS, mydir1 mydir2, $(XCC_FLAGS) -g -O3)
ifeq ($(ARCH_G),) $(call SET_XCC_C_FLAGS, $(MODULE_DIRS) $(XCC_FLAGS) -g -O3)
ARCH_FLAG = -D ARCH_L $(call SET_XCC_XC_FLAGS, $(MODULE_DIRS), $(XCC_FLAGS) -fsubword-select -g -O3)
else
ARCH_FLAG = -D ARCH_G
endif
$(call SET_XCC_C_FLAGS, $(MODULE_DIRS) $(XCC_FLAGS) $(ARCH_FLAG) -g -O3)
$(call SET_XCC_XC_FLAGS, $(MODULE_DIRS), $(XCC_FLAGS) $(ARCH_FLAG) -fsubword-select -g -O3)
# You can change the flags of an individual file by setting the # You can change the flags of an individual file by setting the
# XCC_FLAGS_[filename] variable. e.g. # XCC_FLAGS_[filename] variable. e.g.

9
module_dfu/src/dfu.xc
View File

@@ -458,20 +458,11 @@ int DFUDeviceRequests(XUD_ep ep0_out, XUD_ep &?ep0_in, USB_SetupPacket_t &sp, ch
if (sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_D2H && sp.wLength != 0) if (sp.bmRequestType.Direction == USB_BM_REQTYPE_DIRECTION_D2H && sp.wLength != 0)
{ {
// Device to host
#ifdef ARCH_G
XUD_DoGetRequest(ep0_out, 0, (data_buffer, unsigned char[]), return_data_len, return_data_len);
#else
XUD_DoGetRequest(ep0_out, ep0_in, (data_buffer, unsigned char[]), return_data_len, return_data_len); XUD_DoGetRequest(ep0_out, ep0_in, (data_buffer, unsigned char[]), return_data_len, return_data_len);
#endif
} }
else else
{ {
#ifdef ARCH_G
XUD_DoSetRequestStatus(ep0_out);
#else
XUD_DoSetRequestStatus(ep0_in); XUD_DoSetRequestStatus(ep0_in);
#endif
} }
// If device reset requested, handle after command acknowledgement // If device reset requested, handle after command acknowledgement

8
module_usb_audio/main.xc
View File

@@ -127,7 +127,7 @@ on tile[AUDIO_IO_TILE] : buffered port:1 p_midi_rx = PORT_MIDI_IN;
/* Clock blocks */ /* Clock blocks */
#ifdef MIDI #ifdef MIDI
#if defined (ARCH_L) && (AUDIO_IO_TILE == XUD_TILE) #if (XUD_SERIES_SUPPORT == XUD_L_SERIES) && (AUDIO_IO_TILE == XUD_TILE)
/* Note: L series ref clocked clocked from USB clock when USB enabled - use another clockblock for MIDI /* Note: L series ref clocked clocked from USB clock when USB enabled - use another clockblock for MIDI
* if MIDI and XUD on same tile. See XUD documentation. * if MIDI and XUD on same tile. See XUD documentation.
* *
@@ -153,8 +153,8 @@ on tile[AUDIO_IO_TILE] : clock clk_audio_bclk = XS1_CLKBLK_3;
on tile[AUDIO_IO_TILE] : clock clk_mst_spd = XS1_CLKBLK_1; on tile[AUDIO_IO_TILE] : clock clk_mst_spd = XS1_CLKBLK_1;
#endif #endif
/* L Series needs a port to use for USB reset */ /* L/G Series needs a port to use for USB reset */
#if (defined(ARCH_L) || defined(ARCH_G)) && defined(PORT_USB_RESET) #if (XUD_SERIES_SUPPORT != XUD_U_SERIES) && defined(PORT_USB_RESET)
/* This define is checked since it could be on a shift reg or similar */ /* This define is checked since it could be on a shift reg or similar */
on tile[XUD_TILE] : out port p_usb_rst = PORT_USB_RESET; on tile[XUD_TILE] : out port p_usb_rst = PORT_USB_RESET;
#else #else
@@ -162,7 +162,7 @@ on tile[XUD_TILE] : out port p_usb_rst = PORT_USB_RESET;
#define p_usb_rst null #define p_usb_rst null
#endif #endif
#if defined (ARCH_L) || defined(ARCH_G) #if (XUD_SERIES_SUPPORT != XUD_U_SERIES)
/* L Series also needs a clock for this port */ /* L Series also needs a clock for this port */
on tile[XUD_TILE] : clock clk = XS1_CLKBLK_4; on tile[XUD_TILE] : clock clk = XS1_CLKBLK_4;
#else #else