summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2005-01-24 15:05:14 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2005-01-24 15:05:14 +0000
commit14426c8fb89e6d37a3a53e1d05df87082de7c860 (patch)
treed0596dff96ca726d080f48bc6d768c692d03940d /cpukit
parent2005-01-24 Ralf Corsepius <ralf.corsepius@rtems.org> (diff)
downloadrtems-14426c8fb89e6d37a3a53e1d05df87082de7c860.tar.bz2
2005-01-24 Ralf Corsepius <ralf.corsepius@rtems.org>
* score/include/rtems/score/heap.h: Use uintptr_t for _H_uptr_t. * score/inline/rtems/score/address.inl: Remove RTEMS_CPU_HAS_16_BIT_ADDRESSES. Use uintptr_t for void* to address cast.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/ChangeLog7
-rw-r--r--cpukit/score/include/rtems/score/heap.h2
-rw-r--r--cpukit/score/inline/rtems/score/address.inl4
3 files changed, 9 insertions, 4 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index e10d2d55f5..2e4006a792 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,12 @@
2005-01-24 Ralf Corsepius <ralf.corsepius@rtems.org>
+ * score/include/rtems/score/heap.h: Use uintptr_t for _H_uptr_t.
+ * score/inline/rtems/score/address.inl: Remove
+ RTEMS_CPU_HAS_16_BIT_ADDRESSES.
+ Use uintptr_t for void* to address cast.
+
+2005-01-24 Ralf Corsepius <ralf.corsepius@rtems.org>
+
* libcsupport/include/stdint.h: Use __PTRDIFF_TYPE for intptr_t.
2005-01-23 Ralf Corsepius <ralf.corsepius@rtems.org>
diff --git a/cpukit/score/include/rtems/score/heap.h b/cpukit/score/include/rtems/score/heap.h
index 7559cd89fb..42c79bea9c 100644
--- a/cpukit/score/include/rtems/score/heap.h
+++ b/cpukit/score/include/rtems/score/heap.h
@@ -51,7 +51,7 @@ extern "C" {
* 'rtems/score/types.h' and used here.
*/
-typedef unsigned long int _H_uptr_t;
+typedef uintptr_t _H_uptr_t;
/**
* Forward reference
diff --git a/cpukit/score/inline/rtems/score/address.inl b/cpukit/score/inline/rtems/score/address.inl
index 11c987306f..44079af2ea 100644
--- a/cpukit/score/inline/rtems/score/address.inl
+++ b/cpukit/score/inline/rtems/score/address.inl
@@ -80,10 +80,8 @@ RTEMS_INLINE_ROUTINE boolean _Addresses_Is_aligned (
{
#if (CPU_ALIGNMENT == 0)
return TRUE;
-#elif defined(RTEMS_CPU_HAS_16_BIT_ADDRESSES)
- return ( ( (unsigned short)address % CPU_ALIGNMENT ) == 0 );
#else
- return ( ( (uint32_t )address % CPU_ALIGNMENT ) == 0 );
+ return ( ( (uintptr_t)address % CPU_ALIGNMENT ) == 0 );
#endif
}