Update mbgdevio example programs for C

Account for renamed macros in the mbglib header files.

5 files changed, 40 insertions, 15 deletions

diff --git a/c/demo/mbgdevio/hrtime.c b/c/demo/mbgdevio/hrtime.c
index 020e354..0fc3e1b 100644
--- a/c/demo/mbgdevio/hrtime.c
+++ b/c/demo/mbgdevio/hrtime.c
@@ -1,13 +1,16 @@
 
 /**************************************************************************
  *
- *  $Id: hrtime.c 1.6 2012/08/09 09:14:02Z daniel TRASH $
+ *  $Id: hrtime.c 1.7 2018/08/03 14:08:32Z martin REL_M $
  *  $Name: $
  *
  *  Copyright (c) Meinberg Funkuhren, Bad Pyrmont, Germany
  *
  * -----------------------------------------------------------------------
  *  $Log: hrtime.c $
+ *  Revision 1.7  2018/08/03 14:08:32Z  martin
+ *  Account for macro _pcps_port_base renamed
+ *  to _pcps_short_port_base().
  *  Revision 1.6  2012/08/09 09:14:02Z  daniel
  *  Revision 1.5  2009/01/23 08:31:28Z  daniel
  *  Revision 1.4  2009/01/07 15:22:36Z  daniel
@@ -138,10 +141,10 @@ void print_dev_info( MBG_DEV_HANDLE dh,
 
   if ( rc == PCPS_SUCCESS )
   {
-    _pcps_port_base( p_dev, 0 ) ? 
+    _pcps_short_port_base( p_dev, 0 ) ? 
       printf( "  %s at port %03Xh\n",
             _pcps_fw_id( p_dev ),
-            _pcps_port_base( p_dev, 0 )
+            _pcps_short_port_base( p_dev, 0 )
           ) :
       printf( "  %s\n",
             _pcps_fw_id( p_dev )
diff --git a/c/demo/mbgdevio/mbgdevio_demo.c b/c/demo/mbgdevio/mbgdevio_demo.c
index ad70f1e..766f801 100644
--- a/c/demo/mbgdevio/mbgdevio_demo.c
+++ b/c/demo/mbgdevio/mbgdevio_demo.c
@@ -1,13 +1,16 @@
 
 /**************************************************************************
  *
- *  $Id: mbgdevio_demo.c 1.14 2012/08/09 09:17:55Z daniel TRASH $
+ *  $Id: mbgdevio_demo.c 1.15 2018/08/03 14:10:48Z martin REL_M $
  *  $Name: $
  *
  *  Copyright (c) Meinberg Funkuhren, Bad Pyrmont, Germany
  *
  * -----------------------------------------------------------------------
  *  $Log: mbgdevio_demo.c $
+ *  Revision 1.15  2018/08/03 14:10:48Z  martin
+ *  Account for macro _pcps_port_base renamed
+ *  to _pcps_short_port_base().
  *  Revision 1.14  2012/08/09 09:17:55Z  daniel
  *  Cleanup
  *  Revision 1.13  2012/08/09 09:13:45Z  daniel
@@ -135,7 +138,7 @@ void print_dev_info( MBG_DEV_HANDLE dh,
   {
     printf( "  %s at port %03Xh\n",
             _pcps_type_name( p_dev ),
-            _pcps_port_base( p_dev, 0 )
+            _pcps_short_port_base( p_dev, 0 )
           );
   }
   else
@@ -927,7 +930,7 @@ int main( int argc, char* argv[] )
               int64_t prv_ts = pcps_time_stamp_to_uint64( &hrtime[j - 1].tstamp );
               // we divide by PCPS_HRT_BIN_FRAC_SCALE to get the correct fractions
               // and we multiply by 1E6 to get the result in microseconds
-              double delta_t = (double) ( ts - prv_ts ) * 1E6 / PCPS_HRT_BIN_FRAC_SCALE;
+              double delta_t = (double) ( ts - prv_ts ) * 1E6 / MBG_FRAC32_UNITS_PER_SEC;
               printf( " (%+.1f us)", delta_t );
             }
 
diff --git a/c/demo/mbgdevio/vc6/hrtime.dsp b/c/demo/mbgdevio/vc6/hrtime.dsp
index 00b900a..9a36f23 100644
--- a/c/demo/mbgdevio/vc6/hrtime.dsp
+++ b/c/demo/mbgdevio/vc6/hrtime.dsp
@@ -48,8 +48,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
 
 !ELSEIF  "$(CFG)" == "hrtime - Win32 Debug"
 
@@ -63,16 +63,16 @@ LINK32=link.exe
 # PROP Output_Dir "hrtime___Win32_Debug"
 # PROP Intermediate_Dir "hrtime___Win32_Debug"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\mbglib\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\mbglib\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x407 /d "_DEBUG"
 # ADD RSC /l 0x407 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
 
 !ENDIF 
 
@@ -105,6 +105,10 @@ SOURCE=..\..\..\mbglib\include\mbgdevio.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\mbglib\include\mbgerror.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\mbglib\include\mbggeo.h
 # End Source File
 # Begin Source File
@@ -113,6 +117,10 @@ SOURCE=..\..\..\mbglib\include\mbgutil.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\mbglib\include\pci_asic.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\mbglib\include\pcpsdefs.h
 # End Source File
 # Begin Source File
diff --git a/c/demo/mbgdevio/vc6/mbgdevio_demo.dsp b/c/demo/mbgdevio/vc6/mbgdevio_demo.dsp
index bc893a7..082e424 100644
--- a/c/demo/mbgdevio/vc6/mbgdevio_demo.dsp
+++ b/c/demo/mbgdevio/vc6/mbgdevio_demo.dsp
@@ -109,6 +109,10 @@ SOURCE=..\..\..\mbglib\include\mbgdevio.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\mbglib\include\mbgerror.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\mbglib\include\mbggeo.h
 # End Source File
 # Begin Source File
@@ -117,6 +121,10 @@ SOURCE=..\..\..\mbglib\include\mbgutil.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\mbglib\include\pci_asic.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\mbglib\include\pcpsdefs.h
 # End Source File
 # Begin Source File
diff --git a/c/demo/mbgdevio/xhrtime.c b/c/demo/mbgdevio/xhrtime.c
index f71c869..8e5c9c8 100644
--- a/c/demo/mbgdevio/xhrtime.c
+++ b/c/demo/mbgdevio/xhrtime.c
@@ -1,9 +1,12 @@
 /**************************************************************************
  *
- *  $Id: xhrtime.c 1.4 2009/01/23 08:31:28Z daniel REL_M $
+ *  $Id: xhrtime.c 1.5 2018/08/03 14:08:31Z martin REL_M $
  *
  * -----------------------------------------------------------------------
  *  $Log: xhrtime.c $
+ *  Revision 1.5  2018/08/03 14:08:31Z  martin
+ *  Account for macro _pcps_port_base renamed
+ *  to _pcps_short_port_base().
  *  Revision 1.4  2009/01/23 08:31:28Z  daniel
  *  Revision 1.3  2009/01/20 11:13:26Z  daniel
  *  Added comments.
@@ -150,10 +153,10 @@ void print_dev_info( MBG_DEV_HANDLE dh,
 
   if ( rc == PCPS_SUCCESS )
   {
-    _pcps_port_base( p_dev, 0 ) ? 
+    _pcps_short_port_base( p_dev, 0 ) ? 
       printf( "  %s, SN: %s at port %03Xh\n",
             _pcps_fw_id( p_dev ), _pcps_sernum( p_dev ),
-            _pcps_port_base( p_dev, 0 )
+            _pcps_short_port_base( p_dev, 0 )
           ) :
       printf( "  %s, SN: %s\n",
             _pcps_fw_id( p_dev ), _pcps_sernum( p_dev )