summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2015-10-05 11:27:35 +0000
committermav <mav@FreeBSD.org>2015-10-05 11:27:35 +0000
commitfd7d50642fc1755aacc2b4970a99bbe0770c762c (patch)
treeec9c41d118f07833f9975f2e8a1a1a6d4ecbad7f
parent4a52f62800013e715383cd00eec8a1febcf8269e (diff)
downloadFreeBSD-src-fd7d50642fc1755aacc2b4970a99bbe0770c762c.zip
FreeBSD-src-fd7d50642fc1755aacc2b4970a99bbe0770c762c.tar.gz
MFC r288261: Move ioctl frontend defines where they belong.
-rw-r--r--sys/cam/ctl/ctl_frontend_ioctl.c12
-rw-r--r--sys/cam/ctl/ctl_private.h12
2 files changed, 12 insertions, 12 deletions
diff --git a/sys/cam/ctl/ctl_frontend_ioctl.c b/sys/cam/ctl/ctl_frontend_ioctl.c
index 0f2e7a815..6ef2f66 100644
--- a/sys/cam/ctl/ctl_frontend_ioctl.c
+++ b/sys/cam/ctl/ctl_frontend_ioctl.c
@@ -56,6 +56,18 @@ __FBSDID("$FreeBSD$");
#include <cam/ctl/ctl_debug.h>
#include <cam/ctl/ctl_error.h>
+typedef enum {
+ CTL_IOCTL_INPROG,
+ CTL_IOCTL_DATAMOVE,
+ CTL_IOCTL_DONE
+} ctl_fe_ioctl_state;
+
+struct ctl_fe_ioctl_params {
+ struct cv sem;
+ struct mtx ioctl_mtx;
+ ctl_fe_ioctl_state state;
+};
+
struct cfi_softc {
uint32_t cur_tag_num;
struct ctl_port port;
diff --git a/sys/cam/ctl/ctl_private.h b/sys/cam/ctl/ctl_private.h
index f6f5187..bf48101 100644
--- a/sys/cam/ctl/ctl_private.h
+++ b/sys/cam/ctl/ctl_private.h
@@ -47,18 +47,6 @@
#define CTL_PROCESSOR_PRODUCT "CTLPROCESSOR "
#define CTL_UNKNOWN_PRODUCT "CTLDEVICE "
-typedef enum {
- CTL_IOCTL_INPROG,
- CTL_IOCTL_DATAMOVE,
- CTL_IOCTL_DONE
-} ctl_fe_ioctl_state;
-
-struct ctl_fe_ioctl_params {
- struct cv sem;
- struct mtx ioctl_mtx;
- ctl_fe_ioctl_state state;
-};
-
#define CTL_POOL_ENTRIES_OTHER_SC 200
struct ctl_io_pool {
OpenPOWER on IntegriCloud