summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/dev/ie/if_ie.c6
-rw-r--r--sys/i386/isa/if_ie.c6
-rw-r--r--sys/kern/kern_lkm.c7
-rw-r--r--sys/kern/subr_prf.c4
-rw-r--r--sys/pci/ncr.c6
5 files changed, 15 insertions, 14 deletions
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index 752fea2..aa629d6 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -47,7 +47,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ie.c,v 1.53 1998/06/07 17:10:32 dfr Exp $
+ * $Id: if_ie.c,v 1.54 1998/07/13 09:52:59 bde Exp $
*/
/*
@@ -2414,8 +2414,8 @@ setflag:
static void
print_rbd(volatile struct ie_recv_buf_desc * rbd)
{
- printf("RBD at %8p:\n"
- "actual %04x, next %04x, buffer %8p\n"
+ printf("RBD at %p:\n"
+ "actual %04x, next %04x, buffer %p\n"
"length %04x, mbz %04x\n",
(void *) rbd,
rbd->ie_rbd_actual, rbd->ie_rbd_next,
diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index 752fea2..aa629d6 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/if_ie.c
@@ -47,7 +47,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ie.c,v 1.53 1998/06/07 17:10:32 dfr Exp $
+ * $Id: if_ie.c,v 1.54 1998/07/13 09:52:59 bde Exp $
*/
/*
@@ -2414,8 +2414,8 @@ setflag:
static void
print_rbd(volatile struct ie_recv_buf_desc * rbd)
{
- printf("RBD at %8p:\n"
- "actual %04x, next %04x, buffer %8p\n"
+ printf("RBD at %p:\n"
+ "actual %04x, next %04x, buffer %p\n"
"length %04x, mbz %04x\n",
(void *) rbd,
rbd->ie_rbd_actual, rbd->ie_rbd_next,
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index 3b4731a..0f45dd1 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: kern_lkm.c,v 1.51 1998/07/15 06:39:12 bde Exp $
+ * $Id: kern_lkm.c,v 1.52 1998/07/29 17:38:14 bde Exp $
*/
#include "opt_devfs.h"
@@ -238,9 +238,10 @@ lkmcioctl(dev, cmd, data, flag, p)
resrvp->addr = curp->area; /* ret kernel addr */
#ifdef DEBUG
- printf("LKM: LMRESERV (actual = %8p)\n", (void *)curp->area);
+ printf("LKM: LMRESERV (actual = 0x%8p)\n",
+ (void *)curp->area);
printf("LKM: LMRESERV (adjusted = 0x%08x)\n",
- trunc_page(curp->area));
+ trunc_page(curp->area));
#endif /* DEBUG */
lkm_state = LKMS_RESERVED;
break;
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index b2715e5..0932081 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)subr_prf.c 8.3 (Berkeley) 1/21/94
- * $Id: subr_prf.c,v 1.47 1998/07/08 10:41:32 bde Exp $
+ * $Id: subr_prf.c,v 1.48 1998/07/15 02:32:11 bde Exp $
*/
#include <sys/param.h>
@@ -497,7 +497,7 @@ reswitch: switch (ch = (u_char)*fmt++) {
case 'p':
ul = (uintptr_t)va_arg(ap, void *);
base = 16;
- sharpflag = 1;
+ sharpflag = (width == 0);
goto nosign;
case 'n':
case 'r':
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index f1145c9..8ddf69a 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $Id: ncr.c,v 1.121 1998/07/12 20:32:52 se Exp $
+** $Id: ncr.c,v 1.122 1998/07/14 11:19:32 bde Exp $
**
** Device driver for the NCR 53C810 PCI-SCSI-Controller.
**
@@ -1344,7 +1344,7 @@ static void ncr_attach (pcici_t tag, int unit);
static char ident[] =
- "\n$Id: ncr.c,v 1.121 1998/07/12 20:32:52 se Exp $\n";
+ "\n$Id: ncr.c,v 1.122 1998/07/14 11:19:32 bde Exp $\n";
static const u_long ncr_version = NCR_VERSION * 11
+ (u_long) sizeof (struct ncb) * 7
@@ -4116,7 +4116,7 @@ static int32_t ncr_start (struct scsi_xfer * xp)
if ((unsigned)xp->datalen > 128*1024*1024) {
PRINT_ADDR(xp);
- printf ("trying to transfer %8lx bytes, mem addr = %8p\n",
+ printf ("trying to transfer %8lx bytes, mem addr = %p\n",
(u_long) xp->datalen, (void *) xp->data);
{
int j;
OpenPOWER on IntegriCloud