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

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, 26 insertions, 5 deletions

diff --git a/bsd_eth_drivers/libbsdport/rtems_callout.c b/bsd_eth_drivers/libbsdport/rtems_callout.c
index ce9a477..c041c5b 100644
--- a/bsd_eth_drivers/libbsdport/rtems_callout.c
+++ b/bsd_eth_drivers/libbsdport/rtems_callout.c
@@ -100,6 +100,9 @@ LIST_KEY_DECL(k);
 			n = c->c_next;
 			if ( c->c_time <= 0 ) {
 				/* this one expired */
+				rtems_interrupt_disable(k1);
+					c->c_flags &= ~ CALLOUT_PENDING;
+				rtems_interrupt_enable(k1);
 				c_deq(c);
 				if ( c->c_func )
 					c->c_func(c->c_arg);
@@ -173,31 +176,43 @@ bail:
 
 /* We cannot stop a callout that's in progress */
 
-void
+int
 callout_stop(struct callout *c)
 {
+rtems_interrupt_level l;
 LIST_KEY_DECL(k);
 
 	if ( !c->c_pprev )
-		return;	/* not currently on a list */
+		return 0;	/* not currently on a list */
 
 	LIST_LOCK(k);
+		/* have to check again */
+		if ( ! c->c_pprev ) {
+			LIST_UNLOCK(k);
+			return 0;
+		}
 		/* remove from list */
 		c_deq(c);
+		rtems_interrupt_disable(l);
+		c->c_flags &= ~(CALLOUT_ACTIVE | CALLOUT_PENDING);
+		rtems_interrupt_enable(l);
 	LIST_UNLOCK(k);
+
+	return 1;
 }
 
 
-void
+int
 callout_reset(struct callout *c, int ticks, timeout_t fn, void *arg)
 {
+rtems_interrupt_level l;
 LIST_KEY_DECL(k);
-int                 i;
+int                 i, rval;
 
 	if ( ticks <= 0 )
 		ticks = 1;
 
-	callout_stop(c);
+	rval = callout_stop(c);
 
 	c->c_func = fn;
 	c->c_arg  = arg;
@@ -209,7 +224,13 @@ int                 i;
 	/* enqueue */
 	c_enq(&c_wheel[i], c);
 
+	rtems_interrupt_disable(l);
+		c->c_flags |= (CALLOUT_ACTIVE | CALLOUT_PENDING);
+	rtems_interrupt_enable(l);
+
 	LIST_UNLOCK(k);
+
+	return rval;
 }
 
 static rtems_id callout_tid = 0;