diff options
| author | mjacob <mjacob@FreeBSD.org> | 2006-08-04 20:14:03 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2006-08-04 20:14:03 +0000 |
| commit | 9594cc01412b1b24a82ba7a885ca4deab53d8a2f (patch) | |
| tree | 4374492224a31f4689b20728122a59fe52020366 | |
| parent | 4fa533ec15c745ebfe63163e48fd911d2ff9675d (diff) | |
| download | FreeBSD-src-9594cc01412b1b24a82ba7a885ca4deab53d8a2f.zip FreeBSD-src-9594cc01412b1b24a82ba7a885ca4deab53d8a2f.tar.gz | |
Rename ioctl driven task management functions so they
don't collide with task management definitions on other
platforms.
| -rw-r--r-- | sys/dev/isp/isp_freebsd.c | 10 | ||||
| -rw-r--r-- | sys/dev/isp/isp_ioctl.h | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c index e71e302..620d992 100644 --- a/sys/dev/isp/isp_freebsd.c +++ b/sys/dev/isp/isp_freebsd.c @@ -562,29 +562,29 @@ ispioctl(_DEV dev, u_long c, caddr_t addr, int flags, _IOP *td) loopid <<= 8; } switch (fct->action) { - case CLEAR_ACA: + case IPT_CLEAR_ACA: mbs.param[0] = MBOX_CLEAR_ACA; mbs.param[1] = loopid; mbs.param[2] = fct->lun; break; - case TARGET_RESET: + case IPT_TARGET_RESET: mbs.param[0] = MBOX_TARGET_RESET; mbs.param[1] = loopid; needmarker = 1; break; - case LUN_RESET: + case IPT_LUN_RESET: mbs.param[0] = MBOX_LUN_RESET; mbs.param[1] = loopid; mbs.param[2] = fct->lun; needmarker = 1; break; - case CLEAR_TASK_SET: + case IPT_CLEAR_TASK_SET: mbs.param[0] = MBOX_CLEAR_TASK_SET; mbs.param[1] = loopid; mbs.param[2] = fct->lun; needmarker = 1; break; - case ABORT_TASK_SET: + case IPT_ABORT_TASK_SET: mbs.param[0] = MBOX_ABORT_TASK_SET; mbs.param[1] = loopid; mbs.param[2] = fct->lun; diff --git a/sys/dev/isp/isp_ioctl.h b/sys/dev/isp/isp_ioctl.h index d1f3f67..75ca406 100644 --- a/sys/dev/isp/isp_ioctl.h +++ b/sys/dev/isp/isp_ioctl.h @@ -188,7 +188,11 @@ struct isp_fc_tsk_mgmt { uint32_t loopid; /* 0..255 */ uint32_t lun; enum { - CLEAR_ACA, TARGET_RESET, LUN_RESET, CLEAR_TASK_SET, ABORT_TASK_SET + IPT_CLEAR_ACA, + IPT_TARGET_RESET, + IPT_LUN_RESET, + IPT_CLEAR_TASK_SET, + IPT_ABORT_TASK_SET } action; }; #define ISP_TSK_MGMT _IOWR(ISP_IOC, 97, struct isp_fc_tsk_mgmt) |
