Deleted Added
full compact
scc_bfe_sbus.c (157340) scc_bfe_sbus.c (157351)
1/*-
2 * Copyright (c) 2004-2006 Marcel Moolenaar
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 *

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

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2004-2006 Marcel Moolenaar
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 *

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

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/dev/scc/scc_bfe_sbus.c 157340 2006-03-31 21:55:53Z marcel $");
28__FBSDID("$FreeBSD: head/sys/dev/scc/scc_bfe_sbus.c 157351 2006-04-01 04:51:56Z marcel $");
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/bus.h>
33#include <sys/conf.h>
34#include <sys/kernel.h>
35#include <sys/module.h>
36
37#include <dev/ofw/ofw_bus.h>
38
39#include <machine/bus.h>
40#include <sys/rman.h>
41#include <machine/resource.h>
42
43#include <dev/scc/scc_bfe.h>
44
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/bus.h>
33#include <sys/conf.h>
34#include <sys/kernel.h>
35#include <sys/module.h>
36
37#include <dev/ofw/ofw_bus.h>
38
39#include <machine/bus.h>
40#include <sys/rman.h>
41#include <machine/resource.h>
42
43#include <dev/scc/scc_bfe.h>
44
45#define SBUS_REGSHFT 1
46#define SBUS_RCLK 307200
47
45static int
46scc_sbus_probe(device_t dev)
47{
48 struct scc_softc *sc;
49 const char *nm;
50
51 sc = device_get_softc(dev);
52 nm = ofw_bus_get_name(dev);
53 if (!strcmp(nm, "zs")) {
54 device_set_desc(dev, "Zilog Z8530 dual channel SCC");
55 sc->sc_class = &scc_z8530_class;
48static int
49scc_sbus_probe(device_t dev)
50{
51 struct scc_softc *sc;
52 const char *nm;
53
54 sc = device_get_softc(dev);
55 nm = ofw_bus_get_name(dev);
56 if (!strcmp(nm, "zs")) {
57 device_set_desc(dev, "Zilog Z8530 dual channel SCC");
58 sc->sc_class = &scc_z8530_class;
56 return (scc_bfe_probe(dev));
59 return (scc_bfe_probe(dev, SBUS_REGSHFT, SBUS_RCLK));
57 }
58 return (ENXIO);
59}
60
61static device_method_t scc_sbus_methods[] = {
62 /* Device interface */
63 DEVMETHOD(device_probe, scc_sbus_probe),
64 DEVMETHOD(device_attach, scc_bfe_attach),

--- 21 unchanged lines hidden ---
60 }
61 return (ENXIO);
62}
63
64static device_method_t scc_sbus_methods[] = {
65 /* Device interface */
66 DEVMETHOD(device_probe, scc_sbus_probe),
67 DEVMETHOD(device_attach, scc_bfe_attach),

--- 21 unchanged lines hidden ---