Deleted Added
full compact
mptbl.c (268887) mptbl.c (268972)
1/*-
2 * Copyright (c) 2012 NetApp, Inc.
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) 2012 NetApp, Inc.
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/mptbl.c 268887 2014-07-19 20:13:01Z jhb $
26 * $FreeBSD: stable/10/usr.sbin/bhyve/mptbl.c 268972 2014-07-22 03:14:37Z jhb $
27 */
28
29#include <sys/cdefs.h>
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: stable/10/usr.sbin/bhyve/mptbl.c 268887 2014-07-19 20:13:01Z jhb $");
30__FBSDID("$FreeBSD: stable/10/usr.sbin/bhyve/mptbl.c 268972 2014-07-22 03:14:37Z jhb $");
31
32#include <sys/types.h>
33#include <sys/errno.h>
34#include <x86/mptable.h>
35
36#include <stdio.h>
37#include <string.h>
38

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

205 /*
206 * Always include entries for the first 16 pins along with a entry
207 * for each active PCI INTx pin.
208 */
209 return (16 + count);
210}
211
212static void
31
32#include <sys/types.h>
33#include <sys/errno.h>
34#include <x86/mptable.h>
35
36#include <stdio.h>
37#include <string.h>
38

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

205 /*
206 * Always include entries for the first 16 pins along with a entry
207 * for each active PCI INTx pin.
208 */
209 return (16 + count);
210}
211
212static void
213mpt_generate_pci_int(int bus, int slot, int pin, int ioapic_irq, void *arg)
213mpt_generate_pci_int(int bus, int slot, int pin, int pirq_pin, int ioapic_irq,
214 void *arg)
214{
215 int_entry_ptr *mpiep, mpie;
216
217 mpiep = arg;
218 mpie = *mpiep;
219 memset(mpie, 0, sizeof(*mpie));
220
221 /*

--- 155 unchanged lines hidden ---
215{
216 int_entry_ptr *mpiep, mpie;
217
218 mpiep = arg;
219 mpie = *mpiep;
220 memset(mpie, 0, sizeof(*mpie));
221
222 /*

--- 155 unchanged lines hidden ---