summaryrefslogtreecommitdiffstats
path: root/sys/cam
diff options
context:
space:
mode:
Diffstat (limited to 'sys/cam')
-rw-r--r--sys/cam/cam.h8
-rw-r--r--sys/cam/cam_ccb.h2
-rw-r--r--sys/cam/cam_conf.h4
-rw-r--r--sys/cam/cam_debug.h10
-rw-r--r--sys/cam/cam_extend.h4
-rw-r--r--sys/cam/cam_periph.h4
-rw-r--r--sys/cam/cam_queue.h4
-rw-r--r--sys/cam/cam_sim.h4
-rw-r--r--sys/cam/cam_xpt.h4
-rw-r--r--sys/cam/cam_xpt_periph.h4
-rw-r--r--sys/cam/cam_xpt_sim.h4
11 files changed, 26 insertions, 26 deletions
diff --git a/sys/cam/cam.h b/sys/cam/cam.h
index b185457..28964bc 100644
--- a/sys/cam/cam.h
+++ b/sys/cam/cam.h
@@ -31,9 +31,9 @@
#ifndef _CAM_CAM_H
#define _CAM_CAM_H 1
-#ifdef KERNEL
+#ifdef _KERNEL
#include <opt_cam.h>
-#endif /* KERNEL */
+#endif
#include <sys/cdefs.h>
@@ -163,7 +163,7 @@ void cam_strvis(u_int8_t *dst, const u_int8_t *src, int srclen, int dstlen);
int cam_strmatch(const u_int8_t *str, const u_int8_t *pattern, int str_len);
__END_DECLS
-#ifdef KERNEL
+#ifdef _KERNEL
static __inline void cam_init_pinfo(cam_pinfo *pinfo);
static __inline void cam_init_pinfo(cam_pinfo *pinfo)
@@ -171,6 +171,6 @@ static __inline void cam_init_pinfo(cam_pinfo *pinfo)
pinfo->priority = CAM_PRIORITY_NONE;
pinfo->index = CAM_UNQUEUED_INDEX;
}
-#endif /* KERNEL */
+#endif
#endif /* _CAM_CAM_H */
diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h
index 2f4ad02..aa8e6d4 100644
--- a/sys/cam/cam_ccb.h
+++ b/sys/cam/cam_ccb.h
@@ -34,7 +34,7 @@
#include <sys/queue.h>
#include <sys/cdefs.h>
#include <sys/time.h>
-#ifndef KERNEL
+#ifndef _KERNEL
#include <sys/callout.h>
#endif
#include <cam/cam_debug.h>
diff --git a/sys/cam/cam_conf.h b/sys/cam/cam_conf.h
index fc777c1..6cdd811 100644
--- a/sys/cam/cam_conf.h
+++ b/sys/cam/cam_conf.h
@@ -31,7 +31,7 @@
#ifndef _CAM_CAM_CONF_H
#define _CAM_CAM_CONF_H 1
-#ifdef KERNEL
+#ifdef _KERNEL
#define CAMCONF_UNSPEC 255
#define CAMCONF_ANY 254
@@ -62,6 +62,6 @@ struct cam_periph_config
extern struct cam_sim_config cam_sinit[];
extern struct cam_periph_config cam_pinit[];
-#endif /* KERNEL */
+#endif
#endif /* _CAM_CAM_CONF_H */
diff --git a/sys/cam/cam_debug.h b/sys/cam/cam_debug.h
index aa1a50d..22c56c6 100644
--- a/sys/cam/cam_debug.h
+++ b/sys/cam/cam_debug.h
@@ -30,9 +30,9 @@
#ifndef _CAM_CAM_DEBUG_H
#define _CAM_CAM_DEBUG_H 1
-#if defined(CAMDEBUG) && defined(KERNEL)
+#if defined(CAMDEBUG) && defined(_KERNEL)
#include <machine/clock.h>
-#endif /* CAMDEBUG && KERNEL */
+#endif /* CAMDEBUG && _KERNEL */
/*
* Debugging flags.
@@ -47,7 +47,7 @@ typedef enum {
CAM_DEBUG_PERIPH = 0x20 /* print out peripheral calls */
} cam_debug_flags;
-#if defined(CAMDEBUG) && defined(KERNEL)
+#if defined(CAMDEBUG) && defined(_KERNEL)
/* Path we want to debug */
extern struct cam_path *cam_dpath;
@@ -80,12 +80,12 @@ extern u_int32_t cam_debug_delay;
DELAY(cam_debug_delay); \
}
-#else /* !CAMDEBUG || !KERNEL */
+#else /* !CAMDEBUG || !_KERNEL */
#define CAM_DEBUGGED(A, B) 0
#define CAM_DEBUG(A, B, C)
#define CAM_DEBUG_PRINT(A, B)
-#endif /* CAMDEBUG && KERNEL */
+#endif /* CAMDEBUG && _KERNEL */
#endif /* _CAM_CAM_DEBUG_H */
diff --git a/sys/cam/cam_extend.h b/sys/cam/cam_extend.h
index 21ade23..1ac3835 100644
--- a/sys/cam/cam_extend.h
+++ b/sys/cam/cam_extend.h
@@ -18,7 +18,7 @@
#ifndef _CAM_CAM_EXTEND_H
#define _CAM_CAM_EXTEND_H 1
-#ifdef KERNEL
+#ifdef _KERNEL
struct extend_array;
void *cam_extend_get(struct extend_array *ea, int index);
@@ -26,5 +26,5 @@ struct extend_array *cam_extend_new(void);
void *cam_extend_set(struct extend_array *ea, int index, void *value);
void cam_extend_release(struct extend_array *ea, int index);
-#endif /* KERNEL */
+#endif
#endif /* _CAM_CAM_EXTEND_H */
diff --git a/sys/cam/cam_periph.h b/sys/cam/cam_periph.h
index acb7bd6..633581f 100644
--- a/sys/cam/cam_periph.h
+++ b/sys/cam/cam_periph.h
@@ -33,7 +33,7 @@
#include <sys/queue.h>
-#ifdef KERNEL
+#ifdef _KERNEL
extern struct linker_set periphdriver_set;
@@ -144,5 +144,5 @@ void cam_periph_freeze_after_event(struct cam_periph *periph,
int cam_periph_error(union ccb *ccb, cam_flags camflags,
u_int32_t sense_flags, union ccb *save_ccb);
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* _CAM_CAM_PERIPH_H */
diff --git a/sys/cam/cam_queue.h b/sys/cam/cam_queue.h
index d345931..3d0a29c 100644
--- a/sys/cam/cam_queue.h
+++ b/sys/cam/cam_queue.h
@@ -31,7 +31,7 @@
#ifndef _CAM_CAM_QUEUE_H
#define _CAM_CAM_QUEUE_H 1
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/queue.h>
@@ -234,5 +234,5 @@ cam_ccbq_release_opening(struct cam_ccbq *ccbq)
ccbq->devq_openings++;
}
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* _CAM_CAM_QUEUE_H */
diff --git a/sys/cam/cam_sim.h b/sys/cam/cam_sim.h
index 5325049..95e6dce 100644
--- a/sys/cam/cam_sim.h
+++ b/sys/cam/cam_sim.h
@@ -31,7 +31,7 @@
#ifndef _CAM_CAM_SIM_H
#define _CAM_CAM_SIM_H 1
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* The sim driver creates a sim for each controller. The sim device
@@ -131,5 +131,5 @@ cam_sim_bus(struct cam_sim *sim)
return (sim->bus_id);
}
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* _CAM_CAM_SIM_H */
diff --git a/sys/cam/cam_xpt.h b/sys/cam/cam_xpt.h
index 6d41f6c..8eb77e0 100644
--- a/sys/cam/cam_xpt.h
+++ b/sys/cam/cam_xpt.h
@@ -46,7 +46,7 @@ struct cam_path;
/* Path functions */
-#ifdef KERNEL
+#ifdef _KERNEL
void xpt_action(union ccb *new_ccb);
void xpt_setup_ccb(struct ccb_hdr *ccb_h,
@@ -69,7 +69,7 @@ struct cam_sim *xpt_path_sim(struct cam_path *path);
struct cam_periph *xpt_path_periph(struct cam_path *path);
void xpt_async(u_int32_t async_code, struct cam_path *path,
void *async_arg);
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* _CAM_CAM_XPT_H */
diff --git a/sys/cam/cam_xpt_periph.h b/sys/cam/cam_xpt_periph.h
index 111402f..6281a15 100644
--- a/sys/cam/cam_xpt_periph.h
+++ b/sys/cam/cam_xpt_periph.h
@@ -36,7 +36,7 @@
#include <cam/cam_xpt.h>
/* Functions accessed by the peripheral drivers */
-#ifdef KERNEL
+#ifdef _KERNEL
void xpt_polled_action(union ccb *ccb);
union ccb *xpt_alloc_ccb(void);
void xpt_free_ccb(union ccb *free_ccb);
@@ -46,6 +46,6 @@ int32_t xpt_add_periph(struct cam_periph *periph);
void xpt_remove_periph(struct cam_periph *periph);
void xpt_announce_periph(struct cam_periph *periph,
char *announce_string);
-#endif /* KERNEL */
+#endif
#endif /* _CAM_CAM_XPT_PERIPH_H */
diff --git a/sys/cam/cam_xpt_sim.h b/sys/cam/cam_xpt_sim.h
index 698e638..62a53ec 100644
--- a/sys/cam/cam_xpt_sim.h
+++ b/sys/cam/cam_xpt_sim.h
@@ -36,7 +36,7 @@
#include <cam/cam_queue.h>
/* Functions accessed by SIM drivers */
-#ifdef KERNEL
+#ifdef _KERNEL
int32_t xpt_bus_register(struct cam_sim *sim, u_int32_t bus);
int32_t xpt_bus_deregister(u_int8_t path_id);
u_int32_t xpt_freeze_simq(struct cam_sim *sim, u_int count);
@@ -45,7 +45,7 @@ u_int32_t xpt_freeze_devq(struct cam_path *path, u_int count);
void xpt_release_devq(struct cam_path *path, u_int count,
int run_queue);
void xpt_done(union ccb *done_ccb);
-#endif /* KERNEL */
+#endif
#endif /* _CAM_CAM_XPT_SIM_H */
OpenPOWER on IntegriCloud