[haiku-commits] BRANCH mmu_man-github.sam460ex - in src: add-ons/kernel/drivers/graphics/intel_extreme apps/debugger/debug_info apps/debugger/arch/x86/disasm apps/debugger/arch/x86 apps/debugger/arch
- From: mmu_man-github.sam460ex <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 2 Jan 2013 02:15:45 +0100 (CET)
added 2 changesets to branch 'refs/remotes/mmu_man-github/sam460ex'
old head: dcd112f767b89f0cb5a1e93e0515361c1742c635
new head: ef7bb168f77d9d3537cc0b08bedbe70d50c86924
overview: https://github.com/mmuman/haiku/compare/dcd112f...ef7bb16
----------------------------------------------------------------------------
d34a444: Merge branch 'master' into sam460ex
ef7bb16: U-Boot: fix warnings
[ François Revol <revol@xxxxxxx> ]
----------------------------------------------------------------------------
35 files changed, 815 insertions(+), 162 deletions(-)
.../drivers/graphics/intel_extreme/Jamfile | 2 +-
.../graphics/intel_extreme/intel_extreme.cpp | 45 +----
.../drivers/graphics/intel_extreme/power.cpp | 175 +++++++++++++++++++
.../drivers/graphics/intel_extreme/power.h | 121 +++++++++++++
src/apps/debugger/Jamfile | 3 +-
src/apps/debugger/arch/Architecture.cpp | 7 +-
src/apps/debugger/arch/Architecture.h | 9 +-
src/apps/debugger/arch/InstructionInfo.cpp | 10 +-
src/apps/debugger/arch/InstructionInfo.h | 9 +-
src/apps/debugger/arch/x86/ArchitectureX86.cpp | 84 +++++----
src/apps/debugger/arch/x86/ArchitectureX86.h | 7 +-
.../debugger/arch/x86/disasm/DisassemblerX86.cpp | 112 ++++++++++++
.../debugger/arch/x86/disasm/DisassemblerX86.h | 12 ++
src/apps/debugger/arch/x86/disasm/Jamfile | 3 +
.../debugger/arch/x86_64/ArchitectureX8664.cpp | 16 +-
.../debugger/arch/x86_64/ArchitectureX8664.h | 6 +-
src/apps/debugger/controllers/ThreadHandler.cpp | 39 +++--
.../debug_info/DebuggerImageDebugInfo.cpp | 4 +-
.../debugger/debug_info/DebuggerImageDebugInfo.h | 1 +
.../debugger/debug_info/DwarfImageDebugInfo.cpp | 120 ++++++++-----
.../debugger/debug_info/DwarfImageDebugInfo.h | 9 +-
.../debug_info/DwarfStackFrameDebugInfo.cpp | 76 ++++++++
.../debug_info/DwarfStackFrameDebugInfo.h | 7 +
.../debugger/debug_info/SpecificImageDebugInfo.h | 1 +
src/apps/debugger/ids/ReturnValueID.cpp | 13 ++
src/apps/debugger/ids/ReturnValueID.h | 18 ++
src/apps/debugger/jobs/GetStackTraceJob.cpp | 3 +-
src/apps/debugger/model/Thread.cpp | 13 ++
src/apps/debugger/model/Thread.h | 10 ++
src/apps/deskbar/BarApp.cpp | 2 +
src/preferences/appearance/APRWindow.cpp | 30 ++--
src/system/boot/platform/u-boot/console.cpp | 2 +
src/system/boot/platform/u-boot/devices.cpp | 2 +-
src/system/boot/platform/u-boot/serial.cpp | 4 +
src/system/boot/platform/u-boot/start.cpp | 2 +-
############################################################################
Commit: d34a44470f326b5f3f26792aa64a168bdb829f76
Author: François Revol <revol@xxxxxxx>
Date: Wed Jan 2 00:55:03 2013 UTC
Merge branch 'master' into sam460ex
----------------------------------------------------------------------------
############################################################################
Commit: ef7bb168f77d9d3537cc0b08bedbe70d50c86924
Author: François Revol <revol@xxxxxxx>
Date: Wed Jan 2 01:07:06 2013 UTC
U-Boot: fix warnings
----------------------------------------------------------------------------
diff --git a/src/system/boot/platform/u-boot/console.cpp
b/src/system/boot/platform/u-boot/console.cpp
index 62293e4..1ff4694 100644
--- a/src/system/boot/platform/u-boot/console.cpp
+++ b/src/system/boot/platform/u-boot/console.cpp
@@ -45,10 +45,12 @@ static SerialConsole sSerial;
FILE *stdin, *stdout, *stderr;
+/*
static void
scroll_up()
{
}
+*/
// #pragma mark -
diff --git a/src/system/boot/platform/u-boot/devices.cpp
b/src/system/boot/platform/u-boot/devices.cpp
index 650211b..8a77d92 100644
--- a/src/system/boot/platform/u-boot/devices.cpp
+++ b/src/system/boot/platform/u-boot/devices.cpp
@@ -28,7 +28,7 @@ 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,
+ TRACE("Memory Disk at: %p size: %lx\n", args->platform.boot_tgz_data,
args->platform.boot_tgz_size);
MemoryDisk* disk = new(nothrow) MemoryDisk(
diff --git a/src/system/boot/platform/u-boot/serial.cpp
b/src/system/boot/platform/u-boot/serial.cpp
index 27bbb81..61093ce 100644
--- a/src/system/boot/platform/u-boot/serial.cpp
+++ b/src/system/boot/platform/u-boot/serial.cpp
@@ -165,9 +165,13 @@ serial_init_fdt(const void *fdt)
|| fdt_node_check_compatible(fdt, node, "ns16550") == 1) {
gUART = arch_get_uart_8250(regs, clock);
//dprintf("serial: using 8250\n");
+ // XXX:assume speed is already set
+ (void)speed;
return;
}
+ // for when we can use U-Boot's console
+ panic("Unknown UART type %s", type);
}
diff --git a/src/system/boot/platform/u-boot/start.cpp
b/src/system/boot/platform/u-boot/start.cpp
index 074e434..1bcc0d3 100644
--- a/src/system/boot/platform/u-boot/start.cpp
+++ b/src/system/boot/platform/u-boot/start.cpp
@@ -115,7 +115,7 @@ platform_start_kernel(void)
status_t error = arch_start_kernel(&gKernelArgs, kernelEntry,
stackTop);
- panic("kernel returned!\n");
+ panic("kernel returned %lx!\n", error);
}
Other related posts:
- » [haiku-commits] BRANCH mmu_man-github.sam460ex - in src: add-ons/kernel/drivers/graphics/intel_extreme apps/debugger/debug_info apps/debugger/arch/x86/disasm apps/debugger/arch/x86 apps/debugger/arch - mmu_man-github . sam460ex
