Account for modified debug msg functionsdevel

1 files changed, 32 insertions, 30 deletions

diff --git a/mbgclock/mbgclock_main.c b/mbgclock/mbgclock_main.c
index a2f97b4..157ef19 100755
--- a/mbgclock/mbgclock_main.c
+++ b/mbgclock/mbgclock_main.c
@@ -1,7 +1,7 @@
 
 /**************************************************************************
  *
- *  $Id: mbgclock_main.c 1.3.1.6 2018/06/13 15:40:31 martin TEST $
+ *  $Id: mbgclock_main.c 1.3.1.7 2020/09/28 16:51:45 martin TEST $
  *
  *  Description:
  *    Main file for for mbgclock driver to support Meinberg bus level
@@ -37,6 +37,8 @@
  *
  * -----------------------------------------------------------------------
  *  $Log: mbgclock_main.c $
+ *  Revision 1.3.1.7  2020/09/28 16:51:45  martin
+ *  Account for modified debug msg functions.
  *  Revision 1.3.1.6  2018/06/13 15:40:31  martin
  *  Cleanup and workaround for older DEBUG builds.
  *  Revision 1.3.1.5  2018/02/20 13:56:05  martin
@@ -441,7 +443,7 @@ mbg_alloc_rsrcs( struct mbgclock_softc *psc )
 
   command = pci_conf_read(psc->pa.pa_pc, psc->pa.pa_tag, PCI_COMMAND_STATUS_REG);
 
-  _mbgddmsg_3( MBG_LOG_DEBUG,
+  _mbgddmsg_3( DEBUG_DEV_INIT, MBG_LOG_INFO,
 		       "PCI device 0x%04X:0x%04X : command status register: 0x%08X",
 		       PCI_VENDOR(psc->pa.pa_id),
 	       PCI_PRODUCT(psc->pa.pa_id), command );
@@ -451,7 +453,7 @@ mbg_alloc_rsrcs( struct mbgclock_softc *psc )
 	  int type;
 	  int reg = PCI_BAR( bar );
 
-	  _mbgddmsg_3( MBG_DBG_INIT_DEV,
+	  _mbgddmsg_3( DEBUG_DEV_INIT, MBG_LOG_INFO,
 		       "Alloc I/O range %i: PCI device 0x%04X:0x%04X",
 		       bar, PCI_VENDOR(psc->pa.pa_id),
 		       PCI_PRODUCT(psc->pa.pa_id) );
@@ -471,7 +473,7 @@ mbg_alloc_rsrcs( struct mbgclock_softc *psc )
 			  }
 			  else
 			  {
-				  _mbgddmsg_1( MBG_DBG_INIT_DEV,
+				  _mbgddmsg_1( DEBUG_DEV_INIT, MBG_LOG_INFO,
 					       "%s: Alloc I/O range %i failed",
 					       bar );
 			  }
@@ -547,7 +549,7 @@ mbgclock_match(struct device *parent, struct cfdata *match, void *aux)
 
 		if (pdt != NULL)
 		{
-			_mbgddmsg_2( MBG_DBG_INIT_DEV,
+			_mbgddmsg_2( DEBUG_DEV_INIT, MBG_LOG_INFO,
 				     "probe: PCI device 0x%04X:0x%04X supported",
 				     vend_id, dev_id );
 
@@ -556,7 +558,7 @@ mbgclock_match(struct device *parent, struct cfdata *match, void *aux)
 		}
 	}
 
-	_mbgddmsg_2( MBG_DBG_INIT_DEV, "probe: PCI device 0x%04X:0x%04X not supported",
+	_mbgddmsg_2( DEBUG_DEV_INIT, MBG_LOG_INFO, "probe: PCI device 0x%04X:0x%04X not supported",
 		     vend_id, dev_id );
 	_mbgddmsg_fnc_exit_err();
 	return 0;
@@ -593,14 +595,14 @@ mbgclock_attach(struct device *parent, struct device *self, void *aux)
                 return;
         }
 
-	_mbgddmsg_1( MBG_DBG_INIT_DEV, "Attach for device 0x%04X",
+	_mbgddmsg_1( DEBUG_DEV_INIT, MBG_LOG_INFO, "Attach for device 0x%04X",
 		     dev_id );
 
 	rc = pcps_init_ddev( &psc->pddev );
 
 	if ( mbg_rc_is_error( rc ) )
 	{
-		_mbgddmsg_1( MBG_DBG_INIT_DEV, "Attach device 0x%04X: pcps_init_ddev() failed",
+		_mbgddmsg_1( DEBUG_DEV_INIT, MBG_LOG_INFO, "Attach device 0x%04X: pcps_init_ddev() failed",
 			     dev_id );
 		goto fail;
 	}
@@ -609,7 +611,7 @@ mbgclock_attach(struct device *parent, struct device *self, void *aux)
 
 	if ( mbg_rc_is_error( rc ) )
 	{
-		_mbgddmsg_2( MBG_DBG_INIT_DEV, "Attach device 0x%04X: pcps_setup_ddev() failed, rc: %i",
+		_mbgddmsg_2( DEBUG_DEV_INIT, MBG_LOG_INFO, "Attach device 0x%04X: pcps_setup_ddev() failed, rc: %i",
 			     dev_id, rc );
 		goto fail;
 	}
@@ -620,7 +622,7 @@ mbgclock_attach(struct device *parent, struct device *self, void *aux)
 
 	if ( mbg_rc_is_error( rc ) )
 	{
-		_mbgddmsg_2( MBG_DBG_INIT_DEV, "Attach device 0x%04X: pcps_probe_device() failed, rc: %i",
+		_mbgddmsg_2( DEBUG_DEV_INIT, MBG_LOG_INFO, "Attach device 0x%04X: pcps_probe_device() failed, rc: %i",
 			     dev_id, rc );
 		goto fail;
 	}
@@ -649,7 +651,7 @@ mbgclock_attach(struct device *parent, struct device *self, void *aux)
 
 	idx += snprintf( devinfo + idx, sizeof( devinfo ) - idx, ")" );
 
-	_mbgddmsg_1( MBG_DBG_INIT_DEV, "device 0x%04X attached successfully",
+	_mbgddmsg_1( DEBUG_DEV_INIT, MBG_LOG_INFO, "device 0x%04X attached successfully",
 		     dev_id );
 
 	if (!pmf_device_register(self, NULL, NULL))
@@ -697,7 +699,7 @@ fail:
 
 	psc->pddev = NULL;
 
-	_mbgddmsg_1( MBG_DBG_INIT_DEV, "Failed to attach device 0x%04X",
+	_mbgddmsg_1( DEBUG_DEV_INIT, MBG_LOG_INFO, "Failed to attach device 0x%04X",
 		     dev_id );
 	_mbgddmsg_fnc_exit_err();
 	return;
@@ -726,7 +728,7 @@ mbgclock_detach(struct device *self, int flags)
 
 	dev_id  = PCI_PRODUCT(psc->pa.pa_id);
 
-	_mbgddmsg_1( MBG_DBG_INIT_DEV, "Detach for device 0x%04X",
+	_mbgddmsg_1( DEBUG_DEV_INIT, MBG_LOG_INFO, "Detach for device 0x%04X",
                dev_id );
 
 	/* XXX insure not outstanding requests */
