Deleted Added
full compact
if_malohal.c (190541) if_malohal.c (190550)
1/*-
2 * Copyright (c) 2007 Marvell Semiconductor, Inc.
3 * Copyright (c) 2007 Sam Leffler, Errno Consulting
4 * Copyright (c) 2008 Weongyo Jeong <weongyo@freebsd.org>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
27 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
29 * THE POSSIBILITY OF SUCH DAMAGES.
30 */
31
32#include <sys/cdefs.h>
33#ifdef __FreeBSD__
1/*-
2 * Copyright (c) 2007 Marvell Semiconductor, Inc.
3 * Copyright (c) 2007 Sam Leffler, Errno Consulting
4 * Copyright (c) 2008 Weongyo Jeong <weongyo@freebsd.org>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
27 * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
29 * THE POSSIBILITY OF SUCH DAMAGES.
30 */
31
32#include <sys/cdefs.h>
33#ifdef __FreeBSD__
34__FBSDID("$FreeBSD: head/sys/dev/malo/if_malohal.c 190541 2009-03-30 08:39:42Z weongyo $");
34__FBSDID("$FreeBSD: head/sys/dev/malo/if_malohal.c 190550 2009-03-30 11:23:14Z weongyo $");
35#endif
36
37#include <sys/param.h>
38#include <sys/systm.h>
39#include <sys/endian.h>
40#include <sys/kernel.h>
41#include <sys/firmware.h>
42#include <sys/socket.h>

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

123 MALO_CMDBUF_SIZE, /* maxsize */
124 1, /* nsegments */
125 MALO_CMDBUF_SIZE, /* maxsegsize */
126 BUS_DMA_ALLOCNOW, /* flags */
127 NULL, /* lockfunc */
128 NULL, /* lockarg */
129 &mh->mh_dmat);
130 if (error != 0) {
35#endif
36
37#include <sys/param.h>
38#include <sys/systm.h>
39#include <sys/endian.h>
40#include <sys/kernel.h>
41#include <sys/firmware.h>
42#include <sys/socket.h>

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

123 MALO_CMDBUF_SIZE, /* maxsize */
124 1, /* nsegments */
125 MALO_CMDBUF_SIZE, /* maxsegsize */
126 BUS_DMA_ALLOCNOW, /* flags */
127 NULL, /* lockfunc */
128 NULL, /* lockarg */
129 &mh->mh_dmat);
130 if (error != 0) {
131 device_printf(dev, "unable to allocate memory for cmd buffer, "
131 device_printf(dev, "unable to allocate memory for cmd tag, "
132 "error %u\n", error);
133 goto fail;
134 }
135
136 /* allocate descriptors */
137 error = bus_dmamap_create(mh->mh_dmat, BUS_DMA_NOWAIT, &mh->mh_dmamap);
138 if (error != 0) {
139 device_printf(dev, "unable to create dmamap for cmd buffers, "

--- 778 unchanged lines hidden ---
132 "error %u\n", error);
133 goto fail;
134 }
135
136 /* allocate descriptors */
137 error = bus_dmamap_create(mh->mh_dmat, BUS_DMA_NOWAIT, &mh->mh_dmamap);
138 if (error != 0) {
139 device_printf(dev, "unable to create dmamap for cmd buffers, "

--- 778 unchanged lines hidden ---