diff --git a/fx3_firmware/flash.c b/fx3_firmware/flash.c index 8e3b2a8e..df821208 100644 --- a/fx3_firmware/flash.c +++ b/fx3_firmware/flash.c @@ -115,14 +115,16 @@ CyU3PReturnStatus_t NuandWriteOtp(size_t offset, size_t size, void *buf) { return status; } -void NuandFlashInit() { - CyU3PReturnStatus_t status = CY_U3P_SUCCESS; +CyU3PReturnStatus_t NuandFlashInit() { + CyU3PReturnStatus_t status; NuandGPIOReconfigure(CyFalse, CyTrue); status = CyFxSpiInit(); glAppMode = MODE_FW_CONFIG; + + return status; } void NuandFlashDeinit() { diff --git a/fx3_firmware/flash.h b/fx3_firmware/flash.h index 324665d9..1ddb14a7 100644 --- a/fx3_firmware/flash.h +++ b/fx3_firmware/flash.h @@ -29,7 +29,7 @@ CyU3PReturnStatus_t NuandReadOtp(size_t offset, size_t size, void *buf); CyU3PReturnStatus_t NuandWriteOtp(size_t offset, size_t size, void *buf); CyU3PReturnStatus_t NuandLockOtp(); -void NuandFlashInit(); +CyU3PReturnStatus_t NuandFlashInit(); void NuandFlashDeinit(); int NuandExtractField(char *ptr, int len, char *field, diff --git a/fx3_firmware/fpga.c b/fx3_firmware/fpga.c index fa050427..f9e616f5 100644 --- a/fx3_firmware/fpga.c +++ b/fx3_firmware/fpga.c @@ -39,8 +39,12 @@ int FpgaBeginProgram(void) CyBool_t value; unsigned tEnd; - CyU3PReturnStatus_t apiRetStatus = CY_U3P_SUCCESS; + CyU3PReturnStatus_t apiRetStatus; apiRetStatus = CyU3PGpioSetValue(GPIO_nCONFIG, CyFalse); + if (apiRetStatus != CY_U3P_SUCCESS) { + return apiRetStatus; + } + tEnd = CyU3PGetTime() + 10; while (CyU3PGetTime() < tEnd); apiRetStatus = CyU3PGpioSetValue(GPIO_nCONFIG, CyTrue); @@ -305,7 +309,10 @@ CyBool_t NuandLoadFromFlash(int fpga_len) CyFxSpiFastRead(CyTrue); apiRetStatus = CyU3PSpiSetClock(30000000); - FpgaBeginProgram(); + if (FpgaBeginProgram() != CY_U3P_SUCCESS) { + goto out; + } + nleft = fpga_len; while(nleft) { @@ -366,6 +373,8 @@ CyBool_t NuandLoadFromFlash(int fpga_len) } } +out: + CyU3PDmaBufferFree(ptr); CyU3PSpiDeInit(); diff --git a/fx3_firmware/rf.c b/fx3_firmware/rf.c index 1238c373..e73253af 100644 --- a/fx3_firmware/rf.c +++ b/fx3_firmware/rf.c @@ -228,7 +228,6 @@ static void NuandRFLinkStart(void) uint16_t size = 0; CyU3PEpConfig_t epCfg; CyU3PDmaChannelConfig_t dmaCfg; - CyU3PDmaMultiChannelConfig_t dmaMultiConfig; CyU3PReturnStatus_t apiRetStatus = CY_U3P_SUCCESS; CyU3PUSBSpeed_t usbSpeed = CyU3PUsbGetSpeed(); @@ -289,22 +288,6 @@ static void NuandRFLinkStart(void) CyFxAppErrorHandler (apiRetStatus); } - // multi variant - dmaMultiConfig.size = size * 2; - dmaMultiConfig.count = 22; - dmaMultiConfig.validSckCount = 2; - dmaMultiConfig.prodSckId[0] = BLADE_RF_SAMPLE_EP_PRODUCER_USB_SOCKET; - dmaMultiConfig.consSckId[0] = CY_U3P_PIB_SOCKET_2; - dmaMultiConfig.consSckId[1] = CY_U3P_PIB_SOCKET_3; - dmaMultiConfig.dmaMode = CY_U3P_DMA_MODE_BYTE; - dmaMultiConfig.notification = 0; - dmaMultiConfig.cb = 0; - dmaMultiConfig.prodHeader = 0; - dmaMultiConfig.prodFooter = 0; - dmaMultiConfig.consHeader = 0; - dmaMultiConfig.prodAvailCount = 0; - - // non multi variant CyU3PMemSet((uint8_t *)&dmaCfg, 0, sizeof(dmaCfg)); dmaCfg.size = size * 2; dmaCfg.count = 22;