@@ -739,7 +741,7 @@ mbgclock_detach(struct device *self, int flags)
 
 	psc->pddev = NULL;
 
-	_mbgddmsg_1( MBG_DBG_INIT_DEV, "Device 0x%04X detached",
+	_mbgddmsg_1( DEBUG_DEV_INIT, MBG_LOG_INFO, "Device 0x%04X detached",
                dev_id );
 
 	callout_destroy(&psc->callout);
@@ -757,7 +759,7 @@ int mbgclockopen(dev_t dev, int flags, int mode, struct lwp *l)
 	struct mbgclock_softc *psc = device_lookup_private(&mbgclock_cd, MBG_UNIT(dev));
 	PCPS_DDEV             *pddev;
 
-	_mbgddmsg_0( MBG_DBG_INIT_DEV, "'open' called" );
+	_mbgddmsg_0( DEBUG_DEV_INIT, MBG_LOG_INFO, "'open' called" );
 	DPRINTF(DB_FOLLOW, ("mbgclockopen(0x%"PRIx64", 0x%x, 0x%x, %p)\n", dev, flags, mode, l));
 
 	if (psc == NULL)
@@ -795,7 +797,7 @@ int mbgclockclose(dev_t dev, int flags, int mode, struct lwp *l)
 	struct mbgclock_softc *psc = device_lookup_private(&mbgclock_cd, MBG_UNIT(dev));
 	PCPS_DDEV             *pddev;
 
-	_mbgddmsg_0( MBG_DBG_INIT_DEV, "'close' called" );
+	_mbgddmsg_0( DEBUG_DEV_INIT, MBG_LOG_INFO, "'close' called" );
 	DPRINTF(DB_FOLLOW,("mbgclockclose(0x%"PRIx64", 0x%x, 0x%x, %p)\n", dev, flags, mode, l));
 
 	if (psc == NULL)
@@ -821,7 +823,7 @@ int mbgclockread(dev_t dev, struct uio *uio, int flags)
 	struct mbgclock_softc *psc = device_lookup_private(&mbgclock_cd, MBG_UNIT(dev));
 	PCPS_DDEV             *pddev;
 
-	_mbgddmsg_0( MBG_DBG_INIT_DEV, "'read' called" );
+	_mbgddmsg_0( DEBUG_DEV_INIT, MBG_LOG_INFO, "'read' called" );
 	DPRINTF(DB_FOLLOW,("mbgclockread(0x%"PRIx64", %p)\n", dev, uio));
 
 	if (psc == NULL)
@@ -841,7 +843,7 @@ int mbgclockwrite(dev_t dev, struct uio *uio, int flags)
 	struct mbgclock_softc *psc = device_lookup_private(&mbgclock_cd, MBG_UNIT(dev));
 	PCPS_DDEV             *pddev;
 
-	_mbgddmsg_0( MBG_DBG_INIT_DEV, "'write' called" );
+	_mbgddmsg_0( DEBUG_DEV_INIT, MBG_LOG_INFO, "'write' called" );
 	DPRINTF(DB_FOLLOW, ("mbgclockwrite(0x%"PRIx64", %p)\n", dev, uio));
 
 	if (psc == NULL)
@@ -862,7 +864,7 @@ int mbgclockioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
 	PCPS_DDEV             *pddev;
 	int rc;
 
-	_mbgddmsg_1( MBG_DBG_INIT_DEV, "'ioctl' called, flag=0x%x", flag );
+	_mbgddmsg_1( DEBUG_DEV_INIT, MBG_LOG_INFO, "'ioctl' called, flag=0x%x", flag );
 	DPRINTF(DB_FOLLOW, ("mbgclockioctl(0x%"PRIx64", 0x%lx, %p, 0x%x, %p)\n",
 			    dev, cmd, data, flag, l->l_proc));
 
@@ -924,7 +926,7 @@ int mbgclockioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
 							    KAUTH_REQ_DEVICE_RAWIO_PASSTHRU_READ,
 							    &cmd))
 			{
-				_mbgddmsg_4( MBG_DBG_INFO, "%p IOCTL 0x%02lX: READ/PASSTHRU READ permission denied, dev %s_%s",
+				_mbgddmsg_4( DEBUG_DRVR, MBG_LOG_INFO, "%p IOCTL 0x%02lX: READ/PASSTHRU READ permission denied, dev %s_%s",
 					     dev, cmd, _pcps_ddev_type_name( pddev ), _pcps_ddev_sernum( pddev ) );
 				return EPERM;
 			}
@@ -938,7 +940,7 @@ int mbgclockioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
 							    KAUTH_REQ_DEVICE_RAWIO_PASSTHRU_READCONF,
 							    &cmd))
 			{
-				_mbgddmsg_4( MBG_DBG_INFO, "%p IOCTL 0x%02lX: READ/PASSTHRU_READCONF permission denied, dev %s_%s",
+				_mbgddmsg_4( DEBUG_DRVR, MBG_LOG_INFO, "%p IOCTL 0x%02lX: READ/PASSTHRU_READCONF permission denied, dev %s_%s",
 					     dev, cmd, _pcps_ddev_type_name( pddev ), _pcps_ddev_sernum( pddev ) );
 				return EPERM;
 			}
@@ -951,7 +953,7 @@ int mbgclockioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
 							    KAUTH_REQ_DEVICE_RAWIO_PASSTHRU_WRITE,
 							    &cmd))
 			{
-				_mbgddmsg_4( MBG_DBG_INFO, "%p IOCTL 0x%02lX: WRITE/PASSTHRU_WRITE permission denied, dev %s_%s",
+				_mbgddmsg_4( DEBUG_DRVR, MBG_LOG_INFO, "%p IOCTL 0x%02lX: WRITE/PASSTHRU_WRITE permission denied, dev %s_%s",
 					     dev, cmd, _pcps_ddev_type_name( pddev ), _pcps_ddev_sernum( pddev ) );
 				return EPERM;
 			}
@@ -964,14 +966,14 @@ int mbgclockioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
 							    KAUTH_REQ_DEVICE_RAWIO_PASSTHRU_WRITECONF,
 							    &cmd))
 			{
-				_mbgddmsg_4( MBG_DBG_INFO, "%p IOCTL 0x%02lX: WRITE/PASSTHRU_WRITECONF permission denied, dev %s_%s",
+				_mbgddmsg_4( DEBUG_DRVR, MBG_LOG_INFO, "%p IOCTL 0x%02lX: WRITE/PASSTHRU_WRITECONF permission denied, dev %s_%s",
 					     dev, cmd, _pcps_ddev_type_name( pddev ), _pcps_ddev_sernum( pddev ) );
 				return EPERM;
 			}
 			break;
 
 		default:
-			_mbgddmsg_4( MBG_DBG_INFO, "%p IOCTL 0x%02lX: unknown, permission denied, dev %s_%s",
+			_mbgddmsg_4( DEBUG_DRVR, MBG_LOG_INFO, "%p IOCTL 0x%02lX: unknown, permission denied, dev %s_%s",
 				     dev, cmd, _pcps_ddev_type_name( pddev ), _pcps_ddev_sernum( pddev ) );
 			return EPERM;
 		}
@@ -992,7 +994,7 @@ int mbgclockioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
 			switch ( rc )
 			{
 			case MBG_ERR_INV_DEV_REQUEST:
-				_mbgddmsg_6( MBG_LOG_WARN, "%d,%d ioctl 0x%04lX: invalid cmd %04lX, dev %s_%s",
+				_mbgddmsg_6( DEBUG_DRVR, MBG_LOG_WARN, "%d,%d ioctl 0x%04lX: invalid cmd %04lX, dev %s_%s",
 					     major(dev), minor(dev), cmd, IOCBASECMD( cmd ),
 					     _pcps_ddev_type_name( pddev ), _pcps_ddev_sernum( pddev ) );
 				rc = EINVAL;
@@ -1000,21 +1002,21 @@ int mbgclockioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
 
 
 			case MBG_ERR_NOT_SUPP_BY_DEV:
-				_mbgddmsg_5( MBG_LOG_WARN, "%d,%d ioctl 0x%02lX: not supported by dev %s_%s",
+				_mbgddmsg_5( DEBUG_DRVR, MBG_LOG_WARN, "%d,%d ioctl 0x%02lX: not supported by dev %s_%s",
 					     major(dev), minor(dev), cmd, _pcps_ddev_type_name( pddev ), _pcps_ddev_sernum( pddev ) );
 				rc = ENODEV;
 				break;
 
 
 			case MBG_ERR_NO_MEM:
-				_mbgddmsg_5( MBG_LOG_WARN, "%d,%d ioctl 0x%02lX: unable to allocate buffer for dev %s_%s",
+				_mbgddmsg_5( DEBUG_DRVR, MBG_LOG_WARN, "%d,%d ioctl 0x%02lX: unable to allocate buffer for dev %s_%s",
 					     major(dev), minor(dev), cmd, _pcps_ddev_type_name( pddev ), _pcps_ddev_sernum( pddev ) );
 				rc = ENOMEM;
 				break;
 
 
 			case MBG_ERR_IRQ_UNSAFE:
-				_mbgddmsg_5( MBG_LOG_WARN, "%d,%d ioctl 0x%02lX: busy since unsafe IRQ enabled, dev %s_%s",
+				_mbgddmsg_5( DEBUG_DRVR, MBG_LOG_WARN, "%d,%d ioctl 0x%02lX: busy since unsafe IRQ enabled, dev %s_%s",
 					     major(dev), minor(dev), cmd, _pcps_ddev_type_name( pddev ), _pcps_ddev_sernum( pddev ) );
 				rc = EBUSY;
 				break;
@@ -1022,12 +1024,12 @@ int mbgclockioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
 
 			default:  /* any access error code returned by the low level routine */
 				/* or copying from or to user space */
-				_mbgddmsg_6( MBG_LOG_WARN, "%d,%d ioctl 0x%02lX: error %i accessing dev %s_%s",
+				_mbgddmsg_6( DEBUG_DRVR, MBG_LOG_WARN, "%d,%d ioctl 0x%02lX: error %i accessing dev %s_%s",
 					     major(dev), minor(dev), cmd, rc, _pcps_ddev_type_name( pddev ), _pcps_ddev_sernum( pddev ) );
 				rc = EIO;
 			}
 		} else {
-			_mbgddmsg_5( MBG_DBG_INFO, "%d,%d IOCTL 0x%02lX: success, dev %p_%s",
+			_mbgddmsg_5( DEBUG_DRVR, MBG_LOG_INFO, "%d,%d IOCTL 0x%02lX: success, dev %p_%s",
 				     major(dev), minor(dev), cmd, _pcps_ddev_type_name( pddev ), _pcps_ddev_sernum( pddev ) );
 			rc = 0;
 		}