Deleted Added
full compact
isp_freebsd.h (298966) isp_freebsd.h (314698)
1/* $FreeBSD: stable/10/sys/dev/isp/isp_freebsd.h 298966 2016-05-03 08:00:54Z mav $ */
1/* $FreeBSD: stable/10/sys/dev/isp/isp_freebsd.h 314698 2017-03-05 05:17:36Z mav $ */
2/*-
3 * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions
4 *
5 * Copyright (c) 1997-2008 by Matthew Jacob
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions

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

158};
159typedef struct isp_timed_notify_ack {
160 void *isp;
161 void *not;
162 uint8_t data[64]; /* sb QENTRY_LEN, but order of definitions is wrong */
163 struct callout timer;
164} isp_tna_t;
165
2/*-
3 * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions
4 *
5 * Copyright (c) 1997-2008 by Matthew Jacob
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions

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

158};
159typedef struct isp_timed_notify_ack {
160 void *isp;
161 void *not;
162 uint8_t data[64]; /* sb QENTRY_LEN, but order of definitions is wrong */
163 struct callout timer;
164} isp_tna_t;
165
166TAILQ_HEAD(isp_ccbq, ccb_hdr);
167typedef struct tstate {
168 SLIST_ENTRY(tstate) next;
169 lun_id_t ts_lun;
170 struct cam_path *owner;
166typedef struct tstate {
167 SLIST_ENTRY(tstate) next;
168 lun_id_t ts_lun;
169 struct cam_path *owner;
171 struct isp_ccbq waitq; /* waiting CCBs */
172 struct ccb_hdr_slist atios;
173 struct ccb_hdr_slist inots;
174 uint32_t hold;
175 uint16_t atio_count;
176 uint16_t inot_count;
177 inot_private_data_t * restart_queue;
178 inot_private_data_t * ntfree;
179 inot_private_data_t ntpool[ATPDPSIZE];

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

215#define NEXUS_HASH_WIDTH 32
216#define INITIAL_NEXUS_COUNT MAX_FC_TARG
217#define NEXUS_HASH(tgt, lun) ((tgt + lun) % NEXUS_HASH_WIDTH)
218
219/*
220 * Per channel information
221 */
222SLIST_HEAD(tslist, tstate);
170 struct ccb_hdr_slist atios;
171 struct ccb_hdr_slist inots;
172 uint32_t hold;
173 uint16_t atio_count;
174 uint16_t inot_count;
175 inot_private_data_t * restart_queue;
176 inot_private_data_t * ntfree;
177 inot_private_data_t ntpool[ATPDPSIZE];

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

213#define NEXUS_HASH_WIDTH 32
214#define INITIAL_NEXUS_COUNT MAX_FC_TARG
215#define NEXUS_HASH(tgt, lun) ((tgt + lun) % NEXUS_HASH_WIDTH)
216
217/*
218 * Per channel information
219 */
220SLIST_HEAD(tslist, tstate);
221TAILQ_HEAD(isp_ccbq, ccb_hdr);
223
224struct isp_fc {
225 struct cam_sim *sim;
226 struct cam_path *path;
227 struct ispsoftc *isp;
228 struct proc *kproc;
229 bus_dmamap_t scmap;
230 uint64_t def_wwpn;

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

244 gdt_running : 1,
245 loop_dead : 1,
246 loop_seen_once : 1,
247 fcbsy : 1,
248 ready : 1;
249 struct callout gdt; /* gone device timer */
250 struct task gtask;
251#ifdef ISP_TARGET_MODE
222
223struct isp_fc {
224 struct cam_sim *sim;
225 struct cam_path *path;
226 struct ispsoftc *isp;
227 struct proc *kproc;
228 bus_dmamap_t scmap;
229 uint64_t def_wwpn;

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

243 gdt_running : 1,
244 loop_dead : 1,
245 loop_seen_once : 1,
246 fcbsy : 1,
247 ready : 1;
248 struct callout gdt; /* gone device timer */
249 struct task gtask;
250#ifdef ISP_TARGET_MODE
252 struct tslist lun_hash[LUN_HASH_SIZE];
251 struct tslist lun_hash[LUN_HASH_SIZE];
252 struct isp_ccbq waitq; /* waiting CCBs */
253#if defined(DEBUG)
254 unsigned int inject_lost_data_frame;
255#endif
256#endif
257 int num_threads;
258};
259
260struct isp_spi {
261 struct cam_sim *sim;
262 struct cam_path *path;
263 uint32_t
264 simqfrozen : 3,
265 iid : 4;
266#ifdef ISP_TARGET_MODE
253#if defined(DEBUG)
254 unsigned int inject_lost_data_frame;
255#endif
256#endif
257 int num_threads;
258};
259
260struct isp_spi {
261 struct cam_sim *sim;
262 struct cam_path *path;
263 uint32_t
264 simqfrozen : 3,
265 iid : 4;
266#ifdef ISP_TARGET_MODE
267 struct tslist lun_hash[LUN_HASH_SIZE];
267 struct tslist lun_hash[LUN_HASH_SIZE];
268 struct isp_ccbq waitq; /* waiting CCBs */
268#endif
269 int num_threads;
270};
271
272struct isposinfo {
273 /*
274 * Linkage, locking, and identity
275 */

--- 497 unchanged lines hidden ---
269#endif
270 int num_threads;
271};
272
273struct isposinfo {
274 /*
275 * Linkage, locking, and identity
276 */

--- 497 unchanged lines hidden ---