Mercurial > ecos

changeset 1711:dd8ccc367dae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
treat lwip as CYGPKG_NET wrt monitor enter and exit
author jani
date Thu, 12 Aug 2004 13:04:47 +0000
parents f03c7ea29ce3
children 1cb94172ea76
files packages/hal/common/current/ChangeLog packages/hal/common/current/include/hal_if.h
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/packages/hal/common/current/ChangeLog
+++ b/packages/hal/common/current/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-12  Jani Monoses <jani@iv.ro>
+
+	* include/hal_if.h: Make monitor locking work with CYGPKG_LWIP.
+
 2004-05-19  John Newlin <jnewlin@stretchinc.com>
 
 	* src/hal_stub.c:
--- a/packages/hal/common/current/include/hal_if.h
+++ b/packages/hal/common/current/include/hal_if.h
@@ -70,7 +70,7 @@
 
 // Special monitor locking procedures.  These are necessary when the monitor
 // and eCos share facilities, e.g. the network hardware.
-#ifdef CYGPKG_NET
+#if defined (CYGPKG_NET) || defined (CYGPKG_NET_LWIP)
 #include <cyg/hal/hal_intr.h>
 #include <cyg/hal/drv_api.h>            // cyg_drv_dsr_lock(), etc
 #define _ENTER_MONITOR()                        \
@@ -81,7 +81,7 @@
 #define _EXIT_MONITOR()                         \
     cyg_drv_dsr_unlock();                       \
     HAL_RESTORE_INTERRUPTS(ints)
-#else // !CYGPKG_NET
+#else // !CYGPKG_NET && !CYGPKG_NET_LWIP
 #define _ENTER_MONITOR() CYG_EMPTY_STATEMENT
 #define _EXIT_MONITOR()  CYG_EMPTY_STATEMENT
 #endif