Deleted Added
sdiff udiff text old ( 290830 ) new ( 291188 )
full compact
isp_freebsd.h (290830) isp_freebsd.h (291188)
1/* $FreeBSD: head/sys/dev/isp/isp_freebsd.h 290830 2015-11-14 19:47:17Z mav $ */
1/* $FreeBSD: head/sys/dev/isp/isp_freebsd.h 291188 2015-11-23 10:06:19Z 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

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

164TAILQ_HEAD(isp_ccbq, ccb_hdr);
165typedef struct tstate {
166 SLIST_ENTRY(tstate) next;
167 lun_id_t ts_lun;
168 struct cam_path *owner;
169 struct isp_ccbq waitq; /* waiting CCBs */
170 struct ccb_hdr_slist atios;
171 struct ccb_hdr_slist inots;
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

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

164TAILQ_HEAD(isp_ccbq, ccb_hdr);
165typedef struct tstate {
166 SLIST_ENTRY(tstate) next;
167 lun_id_t ts_lun;
168 struct cam_path *owner;
169 struct isp_ccbq waitq; /* waiting CCBs */
170 struct ccb_hdr_slist atios;
171 struct ccb_hdr_slist inots;
172 uint32_t hold;
173 uint32_t
174 enabled : 1,
175 atio_count : 15,
176 inot_count : 15;
172 uint32_t hold;
173 uint16_t atio_count;
174 uint16_t inot_count;
177 inot_private_data_t * restart_queue;
178 inot_private_data_t * ntfree;
179 inot_private_data_t ntpool[ATPDPSIZE];
180 LIST_HEAD(, atio_private_data) atfree;
181 LIST_HEAD(, atio_private_data) atused[ATPDPHASHSIZE];
182 atio_private_data_t atpool[ATPDPSIZE];
183} tstate_t;
184

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

234 uint32_t loop_down_limit;
235 uint32_t gone_device_time;
236 /*
237 * Per target/lun info- just to keep a per-ITL nexus crn count
238 */
239 struct isp_nexus *nexus_hash[NEXUS_HASH_WIDTH];
240 struct isp_nexus *nexus_free_list;
241 uint32_t
175 inot_private_data_t * restart_queue;
176 inot_private_data_t * ntfree;
177 inot_private_data_t ntpool[ATPDPSIZE];
178 LIST_HEAD(, atio_private_data) atfree;
179 LIST_HEAD(, atio_private_data) atused[ATPDPHASHSIZE];
180 atio_private_data_t atpool[ATPDPSIZE];
181} tstate_t;
182

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

232 uint32_t loop_down_limit;
233 uint32_t gone_device_time;
234 /*
235 * Per target/lun info- just to keep a per-ITL nexus crn count
236 */
237 struct isp_nexus *nexus_hash[NEXUS_HASH_WIDTH];
238 struct isp_nexus *nexus_free_list;
239 uint32_t
242#ifdef ISP_TARGET_MODE
243 tm_luns_enabled : 1,
244 tm_enable_defer : 1,
245 tm_enabled : 1,
246#endif
247 simqfrozen : 3,
248 default_id : 8,
249 hysteresis : 8,
250 def_role : 2, /* default role */
251 gdt_running : 1,
252 loop_dead : 1,
253 fcbsy : 1,
254 ready : 1;

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

