This commit was manufactured by cvs2svn to create tag 'R_20100422_p2'.R_20100422_p2

Sprout from base 2009-04-22 22:06:58 UTC Till Straumann <strauman@slac.stanford.edu> ' - importing updated version from SLAC as of 20090422'
Cherrypick from master 2010-03-07 17:11:23 UTC Till Straumann <strauman@slac.stanford.edu> '2010-03-07  Till Straumann <Till.Straumann@TU-Berlin.de>':
    bsd_eth_drivers/.cvsignore
    bsd_eth_drivers/ChangeLog
    bsd_eth_drivers/Makefile.am
    bsd_eth_drivers/if_bge/.cvsignore
    bsd_eth_drivers/if_bge/Makefile.am
    bsd_eth_drivers/if_bge/if_bge.c
    bsd_eth_drivers/if_bge/if_bgereg.h
    bsd_eth_drivers/if_em/.cvsignore
    bsd_eth_drivers/if_em/Makefile.am
    bsd_eth_drivers/if_em/e1000_manage.c
    bsd_eth_drivers/if_em/e1000_manage.h
    bsd_eth_drivers/if_em/e1000_osdep.h
    bsd_eth_drivers/if_em/if_em.c
    bsd_eth_drivers/if_fxp/.cvsignore
    bsd_eth_drivers/if_fxp/Makefile.am
    bsd_eth_drivers/if_fxp/if_fxp.c
    bsd_eth_drivers/if_fxp/if_fxpvar.h
    bsd_eth_drivers/if_le/.cvsignore
    bsd_eth_drivers/if_pcn/.cvsignore
    bsd_eth_drivers/if_pcn/if_pcn.c
    bsd_eth_drivers/if_re/.cvsignore
    bsd_eth_drivers/if_re/Makefile.am
    bsd_eth_drivers/if_re/if_re.c
    bsd_eth_drivers/if_re/if_rl.c
    bsd_eth_drivers/if_re/if_rlreg.h
    bsd_eth_drivers/libbsdport/.cvsignore
    bsd_eth_drivers/libbsdport/Makefile.am
    bsd_eth_drivers/libbsdport/alldrv.c
    bsd_eth_drivers/libbsdport/bus.h
    bsd_eth_drivers/libbsdport/callout.h
    bsd_eth_drivers/libbsdport/devicet.c
    bsd_eth_drivers/libbsdport/ifmedia.c
    bsd_eth_drivers/libbsdport/libbsdport.h
    bsd_eth_drivers/libbsdport/libbsdport_api.h
    bsd_eth_drivers/libbsdport/libbsdport_post.h
    bsd_eth_drivers/libbsdport/miistuff.c
    bsd_eth_drivers/libbsdport/misc.c
    bsd_eth_drivers/libbsdport/mutex.h
    bsd_eth_drivers/libbsdport/rtems_callout.c
    bsd_eth_drivers/libbsdport/sysbus.c
    bsd_eth_drivers/libbsdport/taskqueue.h
    bsd_eth_drivers/links.am
Cherrypick from freebsd_orig 2009-04-23 04:52:05 UTC Till Straumann <strauman@slac.stanford.edu> ' - importing original 'releng_7_1' version of FXP driver from FreeBSD.':
    bsd_eth_drivers/if_fxp/if_fxpreg.h
    bsd_eth_drivers/if_fxp/rcvbundl.h
Delete:
    INSTALL
    Makefile.am
    bootstrap
    config.h.in
    configure.ac
    m4/acinclude.m4
    m4/config-if-present.m4
    m4/cvstag.m4
    m4/multilib-fix.m4
    m4/multilib-installdir.m4
    m4/rtems-bsp-postlink.m4
    m4/rtems-bsplist.m4
    m4/rtems-check-libargs.m4
    m4/rtems-checkprog.m4
    m4/rtems-checktool.m4
    m4/rtems-checktop.m4
    m4/rtems-fixup-prefix.m4
    m4/rtems-isml.m4
    m4/rtems-ismultibsp.m4
    m4/rtems-isrtems.m4
    m4/rtems-makevars.m4
    m4/rtems-multilib.m4
    m4/rtems-options.m4
    m4/rtems-setup-recurse.m4
    m4/rtems-tools.m4
    m4/rtems-trim-builddir.m4
    m4/rtems-verscheck.m4
    makefile.top.am
    makefile.top.in
    rtems-pre.am
    rtems.am
    ssrlApps.components.in

