[Nscldaq-cvscommits] SF.net SVN: nscldaq:[2932] trunk/nextgen/sbs/vmemodules/CVC32CC32.cpp

[<ro...@us...>]

Revision: 2932
          http://sourceforge.net/p/nscldaq/code/2932
Author:   ron-fox
Date:     2012-12-26 14:38:26 +0000 (Wed, 26 Dec 2012)
Log Message:
-----------
Make CVC32CC32 64 bit clean

Modified Paths:
--------------
    trunk/nextgen/sbs/vmemodules/CVC32CC32.cpp

Modified: trunk/nextgen/sbs/vmemodules/CVC32CC32.cpp
===================================================================
--- trunk/nextgen/sbs/vmemodules/CVC32CC32.cpp	2012-12-26 14:36:30 UTC (rev 2931)
+++ trunk/nextgen/sbs/vmemodules/CVC32CC32.cpp	2012-12-26 14:38:26 UTC (rev 2932)
@@ -17,6 +17,8 @@
 #include "CVC32CC32.h"
 #include <CVMEInterface.h>
 
+#include <stdint.h>
+
 uint8_t* CVC32CC32::m_pBranches[CVC32CC32::BRANCHES][CVC32CC32::VMECRATES];
 
 static const unsigned WIENER_SIZE   = (1UL << 16);
@@ -116,7 +118,7 @@
 CVC32CC32::mapBranch(unsigned branch, unsigned vmeCrate)
 {
   void * fd = CVMEInterface::Open(CVMEInterface::Standard, vmeCrate);
-  long base = 0x800000 + (branch << WIENER_SHIFT);
+  uint32_t base = 0x800000 + (branch << WIENER_SHIFT);
   
   try {
     m_pBranches[branch][vmeCrate] = 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.