From 7262e19eca37218e805de125cc36cb08607fc6d7 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Thu, 4 Aug 2011 10:08:57 +0200 Subject: Fixed a crash with early debug printf statements printf does not work during rtas_init of snk yet, so the code has to use the snk_kernel_interface instead. Signed-off-by: Thomas Huth --- clients/net-snk/oflib/rtas.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'clients') diff --git a/clients/net-snk/oflib/rtas.c b/clients/net-snk/oflib/rtas.c index 63d6e2f..5d0560a 100644 --- a/clients/net-snk/oflib/rtas.c +++ b/clients/net-snk/oflib/rtas.c @@ -15,8 +15,11 @@ #include #include #include +#include #include "kernel.h" +extern snk_kernel_t snk_kernel_interface; + typedef int rtas_arg_t; typedef struct { @@ -97,9 +100,10 @@ instantiate_rtas(void) { long long *rtas_mem_space; ihandle_t ihandle; + _rtas.dev = of_finddevice("/rtas"); if ((long) _rtas.dev < 0) { - printf("Could not open /rtas\n"); + snk_kernel_interface.print("\nCould not open /rtas\n"); return -1; } @@ -107,7 +111,7 @@ instantiate_rtas(void) sizeof(_rtas.rtas_size)); if (_rtas.rtas_size <= 0) { - printf("Size of rtas (%x) too small to make sense\n", + snk_kernel_interface.print("\nSize of rtas (%x) too small to make sense\n", _rtas.rtas_size); return -1; } @@ -115,14 +119,14 @@ instantiate_rtas(void) rtas_mem_space = (long long *) malloc_aligned(_rtas.rtas_size, 0x100); if (!rtas_mem_space) { - printf("Failed to allocated memory for RTAS\n"); + snk_kernel_interface.print("\nFailed to allocated memory for RTAS\n"); return -1; } ihandle = of_open("/rtas"); if ((long) ihandle < 0) { - printf("Could not open /rtas\n"); + snk_kernel_interface.print("Could not open /rtas\n"); return -1; } @@ -132,11 +136,11 @@ instantiate_rtas(void) > 0) { _rtas.rtas_start = rtas_mem_space; } else { - printf("instantiate-rtas failed\n"); + snk_kernel_interface.print("instantiate-rtas failed\n"); return -1; } #if 0 - printf("\ninstantiate-rtas at %x size %x entry %x\n", + snk_kernel_interface.print("\ninstantiate-rtas at %x size %x entry %x\n", _rtas.rtas_start, _rtas.rtas_size, _rtas.rtas_entry); #endif return 0; -- cgit v1.1