1 files changed, 56 insertions, 4 deletions

diff --git a/bsd_eth_drivers/libbsdport/sysbus.c b/bsd_eth_drivers/libbsdport/sysbus.c
index fcd3aac..a88d7ad 100644
--- a/bsd_eth_drivers/libbsdport/sysbus.c
+++ b/bsd_eth_drivers/libbsdport/sysbus.c
@@ -96,6 +96,41 @@ int        isio;
 	return (struct resource*)0;
 }
 
+int
+bus_alloc_resources(device_t dev, struct resource_spec *rs,
+    struct resource **res)
+{
+	int i;
+
+	for (i = 0; rs[i].type != -1; i++)
+		res[i] = NULL;
+	for (i = 0; rs[i].type != -1; i++) {
+		res[i] = bus_alloc_resource_any(dev,
+		    rs[i].type, &rs[i].rid, rs[i].flags);
+		if (res[i] == NULL && !(rs[i].flags & RF_OPTIONAL)) {
+			bus_release_resources(dev, rs, res);
+			return (ENXIO);
+		}
+	}
+	return (0);
+}
+
+void
+bus_release_resources(device_t dev, const struct resource_spec *rs,
+    struct resource **res)
+{
+	int i;
+
+	for (i = 0; rs[i].type != -1; i++)
+		if (res[i] != NULL) {
+			bus_release_resource(
+			    dev, rs[i].type, rs[i].rid, res[i]);
+			res[i] = NULL;
+		}
+}
+
+
+
 struct irq_cookie {
 	device_t        dev;
 	driver_filter_t handler;
@@ -143,8 +178,6 @@ bus_setup_intr(device_t dev, struct resource *r, int flags, driver_filter_t filt
 int                rval;
 struct irq_cookie *info = 0;
 
-
-
 	if ( filter && handler ) {
 		rtems_panic("bus_setup_intr for both: filter & handler not implemented\n");
 	}
@@ -154,7 +187,7 @@ struct irq_cookie *info = 0;
 			device_printf(dev, "bus_setup_intr: device has no driver attached\n");
 			return EINVAL;
 		} else if ( !dev->drv->methods->irq_check_dis ) {
-			device_printf(dev, "bus_setup_intr: driver has no 'irq_dis' method\n");
+			device_printf(dev, "bus_setup_intr: driver has no 'irq_check_dis' method\n");
 			return EINVAL;
 		}
 	}
@@ -247,10 +280,13 @@ int
 bus_dmamem_alloc(bus_dma_tag_t tag, void **p_vaddr, unsigned flags, bus_dmamap_t *p_map)
 {
 uintptr_t a;
-	if ( ! (*p_map = malloc(tag->maxsize + tag->alignment, M_DEVBUF, M_NOWAIT)) )
+unsigned  sz = tag->maxsize + tag->alignment;
+	if ( ! (*p_map = malloc(sz, M_DEVBUF, M_NOWAIT)) )
 		return ENOMEM;
 	a = ((uintptr_t)*p_map + tag->alignment - 1 ) & ~(tag->alignment - 1);
 	*p_vaddr = (void*)a;
+	if ( (BUS_DMA_ZERO & flags) )
+		memset(*p_map, 0, sz);
 	return 0;
 }
 
@@ -259,3 +295,19 @@ bus_dmamem_free(bus_dma_tag_t tag, void *vaddr, bus_dmamap_t map)
 {
 	free(map, M_DEVBUF);
 }
+
+/* Dummy handle for Giant mutex */
+uint32_t __busdma_dummy_Giant = 0;
+
+int
+resource_int_value(const char *name, int unit, const char *resname, int *result)
+{
+	/* not implemented */
+	return ENOENT;
+}
+int
+resource_long_value(const char *name, int unit, const char *resname, long *result)
+{
+	/* not implemented */
+	return ENOENT;
+}