Added register of known devices

fm10k-dump.c

@@ -78,15 +78,13 @@ int main(int argc, char** argv){
 
     unsigned int mbitsToRead = 8;
 
+    const KNOWN_FLASH_DEVICE* knownFlashDevice = getKnownFlashFromManufacturerData(manufacturerInfo);
 
-    switch (manufacturerInfo.value >> 8) {
-        case 0x1f2701:
-            printf("Device: Adesto AT45Dxxx Standard:1 32Mbit\n");
-            mbitsToRead = 32;
-            break;
-        default:
-            printf("Device: Unknown, defaulting %uMbit size\n", mbitsToRead);
-            break;
+    if(knownFlashDevice != NULL){
+        printf("Device: %s\n", knownFlashDevice->name);
+        mbitsToRead = knownFlashDevice->sizeInMbit;
+    }else{
+        printf("Device: Unknown, defaulting %uMbit size\n", mbitsToRead);
     }
 
     if(argc > 3){

fm10k.c

@@ -32,6 +32,11 @@
 #include "fm10k.h"
 #include <stdio.h>
 
+KNOWN_FLASH_DEVICE KNOWN_FLASH_DEVICE_LIST[] = {
+        {{0x0101271f}, "Adesto AT45DB321E 32-Mbit", 32},
+        {{0}, "", 0}
+};
+
 void ReadRegister32(uintptr_t mem, uint32_t addr, uint32_t* value) {
     *value = *(((uint32_t*)mem) + addr);
 }
@@ -316,4 +321,15 @@ uint32_t fm10k_uio_spi_WriteFlash(uintptr_t mem, uint32_t address, const uint8_t
     fm10k_uio_spi_Disable(mem);
 
     return 0;
+}
+
+const KNOWN_FLASH_DEVICE* getKnownFlashFromManufacturerData(SPI_COMMAND_READ_MANUFACTURER_RESULT data){
+    uint32_t deviceCount = (sizeof(KNOWN_FLASH_DEVICE_LIST) / sizeof(KNOWN_FLASH_DEVICE)) - 1;
+    for(uint32_t i = 0; i < deviceCount; ++i){
+        if(KNOWN_FLASH_DEVICE_LIST[i].data.value == data.value){
+            return &KNOWN_FLASH_DEVICE_LIST[i];
+        }
+    }
+
+    return NULL;
 }

fm10k.h

@@ -55,6 +55,7 @@
 #if __GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ >= 4)) || __clang__
 
 typedef union {
+    uint32_t value;
     struct {
         uint16_t Freq : 10; // Actual speed is PCIE_REFCLK/(2*(1+Freq))
         uint8_t Enable : 1;
@@ -70,21 +71,26 @@ typedef union {
         uint8_t PinIO3 : 1; // volatile ReadWrite
         uint8_t Reserved : 5;
     } __attribute__((packed)) fields;
-    uint32_t value;
 } SPI_CTRL;
 
 typedef union {
+    uint32_t value;
     struct {
         uint8_t manufacturerId : 8;
-        uint8_t familyCode : 3;
         uint8_t densityCode : 5;
-        uint8_t subCode : 3;
+        uint8_t familyCode : 3;
         uint8_t productVariant : 5;
+        uint8_t subCode : 3;
         uint8_t RESERVED : 8;
     } __attribute__((packed)) fields;
-    uint32_t value;
 } SPI_COMMAND_READ_MANUFACTURER_RESULT;
 
+typedef struct {
+    SPI_COMMAND_READ_MANUFACTURER_RESULT data;
+    char name[64];
+    uint32_t sizeInMbit;
+} KNOWN_FLASH_DEVICE;
+
 #else
 #error "Packed bit-fields of type char were not properly bit-packed on many targets prior to GCC 4.4, upgrade to GCC >= 4.4."
 #endif
@@ -106,6 +112,7 @@ void fm10k_uio_spi_Disable(uintptr_t mem);
 
 //Error if result.value is 0x00
 SPI_COMMAND_READ_MANUFACTURER_RESULT fm10k_uio_spi_ReadManufacturerData(uintptr_t mem);
+const KNOWN_FLASH_DEVICE* getKnownFlashFromManufacturerData(SPI_COMMAND_READ_MANUFACTURER_RESULT data);
 
 uint32_t fm10k_uio_spi_ReadFlash(uintptr_t mem, uint32_t address, uint8_t* data, uint32_t len);
 uint32_t fm10k_uio_spi_WriteFlash(uintptr_t mem, uint32_t address, const uint8_t* data, uint32_t len);