From: hadaq Date: Tue, 11 Oct 2011 15:48:52 +0000 (+0000) Subject: updated manId table X-Git-Tag: v6.0~122 X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=0d6997ca1d2c7b75f2d44f1dd0a06c8ef59c4886;p=trbnettools.git updated manId table --- diff --git a/libtrbnet/trbflash.c b/libtrbnet/trbflash.c index 49e2a7c..beb1d9a 100644 --- a/libtrbnet/trbflash.c +++ b/libtrbnet/trbflash.c @@ -117,7 +117,7 @@ typedef struct { } FlashParam; static FlashParam flashParamRef; -static const char trbflash_version[] = "$Revision: 2.35 $"; +static const char trbflash_version[] = "$Revision: 2.36 $"; static uint32_t mdcFlashSelect = 1; @@ -191,16 +191,16 @@ static int setFlashParam(FlashParam* flashParam, uint16_t hardwareId) /* MDC HUB */ case 0x1210: flashParam->flashType = FLASH_MDC_HUB_V2_FPGA1234; - flashParam->manId = 0x1520c2; + flashParam->manId = 0x00471f; strcpy(flashParam->allowedStringId[0], "mdchub_fpga1234"); - flashParam->numPages = 8192; + flashParam->numPages = 16384; break; case 0x1250: flashParam->flashType = FLASH_MDC_HUB_V2_FPGA5; - flashParam->manId = 0x1520c2; + flashParam->manId = 0x00471f; strcpy(flashParam->allowedStringId[0], "mdchub_fpga5"); - flashParam->numPages = 8192; + flashParam->numPages = 16384; break; /* MDC OEP */ @@ -222,23 +222,23 @@ static int setFlashParam(FlashParam* flashParam, uint16_t hardwareId) /* SHOWER */ case 0x4210: flashParam->flashType = FLASH_SHOWER_ADDON_V2_FPGA1; - flashParam->manId = 0x1520c2; + flashParam->manId = 0x00471f; strcpy(flashParam->allowedStringId[0], "shower_fpga1"); - flashParam->numPages = 8192; + flashParam->numPages = 16384; break; case 0x4220: flashParam->flashType = FLASH_SHOWER_ADDON_V2_FPGA2; - flashParam->manId = 0x1520c2; + flashParam->manId = 0x00471f; strcpy(flashParam->allowedStringId[0], "shower_fpga2"); - flashParam->numPages = 8192; + flashParam->numPages = 16384; break; case 0x4230: flashParam->flashType = FLASH_SHOWER_ADDON_V2_FPGA3; - flashParam->manId = 0x1520c2; + flashParam->manId = 0x00471f; strcpy(flashParam->allowedStringId[0], "adcmv3"); - flashParam->numPages = 8192; + flashParam->numPages = 16384; break; /* TRB3 */ @@ -286,7 +286,6 @@ static int setFlashParam(FlashParam* flashParam, uint16_t hardwareId) case 0x9130: flashParam->flashType = FLASH_TRB3_FPGA_3; flashParam->manId = 0x1720c2; - strcpy(flashParam->allowedStringId[0], "trb3_central"); strcpy(flashParam->allowedStringId[1], "trb3_fpga1"); strcpy(flashParam->allowedStringId[2], "trb3_fpga2"); @@ -334,6 +333,8 @@ static int writeSetupRegister(uint16_t trb_address, uint8_t value) } ctr++; } while (trb_term.status_channel != 0); + + if (trb_term.status_channel != 0) { fprintf(logFile, @@ -592,7 +593,7 @@ static int initTransfer(uint16_t trb_address) if (match == 0) { fprintf(logFile, - "Error > initTransfer: ManId 0x%04x incompatible " + "Error > initTransfer: ManId 0x%06x incompatible " "on EndPoint 0x%04x\n", manId, trbBuffer[i] & 0xffff); return -1; }