From f6f24090f11ada165b24617fcf5b6b24ca2788b7 Mon Sep 17 00:00:00 2001 From: ken Date: Mon, 27 Sep 1999 06:12:57 +0000 Subject: [PATCH] Fix two rather embarrassing bugs in camcontrol. The first caused the 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) --- sbin/camcontrol/camcontrol.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index b6f9e6770b44..7eb0e65dca4d 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -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;