Date: Thu, 4 Dec 2008 19:52:16 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 154067 for review Message-ID: <200812041952.mB4JqGqb019645@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=154067 Change 154067 by sam@sam_ebb on 2008/12/04 19:52:12 s/IXP425/IXP4XX/ for bits shared with IXP435 and like other parts Affected files ... .. //depot/projects/vap/sys/arm/xscale/ixp425/if_npe.c#8 edit .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425.c#8 edit .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_iic.c#5 edit .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_npe.c#5 edit .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_pci.c#4 edit .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_qmgr.c#4 edit .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_timer.c#3 edit .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_wdog.c#3 edit Differences ... ==== //depot/projects/vap/sys/arm/xscale/ixp425/if_npe.c#8 (text+ko) ==== @@ -260,11 +260,11 @@ /* NB: all tx done processing goes through one queue */ static int tx_doneqid = -1; -SYSCTL_NODE(_hw, OID_AUTO, npe, CTLFLAG_RD, 0, "IXP425 NPE driver parameters"); +SYSCTL_NODE(_hw, OID_AUTO, npe, CTLFLAG_RD, 0, "IXP4XX NPE driver parameters"); static int npe_debug = 0; SYSCTL_INT(_hw_npe, OID_AUTO, debug, CTLFLAG_RW, &npe_debug, - 0, "IXP425 NPE network interface debug msgs"); + 0, "IXP4XX NPE network interface debug msgs"); TUNABLE_INT("hw.npe.npe", &npe_debug); #define DPRINTF(sc, fmt, ...) do { \ if (sc->sc_debug) device_printf(sc->sc_dev, fmt, __VA_ARGS__); \ ==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425.c#8 (text+ko) ==== @@ -181,7 +181,7 @@ static int ixp425_probe(device_t dev) { - device_set_desc(dev, "Intel IXP425"); + device_set_desc(dev, "Intel IXP4XX"); return (0); } @@ -210,13 +210,13 @@ panic("%s: failed to create dma tag", __func__); sc->sc_irq_rman.rm_type = RMAN_ARRAY; - sc->sc_irq_rman.rm_descr = "IXP425 IRQs"; + sc->sc_irq_rman.rm_descr = "IXP4XX IRQs"; if (rman_init(&sc->sc_irq_rman) != 0 || rman_manage_region(&sc->sc_irq_rman, 0, cpu_is_ixp43x() ? 63 : 31) != 0) panic("%s: failed to set up IRQ rman", __func__); sc->sc_mem_rman.rm_type = RMAN_ARRAY; - sc->sc_mem_rman.rm_descr = "IXP425 Memory"; + sc->sc_mem_rman.rm_descr = "IXP4XX Memory"; if (rman_init(&sc->sc_mem_rman) != 0 || rman_manage_region(&sc->sc_mem_rman, 0, ~0) != 0) panic("%s: failed to set up memory rman", __func__); ==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_iic.c#5 (text+ko) ==== @@ -63,7 +63,7 @@ static int ixpiic_probe(device_t dev) { - device_set_desc(dev, "IXP425 GPIO-Based I2C Interface"); + device_set_desc(dev, "IXP4XX GPIO-Based I2C Interface"); return (0); } ==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_npe.c#5 (text+ko) ==== @@ -179,7 +179,7 @@ static int npe_debug = 0; SYSCTL_INT(_debug, OID_AUTO, ixp425npe, CTLFLAG_RW, &npe_debug, - 0, "IXP425 NPE debug msgs"); + 0, "IXP4XX NPE debug msgs"); TUNABLE_INT("debug.ixp425npe", &npe_debug); #define DPRINTF(dev, fmt, ...) do { \ if (npe_debug) device_printf(dev, fmt, __VA_ARGS__); \ ==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_pci.c#4 (text+ko) ==== @@ -89,8 +89,7 @@ static int ixppcib_probe(device_t dev) { - - device_set_desc(dev, "IXP425 PCI Bus"); + device_set_desc(dev, "IXP4XX PCI Bus"); return (0); } @@ -153,7 +152,7 @@ /* Initialize memory and i/o rmans. */ sc->sc_io_rman.rm_type = RMAN_ARRAY; - sc->sc_io_rman.rm_descr = "IXP425 PCI I/O Ports"; + sc->sc_io_rman.rm_descr = "IXP4XX PCI I/O Ports"; if (rman_init(&sc->sc_io_rman) != 0 || rman_manage_region(&sc->sc_io_rman, 0, IXP425_PCI_IO_SIZE) != 0) { @@ -161,7 +160,7 @@ } sc->sc_mem_rman.rm_type = RMAN_ARRAY; - sc->sc_mem_rman.rm_descr = "IXP425 PCI Memory"; + sc->sc_mem_rman.rm_descr = "IXP4XX PCI Memory"; if (rman_init(&sc->sc_mem_rman) != 0 || rman_manage_region(&sc->sc_mem_rman, IXP425_PCI_MEM_HWBASE, IXP425_PCI_MEM_HWBASE + IXP425_PCI_MEM_SIZE) != 0) { ==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_qmgr.c#4 (text+ko) ==== @@ -161,7 +161,7 @@ static int qmgr_debug = 0; SYSCTL_INT(_debug, OID_AUTO, qmgr, CTLFLAG_RW, &qmgr_debug, - 0, "IXP425 Q-Manager debug msgs"); + 0, "IXP4XX Q-Manager debug msgs"); TUNABLE_INT("debug.qmgr", &qmgr_debug); #define DPRINTF(dev, fmt, ...) do { \ if (qmgr_debug) printf(fmt, __VA_ARGS__); \ @@ -204,7 +204,7 @@ static int ixpqmgr_probe(device_t dev) { - device_set_desc(dev, "IXP425 Q-Manager"); + device_set_desc(dev, "IXP4XX Q-Manager"); return 0; } ==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_timer.c#3 (text+ko) ==== @@ -86,14 +86,14 @@ NULL, /* no poll_pps */ ~0u, /* counter_mask */ COUNTS_PER_SEC, /* frequency */ - "IXP425 Timer", /* name */ + "IXP4XX Timer", /* name */ 1000, /* quality */ }; static int ixpclk_probe(device_t dev) { - device_set_desc(dev, "IXP425 Timer"); + device_set_desc(dev, "IXP4XX Timer"); return (0); } ==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_wdog.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ __FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_wdog.c,v 1.2 2007/03/27 21:03:36 n_hibma Exp $"); /* - * IXP425 Watchdog Timer Support. + * IXP4XX Watchdog Timer Support. */ #include <sys/param.h> #include <sys/systm.h> @@ -88,7 +88,7 @@ static int ixpwdog_probe(device_t dev) { - device_set_desc(dev, "IXP425 Watchdog Timer"); + device_set_desc(dev, "IXP4XX Watchdog Timer"); return (0); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812041952.mB4JqGqb019645>