From 3f341c9ecb63b233e1ec0f521ddcb080ca85a09f Mon Sep 17 00:00:00 2001
From: wierenga <sdos@astron.nl>
Date: Wed, 15 Nov 2006 13:26:34 +0000
Subject: [PATCH] BugID: 970 Remove unnecessary WRITE_CDO_ONCE configuration
option.
---
MAC/APL/PIC/RSPDriver/src/CDOWrite.cc | 5 -----
MAC/APL/PIC/RSPDriver/src/RSPDriver.conf.in | 7 ++-----
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/MAC/APL/PIC/RSPDriver/src/CDOWrite.cc b/MAC/APL/PIC/RSPDriver/src/CDOWrite.cc
index 06447cfe488..d474fd6b64f 100644
--- a/MAC/APL/PIC/RSPDriver/src/CDOWrite.cc
+++ b/MAC/APL/PIC/RSPDriver/src/CDOWrite.cc
@@ -149,11 +149,6 @@ uint16 CDOWrite::compute_ip_checksum(void* addr, int count)
void CDOWrite::sendrequest()
{
- // write register (with same setting) every second if WRITE_CDO_ONCE == 0
- if (0 == GET_CONFIG("RSPDriver.WRITE_CDO_ONCE", i)) {
- Cache::getInstance().getState().cdo().write(getBoardId() * getNumIndices() + getCurrentIndex());
- }
-
// skip update if the CDO settings have not been modified
if (RTC::RegisterState::WRITE != Cache::getInstance().getState().cdo().get(getBoardId() * getNumIndices() + getCurrentIndex()))
{
diff --git a/MAC/APL/PIC/RSPDriver/src/RSPDriver.conf.in b/MAC/APL/PIC/RSPDriver/src/RSPDriver.conf.in
index d3b69f784d6..c20cb87dddb 100644
--- a/MAC/APL/PIC/RSPDriver/src/RSPDriver.conf.in
+++ b/MAC/APL/PIC/RSPDriver/src/RSPDriver.conf.in
@@ -40,8 +40,8 @@ RSPDriver.PPS_TRIGGER=1
#
# Specify MAC addresses of the RSP boards explicitly
#
-RSPDriver.MAC_ADDR_0=10:FA:00:00:00:00
-RSPDriver.MAC_ADDR_1=10:FA:00:00:01:00
+RSPDriver.MAC_ADDR_0=10:FA:00:00:11:00
+RSPDriver.MAC_ADDR_1=10:FA:00:00:12:00
RSPDriver.MAC_ADDR_2=10:FA:00:00:02:00
RSPDriver.MAC_ADDR_3=10:FA:00:00:03:00
RSPDriver.MAC_ADDR_4=10:FA:00:00:04:00
@@ -210,9 +210,6 @@ RSPDriver.LOOPBACK_MODE=0
RSPDriver.WRITE_RSU=1
RSPDriver.WRITE_BS=1
RSPDriver.WRITE_CDO=1
-# WRITE_CDO_ONCE, if set to 1 only write CDO register once at startup
-# otherwise rewrite same data every update (= second)
-RSPDriver.WRITE_CDO_ONCE=1#0
# READ_CDO, if set to 1 reads back contents of pid=CDO, regid=0x01
# This can be used to verify that the UDP/IP header is correctly
# written to the register.
--
GitLab