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)
ifeq ($(ARCH_G),)
ARCH_FLAG = -D ARCH_L
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)
$(call SET_XCC_C_FLAGS, $(MODULE_DIRS) $(XCC_FLAGS) -g -O3)
$(call SET_XCC_XC_FLAGS, $(MODULE_DIRS), $(XCC_FLAGS) -fsubword-select -g -O3)
# You can change the flags of an individual file by setting the
# 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)
{
// 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);
#endif
}
else
{
#ifdef ARCH_G
XUD_DoSetRequestStatus(ep0_out);
#else
XUD_DoSetRequestStatus(ep0_in);
#endif
}
// If device reset requested, handle after command acknowledgement