From: <ro...@us...> - 2012-12-27 17:32:23
|
Revision: 2941 http://sourceforge.net/p/nscldaq/code/2941 Author: ron-fox Date: 2012-12-27 17:32:20 +0000 (Thu, 27 Dec 2012) Log Message: ----------- Remove redundant read of srama. Modified Paths: -------------- branches/hira-sisstuff/usb/vmusb/devices/CHINP.cpp Modified: branches/hira-sisstuff/usb/vmusb/devices/CHINP.cpp =================================================================== --- branches/hira-sisstuff/usb/vmusb/devices/CHINP.cpp 2012-12-27 17:31:20 UTC (rev 2940) +++ branches/hira-sisstuff/usb/vmusb/devices/CHINP.cpp 2012-12-27 17:32:20 UTC (rev 2941) @@ -178,8 +178,8 @@ // read chip ID and channel address list.addMarker(static_cast<uint16_t>((fpga >> 27) & 0x07 | 0x1ff0)); // add ID for XLM slot # list.addBlockCountRead32(srama, static_cast<uint32_t>(0x00000ffe), registerAmod); // Transfer count for 32-bit word data - list.addMaskedCountBlockRead32(srama + sizeof(uint32_t), blockTransferAmod); list.addBlockCountRead32(srama, static_cast<uint32_t>(0x00000ffe), registerAmod); // Transfer count for 32-bit word data - list.addMaskedCountBlockRead32(srama + sizeof(uint32_t), blockTransferAmod); + list.addMaskedCountBlockRead32(srama + sizeof(uint32_t), blockTransferAmod); + if (m_pConfiguration->getBoolParameter("-readsramb")) { list.addMarker(static_cast<uint16_t>((fpga >> 27) & 0x07 | 0x2ff0)); // add ID for XLM slot # list.addBlockCountRead32(sramb, static_cast<uint32_t>(0x00000ffe), registerAmod); // Transfer count for 32-bit word data This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |