d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the more descriptive src_ccb and dst_ccb for the two ccbs being merged.

Browse Source 
MFC after: 1 week
This commit is contained in:
Warner Losh 2020-06-20 04:07:23 +00:00
parent 972670e132
commit f66ca1b1eb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=362419
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/cam/cam_xpt.c
View File

@ -3526,22 +3526,22 @@ xpt_run_devq(struct cam_devq *devq)
} }
/* /*
* This function merges stuff from the slave ccb into the master ccb, while * This function merges stuff from the src ccb into the dst ccb, while keeping
* keeping important fields in the master ccb constant. * important fields in the dst ccb constant.
*/ */
void void
xpt_merge_ccb(union ccb *master_ccb, union ccb *slave_ccb) xpt_merge_ccb(union ccb *dst_ccb, union ccb *src_ccb)
{ {
/* /*
* Pull fields that are valid for peripheral drivers to set * Pull fields that are valid for peripheral drivers to set
* into the master CCB along with the CCB "payload". * into the dst CCB along with the CCB "payload".
*/ */
master_ccb->ccb_h.retry_count = slave_ccb->ccb_h.retry_count; dst_ccb->ccb_h.retry_count = src_ccb->ccb_h.retry_count;
master_ccb->ccb_h.func_code = slave_ccb->ccb_h.func_code; dst_ccb->ccb_h.func_code = src_ccb->ccb_h.func_code;
master_ccb->ccb_h.timeout = slave_ccb->ccb_h.timeout; dst_ccb->ccb_h.timeout = src_ccb->ccb_h.timeout;
master_ccb->ccb_h.flags = slave_ccb->ccb_h.flags; dst_ccb->ccb_h.flags = src_ccb->ccb_h.flags;
bcopy(&(&slave_ccb->ccb_h)[1], &(&master_ccb->ccb_h)[1], bcopy(&(&src_ccb->ccb_h)[1], &(&dst_ccb->ccb_h)[1],
sizeof(union ccb) - sizeof(struct ccb_hdr)); sizeof(union ccb) - sizeof(struct ccb_hdr));
} }

4
sys/cam/cam_xpt.h
View File

@ -86,8 +86,8 @@ void xpt_setup_ccb_flags(struct ccb_hdr *ccb_h,
void xpt_setup_ccb(struct ccb_hdr *ccb_h, void xpt_setup_ccb(struct ccb_hdr *ccb_h,
struct cam_path *path, struct cam_path *path,
u_int32_t priority); u_int32_t priority);
void xpt_merge_ccb(union ccb *master_ccb, void xpt_merge_ccb(union ccb *dst_ccb,
union ccb *slave_ccb); union ccb *src_ccb);
cam_status xpt_create_path(struct cam_path **new_path_ptr, cam_status xpt_create_path(struct cam_path **new_path_ptr,
struct cam_periph *perph, struct cam_periph *perph,
path_id_t path_id, path_id_t path_id,