From 4e2f18fbf39c682e673677f18a28bc2c79d0ccf8 Mon Sep 17 00:00:00 2001
From: qzhou <qidong.zhou@desy.de>
Date: Thu, 16 Jul 2020 00:36:10 +0900
Subject: [PATCH] fix conflict
---
Pcie40Applications/regconfig.cpp | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/Pcie40Applications/regconfig.cpp b/Pcie40Applications/regconfig.cpp
index a4844e4..ae0c999 100644
--- a/Pcie40Applications/regconfig.cpp
+++ b/Pcie40Applications/regconfig.cpp
@@ -271,6 +271,29 @@ pcie40_op(int dev, int ch, int op_addr, int addr, int data, pcie40reg_t pcie40)
}
if (op_addr == PCIE40_CHECKFEE) {
+ int hwtype;
+ int serial;
+ int fwtype;
+ int fwver;
+ static const char *feetype[] = {
+ "UNDEF", "SVD", "CDC", "BPID", "EPID", "ECL", "EECL", "KLM", "EKLM",
+ "TRG", "UNKNOWN-10", "UNKNOWN-11",
+ "UNKNOWN-12", "UNKNOWN-13", "DEMO", "TEST" };
+ static const char *demotype[] = {
+ "UNDEF", "HSLB-B2L", "SP605-B2L", "ML605-B2L", "AC701-B2L" };
+ static const char *trgtype[] = {
+ "TRGMERGER", /* = 0 */
+ "TRGTSF", /* = 1 */
+ "TRG2D", /* = 2 */
+ "TRG3D", /* = 3 */
+ "TRGNN", /* = 4 */
+ "TRGEVTT", /* = 5 */
+ "TRGGRL", /* = 6 */
+ "TRGGDL", /* = 7 */
+ "TRGETM", /* = 8 */
+ "TRGTOP", /* = 9 */
+ "TRGKLM", /* = 10 */
+ };
if (!pcie40_b2l_status(dev_slot, ch)) {
printf("Failed: b2l is down\n");
return -1;
--
GitLab