From: Jan Michel <j.michel@gsi.de>
Date: Wed, 6 Jul 2016 13:04:13 +0000 (+0200)
Subject: update trbflash with new hardware ids for Dirich family
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=939ca1e020cc17030f5b07ffe1731f2bf1c569a8;p=trbnettools.git

update trbflash with new hardware ids for Dirich family
---

diff --git a/.gitignore b/.gitignore
index b2b429c..9fb33b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,7 @@ trbnetd/trbrpc.h
 trbnetd/trbrpc_clnt.c
 trbnetd/trbrpc_svc.c
 trbnetd/trbrpc_xdr.c
+bin
+binlocal
+include
+.kateproject.d
diff --git a/libtrbnet/trbflash.c b/libtrbnet/trbflash.c
index 3f40b82..edb6eed 100644
--- a/libtrbnet/trbflash.c
+++ b/libtrbnet/trbflash.c
@@ -92,7 +92,9 @@ typedef enum
     
     CBM_RICH_1 = 19,
     CBM_TOF_1 = 20,
-    FLASH_TRB3SC = 21
+    FLASH_TRB3SC = 21,
+    FLASH_DIRICH = 22,
+    FLASH_DIRICH_CONCENTRATOR = 23
     
   } FlashType;
 
@@ -118,7 +120,9 @@ static const char FlashTypeStr[][32] = {
   "TRB3 FPGA 4",
   "CBM RICH V1",
   "CBM TOF V1",
-  "TRB3sc"
+  "TRB3sc",
+  "Dirich",
+  "DirichConcentrator"
 };
 
 typedef struct {
@@ -348,6 +352,20 @@ static int setFlashParam(FlashParam* flashParam, uint16_t hardwareId)
     strcpy(flashParam->allowedStringId[0], "trb3sc");
     flashParam->numPages = 32768;
     break;    
+
+  case 0x9600:
+    flashParam->flashType = FLASH_DIRICH;
+    flashParam->manId = 0x18ba20;
+    strcpy(flashParam->allowedStringId[0], "dirich");
+    flashParam->numPages = 32768;
+    break;    
+
+  case 0x9700:
+    flashParam->flashType = FLASH_DIRICH_CONCENTRATOR;
+    flashParam->manId = 0x1720c2;
+    strcpy(flashParam->allowedStringId[0], "dirich_co");
+    flashParam->numPages = 32768;
+    break;    
     
   default:
     return -1;