# HG changeset patch
# User gthomas
# Date 1036441380 0
# Node ID e997e6708ee75a21c8b62b1f2d51c53997f604c8
# Parent  a3b06a9328a7475cf7113992d7a9e24c5ad4b66b
Fix problem with overloaded 'ticks'

diff --git a/packages/devs/eth/cf/current/ChangeLog b/packages/devs/eth/cf/current/ChangeLog
--- a/packages/devs/eth/cf/current/ChangeLog
+++ b/packages/devs/eth/cf/current/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-04  Gary Thomas  <gthomas@ecoscentric.com>
+
+	* src/if_sc_lpe.c (do_delay): Fix problem with overloaded name 'ticks'.
+	n.b. the FreeBSD stack has this defined for it's own use.
+
 2002-06-14  Gary Thomas  <gary@chez-thomas.org>
 
 	* src/if_sc_lpe.c: 
diff --git a/packages/devs/eth/cf/current/src/if_sc_lpe.c b/packages/devs/eth/cf/current/src/if_sc_lpe.c
--- a/packages/devs/eth/cf/current/src/if_sc_lpe.c
+++ b/packages/devs/eth/cf/current/src/if_sc_lpe.c
@@ -9,6 +9,7 @@
 // -------------------------------------------
 // This file is part of eCos, the Embedded Configurable Operating System.
 // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+// Copyright (C) 2002 Gary Thomas
 //
 // eCos is free software; you can redistribute it and/or modify it under
 // the terms of the GNU General Public License as published by the Free
@@ -85,8 +86,6 @@
 
 #define SC_LPE_MANUF 0x0104
 
-
-
 #ifdef CYGPKG_KERNEL
 #define STACK_SIZE CYGNUM_HAL_STACK_SIZE_TYPICAL
 static char sc_lpe_card_handler_stack[STACK_SIZE];
@@ -94,13 +93,13 @@ static cyg_thread sc_lpe_card_handler_th
 static cyg_handle_t sc_lpe_card_handler_thread_handle;
 #endif  // CYGPKG_KERNEL
 
-static void
-do_delay(int ticks)
+__inline__ static void
+do_delay(int _ticks)
 {
 #ifdef CYGPKG_KERNEL
-    cyg_thread_delay(ticks);
+    cyg_thread_delay(_ticks);
 #else
-    CYGACC_CALL_IF_DELAY_US(10000*ticks);
+    CYGACC_CALL_IF_DELAY_US(10000*_ticks);
 #endif
 }