From 75e4ff02d0c9d51f1d7f8331c666198484093677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 21 Nov 2011 03:19:31 +0100 Subject: [PATCH] Style cleanup --- src/system/boot/platform/u-boot/devices.cpp | 7 +++++-- src/system/boot/platform/u-boot/start2.cpp | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/system/boot/platform/u-boot/devices.cpp b/src/system/boot/platform/u-boot/devices.cpp index 9e3f95eaca..650211b6ee 100644 --- a/src/system/boot/platform/u-boot/devices.cpp +++ b/src/system/boot/platform/u-boot/devices.cpp @@ -27,9 +27,12 @@ platform_add_boot_device(struct stage2_args *args, NodeList *devicesList) if (!args->platform.boot_tgz_data || !args->platform.boot_tgz_size) return B_DEVICE_NOT_FOUND; - TRACE("Memory Disk at: %lx size: %lx\n",args->platform.boot_tgz_data, args->platform.boot_tgz_size); + + TRACE("Memory Disk at: %lx size: %lx\n", args->platform.boot_tgz_data, + args->platform.boot_tgz_size); + MemoryDisk* disk = new(nothrow) MemoryDisk( - (const uint8 *)args->platform.boot_tgz_data, + (const uint8 *)args->platform.boot_tgz_data, args->platform.boot_tgz_size, "boot.tgz"); if (!disk) { dprintf("platform_add_boot_device(): Could not create MemoryDisk !\n"); diff --git a/src/system/boot/platform/u-boot/start2.cpp b/src/system/boot/platform/u-boot/start2.cpp index ac42a104d8..32fdcde67b 100644 --- a/src/system/boot/platform/u-boot/start2.cpp +++ b/src/system/boot/platform/u-boot/start2.cpp @@ -102,7 +102,6 @@ platform_start_kernel(void) status_t error = arch_start_kernel(&gKernelArgs, kernelEntry, stackTop); - dprintf("kernel returned!\n"); panic("kernel returned!\n"); } @@ -152,7 +151,8 @@ start_raw(int argc, const char **argv) // if we get passed a uimage, try to find the second blob if (gUImage != NULL - && image_multi_getimg(gUImage, 1, (uint32*)&args.platform.boot_tgz_data, + && image_multi_getimg(gUImage, 1, + (uint32*)&args.platform.boot_tgz_data, &args.platform.boot_tgz_size)) { dprintf("Found boot tgz @ %p, %" B_PRIu32 " bytes\n", args.platform.boot_tgz_data, args.platform.boot_tgz_size);