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

Fix two rather embarrassing bugs in camcontrol. The first caused the

Browse Source 
CAM_PASS_ERR_RECOVER flag to be set unconditionally on READ DEFECTS
commands, and also caused the CAM_DIR_IN flag to not be set.  This was
the cause of all of the "camcontrol defects doesn't work with my NCR
controller" bugs.

The second prevented camcontrol negotiate from negotiating any bus width
other than 8 bits.

Submitted by:	groudier@club-internet.fr (Gerard Roudier)
This commit is contained in:
ken 1999-09-27 06:12:57 +00:00
parent cfa4d8f19b
commit f6f24090f1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sbin/camcontrol/camcontrol.c
View File

@ -1151,8 +1151,8 @@ readdefects(struct cam_device *device, int argc, char **argv,
cam_fill_csio(&ccb->csio,
/*retries*/ retry_count,
/*cbfcnp*/ NULL,
/*flags*/ CAM_DIR_IN | (arglist & CAM_ARG_ERR_RECOVER) ?
CAM_PASS_ERR_RECOVER : 0,
/*flags*/ CAM_DIR_IN | ((arglist & CAM_ARG_ERR_RECOVER) ?
CAM_PASS_ERR_RECOVER : 0),
/*tag_action*/ MSG_SIMPLE_Q_TAG,
/*data_ptr*/ defect_list,
/*dxfer_len*/ dlist_length,
@ -2529,7 +2529,9 @@ ratecontrol(struct cam_device *device, int retry_count, int timeout,
warnx("HBA does not support 32 bit bus width");
retval = 1;
goto ratecontrol_bailout;
} else if (bus_width != 8) {
} else if ((bus_width != 8)
&& (bus_width != 16)
&& (bus_width != 32)) {
warnx("Invalid bus width %d", bus_width);
retval = 1;
goto ratecontrol_bailout;