summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjan <jan@cvs.openbsd.org>2019-10-05 20:41:28 +0000
committerjan <jan@cvs.openbsd.org>2019-10-05 20:41:28 +0000
commit810bdf5e8e0f154b58a614d4671f9b841e1f10e1 (patch)
treed000253281292006b4502b4a3ddc74d5a8d2cc79
parent8ebcc8b46e4c55f7422462ffc1aad2062eb231df (diff)
fix build errors of aac(4)
-rw-r--r--sys/dev/ic/aac.c6
-rw-r--r--sys/dev/ic/aacvar.h7
2 files changed, 4 insertions, 9 deletions
diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c
index 996b32bc901..e73526cd0a2 100644
--- a/sys/dev/ic/aac.c
+++ b/sys/dev/ic/aac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aac.c,v 1.70 2017/04/11 14:43:49 dhill Exp $ */
+/* $OpenBSD: aac.c,v 1.71 2019/10/05 20:41:27 jan Exp $ */
/*-
* Copyright (c) 2000 Michael Smith
@@ -2129,7 +2129,7 @@ aac_internal_cache_cmd(struct scsi_xfer *xs)
struct scsi_read_cap_data rcd;
u_int8_t target = link->target;
- AAC_DPRINTF(AAC_D_CMD, ("aac_internal_cache_cmd: ",
+ AAC_DPRINTF(AAC_D_CMD, ("%s: aac_internal_cache_cmd: ",
sc->aac_dev.dv_xname));
switch (xs->cmd->opcode) {
@@ -2277,7 +2277,7 @@ aac_scsi_cmd(struct scsi_xfer *xs)
blockcnt = _2btol(rwb->length);
}
- AAC_DPRINTF(AAC_D_CMD, ("blkno=%d bcount=%d ",
+ AAC_DPRINTF(AAC_D_CMD, ("opcode=%d blkno=%d bcount=%d ",
xs->cmd->opcode, blockno, blockcnt));
if (blockno >= sc->aac_hdr[target].hd_size ||
diff --git a/sys/dev/ic/aacvar.h b/sys/dev/ic/aacvar.h
index 0f1e9fc0031..d6d73486b25 100644
--- a/sys/dev/ic/aacvar.h
+++ b/sys/dev/ic/aacvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: aacvar.h,v 1.13 2016/04/01 04:16:27 jsg Exp $ */
+/* $OpenBSD: aacvar.h,v 1.14 2019/10/05 20:41:27 jan Exp $ */
/*-
* Copyright (c) 2000 Michael Smith
@@ -429,11 +429,6 @@ int aac_attach(struct aac_softc *);
int aac_intr(void *);
/* These all require correctly aligned buffers */
-static __inline__ void aac_enc16(u_int8_t *, u_int16_t);
-static __inline__ void aac_enc32(u_int8_t *, u_int32_t);
-static __inline__ u_int16_t aac_dec16(u_int8_t *);
-static __inline__ u_int32_t aac_dec32(u_int8_t *);
-
static __inline__ void
aac_enc16(addr, value)
u_int8_t *addr;