Module Name: src
Committed By: christos
Date: Wed May 13 02:35:25 UTC 2009
Modified Files:
src/sys/dev/scsipi: scsipiconf.h
Log Message:
sprinkle #ifdef _KERNEL to make scsictl compile.
To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/sys/dev/scsipi/scsipiconf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/scsipi/scsipiconf.h
diff -u src/sys/dev/scsipi/scsipiconf.h:1.114 src/sys/dev/scsipi/scsipiconf.h:1.115
--- src/sys/dev/scsipi/scsipiconf.h:1.114 Tue May 12 10:44:31 2009
+++ src/sys/dev/scsipi/scsipiconf.h Tue May 12 22:35:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipiconf.h,v 1.114 2009/05/12 14:44:31 cegger Exp $ */
+/* $NetBSD: scsipiconf.h,v 1.115 2009/05/13 02:35:25 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -143,7 +143,7 @@
ADAPTER_REQ_SET_XFER_MODE /* set xfer mode */
} scsipi_adapter_req_t;
-
+#ifdef _KERNEL
/*
* scsipi_periphsw:
*
@@ -204,6 +204,7 @@
int (*adapt_accesschk)(struct scsipi_periph *,
struct scsipi_inquiry_pattern *);
};
+#endif
/* adapt_flags */
#define SCSIPI_ADAPT_POLL_ONLY 0x01 /* Adaptor can't do interrupts. */
@@ -256,6 +257,7 @@
#define SCSIPI_CHAN_PERIPH_BUCKETS 16
#define SCSIPI_CHAN_PERIPH_HASHMASK (SCSIPI_CHAN_PERIPH_BUCKETS - 1)
+#ifdef _KERNEL
struct scsipi_channel {
const struct scsipi_bustype *chan_bustype; /* channel's bus type */
const char *chan_name; /* this channel's name */
@@ -295,6 +297,7 @@
void (*chan_init_cb)(struct scsipi_channel *, void *);
void *chan_init_cb_arg;
};
+#endif
/* chan_flags */
#define SCSIPI_CHAN_OPENINGS 0x01 /* use chan_openings */
@@ -328,6 +331,7 @@
#define PERIPH_NTAGWORDS ((256 / 8) / sizeof(u_int32_t))
+#ifdef _KERNEL
/*
* scsipi_periph:
*
@@ -387,6 +391,7 @@
struct scsipi_xfer *periph_xscheck;
};
+#endif
/*
* Macro to return the current xfer mode of a periph.
