Deleted Added
full compact
camcontrol.c (249895) camcontrol.c (250662)
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: head/sbin/camcontrol/camcontrol.c 249895 2013-04-25 14:11:38Z smh $");
30__FBSDID("$FreeBSD: head/sbin/camcontrol/camcontrol.c 250662 2013-05-15 17:26:50Z asomers $");
31
32#include <sys/ioctl.h>
33#include <sys/stdint.h>
34#include <sys/types.h>
35#include <sys/endian.h>
36#include <sys/sbuf.h>
37
38#include <stdio.h>

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

7133 }
7134
7135 if (disresponse->function_result == SMP_FR_PHY_VACANT) {
7136 if (quiet == 0)
7137 fprintf(stdout, "%3d <vacant>\n", i);
7138 continue;
7139 }
7140
31
32#include <sys/ioctl.h>
33#include <sys/stdint.h>
34#include <sys/types.h>
35#include <sys/endian.h>
36#include <sys/sbuf.h>
37
38#include <stdio.h>

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

7133 }
7134
7135 if (disresponse->function_result == SMP_FR_PHY_VACANT) {
7136 if (quiet == 0)
7137 fprintf(stdout, "%3d <vacant>\n", i);
7138 continue;
7139 }
7140
7141 item = findsasdevice(&devlist,
7142 scsi_8btou64(disresponse->attached_sas_address));
7141 if (disresponse->attached_device == SMP_DIS_AD_TYPE_NONE) {
7142 item = NULL;
7143 } else {
7144 item = findsasdevice(&devlist,
7145 scsi_8btou64(disresponse->attached_sas_address));
7146 }
7143
7144 if ((quiet == 0)
7145 || (item != NULL)) {
7146 fprintf(stdout, "%3d 0x%016jx", i,
7147 (uintmax_t)scsi_8btou64(
7148 disresponse->attached_sas_address));
7149 if (item == NULL) {
7150 fprintf(stdout, "\n");

--- 723 unchanged lines hidden ---
7147
7148 if ((quiet == 0)
7149 || (item != NULL)) {
7150 fprintf(stdout, "%3d 0x%016jx", i,
7151 (uintmax_t)scsi_8btou64(
7152 disresponse->attached_sas_address));
7153 if (item == NULL) {
7154 fprintf(stdout, "\n");

--- 723 unchanged lines hidden ---