fx3_firmware: v2.3.0 - Add flash ID command

Allows the SPI flash manufacturer ID and device ID to be reported to the
host. Useful for determining the architecture (density, page size, etc.)
of the flash chip used on the board.

Author: bglod

firmware_common/bladeRF.h

@@ -29,6 +29,7 @@
 #define BLADE_USB_CMD_RF_RX                     4
 #define BLADE_USB_CMD_RF_TX                     5
 #define BLADE_USB_CMD_QUERY_DEVICE_READY        6
+#define BLADE_USB_CMD_QUERY_FLASH_ID            7
 #define BLADE_USB_CMD_FLASH_READ              100
 #define BLADE_USB_CMD_FLASH_WRITE             101
 #define BLADE_USB_CMD_FLASH_ERASE             102

fx3_firmware/CMakeLists.txt

@@ -34,7 +34,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/../host/cmake/modules)
 
 # Update these definitions when updating the firmware version
 set(VERSION_INFO_MAJOR 2)
-set(VERSION_INFO_MINOR 2)
+set(VERSION_INFO_MINOR 3)
 set(VERSION_INFO_PATCH 0)
 
 if(NOT DEFINED VERSION_INFO_EXTRA)

fx3_firmware/src/bladeRF.c

@@ -454,6 +454,11 @@ CyBool_t NuandHandleVendorRequest(
         CyU3PUsbSendRetCode(ret);
     break;
 
+    case BLADE_USB_CMD_QUERY_FLASH_ID:
+        ret = (NuandGetSPIManufacturer() << 8) | NuandGetSPIDeviceID();
+        CyU3PUsbSendRetCode(ret);
+    break;
+
     case BLADE_USB_CMD_SET_LOOPBACK:
         NuandRFLinkLoopBack(wValue);
         CyU3PUsbSendRetCode(wValue);

fx3_firmware/src/flash.c

@@ -164,6 +164,13 @@ uint8_t NuandGetSPIManufacturer() {
     return spi_mfn[0];
 }
 
+uint8_t NuandGetSPIDeviceID() {
+    if (!cached_spi_mfn) {
+        cacheSPIManufacturer();
+    }
+    return spi_mfn[1];
+}
+
 CyU3PReturnStatus_t NuandReadOtp(size_t offset, size_t size, void *buf) {
     CyU3PReturnStatus_t status;
 

fx3_firmware/src/flash.h

@@ -29,6 +29,7 @@ CyU3PReturnStatus_t NuandReadOtp(size_t offset, size_t size, void *buf);
 CyU3PReturnStatus_t NuandWriteOtp(size_t offset, size_t size, void *buf);
 CyU3PReturnStatus_t NuandLockOtp();
 uint8_t NuandGetSPIManufacturer();
+uint8_t NuandGetSPIDeviceID();
 void cacheSPIManufacturer();