Mercurial > ecos
changeset 2210:7f47e5d2fe20
* host/instr/dump_instr.c: Use CYG_NELEM from infra.
* src/instrmnt/meminst.cxx: Use CYG_NELEM from infra.
| author | asl |
|---|---|
| date | Fri, 19 May 2006 10:15:43 +0000 |
| parents | b2a26dbe68a2 |
| children | acfe2ec52590 |
| files | packages/kernel/current/ChangeLog packages/kernel/current/host/instr/dump_instr.c packages/kernel/current/src/instrmnt/meminst.cxx |
| diffstat | 3 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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;
--- 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;