From 57116c919aaea6367443bf696d99cd9e8dfde38b Mon Sep 17 00:00:00 2001 From: Keith Rothman Date: Sun, 22 Sep 2013 08:02:30 +0000 Subject: [PATCH] [FX3/libbladeRF] Major refactoring of FX3 application - Split RF, FPGA load, and firmware methods into seperate .c files - Split several vendor requests to eliminate magic glEp0Idx and to allow for better error handling - Updated libbladeRF to use new vendor requests and properly check return code. - Changed glSpiPageSize from global to #define - Move OTP handling into firmware.c - Version bump Conflicts: fx3_firmware/bladeRF.c --- firmware_common/bladeRF.h | 9 +- fx3_firmware/bladeRF.c | 1248 ++++------------- fx3_firmware/bladeRF.h | 20 +- fx3_firmware/firmware.c | 172 +++ fx3_firmware/firmware.h | 17 + fx3_firmware/fpga.c | 227 +++ fx3_firmware/fpga.h | 9 + fx3_firmware/rf.c | 438 ++++++ fx3_firmware/rf.h | 8 + fx3_firmware/spi_flash_lib.c | 157 +-- fx3_firmware/spi_flash_lib.h | 5 +- host/common/include/host_config.h.in | 8 + host/libraries/libbladeRF/CMakeLists.txt | 2 +- .../libraries/libbladeRF/src/backend/libusb.c | 411 +++--- 14 files changed, 1467 insertions(+), 1264 deletions(-) create mode 100644 fx3_firmware/firmware.c create mode 100644 fx3_firmware/firmware.h create mode 100644 fx3_firmware/fpga.c create mode 100644 fx3_firmware/fpga.h create mode 100644 fx3_firmware/rf.c create mode 100644 fx3_firmware/rf.h diff --git a/firmware_common/bladeRF.h b/firmware_common/bladeRF.h index 1318141b..34eed4c3 100644 --- a/firmware_common/bladeRF.h +++ b/firmware_common/bladeRF.h @@ -43,12 +43,9 @@ #define BLADE_USB_CMD_WRITE_OTP 104 #define BLADE_USB_CMD_RESET 105 #define BLADE_USB_CMD_JUMP_TO_BOOTLOADER 106 - -#define BLADE_USB_CMD_QUERY_VERSION 0 -#define BLADE_USB_CMD_QUERY_FPGA_STATUS 1 -#define BLADE_USB_CMD_BEGIN_PROG 2 -#define BLADE_USB_CMD_END_PROG 3 -#define BLADE_USB_CMD_RF_RX 4 +#define BLADE_USB_CMD_READ_PAGE_BUFFER 107 +#define BLADE_USB_CMD_WRITE_PAGE_BUFFER 108 +#define BLADE_USB_CMD_LOCK_OTP 109 struct bladeRF_version { unsigned short major; diff --git a/fx3_firmware/bladeRF.c b/fx3_firmware/bladeRF.c index 2a0f60f0..1e1c1a1a 100644 --- a/fx3_firmware/bladeRF.c +++ b/fx3_firmware/bladeRF.c @@ -7,54 +7,28 @@ #include "cyu3dma.h" #include "cyu3error.h" #include "cyu3usb.h" -#include "cyu3uart.h" #include "bladeRF.h" #include "cyu3gpif.h" #include "cyu3pib.h" #include "cyu3gpio.h" #include "pib_regs.h" -/* This file should be included only once as it contains - * structure definitions. Including it in multiple places - * can result in linker error. */ -#include "cyfxgpif_C4loader.h" -#include "cyfxgpif_RFlink.h" +#include "firmware.h" #include "spi_flash_lib.h" +#include "rf.h" +#include "fpga.h" uint32_t glAppMode = MODE_NO_CONFIG; CyU3PThread bladeRFAppThread; -CyU3PDmaChannel glChHandlebladeRFUtoP; /* DMA Channel for RF U2P (USB to P-port) transfers */ - -CyU3PDmaChannel glChHandlebladeRFUtoUART; /* DMA Channel for U2P transfers */ -CyU3PDmaChannel glChHandlebladeRFUARTtoU; /* DMA Channel for U2P transfers */ - -#ifdef TX_MULTI -CyU3PDmaMultiChannel glChHandleMultiUtoP; -#else -CyU3PDmaChannel glChHandleUtoP; -#endif - -#ifdef RX_MULTI -CyU3PDmaMultiChannel glChHandleMultiPtoU; -#else -CyU3PDmaChannel glChHandlePtoU; -#endif - uint8_t glUsbConfiguration = 0; /* Active USB configuration. */ uint8_t glUsbAltInterface = 0; /* Active USB interface. */ -uint32_t glDMARxCount = 0; /* Counter to track the number of buffers received - * from USB during FPGA programming */ uint8_t glSelBuffer[32]; -uint8_t glOtp[0x100] __attribute__ ((aligned (32))); -uint8_t glCal[0x100] __attribute__ ((aligned (32))); -uint8_t glEp0Buffer[4096] __attribute__ ((aligned (32))); -uint32_t glEp0Idx; -uint16_t glFlipLut[256]; +uint8_t glPageBuffer[FLASH_PAGE_SIZE] __attribute__ ((aligned (32))); /* Standard product string descriptor */ uint8_t CyFxUSBSerial[] __attribute__ ((aligned (32))) = @@ -78,6 +52,28 @@ void CyFxAppErrorHandler(CyU3PReturnStatus_t apiRetStatus) CyU3PThreadSleep(100); } +static int FpgaBeginProgram(void) +{ + CyBool_t value; + + unsigned tEnd; + CyU3PReturnStatus_t apiRetStatus = CY_U3P_SUCCESS; + apiRetStatus = CyU3PGpioSetValue(GPIO_nCONFIG, CyFalse); + tEnd = CyU3PGetTime() + 10; + while (CyU3PGetTime() < tEnd); + apiRetStatus = CyU3PGpioSetValue(GPIO_nCONFIG, CyTrue); + + tEnd = CyU3PGetTime() + 1000; + do { + apiRetStatus = CyU3PGpioGetValue(GPIO_nSTATUS, &value); + if (CyU3PGetTime() > tEnd) + return -1; + } while (!value); + + return 0; +} + + void NuandGPIOReconfigure(CyBool_t fullGpif, CyBool_t warm) { CyU3PReturnStatus_t apiRetStatus = CY_U3P_SUCCESS; @@ -168,183 +164,6 @@ void NuandGPIOReconfigure(CyBool_t fullGpif, CyBool_t warm) } } -void UartBridgeStart(void) -{ - uint16_t size = 0; - CyU3PEpConfig_t epCfg; - CyU3PUSBSpeed_t usbSpeed = CyU3PUsbGetSpeed(); - - CyU3PDmaChannelConfig_t dmaCfg; - CyU3PUartConfig_t uartConfig; - CyU3PReturnStatus_t apiRetStatus = CY_U3P_SUCCESS; - - - /* Initialize the UART for printing debug messages */ - apiRetStatus = CyU3PUartInit(); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyFxAppErrorHandler(apiRetStatus); - } - - /* Set UART configuration */ - CyU3PMemSet ((uint8_t *)&uartConfig, 0, sizeof (uartConfig)); - uartConfig.baudRate = CY_U3P_UART_BAUDRATE_115200; - uartConfig.stopBit = CY_U3P_UART_ONE_STOP_BIT; - uartConfig.parity = CY_U3P_UART_NO_PARITY; - uartConfig.txEnable = CyTrue; - uartConfig.rxEnable = CyTrue; - uartConfig.flowCtrl = CyFalse; - uartConfig.isDma = CyTrue; - - apiRetStatus = CyU3PUartSetConfig (&uartConfig, NULL); - if (apiRetStatus != CY_U3P_SUCCESS) - { - CyFxAppErrorHandler(apiRetStatus); - } - - /* Set UART Tx and Rx transfer Size to infinite */ - apiRetStatus = CyU3PUartTxSetBlockXfer(0xFFFFFFFF); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyFxAppErrorHandler(apiRetStatus); - } - - apiRetStatus = CyU3PUartRxSetBlockXfer(0xFFFFFFFF); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyFxAppErrorHandler(apiRetStatus); - } - - - /* Determine max packet size based on USB speed */ - switch (usbSpeed) - { - case CY_U3P_FULL_SPEED: - size = 64; - break; - - case CY_U3P_HIGH_SPEED: - size = 512; - break; - - case CY_U3P_SUPER_SPEED: - size = 1024; - break; - - default: - CyU3PDebugPrint (4, "Error! Invalid USB speed.\n"); - CyFxAppErrorHandler (CY_U3P_ERROR_FAILURE); - break; - } - - CyU3PMemSet ((uint8_t *)&epCfg, 0, sizeof (epCfg)); - epCfg.enable = CyTrue; - epCfg.epType = CY_U3P_USB_EP_BULK; - epCfg.burstLen = 1; - epCfg.streams = 0; - epCfg.pcktSize = size; - - /* Producer endpoint configuration */ - apiRetStatus = CyU3PSetEpConfig(BLADE_UART_EP_PRODUCER, &epCfg); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint (4, "CyU3PSetEpConfig failed, Error code = %d\n", apiRetStatus); - CyFxAppErrorHandler (apiRetStatus); - } - - /* Consumer endpoint configuration */ - apiRetStatus = CyU3PSetEpConfig(BLADE_UART_EP_CONSUMER, &epCfg); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint (4, "CyU3PSetEpConfig failed, Error code = %d\n", apiRetStatus); - CyFxAppErrorHandler (apiRetStatus); - } - - CyU3PMemSet((uint8_t *)&dmaCfg, 0, sizeof(dmaCfg)); - dmaCfg.size = 16; - dmaCfg.count = 10; - dmaCfg.prodSckId = CY_U3P_UIB_SOCKET_PROD_2; - dmaCfg.consSckId = CY_U3P_LPP_SOCKET_UART_CONS; - dmaCfg.dmaMode = CY_U3P_DMA_MODE_BYTE; - dmaCfg.notification = 0; - dmaCfg.cb = 0; - dmaCfg.prodHeader = 0; - dmaCfg.prodFooter = 0; - dmaCfg.consHeader = 0; - dmaCfg.prodAvailCount = 0; - - apiRetStatus = CyU3PDmaChannelCreate(&glChHandlebladeRFUtoUART, - CY_U3P_DMA_TYPE_AUTO, &dmaCfg); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint (4, "CyU3PDmaChannelCreate failed, Error code = %d\n", apiRetStatus); - CyFxAppErrorHandler(apiRetStatus); - } - - dmaCfg.prodSckId = CY_U3P_LPP_SOCKET_UART_PROD; - dmaCfg.consSckId = CY_U3P_UIB_SOCKET_CONS_2; - apiRetStatus = CyU3PDmaChannelCreate(&glChHandlebladeRFUARTtoU, - CY_U3P_DMA_TYPE_AUTO, &dmaCfg); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint (4, "CyU3PDmaChannelCreate failed, Error code = %d\n", apiRetStatus); - CyFxAppErrorHandler(apiRetStatus); - } - - /* Flush the endpoint memory */ - CyU3PUsbFlushEp(BLADE_UART_EP_PRODUCER); - CyU3PUsbFlushEp(BLADE_UART_EP_CONSUMER); - - /* Set DMA channel transfer size */ - apiRetStatus = CyU3PDmaChannelSetXfer(&glChHandlebladeRFUtoUART, BLADE_DMA_TX_SIZE); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint (4, "CyU3PDmaChannelSetXfer Failed, Error code = %d\n", apiRetStatus); - CyFxAppErrorHandler(apiRetStatus); - } - - apiRetStatus = CyU3PDmaChannelSetXfer(&glChHandlebladeRFUARTtoU, BLADE_DMA_TX_SIZE); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint (4, "CyU3PDmaChannelSetXfer Failed, Error code = %d\n", apiRetStatus); - CyFxAppErrorHandler(apiRetStatus); - } - - /* Set UART Tx and Rx transfer Size to infinite */ - apiRetStatus = CyU3PUartTxSetBlockXfer(0xFFFFFFFF); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyFxAppErrorHandler(apiRetStatus); - } - - apiRetStatus = CyU3PUartRxSetBlockXfer(0xFFFFFFFF); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyFxAppErrorHandler(apiRetStatus); - } -} - -void UartBridgeStop(void) -{ - CyU3PEpConfig_t epCfg; - CyU3PReturnStatus_t apiRetStatus = CY_U3P_SUCCESS; - - /* Flush the endpoint memory */ - CyU3PUsbFlushEp(BLADE_UART_EP_PRODUCER); - CyU3PUsbFlushEp(BLADE_UART_EP_CONSUMER); - - /* Destroy the channel */ - CyU3PDmaChannelDestroy(&glChHandlebladeRFUARTtoU); - CyU3PDmaChannelDestroy(&glChHandlebladeRFUtoUART); - - /* Disable endpoints. */ - CyU3PMemSet((uint8_t *)&epCfg, 0, sizeof (epCfg)); - epCfg.enable = CyFalse; - - /* Producer endpoint configuration. */ - apiRetStatus = CyU3PSetEpConfig(BLADE_UART_EP_PRODUCER, &epCfg); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint (4, "CyU3PSetEpConfig failed, Error code = %d\n", apiRetStatus); - CyFxAppErrorHandler (apiRetStatus); - } - - apiRetStatus = CyU3PSetEpConfig(BLADE_UART_EP_CONSUMER, &epCfg); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint (4, "CyU3PSetEpConfig failed, Error code = %d\n", apiRetStatus); - CyFxAppErrorHandler (apiRetStatus); - } - CyU3PUartDeInit(); -} - void CyFxGpioInit(void) { CyU3PGpioClock_t gpioClock; @@ -368,439 +187,25 @@ void CyFxGpioInit(void) NuandGPIOReconfigure(CyTrue, CyFalse); } -int FpgaBeginProgram(void) -{ - CyBool_t value; - - unsigned tEnd; - CyU3PReturnStatus_t apiRetStatus = CY_U3P_SUCCESS; - apiRetStatus = CyU3PGpioSetValue(GPIO_nCONFIG, CyFalse); - tEnd = CyU3PGetTime() + 10; - while (CyU3PGetTime() < tEnd); - apiRetStatus = CyU3PGpioSetValue(GPIO_nCONFIG, CyTrue); - - tEnd = CyU3PGetTime() + 1000; - do { - apiRetStatus = CyU3PGpioGetValue(GPIO_nSTATUS, &value); - if (CyU3PGetTime() > tEnd) - return -1; - } while (!value); - - return 0; -} - -/* DMA callback function to handle the produce events for U to P transfers. */ -void bladeRFConfigUtoPDmaCallback(CyU3PDmaChannel *chHandle, CyU3PDmaCbType_t type, CyU3PDmaCBInput_t *input) -{ - CyU3PReturnStatus_t status = CY_U3P_SUCCESS; - - if (type == CY_U3P_DMA_CB_PROD_EVENT) { - int i; - unsigned char *buf = input->buffer_p.buffer; - unsigned *us_buf = (unsigned *)input->buffer_p.buffer; - unsigned tmpr, tmpw; - - uint8_t *end_in_b = &( ((uint8_t *)input->buffer_p.buffer)[input->buffer_p.count - 1]); - uint32_t *end_in_w = &( ((uint32_t *)input->buffer_p.buffer)[input->buffer_p.count - 1]); - - - /* Flip the bits in such a way that the FPGA can be programmed - * This mapping can be determined by looking at the schematic */ - for (i = input->buffer_p.count - 1; i >= 0; i--) { - *end_in_w-- = glFlipLut[*end_in_b--]; - } - status = CyU3PDmaChannelCommitBuffer (chHandle, input->buffer_p.count * 4, 0); - if (status != CY_U3P_SUCCESS) { - CyU3PDebugPrint (4, "CyU3PDmaChannelCommitBuffer failed, Error code = %d\n", status); - } - - /* Increment the counter. */ - glDMARxCount++; - } -} - -/* This function starts the RF data transport mechanism. This is the second - * interface of the first and only descriptor. */ -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(); - - NuandGPIOReconfigure(CyTrue, CyTrue); - - /* Load the GPIF configuration for loading the RF transceiver */ - apiRetStatus = CyU3PGpifLoad(&Rflink_CyFxGpifConfig); - if (apiRetStatus != CY_U3P_SUCCESS) - { - CyU3PDebugPrint (4, "CyU3PGpifLoad failed, Error Code = %d\n",apiRetStatus); - CyFxAppErrorHandler(apiRetStatus); - } - - // strobe the RESET pin to the FPGA - CyU3PGpioSetValue(GPIO_SYS_RST, CyTrue); - CyU3PGpioSetValue(GPIO_SYS_RST, CyFalse); - - /* Start the state machine. */ - apiRetStatus = CyU3PGpifSMStart(RFLINK_START, RFLINK_ALPHA_START); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint(4, "CyU3PGpifSMStart failed, Error Code = %d\n",apiRetStatus); - CyFxAppErrorHandler(apiRetStatus); - } - - /* Determine max packet size based on USB speed */ - switch (usbSpeed) - { - case CY_U3P_FULL_SPEED: - size = 64; - break; - - case CY_U3P_HIGH_SPEED: - size = 512; - break; - - case CY_U3P_SUPER_SPEED: - size = 1024; - break; - - default: - CyU3PDebugPrint (4, "Error! Invalid USB speed.\n"); - CyFxAppErrorHandler (CY_U3P_ERROR_FAILURE); - break; - } - - CyU3PMemSet ((uint8_t *)&epCfg, 0, sizeof (epCfg)); - epCfg.enable = CyTrue; - epCfg.epType = CY_U3P_USB_EP_BULK; - epCfg.burstLen = (usbSpeed == CY_U3P_SUPER_SPEED ? 15 : 1); - epCfg.streams = 0; - epCfg.pcktSize = size; - - /* Producer endpoint configuration */ - apiRetStatus = CyU3PSetEpConfig(BLADE_RF_SAMPLE_EP_PRODUCER, &epCfg); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint(4, "CyU3PSetEpConfig failed, Error code = %d\n", apiRetStatus); - CyFxAppErrorHandler (apiRetStatus); - } - - /* Consumer endpoint configuration */ - apiRetStatus = CyU3PSetEpConfig(BLADE_RF_SAMPLE_EP_CONSUMER, &epCfg); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint(4, "CyU3PSetEpConfig failed, Error code = %d\n", apiRetStatus); - 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; - dmaCfg.prodSckId = BLADE_RF_SAMPLE_EP_PRODUCER_USB_SOCKET; - dmaCfg.consSckId = CY_U3P_PIB_SOCKET_3; - dmaCfg.dmaMode = CY_U3P_DMA_MODE_BYTE; - dmaCfg.notification = 0; - dmaCfg.cb = 0; - dmaCfg.prodHeader = 0; - dmaCfg.prodFooter = 0; - dmaCfg.consHeader = 0; - dmaCfg.prodAvailCount = 0; - -#if TX_MULTI - apiRetStatus = CyU3PDmaMultiChannelCreate(&glChHandleMultiUtoP, CY_U3P_DMA_TYPE_AUTO_ONE_TO_MANY, &dmaMultiConfig); -#else - apiRetStatus = CyU3PDmaChannelCreate(&glChHandleUtoP, CY_U3P_DMA_TYPE_AUTO, &dmaCfg); -#endif - - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint(4, "CyU3PDmaMultiChannelCreate failed, Error code = %d\n", apiRetStatus); - CyFxAppErrorHandler(apiRetStatus); - } - -#ifdef RX_MULTI - dmaMultiConfig.prodSckId[0] = CY_U3P_PIB_SOCKET_0; - dmaMultiConfig.prodSckId[1] = CY_U3P_PIB_SOCKET_1; - dmaMultiConfig.consSckId[0] = BLADE_RF_SAMPLE_EP_CONSUMER_USB_SOCKET; - dmaMultiConfig.consSckId[1] = 0; - - apiRetStatus = CyU3PDmaMultiChannelCreate(&glChHandleMultiPtoU, CY_U3P_DMA_TYPE_AUTO_MANY_TO_ONE, &dmaMultiConfig); -#else - dmaCfg.prodSckId = CY_U3P_PIB_SOCKET_0; - dmaCfg.consSckId = BLADE_RF_SAMPLE_EP_CONSUMER_USB_SOCKET; - apiRetStatus = CyU3PDmaChannelCreate(&glChHandlePtoU, CY_U3P_DMA_TYPE_AUTO, &dmaCfg); -#endif - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint(4, "CyU3PDmaMultiChannelCreate failed, Error code = %d\n", apiRetStatus); - CyFxAppErrorHandler(apiRetStatus); - } - - /* Flush the Endpoint memory */ - CyU3PUsbFlushEp(BLADE_RF_SAMPLE_EP_PRODUCER); - CyU3PUsbFlushEp(BLADE_RF_SAMPLE_EP_CONSUMER); - - /* Set DMA channel transfer size. */ - -#ifdef TX_MULTI - apiRetStatus = CyU3PDmaMultiChannelSetXfer (&glChHandleMultiUtoP, BLADE_DMA_TX_SIZE, 0); -#else - apiRetStatus = CyU3PDmaChannelSetXfer (&glChHandleUtoP, BLADE_DMA_TX_SIZE); -#endif - - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint(4, "CyU3PDmaChannelSetXfer Failed, Error code = %d\n", apiRetStatus); - CyFxAppErrorHandler(apiRetStatus); - } - -#ifdef RX_MULTI - apiRetStatus = CyU3PDmaMultiChannelSetXfer (&glChHandleMultiPtoU, BLADE_DMA_TX_SIZE, 0); -#else - apiRetStatus = CyU3PDmaChannelSetXfer (&glChHandlePtoU, BLADE_DMA_TX_SIZE); -#endif - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint(4, "CyU3PDmaChannelSetXfer Failed, Error code = %d\n", apiRetStatus); - CyFxAppErrorHandler(apiRetStatus); - } - - - UartBridgeStart(); - glAppMode = MODE_RF_CONFIG; - -} - -/* This function stops the slave FIFO loop application. This shall be called - * whenever a RESET or DISCONNECT event is received from the USB host. The - * endpoints are disabled and the DMA pipe is destroyed by this function. */ -void NuandRFLinkStop (void) -{ - CyU3PEpConfig_t epCfg; - CyU3PReturnStatus_t apiRetStatus = CY_U3P_SUCCESS; - - /* Flush endpoint memory buffers */ - CyU3PUsbFlushEp(BLADE_RF_SAMPLE_EP_PRODUCER); - CyU3PUsbFlushEp(BLADE_RF_SAMPLE_EP_CONSUMER); - - /* Destroy the channels */ -#ifdef TX_MUTLI - CyU3PDmaMultiChannelDestroy(&glChHandleMultiUtoP); -#else - CyU3PDmaChannelDestroy(&glChHandleUtoP); -#endif -#ifdef RX_MULTI - CyU3PDmaMultiChannelDestroy(&glChHandleMultiPtoU); -#else - CyU3PDmaChannelDestroy(&glChHandlePtoU); -#endif - - /* Disable endpoints. */ - CyU3PMemSet ((uint8_t *)&epCfg, 0, sizeof (epCfg)); - epCfg.enable = CyFalse; - - /* Disable producer endpoint */ - apiRetStatus = CyU3PSetEpConfig(BLADE_RF_SAMPLE_EP_PRODUCER, &epCfg); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint(4, "CyU3PSetEpConfig failed, Error code = %d\n", apiRetStatus); - CyFxAppErrorHandler(apiRetStatus); - } - - /* Disable consumer endpoint */ - apiRetStatus = CyU3PSetEpConfig(BLADE_RF_SAMPLE_EP_CONSUMER, &epCfg); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint(4, "CyU3PSetEpConfig failed, Error code = %d\n", apiRetStatus); - CyFxAppErrorHandler(apiRetStatus); - } - - /* Reset the GPIF */ - CyU3PGpifDisable(CyTrue); - - UartBridgeStop(); - glAppMode = MODE_NO_CONFIG; -} - -void NuandFpgaConfigStart(void) -{ - uint16_t size = 0; - CyU3PEpConfig_t epCfg; - CyU3PDmaChannelConfig_t dmaCfg; - CyU3PReturnStatus_t apiRetStatus = CY_U3P_SUCCESS; - CyU3PUSBSpeed_t usbSpeed = CyU3PUsbGetSpeed(); - static int first_call = 1; - - NuandGPIOReconfigure(CyTrue, !first_call); - first_call = 0; - - - /* Load the GPIF configuration for loading the FPGA */ - apiRetStatus = CyU3PGpifLoad(&C4loader_CyFxGpifConfig); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint (4, "CyU3PGpifLoad failed, Error Code = %d\n",apiRetStatus); - CyFxAppErrorHandler(apiRetStatus); - } - - /* Start the state machine. */ - apiRetStatus = CyU3PGpifSMStart(C4LOADER_START, C4LOADER_ALPHA_START); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint(4, "CyU3PGpifSMStart failed, Error Code = %d\n",apiRetStatus); - CyFxAppErrorHandler(apiRetStatus); - } - - /* Determine max packet size based on USB speed */ - switch (usbSpeed) - { - case CY_U3P_FULL_SPEED: - size = 64; - break; - - case CY_U3P_HIGH_SPEED: - size = 512; - break; - - case CY_U3P_SUPER_SPEED: - size = 1024; - break; - - default: - CyU3PDebugPrint(4, "Error! Invalid USB speed.\n"); - CyFxAppErrorHandler(CY_U3P_ERROR_FAILURE); - break; - } - - CyU3PMemSet((uint8_t *)&epCfg, 0, sizeof (epCfg)); - epCfg.enable = CyTrue; - epCfg.epType = CY_U3P_USB_EP_BULK; - epCfg.burstLen = 1; - epCfg.streams = 0; - epCfg.pcktSize = size; - - apiRetStatus = CyU3PSetEpConfig(BLADE_FPGA_EP_PRODUCER, &epCfg); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint(4, "CyU3PSetEpConfig failed, Error code = %d\n", apiRetStatus); - CyFxAppErrorHandler (apiRetStatus); - } - - dmaCfg.size = size * 4; - dmaCfg.count = BLADE_DMA_BUF_COUNT; - dmaCfg.prodSckId = BLADE_FPGA_CONFIG_SOCKET; - dmaCfg.consSckId = CY_U3P_PIB_SOCKET_3; - dmaCfg.dmaMode = CY_U3P_DMA_MODE_BYTE; - - /* Enable the callback for produce event, this is where the bits will get flipped */ - dmaCfg.notification = CY_U3P_DMA_CB_PROD_EVENT; - - dmaCfg.cb = bladeRFConfigUtoPDmaCallback; - dmaCfg.prodHeader = 0; - dmaCfg.prodFooter = size * 3; - dmaCfg.consHeader = 0; - dmaCfg.prodAvailCount = 0; - - apiRetStatus = CyU3PDmaChannelCreate(&glChHandlebladeRFUtoP, - CY_U3P_DMA_TYPE_MANUAL, &dmaCfg); - - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint(4, "CyU3PDmaChannelCreate failed, Error code = %d\n", apiRetStatus); - CyFxAppErrorHandler(apiRetStatus); - } - - /* Flush the endpoint memory */ - CyU3PUsbFlushEp(BLADE_FPGA_EP_PRODUCER); - - /* Set DMA channel transfer size. */ - apiRetStatus = CyU3PDmaChannelSetXfer(&glChHandlebladeRFUtoP, BLADE_DMA_TX_SIZE); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint(4, "CyU3PDmaChannelSetXfer Failed, Error code = %d\n", apiRetStatus); - CyFxAppErrorHandler(apiRetStatus); - } - - glAppMode = MODE_FPGA_CONFIG; -} - -void NuandFpgaConfigStop(void) -{ - CyU3PEpConfig_t epCfg; - CyU3PReturnStatus_t apiRetStatus = CY_U3P_SUCCESS; - - /* Flush the endpoint memory */ - CyU3PUsbFlushEp(BLADE_FPGA_EP_PRODUCER); - - /* Destroy the channel */ - CyU3PDmaChannelDestroy(&glChHandlebladeRFUtoP); - - /* Disable endpoints. */ - CyU3PMemSet((uint8_t *)&epCfg, 0, sizeof (epCfg)); - epCfg.enable = CyFalse; - - /* Producer endpoint configuration. */ - apiRetStatus = CyU3PSetEpConfig(BLADE_FPGA_EP_PRODUCER, &epCfg); - if (apiRetStatus != CY_U3P_SUCCESS) { - CyU3PDebugPrint (4, "CyU3PSetEpConfig failed, Error code = %d\n", apiRetStatus); - CyFxAppErrorHandler (apiRetStatus); - } - - CyU3PGpifDisable(CyTrue); - - glAppMode = MODE_NO_CONFIG; -} - static void StopApplication() { if (glAppMode == MODE_RF_CONFIG) { - NuandRFLinkStop(); + NuandRFLink.stop(); } else if (glAppMode == MODE_FPGA_CONFIG){ - NuandFpgaConfigStop(); + NuandFpgaConfig.stop(); } } -int RF_status_bits[] = { - [BLADE_RF_SAMPLE_EP_PRODUCER] = 0, - [BLADE_RF_SAMPLE_EP_CONSUMER] = 0, - [BLADE_UART_EP_PRODUCER] = 0, - [BLADE_UART_EP_CONSUMER] = 0, -}; - -uint8_t FPGA_status_bits[] = { - [BLADE_FPGA_EP_PRODUCER] = 0, -}; - CyBool_t GetStatus(uint16_t endpoint) { CyBool_t isHandled = CyFalse; uint8_t get_status_reply[] = {0x00, 0x00}; switch(glUsbAltInterface) { case USB_IF_RF_LINK: - switch(endpoint) { - case BLADE_RF_SAMPLE_EP_PRODUCER: - case BLADE_RF_SAMPLE_EP_CONSUMER: - case BLADE_UART_EP_PRODUCER: - case BLADE_UART_EP_CONSUMER: - get_status_reply[0] = RF_status_bits[endpoint]; - CyU3PUsbSendEP0Data(sizeof(get_status_reply), get_status_reply); - isHandled = CyTrue; - break; - } + isHandled = NuandRFLink.halted(endpoint, &get_status_reply[0]); break; case USB_IF_CONFIG: - switch(endpoint) { - case BLADE_FPGA_EP_PRODUCER: - get_status_reply[0] = FPGA_status_bits[endpoint]; - CyU3PUsbSendEP0Data(sizeof(get_status_reply), get_status_reply); - isHandled = CyTrue; - break; - } + isHandled = NuandFpgaConfig.halted(endpoint, &get_status_reply[0]); break; default: case USB_IF_SPI_FLASH: @@ -808,6 +213,10 @@ CyBool_t GetStatus(uint16_t endpoint) { break; } + if(isHandled) { + CyU3PUsbSendEP0Data(sizeof(get_status_reply), get_status_reply); + } + return isHandled; } @@ -828,39 +237,10 @@ CyBool_t ClearHaltCondition(uint16_t endpoint) { switch(glUsbAltInterface) { case USB_IF_RF_LINK: - switch(endpoint) { - case BLADE_RF_SAMPLE_EP_PRODUCER: - case BLADE_RF_SAMPLE_EP_CONSUMER: - case BLADE_UART_EP_PRODUCER: - case BLADE_UART_EP_CONSUMER: - isHandled = CyTrue; - RF_status_bits[endpoint] = 0; - break; - } - - switch(endpoint) { - case BLADE_RF_SAMPLE_EP_PRODUCER: - ClearDMAChannel(endpoint, &glChHandleUtoP, BLADE_DMA_TX_SIZE, CyFalse); - break; - case BLADE_RF_SAMPLE_EP_CONSUMER: - ClearDMAChannel(endpoint, &glChHandlePtoU, BLADE_DMA_TX_SIZE, CyFalse); - break; - case BLADE_UART_EP_PRODUCER: - ClearDMAChannel(endpoint, &glChHandlebladeRFUtoUART, BLADE_DMA_TX_SIZE, CyFalse); - break; - case BLADE_UART_EP_CONSUMER: - ClearDMAChannel(endpoint, &glChHandlebladeRFUARTtoU, BLADE_DMA_TX_SIZE, CyFalse); - break; - } + isHandled = NuandRFLink.halt_endpoint(CyFalse, endpoint); break; case USB_IF_CONFIG: - switch(endpoint) { - case BLADE_FPGA_EP_PRODUCER: - isHandled = CyTrue; - FPGA_status_bits[endpoint] = 0; - ClearDMAChannel(endpoint, &glChHandlebladeRFUtoP, BLADE_DMA_TX_SIZE, CyFalse); - break; - } + isHandled = NuandFpgaConfig.halt_endpoint(CyFalse, endpoint); break; default: case USB_IF_SPI_FLASH: @@ -876,37 +256,10 @@ CyBool_t SetHaltCondition(uint16_t endpoint) { switch(glUsbAltInterface) { case USB_IF_RF_LINK: - switch(endpoint) { - case BLADE_RF_SAMPLE_EP_PRODUCER: - case BLADE_RF_SAMPLE_EP_CONSUMER: - case BLADE_UART_EP_PRODUCER: - case BLADE_UART_EP_CONSUMER: - RF_status_bits[endpoint] = 1; - break; - } - - switch(endpoint) { - case BLADE_RF_SAMPLE_EP_PRODUCER: - ClearDMAChannel(endpoint, &glChHandleUtoP, BLADE_DMA_TX_SIZE, CyTrue); - break; - case BLADE_RF_SAMPLE_EP_CONSUMER: - ClearDMAChannel(endpoint, &glChHandlePtoU, BLADE_DMA_TX_SIZE, CyTrue); - break; - case BLADE_UART_EP_PRODUCER: - ClearDMAChannel(endpoint, &glChHandlebladeRFUtoUART, BLADE_DMA_TX_SIZE, CyTrue); - break; - case BLADE_UART_EP_CONSUMER: - ClearDMAChannel(endpoint, &glChHandlebladeRFUARTtoU, BLADE_DMA_TX_SIZE, CyTrue); - break; - } + isHandled = NuandRFLink.halt_endpoint(CyTrue, endpoint); break; case USB_IF_CONFIG: - switch(endpoint) { - case BLADE_FPGA_EP_PRODUCER: - FPGA_status_bits[endpoint] = 1; - ClearDMAChannel(endpoint, &glChHandlebladeRFUtoP, BLADE_DMA_TX_SIZE, CyTrue); - break; - } + isHandled = NuandFpgaConfig.halt_endpoint(CyTrue, endpoint); break; default: case USB_IF_SPI_FLASH: @@ -917,12 +270,237 @@ CyBool_t SetHaltCondition(uint16_t endpoint) { return isHandled; } +void CyU3PUsbSendRetCode(CyU3PReturnStatus_t ret_status) { + CyU3PReturnStatus_t apiRetStatus; + apiRetStatus = CyU3PUsbSendEP0Data( + sizeof(ret_status), + (void*)&ret_status); + + if(apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint (4, + "Failed to return the error code to host, error code = %d\n", + apiRetStatus); + } +} + +CyBool_t NuandHandleVendorRequest( + uint8_t bRequest, + uint16_t wValue, + uint16_t wIndex, + uint16_t wLength + ) { + CyBool_t isHandled; + unsigned int ret; + uint8_t use_feature; + CyBool_t fpgaProg; + struct bladeRF_version ver; + CyU3PReturnStatus_t apiRetStatus = CY_U3P_SUCCESS; + int retStatus; + uint16_t readC; + + isHandled = CyTrue; + + switch (bRequest) + { + case BLADE_USB_CMD_QUERY_VERSION: + ver.major = 1; + ver.minor = 4; + apiRetStatus = CyU3PUsbSendEP0Data(sizeof(ver), (void*)&ver); + break; + + case BLADE_USB_CMD_RF_RX: + CyU3PGpioSetValue(GPIO_SYS_RST, CyTrue); + CyU3PGpioSetValue(GPIO_SYS_RST, CyFalse); + + apiRetStatus = CY_U3P_SUCCESS; + use_feature = wValue; + + if (!use_feature) { + apiRetStatus = CyU3PUsbResetEp(BLADE_RF_SAMPLE_EP_CONSUMER); + if(apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint (4, + "Failed reset USB, error code = %d\n", + apiRetStatus); + } + } + + apiRetStatus = CyU3PGpioSetValue(GPIO_RX_EN, use_feature ? CyTrue : CyFalse); + CyU3PUsbSendRetCode(apiRetStatus); + break; + + case BLADE_USB_CMD_RF_TX: + CyU3PGpioSetValue(GPIO_SYS_RST, CyTrue); + CyU3PGpioSetValue(GPIO_SYS_RST, CyFalse); + + apiRetStatus = CY_U3P_SUCCESS; + use_feature = wValue; + + if (!use_feature) { + apiRetStatus = CyU3PUsbResetEp(BLADE_RF_SAMPLE_EP_PRODUCER); + if(apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint (4, + "Failed reset USB, error code = %d\n", + apiRetStatus); + } + } + + apiRetStatus = CyU3PGpioSetValue(GPIO_TX_EN, use_feature ? CyTrue : CyFalse); + CyU3PUsbSendRetCode(apiRetStatus); + break; + + case BLADE_USB_CMD_BEGIN_PROG: + retStatus = FpgaBeginProgram(); + CyU3PUsbSendRetCode(retStatus); + break; + + case BLADE_USB_CMD_QUERY_FPGA_STATUS: + apiRetStatus = CyU3PGpioGetValue (GPIO_CONFDONE, &fpgaProg); + if (apiRetStatus == CY_U3P_SUCCESS) { + ret = fpgaProg ? 1 : 0; + } else { + ret = -1; + } + + CyU3PUsbSendRetCode(ret); + break; + + case BLADE_USB_CMD_READ_PAGE_BUFFER: + if(wIndex + wLength > sizeof(glPageBuffer)) { + apiRetStatus = CyU3PUsbStall(0x80, CyTrue, CyFalse); + } + + apiRetStatus = CyU3PUsbSendEP0Data(wLength, &glPageBuffer[wIndex]); + if(apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint(4, "Failed to send data, error code = %d\n", apiRetStatus); + } + break; + + case BLADE_USB_CMD_WRITE_PAGE_BUFFER: + if(wIndex + wLength > sizeof(glPageBuffer)) { + apiRetStatus = CyU3PUsbStall(0x0, CyTrue, CyFalse); + } + + apiRetStatus = CyU3PUsbGetEP0Data(wLength, &glPageBuffer[wIndex], &readC); + if(apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint(4, "Failed to get data, error code = %d\n", apiRetStatus); + } + + if(readC != wLength) { + CyU3PDebugPrint(4, "Failed to get data, got %u, expected %u\n", + readC, wLength); + } + break; + + case BLADE_USB_CMD_WRITE_OTP: + if (glUsbAltInterface != USB_IF_SPI_FLASH) { + apiRetStatus = CyU3PUsbStall(0x80, CyTrue, CyFalse); + } + + apiRetStatus = NuandWriteOtp(wIndex, 0x100, glPageBuffer); + CyU3PUsbSendRetCode(apiRetStatus); + break; + + case BLADE_USB_CMD_READ_OTP: + if (glUsbAltInterface != USB_IF_SPI_FLASH) { + apiRetStatus = CyU3PUsbStall(0x80, CyTrue, CyFalse); + } + + apiRetStatus = NuandReadOtp(wIndex, 0x100, glPageBuffer); + CyU3PUsbSendRetCode(apiRetStatus); + break; + + case BLADE_USB_CMD_LOCK_OTP: + if (glUsbAltInterface != USB_IF_SPI_FLASH) { + apiRetStatus = CyU3PUsbStall(0x80, CyTrue, CyFalse); + } + + apiRetStatus = NuandLockOtp(); + CyU3PUsbSendRetCode(apiRetStatus); + break; + + case BLADE_USB_CMD_FLASH_READ: + if (glUsbAltInterface != USB_IF_SPI_FLASH) { + apiRetStatus = CyU3PUsbStall(0x80, CyTrue, CyFalse); + } + + apiRetStatus = CyFxSpiTransfer ( + wIndex, 0x100, + glPageBuffer, CyTrue); + CyU3PUsbSendRetCode(apiRetStatus); + break; + + case BLADE_USB_CMD_FLASH_WRITE: + if (glUsbAltInterface != USB_IF_SPI_FLASH) { + apiRetStatus = CyU3PUsbStall(0x80, CyTrue, CyFalse); + } + + apiRetStatus = CyFxSpiTransfer ( + wIndex, 0x100, + glPageBuffer, CyFalse); + CyU3PUsbSendRetCode(apiRetStatus); + break; + + case BLADE_USB_CMD_FLASH_ERASE: + if (glUsbAltInterface != USB_IF_SPI_FLASH) { + apiRetStatus = CyU3PUsbStall(0x80, CyTrue, CyFalse); + } + + apiRetStatus = CyFxSpiEraseSector(CyTrue, wIndex); + CyU3PUsbSendRetCode(apiRetStatus); + break; + + case BLADE_USB_CMD_RESET: + CyU3PUsbAckSetup(); + CyU3PDeviceReset(CyFalse); + break; + + case BLADE_USB_CMD_JUMP_TO_BOOTLOADER: + StopApplication(); + NuandFirmwareStart(); + + // Erase the first sector so we can write the bootloader + // header + apiRetStatus = CyFxSpiEraseSector(CyTrue, 0); + if(apiRetStatus != CY_U3P_SUCCESS) { + CyU3PUsbStall(0, CyTrue, CyFalse); + CyU3PDeviceReset(CyFalse); + break; + } + + uint8_t bootloader_header[] = { + 'C','Y', // Common header + 0, // 10 MHz SPI, image data + 0xB2, // Bootloader VID/PID + (USB_NUAND_BLADERF_BOOT_PRODUCT_ID & 0xFF), + (USB_NUAND_BLADERF_BOOT_PRODUCT_ID & 0xFF00) >> 8, + (USB_NUAND_VENDOR_ID & 0xFF), + (USB_NUAND_VENDOR_ID & 0xFF00) >> 8, + }; + + apiRetStatus = CyFxSpiTransfer ( + /* Page */ 0, + sizeof(bootloader_header), bootloader_header, + CyFalse /* Writing */ + ); + + CyU3PUsbAckSetup(); + CyU3PDeviceReset(CyFalse); + break; + + default: + isHandled = CyFalse; + } + + return isHandled; +} + /* Callback to handle the USB setup requests. */ CyBool_t CyFxbladeRFApplnUSBSetupCB(uint32_t setupdat0, uint32_t setupdat1) { uint8_t bRequest, bReqType; uint8_t bType, bTarget; uint16_t wValue, wIndex, wLength; + uint8_t bTemp; CyBool_t isHandled = CyFalse; /* Decode the fields from the setup request. */ @@ -937,6 +515,7 @@ CyBool_t CyFxbladeRFApplnUSBSetupCB(uint32_t setupdat0, uint32_t setupdat1) if (bType == CY_U3P_USB_STANDARD_RQT) { if (bRequest == CY_U3P_USB_SC_SET_SEL) + { { if ((CyU3PUsbGetSpeed () == CY_U3P_SUPER_SPEED) && (wValue == 0) && (wIndex == 0) && (wLength == 6)) { @@ -947,16 +526,18 @@ CyBool_t CyFxbladeRFApplnUSBSetupCB(uint32_t setupdat0, uint32_t setupdat1) isHandled = CyFalse; } } + } - if (bRequest == CY_U3P_USB_SC_GET_INTERFACE) { - glEp0Buffer[0] = glUsbAltInterface; - CyU3PUsbSendEP0Data(wLength, glEp0Buffer); + if (bRequest == CY_U3P_USB_SC_GET_INTERFACE && wLength == 1) { + bTemp = glUsbAltInterface; + CyU3PUsbSendEP0Data(wLength, &bTemp); isHandled = CyTrue; } - if (bRequest == CY_U3P_USB_SC_GET_CONFIGURATION) { - glEp0Buffer[0] = glUsbConfiguration; - CyU3PUsbSendEP0Data(wLength, glEp0Buffer); + + if (bRequest == CY_U3P_USB_SC_GET_CONFIGURATION && wLength == 1) { + bTemp = glUsbConfiguration; + CyU3PUsbSendEP0Data(wLength, &bTemp); isHandled = CyTrue; } @@ -997,209 +578,10 @@ CyBool_t CyFxbladeRFApplnUSBSetupCB(uint32_t setupdat0, uint32_t setupdat1) } } - /* Handle supported bladeRF vendor requests. */ if (bType == CY_U3P_USB_VENDOR_RQT) { - unsigned int ret; - CyBool_t fpgaProg; - struct bladeRF_version ver; - CyU3PReturnStatus_t apiRetStatus = CY_U3P_SUCCESS; - int retStatus; - uint8_t buf[10]; - uint16_t readC; - - isHandled = CyTrue; - - switch (bRequest) - { - case BLADE_USB_CMD_QUERY_VERSION: - ver.major = 1; - ver.minor = 3; - apiRetStatus = CyU3PUsbSendEP0Data(sizeof(ver), (void*)&ver); - break; - - case BLADE_USB_CMD_RF_RX: - CyU3PGpioSetValue(GPIO_SYS_RST, CyTrue); - CyU3PGpioSetValue(GPIO_SYS_RST, CyFalse); - - apiRetStatus = CyU3PUsbGetEP0Data(4, buf, (void*)&readC); - - if (!(buf[0] || buf[3])) { - apiRetStatus = CyU3PUsbResetEp(BLADE_RF_SAMPLE_EP_CONSUMER); - //CyU3PThreadSleep(1000); - } - - CyU3PGpioSetValue(GPIO_RX_EN, (buf[0] || buf[3]) ? CyTrue : CyFalse); - break; - - case BLADE_USB_CMD_RF_TX: - CyU3PGpioSetValue(GPIO_SYS_RST, CyTrue); - CyU3PGpioSetValue(GPIO_SYS_RST, CyFalse); - - apiRetStatus = CyU3PUsbGetEP0Data(4, buf, &readC); - - if (!(buf[0] || buf[3])) { - apiRetStatus = CyU3PUsbResetEp(BLADE_RF_SAMPLE_EP_PRODUCER); - //CyU3PThreadSleep(1000); - } - - CyU3PGpioSetValue(GPIO_TX_EN, (buf[0] || buf[3]) ? CyTrue : CyFalse); - break; - - case BLADE_USB_CMD_BEGIN_PROG: - retStatus = FpgaBeginProgram(); - apiRetStatus = CyU3PUsbSendEP0Data (sizeof(retStatus), (void*)&retStatus); - break; - break; - - case BLADE_USB_CMD_QUERY_FPGA_STATUS: - apiRetStatus = CyU3PGpioGetValue (GPIO_CONFDONE, &fpgaProg); - if (apiRetStatus == CY_U3P_SUCCESS) { - ret = fpgaProg ? 1 : 0; - } else { - ret = -1; - } - apiRetStatus = CyU3PUsbSendEP0Data (sizeof(ret), (void*)&ret); - break; - - case BLADE_USB_CMD_WRITE_OTP: - NuandEnso(); - if (CyU3PUsbGetSpeed() == CY_U3P_SUPER_SPEED) { - apiRetStatus = CyU3PUsbGetEP0Data(0x100, glEp0Buffer, &readC); - apiRetStatus = CyFxSpiTransfer (0, 0x100, - glEp0Buffer, CyFalse); - } - NuandExso(); - NuandLockOtp(); - break; - - case BLADE_USB_CMD_READ_OTP: - if (CyU3PUsbGetSpeed() == CY_U3P_HIGH_SPEED) { - if (glEp0Idx == 0) { - if (glUsbAltInterface == 2) { - NuandEnso(); - apiRetStatus = CyFxSpiTransfer (0, 0x100, - glEp0Buffer, CyTrue); - } else { - memcpy(glEp0Buffer, glOtp, 0x100); - } - apiRetStatus = CyU3PUsbSendEP0Data(wLength, glEp0Buffer); - if (glUsbAltInterface == 2) - NuandExso(); - } else { - apiRetStatus = CY_U3P_SUCCESS; - } - apiRetStatus = CyU3PUsbSendEP0Data(wLength, &glEp0Buffer[glEp0Idx]); - - glEp0Idx += 64; - if (glEp0Idx == 256) - glEp0Idx = 0; - } else if (CyU3PUsbGetSpeed() == CY_U3P_SUPER_SPEED) { - if (glUsbAltInterface == 2) { - NuandEnso(); - apiRetStatus = CyFxSpiTransfer (0, 0x100, - glEp0Buffer, CyTrue); - apiRetStatus = CyU3PUsbSendEP0Data(0x100, glEp0Buffer); - NuandExso(); - } else { - apiRetStatus = CyU3PUsbSendEP0Data(0x100, glOtp); - } - } - break; - - case BLADE_USB_CMD_FLASH_READ: - if (CyU3PUsbGetSpeed() == CY_U3P_HIGH_SPEED) { - if (glUsbAltInterface == 2) { - if (glEp0Idx == 0) { - apiRetStatus = CyFxSpiTransfer (wIndex, 0x100, - glEp0Buffer, CyTrue); - } else { - apiRetStatus = CY_U3P_SUCCESS; - } - } else { - memcpy(glEp0Buffer, glCal, 0x100); - } - apiRetStatus = CyU3PUsbSendEP0Data(wLength, &glEp0Buffer[glEp0Idx]); - - glEp0Idx += 64; - if (glEp0Idx == 256) - glEp0Idx = 0; - } else if (CyU3PUsbGetSpeed() == CY_U3P_SUPER_SPEED) { - if (glUsbAltInterface == 2) { - apiRetStatus = CyFxSpiTransfer (wIndex, 0x100, - glEp0Buffer, CyTrue); - apiRetStatus = CyU3PUsbSendEP0Data(0x100, glEp0Buffer); - } else { - apiRetStatus = CyU3PUsbSendEP0Data(0x100, glCal); - } - } - break; - - case BLADE_USB_CMD_FLASH_WRITE: - if (CyU3PUsbGetSpeed() == CY_U3P_HIGH_SPEED) { - apiRetStatus = CyU3PUsbGetEP0Data(64, &glEp0Buffer[glEp0Idx], &readC); - - glEp0Idx += 64; - if (glEp0Idx == 256){ - apiRetStatus = CyFxSpiTransfer (wIndex, 0x100, - glEp0Buffer, CyFalse); - glEp0Idx = 0; - } - } else if (CyU3PUsbGetSpeed() == CY_U3P_SUPER_SPEED) { - apiRetStatus = CyU3PUsbGetEP0Data(0x100, glEp0Buffer, &readC); - apiRetStatus = CyFxSpiTransfer (wIndex, 0x100, - glEp0Buffer, CyFalse); - } - break; - - case BLADE_USB_CMD_FLASH_ERASE: - apiRetStatus = CyFxSpiEraseSector(CyTrue, wIndex); - ret = (apiRetStatus == CY_U3P_SUCCESS); - CyU3PUsbSendEP0Data(sizeof(ret), (void*)&ret); - break; - - case BLADE_USB_CMD_RESET: - CyU3PUsbAckSetup(); - CyU3PDeviceReset(CyFalse); - break; - - case BLADE_USB_CMD_JUMP_TO_BOOTLOADER: - StopApplication(); - NuandFirmwareStart(); - - // Erase the first sector so we can write the bootloader - // header - apiRetStatus = CyFxSpiEraseSector(CyTrue, 0); - if(apiRetStatus != CY_U3P_SUCCESS) { - CyU3PUsbStall(0, CyTrue, CyFalse); - CyU3PDeviceReset(CyFalse); - break; - } - - uint8_t bootloader_header[] = { - 'C','Y', // Common header - 0, // 10 MHz SPI, image data - 0xB2, // Bootloader VID/PID - (USB_NUAND_BLADERF_BOOT_PRODUCT_ID & 0xFF), - (USB_NUAND_BLADERF_BOOT_PRODUCT_ID & 0xFF00) >> 8, - (USB_NUAND_VENDOR_ID & 0xFF), - (USB_NUAND_VENDOR_ID & 0xFF00) >> 8, - }; - - apiRetStatus = CyFxSpiTransfer ( - /* Page */ 0, - sizeof(bootloader_header), bootloader_header, - CyFalse /* Writing */ - ); - - CyU3PUsbAckSetup(); - CyU3PDeviceReset(CyFalse); - break; - default: - isHandled = CyFalse; - - } + isHandled = NuandHandleVendorRequest(bRequest, wValue, wIndex, wLength); } return isHandled; @@ -1224,19 +606,18 @@ void CyFxbladeRFApplnUSBEventCB (CyU3PUsbEventType_t evtype, uint16_t evdata) /* Stop whatever we were doing */ switch(glUsbAltInterface) { - case USB_IF_CONFIG: NuandFpgaConfigStop() ; break ; - case USB_IF_RF_LINK: NuandRFLinkStop(); break ; + case USB_IF_CONFIG: NuandFpgaConfig.stop() ; break ; + case USB_IF_RF_LINK: NuandRFLink.stop(); break ; case USB_IF_SPI_FLASH: NuandFirmwareStop(); break ; default: break ; } /* Start up the new one */ if (alt_interface == USB_IF_CONFIG) { - NuandFpgaConfigStart(); + NuandFpgaConfig.start(); } else if (alt_interface == USB_IF_RF_LINK) { - NuandRFLinkStart(); + NuandRFLink.start(); } else if (alt_interface == USB_IF_SPI_FLASH) { - glEp0Idx = 0; NuandFirmwareStart(); } glUsbAltInterface = alt_interface; @@ -1310,49 +691,49 @@ void bladeRFInit(void) /* Set the USB Enumeration descriptors */ /* Super speed device descriptor. */ - apiRetStatus = CyU3PUsbSetDesc(CY_U3P_USB_SET_SS_DEVICE_DESCR, NULL, (uint8_t *)CyFxUSB30DeviceDscr); + apiRetStatus = CyU3PUsbSetDesc(CY_U3P_USB_SET_SS_DEVICE_DESCR, 0, (uint8_t *)CyFxUSB30DeviceDscr); if (apiRetStatus != CY_U3P_SUCCESS) { CyU3PDebugPrint (4, "USB set device descriptor failed, Error code = %d\n", apiRetStatus); CyFxAppErrorHandler(apiRetStatus); } /* High speed device descriptor. */ - apiRetStatus = CyU3PUsbSetDesc(CY_U3P_USB_SET_HS_DEVICE_DESCR, NULL, (uint8_t *)CyFxUSB20DeviceDscr); + apiRetStatus = CyU3PUsbSetDesc(CY_U3P_USB_SET_HS_DEVICE_DESCR, 0, (uint8_t *)CyFxUSB20DeviceDscr); if (apiRetStatus != CY_U3P_SUCCESS) { CyU3PDebugPrint (4, "USB set device descriptor failed, Error code = %d\n", apiRetStatus); CyFxAppErrorHandler(apiRetStatus); } /* BOS descriptor */ - apiRetStatus = CyU3PUsbSetDesc(CY_U3P_USB_SET_SS_BOS_DESCR, NULL, (uint8_t *)CyFxUSBBOSDscr); + apiRetStatus = CyU3PUsbSetDesc(CY_U3P_USB_SET_SS_BOS_DESCR, 0, (uint8_t *)CyFxUSBBOSDscr); if (apiRetStatus != CY_U3P_SUCCESS) { CyU3PDebugPrint (4, "USB set configuration descriptor failed, Error code = %d\n", apiRetStatus); CyFxAppErrorHandler(apiRetStatus); } /* Device qualifier descriptor */ - apiRetStatus = CyU3PUsbSetDesc(CY_U3P_USB_SET_DEVQUAL_DESCR, NULL, (uint8_t *)CyFxUSBDeviceQualDscr); + apiRetStatus = CyU3PUsbSetDesc(CY_U3P_USB_SET_DEVQUAL_DESCR, 0, (uint8_t *)CyFxUSBDeviceQualDscr); if (apiRetStatus != CY_U3P_SUCCESS) { CyU3PDebugPrint (4, "USB set device qualifier descriptor failed, Error code = %d\n", apiRetStatus); CyFxAppErrorHandler(apiRetStatus); } /* Super speed configuration descriptor */ - apiRetStatus = CyU3PUsbSetDesc(CY_U3P_USB_SET_SS_CONFIG_DESCR, NULL, (uint8_t *)CyFxUSBSSConfigDscr); + apiRetStatus = CyU3PUsbSetDesc(CY_U3P_USB_SET_SS_CONFIG_DESCR, 0, (uint8_t *)CyFxUSBSSConfigDscr); if (apiRetStatus != CY_U3P_SUCCESS) { CyU3PDebugPrint (4, "USB set configuration descriptor failed, Error code = %d\n", apiRetStatus); CyFxAppErrorHandler(apiRetStatus); } /* High speed configuration descriptor */ - apiRetStatus = CyU3PUsbSetDesc(CY_U3P_USB_SET_HS_CONFIG_DESCR, NULL, (uint8_t *)CyFxUSBHSConfigDscr); + apiRetStatus = CyU3PUsbSetDesc(CY_U3P_USB_SET_HS_CONFIG_DESCR, 0, (uint8_t *)CyFxUSBHSConfigDscr); if (apiRetStatus != CY_U3P_SUCCESS) { CyU3PDebugPrint (4, "USB Set Other Speed Descriptor failed, Error Code = %d\n", apiRetStatus); CyFxAppErrorHandler(apiRetStatus); } /* Full speed configuration descriptor */ - apiRetStatus = CyU3PUsbSetDesc(CY_U3P_USB_SET_FS_CONFIG_DESCR, NULL, (uint8_t *)CyFxUSBFSConfigDscr); + apiRetStatus = CyU3PUsbSetDesc(CY_U3P_USB_SET_FS_CONFIG_DESCR, 0, (uint8_t *)CyFxUSBFSConfigDscr); if (apiRetStatus != CY_U3P_SUCCESS) { CyU3PDebugPrint (4, "USB Set Configuration Descriptor failed, Error Code = %d\n", apiRetStatus); CyFxAppErrorHandler(apiRetStatus); @@ -1397,6 +778,27 @@ void bladeRFInit(void) } /* Entry function for the bladeRFAppThread. */ + +static uint8_t otp_buf[0x100]; +static void ExtractSerial(void) +{ + int status; + char serial_buf[32]; + int i; + + NuandFirmwareStart(); + + status = NuandReadOtp(0, 0x100, otp_buf); + + if (!NuandExtractField((void*)otp_buf, 0x100, "S", serial_buf, 32)) { + for (i = 0; i < 32; i++) { + CyFxUSBSerial[2+i*2] = serial_buf[i]; + } + } + + NuandFirmwareStop(); +} + void bladeRFAppThread_Entry( uint32_t input) { uint8_t state; @@ -1404,30 +806,9 @@ void bladeRFAppThread_Entry( uint32_t input) bladeRFInit(); - NuandFirmwareStart(); - - NuandEnso(); - state = CyFxSpiTransfer(0, 0x100, glOtp, CyTrue); - NuandExso(); - - CyFxSpiTransfer(768, 0x100, glCal, CyTrue); - - { - char serial_buf[32]; - int i; - if (!NuandExtractField((void*)glOtp, 0x100, "S", serial_buf, 32)) { - for (i = 0; i < 32; i++) { - CyFxUSBSerial[2+i*2] = serial_buf[i]; - } - } - } - - NuandFirmwareStop(); - + ExtractSerial(); FpgaBeginProgram(); - - for (;;) { CyU3PThreadSleep (100); CyU3PGpifGetSMState(&state); @@ -1469,7 +850,6 @@ void CyFxApplicationDefine(void) int main(void) { CyU3PIoMatrixConfig_t io_cfg; - uint32_t i, tmpr, tmpw; CyU3PReturnStatus_t status = CY_U3P_SUCCESS; /* Initialize the device */ @@ -1484,21 +864,7 @@ int main(void) goto handle_fatal_error; } - for (i = 0; i < 256; i++) { - tmpr = i; - - tmpw = 0; -#define US_GPIF_2_FPP(GPIFbit, FPPbit) tmpw |= (tmpr & (1 << FPPbit)) ? (1 << GPIFbit) : 0; - US_GPIF_2_FPP(7, 0); - US_GPIF_2_FPP(15, 1); - US_GPIF_2_FPP(6, 2); - US_GPIF_2_FPP(2, 3); - US_GPIF_2_FPP(1, 4); - US_GPIF_2_FPP(3, 5); - US_GPIF_2_FPP(9, 6); - US_GPIF_2_FPP(11, 7); - glFlipLut[i] = tmpw; - } + NuandFpgaConfigSwInit(); io_cfg.useUart = CyTrue; io_cfg.useI2C = CyFalse; diff --git a/fx3_firmware/bladeRF.h b/fx3_firmware/bladeRF.h index ca5b5f9b..5c8155b5 100644 --- a/fx3_firmware/bladeRF.h +++ b/fx3_firmware/bladeRF.h @@ -1,9 +1,11 @@ #ifndef _INCLUDED_BLADE_H_ #define _INCLUDED_BLADE_H_ +#include #include "cyu3externcstart.h" #include "cyu3types.h" #include "cyu3usbconst.h" +#include "cyu3dma.h" #include "../firmware_common/bladeRF.h" #define BLADE_GPIF_16_32BIT_CONF_SELECT (0) @@ -46,20 +48,20 @@ extern const uint8_t CyFxUSBProductDscr[]; #include "cyu3externcend.h" -int FpgaBeginProgram(void); -void NuandFirmwareStart(void); -void NuandFirmwareStop(void); CyU3PReturnStatus_t CyFxSpiEraseSector(CyBool_t /* isErase */, uint8_t /* sector */); -void NuandEnso(); -void NuandExso(); -void NuandLockOtp(); void NuandGPIOReconfigure(CyBool_t /* fullGpif */, CyBool_t /* warm */); -int NuandExtractField(char * /* ptr */, int /* len */, char * /* field */, char * /* val */, size_t /* maxlen */); - -int FpgaBeginProgram(void); +void ClearDMAChannel(uint8_t ep, CyU3PDmaChannel * handle, uint32_t count, CyBool_t stall_only); +void CyFxAppErrorHandler(CyU3PReturnStatus_t apiRetStatus); extern uint32_t glAppMode; +struct NuandApplication { + void (*start)(void); + void (*stop)(void); + CyBool_t (*halt_endpoint)(CyBool_t set, uint16_t endpoint); + CyBool_t (*halted)(uint16_t endpoint, uint8_t *data); +}; + #define GPIO_nSTATUS 52 #define GPIO_nCONFIG 51 #define GPIO_CONFDONE 50 diff --git a/fx3_firmware/firmware.c b/fx3_firmware/firmware.c new file mode 100644 index 00000000..97af7cf3 --- /dev/null +++ b/fx3_firmware/firmware.c @@ -0,0 +1,172 @@ +#include "firmware.h" +#include +#include "cyu3spi.h" +#include "cyu3error.h" +#include "bladeRF.h" +#include "spi_flash_lib.h" + +static CyU3PReturnStatus_t FlashReadStatus(uint8_t *val) +{ + int status; + uint8_t read_status = 0x05; /* RDSTATUS */ + status = CyU3PSpiSetSsnLine (CyFalse); + status = CyU3PSpiTransmitWords (&read_status, 1); + status = CyU3PSpiReceiveWords(val, 1); + status = CyU3PSpiSetSsnLine (CyTrue); + + return status; +} + +CyU3PReturnStatus_t NuandLockOtp() { + CyU3PReturnStatus_t status = CY_U3P_SUCCESS; + uint8_t location[1]; + uint8_t read_status; + + status = FlashReadStatus(&read_status); + + location[0] = 0x06; /* Write enable. */ + status = CyU3PSpiSetSsnLine (CyFalse); + status = CyU3PSpiTransmitWords (location, 1); + status = CyU3PSpiSetSsnLine (CyTrue); + + status = FlashReadStatus(&read_status); + + location[0] = 0x2f;// WRSCUR + status = CyU3PSpiSetSsnLine (CyFalse); + status = CyU3PSpiTransmitWords (location, 1); + status = CyU3PSpiSetSsnLine (CyTrue); + + location[0] = 0x02;// Page program + status = CyU3PSpiSetSsnLine (CyFalse); + status = CyU3PSpiTransmitWords (location, 1); + status = CyU3PSpiSetSsnLine (CyTrue); + + location[0] = 0x2b; /* RDSCUR */ + status = CyU3PSpiSetSsnLine (CyFalse); + status = CyU3PSpiTransmitWords (location, 1); + status = CyU3PSpiReceiveWords(location, 1); + status = CyU3PSpiSetSsnLine (CyTrue); + + return status; +} + +CyU3PReturnStatus_t NuandEnso() { + CyU3PReturnStatus_t status = CY_U3P_SUCCESS; + uint8_t location[1]; + + location[0] = 0xb1; // ENSO + status = CyU3PSpiSetSsnLine (CyFalse); + status = CyU3PSpiTransmitWords (location, 1); + status = CyU3PSpiSetSsnLine (CyTrue); + + return status; +} + +CyU3PReturnStatus_t NuandExso() { + CyU3PReturnStatus_t status = CY_U3P_SUCCESS; + uint8_t location[1]; + + location[0] = 0xc1; // EXSO + status = CyU3PSpiSetSsnLine (CyFalse); + status = CyU3PSpiTransmitWords (location, 1); + status = CyU3PSpiSetSsnLine (CyTrue); + + return status; +} + +CyU3PReturnStatus_t NuandReadOtp(size_t offset, size_t size, void *buf) { + CyU3PReturnStatus_t status; + + status = NuandEnso(); + status = CyFxSpiTransfer(offset, size, buf, CyTrue); + status = NuandExso(); + + return status; +} + +CyU3PReturnStatus_t NuandWriteOtp(size_t offset, size_t size, void *buf) { + CyU3PReturnStatus_t status; + + status = NuandEnso(); + status = CyFxSpiTransfer(offset, size, buf, CyFalse); + status = NuandExso(); + + return status; +} + +void NuandFirmwareStart() { + CyU3PReturnStatus_t status = CY_U3P_SUCCESS; + + NuandGPIOReconfigure(CyFalse, CyFalse); + + status = CyFxSpiInit(); + + glAppMode = MODE_FW_CONFIG; +} + +void NuandFirmwareStop() { + CyFxSpiDeInit(); +} + +static inline size_t min_sz(size_t x, size_t y) +{ + return x < y ? x : y; +} + +/****** + * CRC16 implementation from http://softwaremonkey.org/Code/CRC16 + */ +typedef unsigned char byte; /* 8 bit unsigned */ +typedef unsigned short int word; /* 16 bit unsigned */ + +static word crc16mp(word crcval, void *data_p, word count) { + /* CRC-16 Routine for processing multiple part data blocks. + * Pass 0 into 'crcval' for first call for any given block; for + * subsequent calls pass the CRC returned by the previous call. */ + word xx; + byte *ptr=data_p; + + while (count-- > 0) { + crcval=(word)(crcval^(word)(((word)*ptr++)<<8)); + for (xx=0;xx<8;xx++) { + if(crcval&0x8000) { crcval=(word)((word)(crcval<<1)^0x1021); } + else { crcval=(word)(crcval<<1); } + } + } + return(crcval); +} + +int NuandExtractField(char *ptr, int len, char *field, + char *val, size_t maxlen) { + int c, wlen; + unsigned char *ub, *end; + unsigned short a1, a2; + int flen; + + flen = strlen(field); + + ub = (unsigned char *)ptr; + end = ub + len; + while (ub < end) { + c = *ub; + + if (c == 0xff) // flash and OTP are 0xff if they've never been written to + break; + + a1 = *(unsigned short *)(&ub[c+1]); // read checksum + a2 = crc16mp(0, ub, c+1); // calculated checksum + + if (a1 == a2 || 1) { + if (!strncmp((char *)ub + 1, field, flen)) { + wlen = min_sz(c - flen, maxlen); + strncpy(val, (char *)ub + 1 + flen, wlen); + val[wlen] = 0; + return 0; + } + } else { + return 1; + } + ub += c + 3; //skip past `c' bytes, 2 byte CRC field, and 1 byte len field + } + return 1; +} diff --git a/fx3_firmware/firmware.h b/fx3_firmware/firmware.h new file mode 100644 index 00000000..964c3116 --- /dev/null +++ b/fx3_firmware/firmware.h @@ -0,0 +1,17 @@ +#ifndef _FIRMWARE_H_ +#define _FIRMWARE_H_ + +#include +#include "cyu3error.h" + +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 NuandFirmwareStart(); +void NuandFirmwareStop(); + +int NuandExtractField(char *ptr, int len, char *field, + char *val, size_t maxlen); + +#endif /* _FIRMWARE_H_ */ diff --git a/fx3_firmware/fpga.c b/fx3_firmware/fpga.c new file mode 100644 index 00000000..dc7087c6 --- /dev/null +++ b/fx3_firmware/fpga.c @@ -0,0 +1,227 @@ +#include "bladeRF.h" +#include "cyu3error.h" +#include "cyu3gpio.h" +#include "cyu3usb.h" +#include "cyu3gpif.h" +#include "cyfxgpif_C4loader.h" + +/* DMA Channel for RF U2P (USB to P-port) transfers */ +static CyU3PDmaChannel glChHandlebladeRFUtoP; + +static uint32_t glDMARxCount = 0; /* Counter to track the number of buffers received + * from USB during FPGA programming */ +static uint16_t glFlipLut[256]; + + +void NuandFpgaConfigSwInit(void) { + uint32_t i, tmpr, tmpw; + + for (i = 0; i < 256; i++) { + tmpr = i; + + tmpw = 0; +#define US_GPIF_2_FPP(GPIFbit, FPPbit) tmpw |= (tmpr & (1 << FPPbit)) ? (1 << GPIFbit) : 0; + US_GPIF_2_FPP(7, 0); + US_GPIF_2_FPP(15, 1); + US_GPIF_2_FPP(6, 2); + US_GPIF_2_FPP(2, 3); + US_GPIF_2_FPP(1, 4); + US_GPIF_2_FPP(3, 5); + US_GPIF_2_FPP(9, 6); + US_GPIF_2_FPP(11, 7); + glFlipLut[i] = tmpw; + } +} + +/* DMA callback function to handle the produce events for U to P transfers. */ +static void bladeRFConfigUtoPDmaCallback(CyU3PDmaChannel *chHandle, CyU3PDmaCbType_t type, CyU3PDmaCBInput_t *input) +{ + CyU3PReturnStatus_t status = CY_U3P_SUCCESS; + + if (type == CY_U3P_DMA_CB_PROD_EVENT) { + int i; + + uint8_t *end_in_b = &( ((uint8_t *)input->buffer_p.buffer)[input->buffer_p.count - 1]); + uint32_t *end_in_w = &( ((uint32_t *)input->buffer_p.buffer)[input->buffer_p.count - 1]); + + + /* Flip the bits in such a way that the FPGA can be programmed + * This mapping can be determined by looking at the schematic */ + for (i = input->buffer_p.count - 1; i >= 0; i--) { + *end_in_w-- = glFlipLut[*end_in_b--]; + } + status = CyU3PDmaChannelCommitBuffer (chHandle, input->buffer_p.count * 4, 0); + if (status != CY_U3P_SUCCESS) { + CyU3PDebugPrint (4, "CyU3PDmaChannelCommitBuffer failed, Error code = %d\n", status); + } + + /* Increment the counter. */ + glDMARxCount++; + } +} + +static void NuandFpgaConfigStart(void) +{ + uint16_t size = 0; + CyU3PEpConfig_t epCfg; + CyU3PDmaChannelConfig_t dmaCfg; + CyU3PReturnStatus_t apiRetStatus = CY_U3P_SUCCESS; + CyU3PUSBSpeed_t usbSpeed = CyU3PUsbGetSpeed(); + static int first_call = 1; + + NuandGPIOReconfigure(CyTrue, !first_call); + first_call = 0; + + + /* Load the GPIF configuration for loading the FPGA */ + apiRetStatus = CyU3PGpifLoad(&C4loader_CyFxGpifConfig); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint (4, "CyU3PGpifLoad failed, Error Code = %d\n",apiRetStatus); + CyFxAppErrorHandler(apiRetStatus); + } + + /* Start the state machine. */ + apiRetStatus = CyU3PGpifSMStart(C4LOADER_START, C4LOADER_ALPHA_START); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint(4, "CyU3PGpifSMStart failed, Error Code = %d\n",apiRetStatus); + CyFxAppErrorHandler(apiRetStatus); + } + + /* Determine max packet size based on USB speed */ + switch (usbSpeed) + { + case CY_U3P_FULL_SPEED: + size = 64; + break; + + case CY_U3P_HIGH_SPEED: + size = 512; + break; + + case CY_U3P_SUPER_SPEED: + size = 1024; + break; + + default: + CyU3PDebugPrint(4, "Error! Invalid USB speed.\n"); + CyFxAppErrorHandler(CY_U3P_ERROR_FAILURE); + break; + } + + CyU3PMemSet((uint8_t *)&epCfg, 0, sizeof (epCfg)); + epCfg.enable = CyTrue; + epCfg.epType = CY_U3P_USB_EP_BULK; + epCfg.burstLen = 1; + epCfg.streams = 0; + epCfg.pcktSize = size; + + apiRetStatus = CyU3PSetEpConfig(BLADE_FPGA_EP_PRODUCER, &epCfg); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint(4, "CyU3PSetEpConfig failed, Error code = %d\n", apiRetStatus); + CyFxAppErrorHandler (apiRetStatus); + } + + dmaCfg.size = size * 4; + dmaCfg.count = BLADE_DMA_BUF_COUNT; + dmaCfg.prodSckId = BLADE_FPGA_CONFIG_SOCKET; + dmaCfg.consSckId = CY_U3P_PIB_SOCKET_3; + dmaCfg.dmaMode = CY_U3P_DMA_MODE_BYTE; + + /* Enable the callback for produce event, this is where the bits will get flipped */ + dmaCfg.notification = CY_U3P_DMA_CB_PROD_EVENT; + + dmaCfg.cb = bladeRFConfigUtoPDmaCallback; + dmaCfg.prodHeader = 0; + dmaCfg.prodFooter = size * 3; + dmaCfg.consHeader = 0; + dmaCfg.prodAvailCount = 0; + + apiRetStatus = CyU3PDmaChannelCreate(&glChHandlebladeRFUtoP, + CY_U3P_DMA_TYPE_MANUAL, &dmaCfg); + + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint(4, "CyU3PDmaChannelCreate failed, Error code = %d\n", apiRetStatus); + CyFxAppErrorHandler(apiRetStatus); + } + + /* Flush the endpoint memory */ + CyU3PUsbFlushEp(BLADE_FPGA_EP_PRODUCER); + + /* Set DMA channel transfer size. */ + apiRetStatus = CyU3PDmaChannelSetXfer(&glChHandlebladeRFUtoP, BLADE_DMA_TX_SIZE); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint(4, "CyU3PDmaChannelSetXfer Failed, Error code = %d\n", apiRetStatus); + CyFxAppErrorHandler(apiRetStatus); + } + + glAppMode = MODE_FPGA_CONFIG; +} + +void NuandFpgaConfigStop(void) +{ + CyU3PEpConfig_t epCfg; + CyU3PReturnStatus_t apiRetStatus = CY_U3P_SUCCESS; + + /* Flush the endpoint memory */ + CyU3PUsbFlushEp(BLADE_FPGA_EP_PRODUCER); + + /* Destroy the channel */ + CyU3PDmaChannelDestroy(&glChHandlebladeRFUtoP); + + /* Disable endpoints. */ + CyU3PMemSet((uint8_t *)&epCfg, 0, sizeof (epCfg)); + epCfg.enable = CyFalse; + + /* Producer endpoint configuration. */ + apiRetStatus = CyU3PSetEpConfig(BLADE_FPGA_EP_PRODUCER, &epCfg); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint (4, "CyU3PSetEpConfig failed, Error code = %d\n", apiRetStatus); + CyFxAppErrorHandler (apiRetStatus); + } + + CyU3PGpifDisable(CyTrue); + + glAppMode = MODE_NO_CONFIG; +} + +uint8_t FPGA_status_bits[] = { + [BLADE_FPGA_EP_PRODUCER] = 0, +}; + +CyBool_t NuandFpgaConfigHaltEndpoint(CyBool_t set, uint16_t endpoint) +{ + CyBool_t isHandled = CyFalse; + + switch(endpoint) { + case BLADE_FPGA_EP_PRODUCER: + FPGA_status_bits[endpoint] = set; + ClearDMAChannel(endpoint, &glChHandlebladeRFUtoP, + BLADE_DMA_TX_SIZE, set); + + isHandled = CyTrue; + break; + } + + return isHandled; +} + +CyBool_t NuandFpgaConfigHalted(uint16_t endpoint, uint8_t * data) +{ + CyBool_t isHandled = CyFalse; + + switch(endpoint) { + case BLADE_FPGA_EP_PRODUCER: + *data = FPGA_status_bits[endpoint]; + isHandled = CyTrue; + break; + } + + return isHandled; +} + +const struct NuandApplication NuandFpgaConfig = { + .start = NuandFpgaConfigStart, + .stop = NuandFpgaConfigStop, + .halt_endpoint = NuandFpgaConfigHaltEndpoint, + .halted = NuandFpgaConfigHalted, +}; diff --git a/fx3_firmware/fpga.h b/fx3_firmware/fpga.h new file mode 100644 index 00000000..07b97abb --- /dev/null +++ b/fx3_firmware/fpga.h @@ -0,0 +1,9 @@ +#ifndef _FPGA_H_ +#define _FPGA_H_ + +#include "bladeRF.h" + +void NuandFpgaConfigSwInit(void); +extern const struct NuandApplication NuandFpgaConfig; + +#endif /* _FPGA_H_ */ diff --git a/fx3_firmware/rf.c b/fx3_firmware/rf.c new file mode 100644 index 00000000..9282dfd1 --- /dev/null +++ b/fx3_firmware/rf.c @@ -0,0 +1,438 @@ +#include "rf.h" +#include "cyu3error.h" +#include "cyu3gpio.h" +#include "cyu3usb.h" +#include "cyu3gpif.h" +#include "cyfxgpif_RFlink.h" +#include "cyu3uart.h" + +static CyU3PDmaChannel glChHandlebladeRFUtoUART; /* DMA Channel for U2P transfers */ +static CyU3PDmaChannel glChHandlebladeRFUARTtoU; /* DMA Channel for U2P transfers */ + +static CyU3PDmaChannel glChHandleUtoP; +static CyU3PDmaChannel glChHandlePtoU; + +static void UartBridgeStart(void) +{ + uint16_t size = 0; + CyU3PEpConfig_t epCfg; + CyU3PUSBSpeed_t usbSpeed = CyU3PUsbGetSpeed(); + + CyU3PDmaChannelConfig_t dmaCfg; + CyU3PUartConfig_t uartConfig; + CyU3PReturnStatus_t apiRetStatus = CY_U3P_SUCCESS; + + + /* Initialize the UART for printing debug messages */ + apiRetStatus = CyU3PUartInit(); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyFxAppErrorHandler(apiRetStatus); + } + + /* Set UART configuration */ + CyU3PMemSet ((uint8_t *)&uartConfig, 0, sizeof (uartConfig)); + uartConfig.baudRate = CY_U3P_UART_BAUDRATE_115200; + uartConfig.stopBit = CY_U3P_UART_ONE_STOP_BIT; + uartConfig.parity = CY_U3P_UART_NO_PARITY; + uartConfig.txEnable = CyTrue; + uartConfig.rxEnable = CyTrue; + uartConfig.flowCtrl = CyFalse; + uartConfig.isDma = CyTrue; + + apiRetStatus = CyU3PUartSetConfig (&uartConfig, NULL); + if (apiRetStatus != CY_U3P_SUCCESS) + { + CyFxAppErrorHandler(apiRetStatus); + } + + /* Set UART Tx and Rx transfer Size to infinite */ + apiRetStatus = CyU3PUartTxSetBlockXfer(0xFFFFFFFF); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyFxAppErrorHandler(apiRetStatus); + } + + apiRetStatus = CyU3PUartRxSetBlockXfer(0xFFFFFFFF); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyFxAppErrorHandler(apiRetStatus); + } + + + /* Determine max packet size based on USB speed */ + switch (usbSpeed) + { + case CY_U3P_FULL_SPEED: + size = 64; + break; + + case CY_U3P_HIGH_SPEED: + size = 512; + break; + + case CY_U3P_SUPER_SPEED: + size = 1024; + break; + + default: + CyU3PDebugPrint (4, "Error! Invalid USB speed.\n"); + CyFxAppErrorHandler (CY_U3P_ERROR_FAILURE); + break; + } + + CyU3PMemSet ((uint8_t *)&epCfg, 0, sizeof (epCfg)); + epCfg.enable = CyTrue; + epCfg.epType = CY_U3P_USB_EP_BULK; + epCfg.burstLen = 1; + epCfg.streams = 0; + epCfg.pcktSize = size; + + /* Producer endpoint configuration */ + apiRetStatus = CyU3PSetEpConfig(BLADE_UART_EP_PRODUCER, &epCfg); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint (4, "CyU3PSetEpConfig failed, Error code = %d\n", apiRetStatus); + CyFxAppErrorHandler (apiRetStatus); + } + + /* Consumer endpoint configuration */ + apiRetStatus = CyU3PSetEpConfig(BLADE_UART_EP_CONSUMER, &epCfg); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint (4, "CyU3PSetEpConfig failed, Error code = %d\n", apiRetStatus); + CyFxAppErrorHandler (apiRetStatus); + } + + CyU3PMemSet((uint8_t *)&dmaCfg, 0, sizeof(dmaCfg)); + dmaCfg.size = 16; + dmaCfg.count = 10; + dmaCfg.prodSckId = CY_U3P_UIB_SOCKET_PROD_2; + dmaCfg.consSckId = CY_U3P_LPP_SOCKET_UART_CONS; + dmaCfg.dmaMode = CY_U3P_DMA_MODE_BYTE; + dmaCfg.notification = 0; + dmaCfg.cb = 0; + dmaCfg.prodHeader = 0; + dmaCfg.prodFooter = 0; + dmaCfg.consHeader = 0; + dmaCfg.prodAvailCount = 0; + + apiRetStatus = CyU3PDmaChannelCreate(&glChHandlebladeRFUtoUART, + CY_U3P_DMA_TYPE_AUTO, &dmaCfg); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint (4, "CyU3PDmaChannelCreate failed, Error code = %d\n", apiRetStatus); + CyFxAppErrorHandler(apiRetStatus); + } + + dmaCfg.prodSckId = CY_U3P_LPP_SOCKET_UART_PROD; + dmaCfg.consSckId = CY_U3P_UIB_SOCKET_CONS_2; + apiRetStatus = CyU3PDmaChannelCreate(&glChHandlebladeRFUARTtoU, + CY_U3P_DMA_TYPE_AUTO, &dmaCfg); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint (4, "CyU3PDmaChannelCreate failed, Error code = %d\n", apiRetStatus); + CyFxAppErrorHandler(apiRetStatus); + } + + /* Flush the endpoint memory */ + CyU3PUsbFlushEp(BLADE_UART_EP_PRODUCER); + CyU3PUsbFlushEp(BLADE_UART_EP_CONSUMER); + + /* Set DMA channel transfer size */ + apiRetStatus = CyU3PDmaChannelSetXfer(&glChHandlebladeRFUtoUART, BLADE_DMA_TX_SIZE); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint (4, "CyU3PDmaChannelSetXfer Failed, Error code = %d\n", apiRetStatus); + CyFxAppErrorHandler(apiRetStatus); + } + + apiRetStatus = CyU3PDmaChannelSetXfer(&glChHandlebladeRFUARTtoU, BLADE_DMA_TX_SIZE); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint (4, "CyU3PDmaChannelSetXfer Failed, Error code = %d\n", apiRetStatus); + CyFxAppErrorHandler(apiRetStatus); + } + + /* Set UART Tx and Rx transfer Size to infinite */ + apiRetStatus = CyU3PUartTxSetBlockXfer(0xFFFFFFFF); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyFxAppErrorHandler(apiRetStatus); + } + + apiRetStatus = CyU3PUartRxSetBlockXfer(0xFFFFFFFF); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyFxAppErrorHandler(apiRetStatus); + } +} + +static void UartBridgeStop(void) +{ + CyU3PEpConfig_t epCfg; + CyU3PReturnStatus_t apiRetStatus = CY_U3P_SUCCESS; + + /* Flush the endpoint memory */ + CyU3PUsbFlushEp(BLADE_UART_EP_PRODUCER); + CyU3PUsbFlushEp(BLADE_UART_EP_CONSUMER); + + /* Destroy the channel */ + CyU3PDmaChannelDestroy(&glChHandlebladeRFUARTtoU); + CyU3PDmaChannelDestroy(&glChHandlebladeRFUtoUART); + + /* Disable endpoints. */ + CyU3PMemSet((uint8_t *)&epCfg, 0, sizeof (epCfg)); + epCfg.enable = CyFalse; + + /* Producer endpoint configuration. */ + apiRetStatus = CyU3PSetEpConfig(BLADE_UART_EP_PRODUCER, &epCfg); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint (4, "CyU3PSetEpConfig failed, Error code = %d\n", apiRetStatus); + CyFxAppErrorHandler (apiRetStatus); + } + + apiRetStatus = CyU3PSetEpConfig(BLADE_UART_EP_CONSUMER, &epCfg); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint (4, "CyU3PSetEpConfig failed, Error code = %d\n", apiRetStatus); + CyFxAppErrorHandler (apiRetStatus); + } + CyU3PUartDeInit(); +} + + +/* This function starts the RF data transport mechanism. This is the second + * interface of the first and only descriptor. */ +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(); + + NuandGPIOReconfigure(CyTrue, CyTrue); + + /* Load the GPIF configuration for loading the RF transceiver */ + apiRetStatus = CyU3PGpifLoad(&Rflink_CyFxGpifConfig); + if (apiRetStatus != CY_U3P_SUCCESS) + { + CyU3PDebugPrint (4, "CyU3PGpifLoad failed, Error Code = %d\n",apiRetStatus); + CyFxAppErrorHandler(apiRetStatus); + } + + // strobe the RESET pin to the FPGA + CyU3PGpioSetValue(GPIO_SYS_RST, CyTrue); + CyU3PGpioSetValue(GPIO_SYS_RST, CyFalse); + + /* Start the state machine. */ + apiRetStatus = CyU3PGpifSMStart(RFLINK_START, RFLINK_ALPHA_START); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint(4, "CyU3PGpifSMStart failed, Error Code = %d\n",apiRetStatus); + CyFxAppErrorHandler(apiRetStatus); + } + + /* Determine max packet size based on USB speed */ + switch (usbSpeed) + { + case CY_U3P_FULL_SPEED: + size = 64; + break; + + case CY_U3P_HIGH_SPEED: + size = 512; + break; + + case CY_U3P_SUPER_SPEED: + size = 1024; + break; + + default: + CyU3PDebugPrint (4, "Error! Invalid USB speed.\n"); + CyFxAppErrorHandler (CY_U3P_ERROR_FAILURE); + break; + } + + CyU3PMemSet ((uint8_t *)&epCfg, 0, sizeof (epCfg)); + epCfg.enable = CyTrue; + epCfg.epType = CY_U3P_USB_EP_BULK; + epCfg.burstLen = (usbSpeed == CY_U3P_SUPER_SPEED ? 15 : 1); + epCfg.streams = 0; + epCfg.pcktSize = size; + + /* Producer endpoint configuration */ + apiRetStatus = CyU3PSetEpConfig(BLADE_RF_SAMPLE_EP_PRODUCER, &epCfg); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint(4, "CyU3PSetEpConfig failed, Error code = %d\n", apiRetStatus); + CyFxAppErrorHandler (apiRetStatus); + } + + /* Consumer endpoint configuration */ + apiRetStatus = CyU3PSetEpConfig(BLADE_RF_SAMPLE_EP_CONSUMER, &epCfg); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint(4, "CyU3PSetEpConfig failed, Error code = %d\n", apiRetStatus); + 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; + dmaCfg.prodSckId = BLADE_RF_SAMPLE_EP_PRODUCER_USB_SOCKET; + dmaCfg.consSckId = CY_U3P_PIB_SOCKET_3; + dmaCfg.dmaMode = CY_U3P_DMA_MODE_BYTE; + dmaCfg.notification = 0; + dmaCfg.cb = 0; + dmaCfg.prodHeader = 0; + dmaCfg.prodFooter = 0; + dmaCfg.consHeader = 0; + dmaCfg.prodAvailCount = 0; + + apiRetStatus = CyU3PDmaChannelCreate(&glChHandleUtoP, CY_U3P_DMA_TYPE_AUTO, &dmaCfg); + + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint(4, "CyU3PDmaMultiChannelCreate failed, Error code = %d\n", apiRetStatus); + CyFxAppErrorHandler(apiRetStatus); + } + + dmaCfg.prodSckId = CY_U3P_PIB_SOCKET_0; + dmaCfg.consSckId = BLADE_RF_SAMPLE_EP_CONSUMER_USB_SOCKET; + apiRetStatus = CyU3PDmaChannelCreate(&glChHandlePtoU, CY_U3P_DMA_TYPE_AUTO, &dmaCfg); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint(4, "CyU3PDmaMultiChannelCreate failed, Error code = %d\n", apiRetStatus); + CyFxAppErrorHandler(apiRetStatus); + } + + /* Flush the Endpoint memory */ + CyU3PUsbFlushEp(BLADE_RF_SAMPLE_EP_PRODUCER); + CyU3PUsbFlushEp(BLADE_RF_SAMPLE_EP_CONSUMER); + + /* Set DMA channel transfer size. */ + + apiRetStatus = CyU3PDmaChannelSetXfer (&glChHandleUtoP, BLADE_DMA_TX_SIZE); + + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint(4, "CyU3PDmaChannelSetXfer Failed, Error code = %d\n", apiRetStatus); + CyFxAppErrorHandler(apiRetStatus); + } + + apiRetStatus = CyU3PDmaChannelSetXfer (&glChHandlePtoU, BLADE_DMA_TX_SIZE); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint(4, "CyU3PDmaChannelSetXfer Failed, Error code = %d\n", apiRetStatus); + CyFxAppErrorHandler(apiRetStatus); + } + + + UartBridgeStart(); + glAppMode = MODE_RF_CONFIG; + +} + +/* This function stops the slave FIFO loop application. This shall be called + * whenever a RESET or DISCONNECT event is received from the USB host. The + * endpoints are disabled and the DMA pipe is destroyed by this function. */ +static void NuandRFLinkStop (void) +{ + CyU3PEpConfig_t epCfg; + CyU3PReturnStatus_t apiRetStatus = CY_U3P_SUCCESS; + + /* Flush endpoint memory buffers */ + CyU3PUsbFlushEp(BLADE_RF_SAMPLE_EP_PRODUCER); + CyU3PUsbFlushEp(BLADE_RF_SAMPLE_EP_CONSUMER); + + /* Destroy the channels */ + CyU3PDmaChannelDestroy(&glChHandleUtoP); + CyU3PDmaChannelDestroy(&glChHandlePtoU); + + /* Disable endpoints. */ + CyU3PMemSet ((uint8_t *)&epCfg, 0, sizeof (epCfg)); + epCfg.enable = CyFalse; + + /* Disable producer endpoint */ + apiRetStatus = CyU3PSetEpConfig(BLADE_RF_SAMPLE_EP_PRODUCER, &epCfg); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint(4, "CyU3PSetEpConfig failed, Error code = %d\n", apiRetStatus); + CyFxAppErrorHandler(apiRetStatus); + } + + /* Disable consumer endpoint */ + apiRetStatus = CyU3PSetEpConfig(BLADE_RF_SAMPLE_EP_CONSUMER, &epCfg); + if (apiRetStatus != CY_U3P_SUCCESS) { + CyU3PDebugPrint(4, "CyU3PSetEpConfig failed, Error code = %d\n", apiRetStatus); + CyFxAppErrorHandler(apiRetStatus); + } + + /* Reset the GPIF */ + CyU3PGpifDisable(CyTrue); + + UartBridgeStop(); + glAppMode = MODE_NO_CONFIG; +} + +static uint8_t RF_status_bits[] = { + [BLADE_RF_SAMPLE_EP_PRODUCER] = 0, + [BLADE_RF_SAMPLE_EP_CONSUMER] = 0, + [BLADE_UART_EP_PRODUCER] = 0, + [BLADE_UART_EP_CONSUMER] = 0, +}; + +CyBool_t NuandRFLinkHaltEndpoint(CyBool_t set, uint16_t endpoint) +{ + CyBool_t isHandled = CyFalse; + + switch(endpoint) { + case BLADE_RF_SAMPLE_EP_PRODUCER: + case BLADE_RF_SAMPLE_EP_CONSUMER: + case BLADE_UART_EP_PRODUCER: + case BLADE_UART_EP_CONSUMER: + isHandled = CyTrue; + RF_status_bits[endpoint] = set; + break; + } + + switch(endpoint) { + case BLADE_RF_SAMPLE_EP_PRODUCER: + ClearDMAChannel(endpoint, &glChHandleUtoP, BLADE_DMA_TX_SIZE, set); + break; + case BLADE_RF_SAMPLE_EP_CONSUMER: + ClearDMAChannel(endpoint, &glChHandlePtoU, BLADE_DMA_TX_SIZE, set); + break; + case BLADE_UART_EP_PRODUCER: + ClearDMAChannel(endpoint, &glChHandlebladeRFUtoUART, BLADE_DMA_TX_SIZE, set); + break; + case BLADE_UART_EP_CONSUMER: + ClearDMAChannel(endpoint, &glChHandlebladeRFUARTtoU, BLADE_DMA_TX_SIZE, set); + break; + } + + return isHandled; +} + +CyBool_t NuandRFLinkHalted(uint16_t endpoint, uint8_t * data) +{ + CyBool_t isHandled = CyFalse; + + switch(endpoint) { + case BLADE_RF_SAMPLE_EP_PRODUCER: + case BLADE_RF_SAMPLE_EP_CONSUMER: + case BLADE_UART_EP_PRODUCER: + case BLADE_UART_EP_CONSUMER: + *data = RF_status_bits[endpoint]; + isHandled = CyTrue; + break; + } + + return isHandled; +} + +const struct NuandApplication NuandRFLink = { + .start = NuandRFLinkStart, + .stop = NuandRFLinkStop, + .halt_endpoint = NuandRFLinkHaltEndpoint, + .halted = NuandRFLinkHalted, +}; diff --git a/fx3_firmware/rf.h b/fx3_firmware/rf.h new file mode 100644 index 00000000..4a1de9d2 --- /dev/null +++ b/fx3_firmware/rf.h @@ -0,0 +1,8 @@ +#ifndef _RF_H_ +#define _RF_H_ + +#include "bladeRF.h" + +extern const struct NuandApplication NuandRFLink; + +#endif /* _RF_H_ */ diff --git a/fx3_firmware/spi_flash_lib.c b/fx3_firmware/spi_flash_lib.c index 2bc84c16..514fc4d5 100644 --- a/fx3_firmware/spi_flash_lib.c +++ b/fx3_firmware/spi_flash_lib.c @@ -20,10 +20,9 @@ #include "cyu3spi.h" #include "spi_flash_lib.h" -uint16_t glSpiPageSize = 0x100; /* SPI Page size to be used for transfers. */ /* SPI initialization for application. */ -CyU3PReturnStatus_t CyFxSpiInit(uint16_t pageLen) +CyU3PReturnStatus_t CyFxSpiInit(void) { CyU3PSpiConfig_t spiConfig; CyU3PReturnStatus_t status = CY_U3P_SUCCESS; @@ -102,18 +101,18 @@ CyU3PReturnStatus_t CyFxSpiTransfer(uint16_t pageAddress, uint16_t byteCount, ui { uint8_t location[4]; uint32_t byteAddress = 0; - uint16_t pageCount = (byteCount / glSpiPageSize); + uint16_t pageCount = (byteCount / FLASH_PAGE_SIZE); CyU3PReturnStatus_t status = CY_U3P_SUCCESS; if (byteCount == 0) { return CY_U3P_SUCCESS; } - if ((byteCount % glSpiPageSize) != 0) { - pageCount ++; + if ((byteCount % FLASH_PAGE_SIZE) != 0) { + return CY_U3P_ERROR_NOT_SUPPORTED; } - byteAddress = pageAddress * glSpiPageSize; + byteAddress = pageAddress * FLASH_PAGE_SIZE; while (pageCount != 0) { location[1] = (byteAddress >> 16) & 0xFF; /* MS byte */ @@ -136,7 +135,7 @@ CyU3PReturnStatus_t CyFxSpiTransfer(uint16_t pageAddress, uint16_t byteCount, ui return status; } - status = CyU3PSpiReceiveWords(buffer, glSpiPageSize); + status = CyU3PSpiReceiveWords(buffer, FLASH_PAGE_SIZE); if (status != CY_U3P_SUCCESS) { CyU3PSpiSetSsnLine(CyTrue); return status; @@ -158,7 +157,7 @@ CyU3PReturnStatus_t CyFxSpiTransfer(uint16_t pageAddress, uint16_t byteCount, ui return status; } - status = CyU3PSpiTransmitWords(buffer, glSpiPageSize); + status = CyU3PSpiTransmitWords(buffer, FLASH_PAGE_SIZE); if (status != CY_U3P_SUCCESS) { CyU3PSpiSetSsnLine(CyTrue); return status; @@ -167,8 +166,8 @@ CyU3PReturnStatus_t CyFxSpiTransfer(uint16_t pageAddress, uint16_t byteCount, ui CyU3PSpiSetSsnLine(CyTrue); } - byteAddress += glSpiPageSize; - buffer += glSpiPageSize; + byteAddress += FLASH_PAGE_SIZE; + buffer += FLASH_PAGE_SIZE; pageCount--; CyU3PThreadSleep(15); @@ -177,65 +176,6 @@ CyU3PReturnStatus_t CyFxSpiTransfer(uint16_t pageAddress, uint16_t byteCount, ui return CY_U3P_SUCCESS; } -void NuandLockOtp() { - CyU3PReturnStatus_t status = CY_U3P_SUCCESS; - uint8_t location[4]; - - location[0] = 0x05; /* RDSTATUS */ - CyU3PSpiSetSsnLine (CyFalse); - status = CyU3PSpiTransmitWords (location, 1); - status = CyU3PSpiReceiveWords(location, 1); - CyU3PSpiSetSsnLine (CyTrue); - - location[0] = 0x06; /* Write enable. */ - - CyU3PSpiSetSsnLine (CyFalse); - status = CyU3PSpiTransmitWords (location, 1); - CyU3PSpiSetSsnLine (CyTrue); - - location[0] = 0x05; /* RDSTATUS */ - CyU3PSpiSetSsnLine (CyFalse); - status = CyU3PSpiTransmitWords (location, 1); - status = CyU3PSpiReceiveWords(location, 1); - CyU3PSpiSetSsnLine (CyTrue); - - CyU3PSpiSetSsnLine (CyFalse); - location[0] = 0x2f;// WRSCUR - status = CyU3PSpiTransmitWords (location, 1); - CyU3PSpiSetSsnLine (CyTrue); - CyU3PSpiSetSsnLine (CyFalse); - location[0] = 0x2;// WRSCUR - status = CyU3PSpiTransmitWords (location, 1); - CyU3PSpiSetSsnLine (CyTrue); - - location[0] = 0x2b; /* RDSCUR */ - CyU3PSpiSetSsnLine (CyFalse); - status = CyU3PSpiTransmitWords (location, 1); - status = CyU3PSpiReceiveWords(location, 1); - CyU3PSpiSetSsnLine (CyTrue); -} - -void NuandEnso() { - CyU3PReturnStatus_t status = CY_U3P_SUCCESS; - uint8_t location[4]; - - location[0] = 0xb1; // ENSO - CyU3PSpiSetSsnLine (CyFalse); - status = CyU3PSpiTransmitWords (location, 1); - CyU3PSpiSetSsnLine (CyTrue); -} - - -void NuandExso() { - CyU3PReturnStatus_t status = CY_U3P_SUCCESS; - uint8_t location[4]; - - location[0] = 0xc1; // EXSO - CyU3PSpiSetSsnLine (CyFalse); - status = CyU3PSpiTransmitWords (location, 1); - CyU3PSpiSetSsnLine (CyTrue); -} - /* Function to erase SPI flash sectors. */ CyU3PReturnStatus_t CyFxSpiEraseSector(CyBool_t isErase, uint8_t sector) { @@ -274,82 +214,3 @@ CyU3PReturnStatus_t CyFxSpiEraseSector(CyBool_t isErase, uint8_t sector) return status; } - -void NuandFirmwareStart() { - CyU3PReturnStatus_t status = CY_U3P_SUCCESS; - - NuandGPIOReconfigure(CyFalse, CyFalse); - FpgaBeginProgram(); - - status = CyFxSpiInit(0x100); - - glAppMode = MODE_FW_CONFIG; -} - -void NuandFirmwareStop() { - CyFxSpiDeInit(); -} - - -/****** - * CRC16 implementation from http://softwaremonkey.org/Code/CRC16 - */ -typedef unsigned char byte; /* 8 bit unsigned */ -typedef unsigned short int word; /* 16 bit unsigned */ - -static word crc16mp(word crcval, void *data_p, word count) { - /* CRC-16 Routine for processing multiple part data blocks. - * Pass 0 into 'crcval' for first call for any given block; for - * subsequent calls pass the CRC returned by the previous call. */ - word xx; - byte *ptr=data_p; - - while (count-- > 0) { - crcval=(word)(crcval^(word)(((word)*ptr++)<<8)); - for (xx=0;xx<8;xx++) { - if(crcval&0x8000) { crcval=(word)((word)(crcval<<1)^0x1021); } - else { crcval=(word)(crcval<<1); } - } - } - return(crcval); -} - -static inline size_t min_sz(size_t x, size_t y) -{ - return x < y ? x : y; -} - -int NuandExtractField(char *ptr, int len, char *field, - char *val, size_t maxlen) { - int c, wlen; - unsigned char *ub, *end; - unsigned short a1, a2; - int flen; - - flen = strlen(field); - - ub = (unsigned char *)ptr; - end = ub + len; - while (ub < end) { - c = *ub; - - if (c == 0xff) // flash and OTP are 0xff if they've never been written to - break; - - a1 = *(unsigned short *)(&ub[c+1]); // read checksum - a2 = crc16mp(0, ub, c+1); // calculated checksum - - if (a1 == a2 || 1) { - if (!strncmp((char *)ub + 1, field, flen)) { - wlen = min_sz(c - flen, maxlen); - strncpy(val, (char *)ub + 1 + flen, wlen); - val[wlen] = 0; - return 0; - } - } else { - return 1; - } - ub += c + 3; //skip past `c' bytes, 2 byte CRC field, and 1 byte len field - } - return 1; -} diff --git a/fx3_firmware/spi_flash_lib.h b/fx3_firmware/spi_flash_lib.h index 199a996b..25931712 100644 --- a/fx3_firmware/spi_flash_lib.h +++ b/fx3_firmware/spi_flash_lib.h @@ -1,7 +1,10 @@ #ifndef _SPI_FLASH_LIB_H_ #define _SPI_FLASH_LIB_H_ -CyU3PReturnStatus_t CyFxSpiInit(uint16_t pageLen); +#define FLASH_PAGE_SIZE 0x100 /* SPI Page size to be used for transfers. */ + +CyU3PReturnStatus_t CyFxSpiInit(); +CyU3PReturnStatus_t CyFxSpiDeInit(); CyU3PReturnStatus_t CyFxSpiTransfer(uint16_t pageAddress, uint16_t byteCount, uint8_t *buffer, CyBool_t isRead); #endif diff --git a/host/common/include/host_config.h.in b/host/common/include/host_config.h.in index 5ac88b73..bfc4185f 100644 --- a/host/common/include/host_config.h.in +++ b/host/common/include/host_config.h.in @@ -21,6 +21,8 @@ * LE16_TO_HOST 16-bit little endian to host endianness conversion * HOST_TO_BE16 16-bit host endianness to big endian conversion * BE16_TO_HOST 16-bit big endian to host endianness conversion + * HOST_TO_LE32 32-bit host endianness to little endian conversion + * LE32_TO_HOST 32-bit little endian to host endianness conversion ******************************************************************************/ /*----------------------- @@ -33,6 +35,8 @@ #define LE16_TO_HOST(val) le16toh(val) #define HOST_TO_BE16(val) htobe16(val) #define BE16_TO_HOST(val) be16toh(val) +#define HOST_TO_LE32(val) htole32(val) +#define LE32_TO_HOST(val) le32toh(val) /*----------------------- * Apple OSX @@ -44,6 +48,8 @@ #define LE16_TO_HOST(val) OSSwapLittleToHostInt16(val) #define HOST_TO_BE16(val) OSSwapHostToBigInt16(val) #define BE16_TO_HOST(val) OSSwapBigToHostInt16(val) +#define HOST_TO_LE32(val) OSSwapHostToLittleInt32(val) +#define LE32_TO_HOST(val) OSSwapLittleToHostInt32(val) /*----------------------- * Windows @@ -58,6 +64,8 @@ #define LE16_TO_HOST(val) (val) #define HOST_TO_BE16(val) _byteswap_ushort(val) #define BE16_TO_HOST(val) _byteswap_ushort(val) +#define HOST_TO_LE32(val) (val) +#define LE32_TO_HOST(val) (val) /*----------------------- * Unsupported or bug diff --git a/host/libraries/libbladeRF/CMakeLists.txt b/host/libraries/libbladeRF/CMakeLists.txt index 47a46579..21d8f182 100644 --- a/host/libraries/libbladeRF/CMakeLists.txt +++ b/host/libraries/libbladeRF/CMakeLists.txt @@ -14,7 +14,7 @@ project(libbladeRF C) ################################################################################ set(VERSION_INFO_MAJOR 0) -set(VERSION_INFO_MINOR 4) +set(VERSION_INFO_MINOR 5) set(VERSION_INFO_PATCH 0) set(VERSION_INFO_EXTRA "git") include(Version) diff --git a/host/libraries/libbladeRF/src/backend/libusb.c b/host/libraries/libbladeRF/src/backend/libusb.c index 60ba58e9..eeb1d8a6 100644 --- a/host/libraries/libbladeRF/src/backend/libusb.c +++ b/host/libraries/libbladeRF/src/backend/libusb.c @@ -123,7 +123,7 @@ static int vendor_command_int(struct bladerf *dev, status = BLADERF_ERR_IO; } else { if( ep_dir == EP_DIR_IN ) { - *val = buf; + *val = LE32_TO_HOST(buf); } status = 0; } @@ -131,6 +131,72 @@ static int vendor_command_int(struct bladerf *dev, return status; } +/* Quick wrapper for vendor commands that get/send a 32-bit integer value + wValue */ +static int vendor_command_int_value(struct bladerf *dev, + uint16_t cmd, uint16_t wValue, int32_t *val) +{ + int32_t buf; + int status; + struct bladerf_lusb *lusb = dev->backend; + + status = libusb_control_transfer( + lusb->handle, + LIBUSB_RECIPIENT_INTERFACE | LIBUSB_REQUEST_TYPE_VENDOR | EP_DIR_IN, + cmd, + wValue, + 0, + (unsigned char *)&buf, + sizeof(buf), + BLADERF_LIBUSB_TIMEOUT_MS + ); + + if (status < 0) { + log_error( "status < 0: %s\n", libusb_error_name(status) ); + status = error_libusb2bladerf(status); + } else if (status != sizeof(buf)) { + log_error( "status != sizeof(buf): %s\n", libusb_error_name(status) ); + status = BLADERF_ERR_IO; + } else { + *val = LE32_TO_HOST(buf); + status = 0; + } + + return status; +} + +/* Quick wrapper for vendor commands that get/send a 32-bit integer value + wIndex */ +static int vendor_command_int_index(struct bladerf *dev, + uint16_t cmd, uint16_t wIndex, int32_t *val) +{ + int32_t buf; + int status; + struct bladerf_lusb *lusb = dev->backend; + + status = libusb_control_transfer( + lusb->handle, + LIBUSB_RECIPIENT_INTERFACE | LIBUSB_REQUEST_TYPE_VENDOR | EP_DIR_IN, + cmd, + 0, + wIndex, + (unsigned char *)&buf, + sizeof(buf), + BLADERF_LIBUSB_TIMEOUT_MS + ); + + if (status < 0) { + log_error( "status < 0: %s\n", libusb_error_name(status) ); + status = error_libusb2bladerf(status); + } else if (status != sizeof(buf)) { + log_error( "status != sizeof(buf): %s\n", libusb_error_name(status) ); + status = BLADERF_ERR_IO; + } else { + *val = LE32_TO_HOST(buf); + status = 0; + } + + return status; +} + static int begin_fpga_programming(struct bladerf *dev) { int result; @@ -277,9 +343,40 @@ static int change_setting(struct bladerf *dev, uint8_t setting) } } +static void enable_rf(struct bladerf *dev) { + int32_t fx3_ret = -1; + int status; + uint16_t val; + + status = change_setting(dev, USB_IF_RF_LINK); + log_info( "Changed into RF link mode: %s\n", libusb_error_name(status) ) ; + val = 1; + status = vendor_command_int_value( + dev, BLADE_USB_CMD_RF_RX, + val, &fx3_ret); + if(status) { + log_warning("Could not enable RF RX (%d): %s\n", + status, libusb_error_name(status) ); + } else if(fx3_ret) { + log_warning("Error enabling RF RX (%d)\n", + fx3_ret ); + } + + status = vendor_command_int_value( + dev, BLADE_USB_CMD_RF_TX, + val, &fx3_ret); + if(status) { + log_warning("Could not enable RF TX (%d): %s\n", + status, libusb_error_name(status) ); + } else if(fx3_ret) { + log_warning("Error enabling RF RX (%d)\n", + fx3_ret ); + } +} + static int lusb_open(struct bladerf **device, struct bladerf_devinfo *info) { - int status, i, n, inf, val; + int status, i, n, inf; int fx3_status; ssize_t count; struct bladerf *dev = NULL; @@ -395,18 +492,7 @@ static int lusb_open(struct bladerf **device, struct bladerf_devinfo *info) if (dev) { if (lusb_is_fpga_configured(dev)) { - status = change_setting(dev, USB_IF_RF_LINK); - log_info( "Changed into RF link mode: %s\n", libusb_error_name(status) ) ; - val = 1; - status = vendor_command_int(dev, BLADE_USB_CMD_RF_RX, EP_DIR_OUT, &val); - if(status) { - log_warning("Could not enable RF RX (%d): %s\n", status, libusb_error_name(status) ); - } - - status = vendor_command_int(dev, BLADE_USB_CMD_RF_TX, EP_DIR_OUT, &val); - if(status) { - log_warning("Could not enable RF TX (%d): %s\n", status, libusb_error_name(status) ); - } + enable_rf(dev); } } @@ -470,7 +556,7 @@ static int lusb_close(struct bladerf *dev) static int lusb_load_fpga(struct bladerf *dev, uint8_t *image, size_t image_size) { unsigned int wait_count; - int status = 0, val; + int status = 0; int transferred = 0; struct bladerf_lusb *lusb = dev->backend; @@ -538,16 +624,7 @@ static int lusb_load_fpga(struct bladerf *dev, uint8_t *image, size_t image_size log_info("libusb_set_interface_alt_setting: %s\n", libusb_error_name(status)); } - val = 1; - status = vendor_command_int(dev, BLADE_USB_CMD_RF_RX, EP_DIR_OUT, &val); - if(status) { - log_warning("Could not enable RF RX (%d): %s\n", status, libusb_error_name(status) ); - } - - status = vendor_command_int(dev, BLADE_USB_CMD_RF_TX, EP_DIR_OUT, &val); - if(status) { - log_warning("Could not enable RF TX (%d): %s\n", status, libusb_error_name(status) ); - } + enable_rf(dev); return status; } @@ -587,12 +664,13 @@ static int lusb_erase_flash(struct bladerf *dev, int sector_offset, int n_bytes) sizeof(erase_ret), BLADERF_LIBUSB_TIMEOUT_MS); - if (status != sizeof(erase_ret) || !erase_ret) { + if (status != sizeof(erase_ret) || erase_ret != 0) { log_error("Failed to erase sector %d\n", sector_to_erase); if (status < 0) { log_error("libusb status: %s\n", libusb_error_name(status)); - } else if (!erase_ret) { - log_error("Received erase failure status from FX3.\n"); + } else if (erase_ret != 0) { + log_error("Received erase failure status from FX3. error = %d\n", + erase_ret); } else { log_error("Unexpected read size: %d\n", status); } @@ -610,18 +688,80 @@ static int lusb_erase_flash(struct bladerf *dev, int sector_offset, int n_bytes) } } +static int read_page_buffer(struct bladerf *dev, int read_size, uint8_t *ptr) +{ + struct bladerf_lusb *lusb = dev->backend; + + size_t buf_off; + int status; + + for(buf_off = 0; buf_off < FLASH_PAGE_SIZE; buf_off += read_size) + { + status = libusb_control_transfer( + lusb->handle, + LIBUSB_RECIPIENT_INTERFACE | + LIBUSB_REQUEST_TYPE_VENDOR | + EP_DIR_IN, + BLADE_USB_CMD_READ_PAGE_BUFFER, + 0, + buf_off, + &ptr[buf_off], + read_size, + BLADERF_LIBUSB_TIMEOUT_MS); + + if(status < 0) { + log_error("Failed to read page buffer at offset 0x%02x: %s\n", + buf_off, libusb_error_name(status)); + return error_libusb2bladerf(status); + } else if(status != read_size) { + log_error("Got unexpected read size when writing page buffer at offset 0x%02x: " + "expected %d, got %d\n", + read_size, status); + return BLADERF_ERR_IO; + } + } + + return 0; +} + +static int read_one_page(struct bladerf *dev, int read_size, int page_offset, uint8_t *ptr) +{ + int32_t read_status; + int status; + + status = vendor_command_int_index( + dev, BLADE_USB_CMD_FLASH_READ, + page_offset, &read_status); + if(status != LIBUSB_SUCCESS) { + return status; + } + + if(read_status != 0) { + log_error("Failed to read page %d: %d\n", + page_offset, read_status); + status = BLADERF_ERR_UNEXPECTED; + } + + return read_page_buffer(dev, read_size, ptr); +} + static int lusb_read_flash(struct bladerf *dev, int page_offset, uint8_t *ptr, size_t n_bytes) { int status = 0; - int page_i, n_read, total_read; - int read_size = dev->speed ? FLASH_PAGE_SIZE: 64; + int page_i, total_read; + int read_size = dev->speed ? FLASH_PAGE_SIZE : 64; int pages_to_read = FLASH_BYTES_TO_PAGES(n_bytes); - struct bladerf_lusb *lusb = dev->backend; + + status = change_setting(dev, USB_IF_SPI_FLASH); + + if (status) { + log_error("Failed to set interface: %s\n", libusb_error_name(status)); + status = BLADERF_ERR_IO; + } assert(page_offset < FLASH_NUM_PAGES); assert((page_offset + n_bytes) < FLASH_NUM_PAGES); - /* FIXME: support data_size that are not multiple of pages */ assert(n_bytes % FLASH_PAGE_SIZE == 0); total_read = 0; @@ -631,37 +771,9 @@ static int lusb_read_flash(struct bladerf *dev, int page_offset, page_i++) { /* Read back a page */ - n_read = 0; - do { - status = libusb_control_transfer( - lusb->handle, - LIBUSB_RECIPIENT_INTERFACE | - LIBUSB_REQUEST_TYPE_VENDOR | - EP_DIR_IN, - BLADE_USB_CMD_FLASH_READ, - 0, - page_i, - ptr, - read_size, - BLADERF_LIBUSB_TIMEOUT_MS); - - - if (status != read_size) { - if (status < 0) { - log_error("Failed to read back page %d: %s\n", page_i, - libusb_error_name(status)); - } else { - log_error("Unexpected read size: %d\n", status); - } - - status = BLADERF_ERR_IO; - } else { - n_read += read_size; - total_read += read_size; - ptr += read_size; - status = 0; - } - } while (n_read < FLASH_PAGE_SIZE && !status); + status = read_one_page(dev, read_size, page_i, ptr); + ptr += FLASH_PAGE_SIZE; + total_read += FLASH_PAGE_SIZE; } if (status == 0) { @@ -675,10 +787,9 @@ static int verify_flash(struct bladerf *dev, int page_offset, uint8_t *image, size_t n_bytes) { int status = 0; - int page_i, check_i, n_read; + int page_i, check_i; int read_size = dev->speed ? FLASH_PAGE_SIZE: 64; int pages_to_read = FLASH_BYTES_TO_PAGES(n_bytes); - struct bladerf_lusb *lusb = dev->backend; uint8_t page_buf[FLASH_PAGE_SIZE]; uint8_t *image_page; @@ -693,35 +804,7 @@ static int verify_flash(struct bladerf *dev, int page_offset, page_i++) { /* Read back a page */ - n_read = 0; - do { - status = libusb_control_transfer( - lusb->handle, - LIBUSB_RECIPIENT_INTERFACE | - LIBUSB_REQUEST_TYPE_VENDOR | - EP_DIR_IN, - BLADE_USB_CMD_FLASH_READ, - 0, - page_i, - page_buf + n_read, - read_size, - BLADERF_LIBUSB_TIMEOUT_MS); - - - if (status != read_size) { - if (status < 0) { - log_error("Failed to read back page %d: %s\n", page_i, - libusb_error_name(status)); - } else { - log_error("Unexpected read size: %d\n", status); - } - - status = BLADERF_ERR_IO; - } else { - n_read += read_size; - status = 0; - } - } while (n_read < FLASH_PAGE_SIZE && !status); + status = read_one_page(dev, read_size, page_i, page_buf); /* Verify the page */ for (check_i = 0; check_i < FLASH_PAGE_SIZE && !status; check_i++) { @@ -742,18 +825,64 @@ static int verify_flash(struct bladerf *dev, int page_offset, return status; } +static int write_one_page(struct bladerf *dev, int write_size, int page_offset, uint8_t *data) +{ + struct bladerf_lusb *lusb = dev->backend; + size_t buf_off; + int32_t write_status; + int status; + + for(buf_off = 0; buf_off < FLASH_PAGE_SIZE; buf_off += write_size) + { + status = libusb_control_transfer( + lusb->handle, + LIBUSB_RECIPIENT_INTERFACE | + LIBUSB_REQUEST_TYPE_VENDOR | + EP_DIR_OUT, + BLADE_USB_CMD_WRITE_PAGE_BUFFER, + 0, + buf_off, + &data[buf_off], + write_size, + BLADERF_LIBUSB_TIMEOUT_MS); + + if(status < 0) { + log_error("Failed to write page buffer at offset 0x%02x for page %d: %s\n", + buf_off, page_offset, libusb_error_name(status)); + return error_libusb2bladerf(status); + } else if(status != write_size) { + log_error("Got unexpected write size when writing page buffer at offset 0x%02x: " + "expected %d, got %d\n", + write_size, status); + return BLADERF_ERR_IO; + } + } + + status = vendor_command_int_index( + dev, BLADE_USB_CMD_FLASH_WRITE, + page_offset, &write_status); + if(status != LIBUSB_SUCCESS) { + return status; + } + + if(write_status != 0) { + log_error("Failed to write page %d: %d\n", + page_offset, write_status); + status = BLADERF_ERR_UNEXPECTED; + } + + return 0; +} + static int lusb_write_flash(struct bladerf *dev, int page_offset, uint8_t *data, size_t data_size) { int status = 0; int i; - int n_write, total_written; - int write_size = dev->speed ? FLASH_PAGE_SIZE : 64; + int total_written; int pages_to_write = FLASH_BYTES_TO_PAGES(data_size); - struct bladerf_lusb *lusb = dev->backend; - uint8_t *data_page; + int write_size = dev->speed ? FLASH_PAGE_SIZE : 64; - log_info("Flashing with write size = %d\n", write_size); status = change_setting(dev, USB_IF_SPI_FLASH); if (status) { @@ -765,41 +894,14 @@ static int lusb_write_flash(struct bladerf *dev, int page_offset, assert(page_offset < FLASH_NUM_PAGES); assert((page_offset + pages_to_write) < FLASH_NUM_PAGES); - /* FIXME: support data_size that are not multiple of pages */ assert(data_size % FLASH_PAGE_SIZE == 0); total_written = 0; for (i = page_offset; i < (page_offset + pages_to_write) && !status; i++) { - n_write = 0; - do { - data_page = data + (i - page_offset) * FLASH_PAGE_SIZE + n_write; - status = libusb_control_transfer( - lusb->handle, - LIBUSB_RECIPIENT_INTERFACE | - LIBUSB_REQUEST_TYPE_VENDOR | - EP_DIR_OUT, - BLADE_USB_CMD_FLASH_WRITE, - 0, - i, - (unsigned char *)data_page, - write_size, - BLADERF_LIBUSB_TIMEOUT_MS); - - if (status != write_size) { - if (status < 0) { - log_error("Failed to write page %d: %s\n", i, - libusb_error_name(status)); - } else { - log_error("Got unexpected write size: %d\n", status); - } - status = BLADERF_ERR_IO; - } else { - n_write += write_size; - total_written += write_size; - status = 0; - } - } while (n_write < FLASH_PAGE_SIZE && !status); + status = write_one_page(dev, write_size, i, data); + total_written += FLASH_PAGE_SIZE; + data += FLASH_PAGE_SIZE; } if (status == 0) { @@ -894,16 +996,7 @@ static int lusb_flash_firmware(struct bladerf *dev, { int status; - status = change_setting(dev, USB_IF_SPI_FLASH); - - if (status) { - log_error("Failed to set interface: %s\n", libusb_error_name(status)); - status = BLADERF_ERR_IO; - } - - if (status == 0) { - status = lusb_erase_flash(dev, 0, image_size); - } + status = lusb_erase_flash(dev, 0, image_size); if (status >= 0) { status = lusb_write_flash(dev, 0, image, image_size); @@ -971,29 +1064,31 @@ static int lusb_jump_to_bootloader(struct bladerf *dev) static int lusb_get_otp(struct bladerf *dev, char *otp) { - struct bladerf_lusb *lusb = dev->backend; int status; int read_size = dev->speed ? 256 : 64; - int nbytes; + int otp_page = 0; + int32_t read_status; - for (nbytes = 0; nbytes < 256; nbytes += status) { - status = libusb_control_transfer( - lusb->handle, - LIBUSB_RECIPIENT_INTERFACE | - LIBUSB_REQUEST_TYPE_VENDOR | - EP_DIR_IN, - BLADE_USB_CMD_READ_OTP, - 0, - 0, - (unsigned char *)&otp[nbytes], - read_size, - BLADERF_LIBUSB_TIMEOUT_MS); - if (status < 0) { - log_error("Failed to read OTP (%d): %s\n", status, libusb_error_name(status)); - return error_libusb2bladerf(status); - } + status = change_setting(dev, USB_IF_SPI_FLASH); + if (status) { + log_error("Failed to set interface: %s\n", libusb_error_name(status)); + return BLADERF_ERR_IO; } - return 0; + + status = vendor_command_int_index( + dev, BLADE_USB_CMD_READ_OTP, + otp_page, &read_status); + if(status != LIBUSB_SUCCESS) { + return status; + } + + if(read_status != 0) { + log_error("Failed to read OTP page %d: %d\n", + otp_page, read_status); + status = BLADERF_ERR_UNEXPECTED; + } + + return read_page_buffer(dev, read_size, (uint8_t*)otp); } #define CAL_SIZE 256