Deleted Added
full compact
dcons_crom.c (170420) dcons_crom.c (185108)
1/*-
2 * Copyright (C) 2003
3 * Hidetoshi Shimokawa. 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

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

27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
34 * $Id: dcons_crom.c,v 1.8 2003/10/23 15:47:21 simokawa Exp $
1/*-
2 * Copyright (C) 2003
3 * Hidetoshi Shimokawa. 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

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

27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 *
34 * $Id: dcons_crom.c,v 1.8 2003/10/23 15:47:21 simokawa Exp $
35 * $FreeBSD: head/sys/dev/dcons/dcons_crom.c 170420 2007-06-08 04:33:25Z simokawa $
35 * $FreeBSD: head/sys/dev/dcons/dcons_crom.c 185108 2008-11-19 22:09:03Z marius $
36 */
37
38#include <sys/param.h>
39#include <sys/kernel.h>
40#include <sys/module.h>
41#include <sys/systm.h>
42#include <sys/types.h>
43#include <sys/conf.h>

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

224 /*nsegments*/ 1,
225 /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT,
226 /*flags*/ BUS_DMA_ALLOCNOW,
227#if __FreeBSD_version >= 501102
228 /*lockfunc*/busdma_lock_mutex,
229 /*lockarg*/&Giant,
230#endif
231 &sc->dma_tag);
36 */
37
38#include <sys/param.h>
39#include <sys/kernel.h>
40#include <sys/module.h>
41#include <sys/systm.h>
42#include <sys/types.h>
43#include <sys/conf.h>

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

224 /*nsegments*/ 1,
225 /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT,
226 /*flags*/ BUS_DMA_ALLOCNOW,
227#if __FreeBSD_version >= 501102
228 /*lockfunc*/busdma_lock_mutex,
229 /*lockarg*/&Giant,
230#endif
231 &sc->dma_tag);
232 bus_dmamap_create(sc->dma_tag, 0, &sc->dma_map);
232 bus_dmamap_create(sc->dma_tag, BUS_DMA_COHERENT, &sc->dma_map);
233 bus_dmamap_load(sc->dma_tag, sc->dma_map,
234 (void *)dcons_conf->buf, dcons_conf->size,
235 dmamap_cb, sc, 0);
236 sc->ehand = EVENTHANDLER_REGISTER(dcons_poll, dcons_crom_poll,
237 (void *)sc, 0);
238 return (0);
239#endif
240}

--- 46 unchanged lines hidden ---
233 bus_dmamap_load(sc->dma_tag, sc->dma_map,
234 (void *)dcons_conf->buf, dcons_conf->size,
235 dmamap_cb, sc, 0);
236 sc->ehand = EVENTHANDLER_REGISTER(dcons_poll, dcons_crom_poll,
237 (void *)sc, 0);
238 return (0);
239#endif
240}

--- 46 unchanged lines hidden ---