# HG changeset patch
# User asl
# Date 1148033743 0
# Node ID 7f47e5d2fe20de18415944a94823b0443906ddf2
# Parent  b2a26dbe68a207391116750bf5f6a29673fa130d
        * host/instr/dump_instr.c: Use CYG_NELEM from infra.
        * src/instrmnt/meminst.cxx: Use CYG_NELEM from infra.

diff --git a/packages/kernel/current/ChangeLog b/packages/kernel/current/ChangeLog
--- a/packages/kernel/current/ChangeLog
+++ b/packages/kernel/current/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-19  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* host/instr/dump_instr.c: Use CYG_NELEM from infra.
+	* src/instrmnt/meminst.cxx: Use CYG_NELEM from infra.
+
 2006-05-09  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* tests/stress_threads.c: Add string.h to avoid compiler warning.
diff --git a/packages/kernel/current/host/instr/dump_instr.c b/packages/kernel/current/host/instr/dump_instr.c
--- a/packages/kernel/current/host/instr/dump_instr.c
+++ b/packages/kernel/current/host/instr/dump_instr.c
@@ -1,4 +1,3 @@
-
 #include <pkgconf/kernel.h>
 #include <cyg/kernel/ktypes.h>         // base kernel types
 #include <cyg/kernel/instrmnt.h>
@@ -23,7 +22,7 @@ struct Instrument_Record
 #ifdef CYGDBG_KERNEL_INSTRUMENT_MSGS
 #define CYGDBG_KERNEL_INSTRUMENT_MSGS_DEFINE_TABLE
 #include <cyg/kernel/instrument_desc.h>
-#define NELEM(x) (sizeof(x)/sizeof*(x))
+
 externC char * cyg_instrument_msg(CYG_WORD16 type) {
 
   struct instrument_desc_s *record;
@@ -31,7 +30,7 @@ externC char * cyg_instrument_msg(CYG_WO
   CYG_WORD cl, event;
 
   record = instrument_desc;
-  end_record = &instrument_desc[NELEM(instrument_desc)-1];
+  end_record = &instrument_desc[CYG_NELEM(instrument_desc)-1];
   cl = type & 0xff00;
   event = type & 0x00ff;
 
diff --git a/packages/kernel/current/src/instrmnt/meminst.cxx b/packages/kernel/current/src/instrmnt/meminst.cxx
--- a/packages/kernel/current/src/instrmnt/meminst.cxx
+++ b/packages/kernel/current/src/instrmnt/meminst.cxx
@@ -226,7 +226,7 @@ externC cyg_bool cyg_instrument_state( c
 #ifdef CYGDBG_KERNEL_INSTRUMENT_MSGS
 #define CYGDBG_KERNEL_INSTRUMENT_MSGS_DEFINE_TABLE
 #include <cyg/kernel/instrument_desc.h>
-#define NELEM(x) (sizeof(x)/sizeof*(x))
+
 externC char * cyg_instrument_msg(CYG_WORD16 type) {
 
   struct instrument_desc_s *record;
@@ -234,7 +234,7 @@ externC char * cyg_instrument_msg(CYG_WO
   CYG_WORD cl, event;
 
   record = instrument_desc;
-  end_record = &instrument_desc[NELEM(instrument_desc)-1];
+  end_record = &instrument_desc[CYG_NELEM(instrument_desc)-1];
   cl = type & 0xff00;
   event = type & 0x00ff;