Deleted Added
full compact
ispvar.h (291188) ispvar.h (291365)
1/* $FreeBSD: head/sys/dev/isp/ispvar.h 291188 2015-11-23 10:06:19Z mav $ */
1/* $FreeBSD: head/sys/dev/isp/ispvar.h 291365 2015-11-26 13:04:58Z mav $ */
2/*-
3 * Copyright (c) 1997-2009 by Matthew Jacob
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 *

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

433
434typedef struct {
435 int isp_gbspeed; /* Connection speed */
436 int isp_linkstate; /* Link state */
437 int isp_fwstate; /* ISP F/W state */
438 int isp_loopstate; /* Loop State */
439 int isp_topo; /* Connection Type */
440
2/*-
3 * Copyright (c) 1997-2009 by Matthew Jacob
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 *

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

433
434typedef struct {
435 int isp_gbspeed; /* Connection speed */
436 int isp_linkstate; /* Link state */
437 int isp_fwstate; /* ISP F/W state */
438 int isp_loopstate; /* Loop State */
439 int isp_topo; /* Connection Type */
440
441 uint32_t : 3,
441 uint32_t : 4,
442 fctape_enabled : 1,
443 sendmarker : 1,
442 fctape_enabled : 1,
443 sendmarker : 1,
444 loop_seen_once : 1,
445 role : 2,
446 isp_portid : 24; /* S_ID */
447
448 uint16_t isp_fwoptions;
449 uint16_t isp_xfwoptions;
450 uint16_t isp_zfwoptions;
451 uint16_t isp_loopid; /* hard loop id */
452 uint16_t isp_sns_hdl; /* N-port handle for SNS */

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

485#define FW_WAIT_LOGIN 2
486#define FW_READY 3
487#define FW_LOSS_OF_SYNC 4
488#define FW_ERROR 5
489#define FW_REINIT 6
490#define FW_NON_PART 7
491
492#define LOOP_NIL 0
444 role : 2,
445 isp_portid : 24; /* S_ID */
446
447 uint16_t isp_fwoptions;
448 uint16_t isp_xfwoptions;
449 uint16_t isp_zfwoptions;
450 uint16_t isp_loopid; /* hard loop id */
451 uint16_t isp_sns_hdl; /* N-port handle for SNS */

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

484#define FW_WAIT_LOGIN 2
485#define FW_READY 3
486#define FW_LOSS_OF_SYNC 4
487#define FW_ERROR 5
488#define FW_REINIT 6
489#define FW_NON_PART 7
490
491#define LOOP_NIL 0
493#define LOOP_TESTING_LINK 1
494#define LOOP_LTEST_DONE 2
495#define LOOP_SCANNING_LOOP 3
496#define LOOP_LSCAN_DONE 4
497#define LOOP_SCANNING_FABRIC 5
498#define LOOP_FSCAN_DONE 6
499#define LOOP_SYNCING_PDB 7
500#define LOOP_READY 8
492#define LOOP_HAVE_LINK 1
493#define LOOP_TESTING_LINK 2
494#define LOOP_LTEST_DONE 3
495#define LOOP_SCANNING_LOOP 4
496#define LOOP_LSCAN_DONE 5
497#define LOOP_SCANNING_FABRIC 6
498#define LOOP_FSCAN_DONE 7
499#define LOOP_SYNCING_PDB 8
500#define LOOP_READY 9
501
502#define TOPO_NL_PORT 0
503#define TOPO_FL_PORT 1
504#define TOPO_N_PORT 2
505#define TOPO_F_PORT 3
506#define TOPO_PTP_STUB 4
507
508#define TOPO_IS_FABRIC(x) ((x) == TOPO_FL_PORT || (x) == TOPO_F_PORT)

--- 649 unchanged lines hidden ---
501
502#define TOPO_NL_PORT 0
503#define TOPO_FL_PORT 1
504#define TOPO_N_PORT 2
505#define TOPO_F_PORT 3
506#define TOPO_PTP_STUB 4
507
508#define TOPO_IS_FABRIC(x) ((x) == TOPO_FL_PORT || (x) == TOPO_F_PORT)

--- 649 unchanged lines hidden ---