Fix potential trap in kernel messagesmbgtools-fbsd-dev-2011-02-07

Also fix some compiler warnings.

4 files changed, 21 insertions, 13 deletions

diff --git a/mbglib/bsd/rsrc_bsd.c b/mbglib/bsd/rsrc_bsd.c
index b65c95a..a1b14d1 100755
--- a/mbglib/bsd/rsrc_bsd.c
+++ b/mbglib/bsd/rsrc_bsd.c
@@ -1,7 +1,7 @@
 
 /**************************************************************************
  *
- *  $Id: rsrc_bsd.c 1.1 2011/01/26 16:09:33 martin TEST $
+ *  $Id: rsrc_bsd.c 1.1.1.1 2011/02/07 15:28:32 martin TEST $
  *
  *  Copyright (c) Meinberg Funkuhren, Bad Pyrmont, Germany
  *
@@ -10,6 +10,8 @@
  *
  * -----------------------------------------------------------------------
  *  $Log: rsrc_bsd.c $
+ *  Revision 1.1.1.1  2011/02/07 15:28:32  martin
+ *  Removed obsolete code; more cleanup required.
  *  Revision 1.1  2011/01/26 16:09:33  martin
  *  Initial revision.
  *
@@ -20,7 +22,7 @@
 #undef _RSRC_BSD
 
 
-extern const char *pcps_driver_name;
+// extern const char *pcps_driver_name;
 
 
 #if 1 //##++ ||defined( KERNEL_VERSION ) && ( LINUX_VERSION_CODE < KERNEL_VERSION( 2, 6, 0 ) )
diff --git a/mbglib/common/pcpsdrvr.c b/mbglib/common/pcpsdrvr.c
index ae179e6..661f483 100755
--- a/mbglib/common/pcpsdrvr.c
+++ b/mbglib/common/pcpsdrvr.c
@@ -1,7 +1,7 @@
 
 /**************************************************************************
  *
- *  $Id: pcpsdrvr.c 1.46.2.24 2011/02/04 14:44:45 martin TEST $
+ *  $Id: pcpsdrvr.c 1.46.2.25 2011/02/07 15:47:28 martin TEST $
  *
  *  Copyright (c) Meinberg Funkuhren, Bad Pyrmont, Germany
  *
@@ -61,6 +61,8 @@
  *
  * -----------------------------------------------------------------------
  *  $Log: pcpsdrvr.c $
+ *  Revision 1.46.2.25  2011/02/07 15:47:28  martin
+ *  Fixed a potential trap in kernel messages.
  *  Revision 1.46.2.24  2011/02/04 14:44:45  martin
  *  Revision 1.46.2.23  2011/02/01 17:12:04  martin
  *  Revision 1.46.2.22  2011/02/01 15:08:34  martin
@@ -351,7 +353,7 @@
   #define DEBUG_SERNUM    ( defined( DEBUG ) && ( DEBUG >= DEBUG_LVL_SERNUM ) )
 #endif
 
-extern const char *pcps_driver_name;
+extern const char pcps_driver_name[];
 
 
 // In some environments special far functions are are neither
@@ -453,16 +455,16 @@ static /*HDR*/
 void report_uptime( const MBG_SYS_UPTIME *p_uptime )
 {
   #if defined( MBG_TGT_LINUX )
-    printk( KERN_INFO "%s: uptime %Lu jiffies -> %Lu s, required %u s\n",
+    printk( KERN_INFO "%s: system uptime %Lu jiffies -> %Lu s, required %u s\n",
             pcps_driver_name, (uint64_t) get_jiffies_64() - INITIAL_JIFFIES,
             (uint64_t) *p_uptime, MAX_BOOT_TIME_PTP270PEX );
   #elif defined( MBG_TGT_BSD )
-    printf( "%s: uptime %lli s, required %u s\n",
-            pcps_driver_name, (long long) *p_uptime, MAX_BOOT_TIME_PTP270PEX );
+    printf( "%s: system uptime %lli s, required %u s\n",
+            pcps_driver_name, *p_uptime, MAX_BOOT_TIME_PTP270PEX );
   #elif defined( MBG_TGT_WIN32 )
     WCHAR wcs_msg[120];
 
-    swprintf( wcs_msg, L"uptime: %I64u s, required %u s",
+    swprintf( wcs_msg, L"system uptime: %I64u s, required %u s",
               (uint64_t) *p_uptime, MAX_BOOT_TIME_PTP270PEX );
     _evt_msg( GlbDriverObject, wcs_msg );
   #endif
diff --git a/mbglib/common/pcpslstr.c b/mbglib/common/pcpslstr.c
index 95197f3..944cee0 100755
--- a/mbglib/common/pcpslstr.c
+++ b/mbglib/common/pcpslstr.c
@@ -1,7 +1,7 @@
 
 /**************************************************************************
  *
- *  $Id: pcpslstr.c 1.22.1.3 2011/01/28 09:34:20 martin TEST $
+ *  $Id: pcpslstr.c 1.22.1.4 2011/02/07 10:34:59 martin TEST $
  *
  *  Copyright (c) Meinberg Funkuhren, Bad Pyrmont, Germany
  *
@@ -11,6 +11,8 @@
  *
  * -----------------------------------------------------------------------
  *  $Log: pcpslstr.c $
+ *  Revision 1.22.1.4  2011/02/07 10:34:59  martin
+ *  Fixed potential compiler warning for sprintf().
  *  Revision 1.22.1.3  2011/01/28 09:34:20  martin
  *  Fixed build under FreeBSD.
  *  Revision 1.22.1.2  2010/11/05 12:55:10  martin
@@ -136,7 +138,7 @@ int sprint_utc_offs( char *s, const char *info, long utc_offs )
   ulong utc_offs_secs = tmp % MINS_PER_HOUR;
 
   if ( info )
-    n += sprintf( &s[n], info );
+    n += sprintf( &s[n], "%s", info );
 
   n += sprintf( &s[n], "%c%lu", utc_offs_sign, utc_offs_hours );
 
diff --git a/mbgstatus/mbgstatus.c b/mbgstatus/mbgstatus.c
index e1251a3..0e3d1e3 100755
--- a/mbgstatus/mbgstatus.c
+++ b/mbgstatus/mbgstatus.c
@@ -1,7 +1,7 @@
 
 /**************************************************************************
  *
- *  $Id: mbgstatus.c 1.13.1.6 2010/11/25 14:54:51 martin TEST $
+ *  $Id: mbgstatus.c 1.13.1.7 2011/02/07 12:10:58 martin TEST $
  *
  *  Description:
  *    Main file for mbgstatus program which demonstrates how to
@@ -10,6 +10,8 @@
  *
  * -----------------------------------------------------------------------
  *  $Log: mbgstatus.c $
+ *  Revision 1.13.1.7  2011/02/07 12:10:58  martin
+ *  Use mbg_get_ptp_status() API call.
  *  Revision 1.13.1.6  2010/11/25 14:54:51  martin
  *  Revision 1.13.1.5  2010/11/05 12:54:22  martin
  *  Introduce "verbose" flag and associated command line parameter -v.
@@ -605,9 +607,9 @@ void show_ptp_state( MBG_DEV_HANDLE dh )
   int ptp_state_available;
   PTP_STATE ptp_state;
 
-  int rc = _mbg_generic_read_gps_var( dh, PC_GPS_PTP_STATE, ptp_state );
+  int rc = mbg_get_ptp_state( dh, &ptp_state );
 
-  if ( mbg_ioctl_err( rc, "reading PTP state" ) )
+  if ( mbg_ioctl_err( rc, "mbg_get_ptp_state" ) )
     return;