Deleted Added
full compact
mpt_pci.c (159494) mpt_pci.c (159919)
1/*-
2 * PCI specific probe and attach routines for LSI Fusion Adapters
3 * FreeBSD Version.
4 *
5 * Copyright (c) 2000, 2001 by Greg Ansley
6 * Partially derived from Matt Jacob's ISP driver.
7 * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 by Matthew Jacob
8 * Feral Software

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

94 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
95 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
96 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
97 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF THE COPYRIGHT
98 * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
99 */
100
101#include <sys/cdefs.h>
1/*-
2 * PCI specific probe and attach routines for LSI Fusion Adapters
3 * FreeBSD Version.
4 *
5 * Copyright (c) 2000, 2001 by Greg Ansley
6 * Partially derived from Matt Jacob's ISP driver.
7 * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 by Matthew Jacob
8 * Feral Software

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

94 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
95 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
96 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
97 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF THE COPYRIGHT
98 * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
99 */
100
101#include <sys/cdefs.h>
102__FBSDID("$FreeBSD: head/sys/dev/mpt/mpt_pci.c 159494 2006-06-10 23:45:31Z mjacob $");
102__FBSDID("$FreeBSD: head/sys/dev/mpt/mpt_pci.c 159919 2006-06-25 04:23:26Z mjacob $");
103
104#include <dev/mpt/mpt.h>
105#include <dev/mpt/mpt_cam.h>
106#include <dev/mpt/mpt_raid.h>
107
108
109#ifndef PCI_VENDOR_LSI
110#define PCI_VENDOR_LSI 0x1000

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

519 * configuration space transfers, so we need to save it now
520 */
521
522 mpt_read_config_regs(mpt);
523
524 /*
525 * Disable PIO until we need it
526 */
103
104#include <dev/mpt/mpt.h>
105#include <dev/mpt/mpt_cam.h>
106#include <dev/mpt/mpt_raid.h>
107
108
109#ifndef PCI_VENDOR_LSI
110#define PCI_VENDOR_LSI 0x1000

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

519 * configuration space transfers, so we need to save it now
520 */
521
522 mpt_read_config_regs(mpt);
523
524 /*
525 * Disable PIO until we need it
526 */
527 pci_disable_io(dev, SYS_RES_IOPORT);
527 if (mpt->is_sas) {
528 pci_disable_io(dev, SYS_RES_IOPORT);
529 }
528
529 /* Initialize the hardware */
530 if (mpt->disabled == 0) {
531 MPT_LOCK(mpt);
532 if (mpt_attach(mpt) != 0) {
533 MPT_UNLOCK(mpt);
534 goto bad;
535 }

--- 367 unchanged lines hidden ---
530
531 /* Initialize the hardware */
532 if (mpt->disabled == 0) {
533 MPT_LOCK(mpt);
534 if (mpt_attach(mpt) != 0) {
535 MPT_UNLOCK(mpt);
536 goto bad;
537 }

--- 367 unchanged lines hidden ---