i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Style cleanup

Browse Source
This commit is contained in:
François Revol
2011-11-21 03:19:31 +01:00
parent 1cdb5905fc
commit 75e4ff02d0
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/u-boot/devices.cpp
+4 -1
View File
@@ -27,7 +27,10 @@ platform_add_boot_device(struct stage2_args *args, NodeList *devicesList)
if (!args->platform.boot_tgz_data || !args->platform.boot_tgz_size) if (!args->platform.boot_tgz_data || !args->platform.boot_tgz_size)
return B_DEVICE_NOT_FOUND; 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( 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"); args->platform.boot_tgz_size, "boot.tgz");
src/system/boot/platform/u-boot/start2.cpp
+2 -2
View File
@@ -102,7 +102,6 @@ platform_start_kernel(void)
status_t error = arch_start_kernel(&gKernelArgs, kernelEntry, status_t error = arch_start_kernel(&gKernelArgs, kernelEntry,
stackTop); stackTop);
dprintf("kernel returned!\n");
panic("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 we get passed a uimage, try to find the second blob
if (gUImage != NULL 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)) { &args.platform.boot_tgz_size)) {
dprintf("Found boot tgz @ %p, %" B_PRIu32 " bytes\n", dprintf("Found boot tgz @ %p, %" B_PRIu32 " bytes\n",
args.platform.boot_tgz_data, args.platform.boot_tgz_size); args.platform.boot_tgz_data, args.platform.boot_tgz_size);