264#endif
265 int num_threads;
266};
267
268struct isp_spi {
269 struct cam_sim *sim;
270 struct cam_path *path;
271 uint32_t
240 simqfrozen : 3,
241 default_id : 8,
242 hysteresis : 8,
243 def_role : 2, /* default role */
244 gdt_running : 1,
245 loop_dead : 1,
246 fcbsy : 1,
247 ready : 1;

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

257#endif
258 int num_threads;
259};
260
261struct isp_spi {
262 struct cam_sim *sim;
263 struct cam_path *path;
264 uint32_t
272#ifdef ISP_TARGET_MODE
273 tm_luns_enabled : 1,
274 tm_enable_defer : 1,
275 tm_enabled : 1,
276#endif
277 simqfrozen : 3,
265 simqfrozen : 3,
278 def_role : 2,
279 iid : 4;
280#ifdef ISP_TARGET_MODE
281 struct tslist lun_hash[LUN_HASH_SIZE];
282#endif
283 int num_threads;
284};
285
286struct isposinfo {

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

334
335 /*
336 * misc- needs to be sorted better XXXXXX
337 */
338 int framesize;
339 int exec_throttle;
340 int cont_max;
341
266 iid : 4;
267#ifdef ISP_TARGET_MODE
268 struct tslist lun_hash[LUN_HASH_SIZE];
269#endif
270 int num_threads;
271};
272
273struct isposinfo {

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

321
322 /*
323 * misc- needs to be sorted better XXXXXX
324 */
325 int framesize;
326 int exec_throttle;
327 int cont_max;
328
342#ifdef ISP_TARGET_MODE
343 cam_status * rptr;
344#endif
345
346 bus_addr_t ecmd_dma;
347 isp_ecmd_t * ecmd_base;
348 isp_ecmd_t * ecmd_free;
349
350 /*
351 * Per-type private storage...
352 */
353 union {

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

612 } \
613 } while (0)
614
615#define XS_SENSE_VALID(xs) (((xs)->ccb_h.status & CAM_AUTOSNS_VALID) != 0)
616
617#define DEFAULT_FRAMESIZE(isp) isp->isp_osinfo.framesize
618#define DEFAULT_EXEC_THROTTLE(isp) isp->isp_osinfo.exec_throttle
619
329 bus_addr_t ecmd_dma;
330 isp_ecmd_t * ecmd_base;
331 isp_ecmd_t * ecmd_free;
332
333 /*
334 * Per-type private storage...
335 */
336 union {

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

595 } \
596 } while (0)
597
598#define XS_SENSE_VALID(xs) (((xs)->ccb_h.status & CAM_AUTOSNS_VALID) != 0)
599
600#define DEFAULT_FRAMESIZE(isp) isp->isp_osinfo.framesize
601#define DEFAULT_EXEC_THROTTLE(isp) isp->isp_osinfo.exec_throttle
602
620#define GET_DEFAULT_ROLE(isp, chan) \
621 (IS_FC(isp)? ISP_FC_PC(isp, chan)->def_role : ISP_SPI_PC(isp, chan)->def_role)
622#define SET_DEFAULT_ROLE(isp, chan, val) \
623 if (IS_FC(isp)) { \
624 ISP_FC_PC(isp, chan)->def_role = val; \
625 } else { \
626 ISP_SPI_PC(isp, chan)->def_role = val; \
627 }
603#define DEFAULT_ROLE(isp, chan) \
604 (IS_FC(isp)? ISP_FC_PC(isp, chan)->def_role : ISP_ROLE_INITIATOR)
628
629#define DEFAULT_IID(isp, chan) isp->isp_osinfo.pc.spi[chan].iid
630
631#define DEFAULT_LOOPID(x, chan) isp->isp_osinfo.pc.fc[chan].default_id
632
633#define DEFAULT_NODEWWN(isp, chan) isp_default_wwn(isp, chan, 0, 1)
634#define DEFAULT_PORTWWN(isp, chan) isp_default_wwn(isp, chan, 0, 0)
635#define ACTIVE_NODEWWN(isp, chan) isp_default_wwn(isp, chan, 1, 1)

--- 144 unchanged lines hidden --- 		605
606#define DEFAULT_IID(isp, chan) isp->isp_osinfo.pc.spi[chan].iid
607
608#define DEFAULT_LOOPID(x, chan) isp->isp_osinfo.pc.fc[chan].default_id
609
610#define DEFAULT_NODEWWN(isp, chan) isp_default_wwn(isp, chan, 0, 1)
611#define DEFAULT_PORTWWN(isp, chan) isp_default_wwn(isp, chan, 0, 0)
612#define ACTIVE_NODEWWN(isp, chan) isp_default_wwn(isp, chan, 1, 1)

--- 144 unchanged lines hidden ---