Deleted Added
full compact
pci_ahci.c (267393) pci_ahci.c (268953)
1/*-
2 * Copyright (c) 2013 Zhixiang Yu <zcore@freebsd.org>
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

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
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 *
1/*-
2 * Copyright (c) 2013 Zhixiang Yu <zcore@freebsd.org>
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

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
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 * $FreeBSD: stable/10/usr.sbin/bhyve/pci_ahci.c 267393 2014-06-12 13:13:15Z jhb $
26 * $FreeBSD: stable/10/usr.sbin/bhyve/pci_ahci.c 268953 2014-07-21 19:08:02Z jhb $
27 */
28
29#include <sys/cdefs.h>
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: stable/10/usr.sbin/bhyve/pci_ahci.c 267393 2014-06-12 13:13:15Z jhb $");
30__FBSDID("$FreeBSD: stable/10/usr.sbin/bhyve/pci_ahci.c 268953 2014-07-21 19:08:02Z jhb $");
31
32#include <sys/param.h>
33#include <sys/linker_set.h>
34#include <sys/stat.h>
35#include <sys/uio.h>
36#include <sys/ioctl.h>
37#include <sys/disk.h>
38#include <sys/ata.h>

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

1781 fprintf(stderr, "pci_ahci: backing device required\n");
1782 return (1);
1783 }
1784
1785#ifdef AHCI_DEBUG
1786 dbg = fopen("/tmp/log", "w+");
1787#endif
1788
31
32#include <sys/param.h>
33#include <sys/linker_set.h>
34#include <sys/stat.h>
35#include <sys/uio.h>
36#include <sys/ioctl.h>
37#include <sys/disk.h>
38#include <sys/ata.h>

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

1781 fprintf(stderr, "pci_ahci: backing device required\n");
1782 return (1);
1783 }
1784
1785#ifdef AHCI_DEBUG
1786 dbg = fopen("/tmp/log", "w+");
1787#endif
1788
1789 sc = malloc(sizeof(struct pci_ahci_softc));
1790 memset(sc, 0, sizeof(struct pci_ahci_softc));
1789 sc = calloc(1, sizeof(struct pci_ahci_softc));
1791 pi->pi_arg = sc;
1792 sc->asc_pi = pi;
1793 sc->ports = MAX_PORTS;
1794
1795 /*
1796 * Only use port 0 for a backing device. All other ports will be
1797 * marked as unused
1798 */

--- 92 unchanged lines hidden ---
1790 pi->pi_arg = sc;
1791 sc->asc_pi = pi;
1792 sc->ports = MAX_PORTS;
1793
1794 /*
1795 * Only use port 0 for a backing device. All other ports will be
1796 * marked as unused
1797 */

--- 92 unchanged lines hidden ---