Deleted Added
full compact
ida_pci.c (119690) ida_pci.c (124471)
1/*-
2 * Copyright (c) 1999,2000 Jonathan Lemon
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

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1999,2000 Jonathan Lemon
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

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/dev/ida/ida_pci.c 119690 2003-09-02 17:30:40Z jhb $");
28__FBSDID("$FreeBSD: head/sys/dev/ida/ida_pci.c 124471 2004-01-13 11:28:21Z mdodd $");
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/kernel.h>
33
34#include <sys/bio.h>
35#include <sys/bus.h>
36#include <sys/conf.h>

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

44#include <dev/pci/pcireg.h>
45#include <dev/pci/pcivar.h>
46
47#include <geom/geom_disk.h>
48
49#include <dev/ida/idavar.h>
50#include <dev/ida/idareg.h>
51
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/kernel.h>
33
34#include <sys/bio.h>
35#include <sys/bus.h>
36#include <sys/conf.h>

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

44#include <dev/pci/pcireg.h>
45#include <dev/pci/pcivar.h>
46
47#include <geom/geom_disk.h>
48
49#include <dev/ida/idavar.h>
50#include <dev/ida/idareg.h>
51
52#define IDA_PCI_MAX_DMA_ADDR 0xFFFFFFFF
53#define IDA_PCI_MAX_DMA_COUNT 0xFFFFFFFF
52#define IDA_PCI_MAX_DMA_ADDR 0xFFFFFFFF
53#define IDA_PCI_MAX_DMA_COUNT 0xFFFFFFFF
54
54
55#define IDA_PCI_MEMADDR PCIR_BAR(1) /* Mem I/O Address */
55#define IDA_PCI_MEMADDR PCIR_BAR(1) /* Mem I/O Address */
56
56
57#define IDA_DEVICEID_SMART 0xAE100E11
58#define IDA_DEVICEID_DEC_SMART 0x00461011
59#define IDA_DEVICEID_NCR_53C1510 0x00101000
57#define IDA_DEVICEID_SMART 0xAE100E11
58#define IDA_DEVICEID_DEC_SMART 0x00461011
59#define IDA_DEVICEID_NCR_53C1510 0x00101000
60
61static int
62ida_v3_fifo_full(struct ida_softc *ida)
63{
64 return (ida_inl(ida, R_CMD_FIFO) == 0);
65}
66
67static void

--- 238 unchanged lines hidden ---
60
61static int
62ida_v3_fifo_full(struct ida_softc *ida)
63{
64 return (ida_inl(ida, R_CMD_FIFO) == 0);
65}
66
67static void

--- 238 unchanged lines hidden ---