2009-05-08 Joel Sherrill <joel.sherrill@oarcorp.com>

	* bootcard.c, bspgetworkarea.c, include/bootcard.h: Switch from ssize_t
	to uintptr_t for bsp_get_work_area() since the work area is larger
	than a single allocatable object.

1 files changed, 9 insertions, 8 deletions

diff --git a/c/src/lib/libbsp/shared/bootcard.c b/c/src/lib/libbsp/shared/bootcard.c
index 7327e210a4..912f73b094 100644
--- a/c/src/lib/libbsp/shared/bootcard.c
+++ b/c/src/lib/libbsp/shared/bootcard.c
@@ -46,6 +46,7 @@
 #include <rtems.h>
 
 #include <bsp/bootcard.h>
+#include <rtems/bspIo.h>
 
 /*
  *  At most a single pointer to the cmdline for those target
@@ -121,9 +122,9 @@ int boot_card(
   rtems_interrupt_level  bsp_isr_level;
   rtems_status_code      sc = RTEMS_SUCCESSFUL;
   void                  *work_area_start = NULL;
-  intptr_t               work_area_size = 0;
+  uintptr_t              work_area_size = 0;
   void                  *heap_start = NULL;
-  intptr_t               heap_size = 0;
+  uintptr_t              heap_size = 0;
 
   /*
    * Special case for PowerPC: The interrupt disable mask is stored in SPRG0.
@@ -149,14 +150,14 @@ int boot_card(
    *  Find out where the block of memory the BSP will use for
    *  the RTEMS Workspace and the C Program Heap is.
    */
-  bsp_get_work_area(&work_area_start, (ssize_t*) &work_area_size,
-                    &heap_start, (ssize_t*) &heap_size);
+  bsp_get_work_area(&work_area_start, &work_area_size,
+                    &heap_start, &heap_size);
 
-  if ( work_area_size <= Configuration.work_space_size ) {
+  if ( (uint32_t) work_area_size <= (uint32_t) Configuration.work_space_size ) {
     printk(
-      "bootcard: Work space too big for work area! (%d > %d)\n",
-      Configuration.work_space_size,
-      work_area_size
+      "bootcard: Work space too big for work area! (0x%08lx > 0x%08lx)\n",
+      (uint32_t)Configuration.work_space_size,
+      (uint32_t)work_area_size
     );
     bsp_cleanup();
     return -1;