Deleted Added
full compact
isp_sbus.c (236379) isp_sbus.c (238887)
1/*-
2 * Copyright (c) 1997-2006 by Matthew Jacob
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

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

24 * SUCH DAMAGE.
25 */
26/*
27 * SBus specific probe and attach routines for Qlogic ISP SCSI adapters.
28 * FreeBSD Version.
29 */
30
31#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1997-2006 by Matthew Jacob
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

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

24 * SUCH DAMAGE.
25 */
26/*
27 * SBus specific probe and attach routines for Qlogic ISP SCSI adapters.
28 * FreeBSD Version.
29 */
30
31#include <sys/cdefs.h>
32__FBSDID("$FreeBSD: head/sys/dev/isp/isp_sbus.c 236379 2012-06-01 04:34:49Z eadler $");
32__FBSDID("$FreeBSD: head/sys/dev/isp/isp_sbus.c 238887 2012-07-29 14:21:42Z mjacob $");
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/linker.h>
37#include <sys/firmware.h>
38#include <sys/bus.h>
39#include <sys/kernel.h>
40#include <sys/module.h>

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

595 ddir = ISP_NOXFR;
596 }
597 } else {
598 dm_segs = NULL;
599 nseg = 0;
600 ddir = ISP_NOXFR;
601 }
602
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/linker.h>
37#include <sys/firmware.h>
38#include <sys/bus.h>
39#include <sys/kernel.h>
40#include <sys/module.h>

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

595 ddir = ISP_NOXFR;
596 }
597 } else {
598 dm_segs = NULL;
599 nseg = 0;
600 ddir = ISP_NOXFR;
601 }
602
603 if (isp_send_cmd(isp, rq, dm_segs, nseg, XS_XFRLEN(csio), ddir) != CMD_QUEUED) {
603 if (isp_send_cmd(isp, rq, dm_segs, nseg, XS_XFRLEN(csio), ddir, NULL) != CMD_QUEUED) {
604 mp->error = MUSHERR_NOQENTRIES;
605 }
606}
607
608static int
609isp_sbus_dmasetup(ispsoftc_t *isp, struct ccb_scsiio *csio, void *ff)
610{
611 mush_t mush, *mp;

--- 111 unchanged lines hidden ---
604 mp->error = MUSHERR_NOQENTRIES;
605 }
606}
607
608static int
609isp_sbus_dmasetup(ispsoftc_t *isp, struct ccb_scsiio *csio, void *ff)
610{
611 mush_t mush, *mp;

--- 111 unchanged lines hidden ---