Deleted Added
full compact
camcontrol.c (350795) camcontrol.c (350796)
1/*
2 * Copyright (c) 1997-2007 Kenneth D. Merry
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 13 unchanged lines hidden (view full) ---

22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 */
28
29#include <sys/cdefs.h>
1/*
2 * Copyright (c) 1997-2007 Kenneth D. Merry
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 13 unchanged lines hidden (view full) ---

22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: stable/11/sbin/camcontrol/camcontrol.c 350795 2019-08-08 21:54:31Z mav $");
30__FBSDID("$FreeBSD: stable/11/sbin/camcontrol/camcontrol.c 350796 2019-08-08 21:55:49Z mav $");
31
32#include <sys/ioctl.h>
33#include <sys/stdint.h>
34#include <sys/types.h>
35#include <sys/stat.h>
36#include <sys/endian.h>
37#include <sys/sbuf.h>
38

--- 5170 unchanged lines hidden (view full) ---

5209 * should be present.
5210 *
5211 * If that VPD page isn't present, or we get an error back from the
5212 * INQUIRY command, we'll just treat it as a normal SCSI device.
5213 */
5214 retval = dev_has_vpd_page(dev, SVPD_ATA_INFORMATION, retry_count,
5215 timeout, verbosemode);
5216 if (retval == 1)
31
32#include <sys/ioctl.h>
33#include <sys/stdint.h>
34#include <sys/types.h>
35#include <sys/stat.h>
36#include <sys/endian.h>
37#include <sys/sbuf.h>
38

--- 5170 unchanged lines hidden (view full) ---

5209 * should be present.
5210 *
5211 * If that VPD page isn't present, or we get an error back from the
5212 * INQUIRY command, we'll just treat it as a normal SCSI device.
5213 */
5214 retval = dev_has_vpd_page(dev, SVPD_ATA_INFORMATION, retry_count,
5215 timeout, verbosemode);
5216 if (retval == 1)
5217 *devtype = CC_DT_ATA_BEHIND_SCSI;
5217 *devtype = CC_DT_SATL;
5218 else
5219 *devtype = CC_DT_SCSI;
5220
5221 retval = 0;
5222
5223bailout:
5224 return (retval);
5225}

--- 4616 unchanged lines hidden ---
5218 else
5219 *devtype = CC_DT_SCSI;
5220
5221 retval = 0;
5222
5223bailout:
5224 return (retval);
5225}

--- 4616 unchanged lines hidden ---