From: Manuel Reyes <m.reyes@gsi.de>
Date: Thu, 7 Nov 2024 12:54:26 +0000 (+0100)
Subject: Fixes the compatibility of trbflash with the dirich concentrators.
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=HEAD;p=trbnettools.git

Fixes the compatibility of trbflash with the dirich concentrators.

Restored the original manufacturer ID of the flash on the dirich concetrator in the assignment of the flash parameters, and added the ID of the flash on the farich concentrator as a compatible flash manufacturer ID.  Manuel Reyes
---

diff --git a/libtrbnet/trbflash.c b/libtrbnet/trbflash.c
index cdef3f4..caa0ce6 100644
--- a/libtrbnet/trbflash.c
+++ b/libtrbnet/trbflash.c
@@ -378,8 +378,8 @@ static int setFlashParam(FlashParam* flashParam, uint16_t hardwareId)
 
   case 0x9700:
     flashParam->flashType = FLASH_DIRICH_CONCENTRATOR;
-    //flashParam->manId = 0x1720c2;
-    flashParam->manId = 0x1728c2;
+    flashParam->manId = 0x1720c2; // manufacturer Id of flash on Dirich concentrator
+    flashParam->compatibleManId[0] =  0x1728c2; // manufacturer Id of flash on Farich concentrator
     strcpy(flashParam->allowedStringId[0], "dirich_co");
     strcpy(flashParam->allowedStringId[1], "combiner");
     flashParam->numPages = 32768;