Deleted Added
full compact
ixp425.c (186352) ixp425.c (186418)
1/* $NetBSD: ixp425.c,v 1.10 2005/12/11 12:16:51 christos Exp $ */
2
3/*
4 * Copyright (c) 2003
5 * Ichiro FUKUHARA <ichiro@ichiro.org>.
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 */
35
36#include <sys/cdefs.h>
1/* $NetBSD: ixp425.c,v 1.10 2005/12/11 12:16:51 christos Exp $ */
2
3/*
4 * Copyright (c) 2003
5 * Ichiro FUKUHARA <ichiro@ichiro.org>.
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 */
35
36#include <sys/cdefs.h>
37__FBSDID("$FreeBSD: head/sys/arm/xscale/ixp425/ixp425.c 186352 2008-12-20 03:26:09Z sam $");
37__FBSDID("$FreeBSD: head/sys/arm/xscale/ixp425/ixp425.c 186418 2008-12-23 04:48:27Z sam $");
38
39#define _ARM32_BUS_DMA_PRIVATE
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/bus.h>
43#include <sys/kernel.h>
44#include <sys/module.h>
45#include <sys/malloc.h>

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

63uint32_t intr_steer2 = 0;
64
65struct ixp425_softc *ixp425_softc = NULL;
66
67static int ixp425_probe(device_t);
68static void ixp425_identify(driver_t *, device_t);
69static int ixp425_attach(device_t);
70
38
39#define _ARM32_BUS_DMA_PRIVATE
40#include <sys/param.h>
41#include <sys/systm.h>
42#include <sys/bus.h>
43#include <sys/kernel.h>
44#include <sys/module.h>
45#include <sys/malloc.h>

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

63uint32_t intr_steer2 = 0;
64
65struct ixp425_softc *ixp425_softc = NULL;
66
67static int ixp425_probe(device_t);
68static void ixp425_identify(driver_t *, device_t);
69static int ixp425_attach(device_t);
70
71/*
72 * Return a mask of the "fuse" bits that identify
73 * which h/w features are present.
74 * NB: assumes the expansion bus is mapped.
75 */
76uint32_t
77ixp4xx_read_feature_bits(void)
78{
79 uint32_t bits = ~IXPREG(IXP425_EXP_VBASE + EXP_FCTRL_OFFSET);
80 bits &= ~EXP_FCTRL_RESVD;
81 if (!cpu_is_ixp46x())
82 bits &= ~EXP_FCTRL_IXP46X_ONLY;
83 return bits;
84}
85
71struct arm32_dma_range *
72bus_dma_get_range(void)
73{
74 return (NULL);
75}
76
77int
78bus_dma_get_range_nb(void)

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

185 return (0);
186}
187
188static int
189ixp425_attach(device_t dev)
190{
191 struct ixp425_softc *sc;
192
86struct arm32_dma_range *
87bus_dma_get_range(void)
88{
89 return (NULL);
90}
91
92int
93bus_dma_get_range_nb(void)

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

200 return (0);
201}
202
203static int
204ixp425_attach(device_t dev)
205{
206 struct ixp425_softc *sc;
207
208 device_printf(dev, "%b\n", ixp4xx_read_feature_bits(), EXP_FCTRL_BITS);
209
193 sc = device_get_softc(dev);
194 sc->sc_iot = &ixp425_bs_tag;
195 KASSERT(ixp425_softc == NULL, ("%s called twice?", __func__));
196 ixp425_softc = sc;
197
198 intr_enabled = 0;
199 ixp425_set_intrmask();
200 ixp425_set_intrsteer();

--- 269 unchanged lines hidden ---
210 sc = device_get_softc(dev);
211 sc->sc_iot = &ixp425_bs_tag;
212 KASSERT(ixp425_softc == NULL, ("%s called twice?", __func__));
213 ixp425_softc = sc;
214
215 intr_enabled = 0;
216 ixp425_set_intrmask();
217 ixp425_set_intrsteer();

--- 269 unchanged lines hidden ---