farich with new flash chip, mt

diff --git a/libtrbnet/trbflash.c b/libtrbnet/trbflash.c
index 5242ac1eef45141d2b47df8d48e2eb6c1d0d927e..94a585bdabaf4f722ac255238aee71ad0476742a 100644 (file)
--- a/libtrbnet/trbflash.c
+++ b/libtrbnet/trbflash.c
@@ -101,7 +101,8 @@ typedef enum
     FLASH_MDCTDC = 26,
     FLASH_FARICH = 27,
     FLASH_DIRICH5S = 28,
-    FLASH_TOMCAT = 29
+    FLASH_TOMCAT = 29,
+    FLASH_FARICH_CONCENTRATOR = 30
   } FlashType;
 
 static const char FlashTypeStr[][32] = {
@@ -129,6 +130,7 @@ static const char FlashTypeStr[][32] = {
   "TRB3sc",
   "Dirich",
   "DirichConcentrator",
+  "FarichConcentrator",
   "Trb5sc",
   "MDC OEP",
   "MDC TDC",
@@ -375,7 +377,8 @@ static int setFlashParam(FlashParam* flashParam, uint16_t hardwareId)
 
   case 0x9700:
     flashParam->flashType = FLASH_DIRICH_CONCENTRATOR;
-    flashParam->manId = 0x1720c2;
+    //flashParam->manId = 0x1720c2;
+    flashParam->manId = 0x1728c2;
     strcpy(flashParam->allowedStringId[0], "dirich_co");
     strcpy(flashParam->allowedStringId[1], "combiner");
     flashParam->numPages = 32768;
@@ -656,6 +659,10 @@ static int initTransfer(uint16_t trb_address)
     int match = 0;
     unsigned int j = 0;
 
+    fprintf(logFile, "Debug: HardwareId: 0x%04x on EndPoint 0x%04x\n",
+                hardwareId, trbBuffer[i] & 0xffff);
+
+    
     if (i == 0) {
       if (setFlashParam(&flashParamRef, hardwareId) == -1) {
         fprintf(logFile, "Error > initTransfer: "