diff --git a/src/add-ons/accelerants/common/dump_edid.c b/src/add-ons/accelerants/common/dump_edid.c
index 2e3568263e..ac8338fd14 100644
--- a/src/add-ons/accelerants/common/dump_edid.c
+++ b/src/add-ons/accelerants/common/dump_edid.c
@@ -1,152 +1,159 @@
 /*
-	Copyright (c) 2003, Thomas Kurschel
-
+ * Copyright 2003, Thomas Kurschel. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
 
+/*!
 	Part of DDC driver
-		
 	Dumps EDID content
 */
 
 #include "edid.h"
+#if !defined(_KERNEL_MODE) && !defined(_BOOT_MODE)
+#	include "ddc_int.h"
+#endif
+
 #include <KernelExport.h>
-#include "ddc_int.h"
+
 #include <stdio.h>
 
-void edid_dump( edid1_info *edid )
+
+void
+edid_dump(edid1_info *edid)
 {
 	int i, j;
-	char buffer[256];
-	
-	SHOW_INFO( 0, "Vendor: %s", edid->vendor.manufacturer );
-	SHOW_INFO( 0, "Product ID: %d", (int)edid->vendor.prod_id );
-	SHOW_INFO( 0, "Serial #: %d", (int)edid->vendor.serial );
-	SHOW_INFO( 0, "Produced in week/year: %d/%d", edid->vendor.week, edid->vendor.year );
-	
-	SHOW_INFO( 0, "EDID version: %d.%d", edid->version.version, edid->version.revision );
-	
-	SHOW_INFO( 0, "Type: %s", edid->display.input_type ? "Digital" : "Analog" );
-	SHOW_INFO( 0, "Size: %d cm x %d cm", edid->display.h_size, edid->display.v_size );
-	SHOW_INFO( 0, "Gamma=%.3f", (edid->display.gamma + 100) / 100.0 );
-	SHOW_INFO( 0, "White (X,Y)=(%.3f,%.3f)", edid->display.white_x / 1024.0, edid->display.white_y / 1024.0 );
-	
-	SHOW_INFO0( 0, "Supported Future Video Modes:" );
-	for( i = 0; i < EDID1_NUM_STD_TIMING; ++i ) {
-		if( edid->std_timing[i].h_size <= 256 )
-			continue;
-			
-		SHOW_INFO( 0, "%dx%d@%dHz (id=%d)", 
-			edid->std_timing[i].h_size, edid->std_timing[i].v_size,
-			edid->std_timing[i].refresh, edid->std_timing[i].id );
-	}
-	
-	SHOW_INFO0( 0, "Supported VESA Video Modes:" );
-	if( edid->established_timing.res_720x400x70 )
-		SHOW_INFO0( 0, "720x400@70" );
-	if( edid->established_timing.res_720x400x88 )
-		SHOW_INFO0( 0, "720x400@88" );
-	if( edid->established_timing.res_640x480x60 )
-		SHOW_INFO0( 0, "640x480@60" );
-	if( edid->established_timing.res_640x480x67 )
-		SHOW_INFO0( 0, "640x480x67" );
-	if( edid->established_timing.res_640x480x72 )
-		SHOW_INFO0( 0, "640x480x72" );
-	if( edid->established_timing.res_640x480x75 )
-		SHOW_INFO0( 0, "640x480x75" );
-	if( edid->established_timing.res_800x600x56 )
-		SHOW_INFO0( 0, "800x600@56" );
-	if( edid->established_timing.res_800x600x60 )
-		SHOW_INFO0( 0, "800x600@60" );
-		
-	if( edid->established_timing.res_800x600x72 )
-		SHOW_INFO0( 0, "800x600@72" );
-	if( edid->established_timing.res_800x600x75 )
-		SHOW_INFO0( 0, "800x600@75" );
-	if( edid->established_timing.res_832x624x75 )
-		SHOW_INFO0( 0, "832x624@75" );
-	if( edid->established_timing.res_1024x768x87i )
-		SHOW_INFO0( 0, "1024x768@87 interlaced" );
-	if( edid->established_timing.res_1024x768x60 )
-		SHOW_INFO0( 0, "1024x768@60" );
-	if( edid->established_timing.res_1024x768x70 )
-		SHOW_INFO0( 0, "1024x768@70" );
-	if( edid->established_timing.res_1024x768x75 )
-		SHOW_INFO0( 0, "1024x768@75" );
-	if( edid->established_timing.res_1280x1024x75 )
-		SHOW_INFO0( 0, "1280x1024@75" );
-		
-	if( edid->established_timing.res_1152x870x75 )
-		SHOW_INFO0( 0, "1152x870@75" );
-		
-	for( i = 0; i < EDID1_NUM_DETAILED_MONITOR_DESC; ++i ) {
-		edid1_detailed_monitor *monitor = &edid->detailed_monitor[i];
-		
-		switch( monitor->monitor_desc_type ) {
-		case edid1_serial_number:
-			SHOW_INFO( 0, "Serial Number: %s", monitor->data.serial_number );
-			break;
-		case edid1_ascii_data:
-			SHOW_INFO( 0, " %s", monitor->data.serial_number );
-			break;
-		case edid1_monitor_ranges: {
-			edid1_monitor_range monitor_range = monitor->data.monitor_range;
-			
-			SHOW_INFO( 0, "Horizontal frequency range = %d..%d kHz",
-				monitor_range.min_h, monitor_range.max_h );
-			SHOW_INFO( 0, "Vertical frequency range = %d..%d Hz",
-				monitor_range.min_v, monitor_range.max_v );
-			SHOW_INFO( 0, "Maximum pixel clock = %d MHz", (uint16)monitor_range.max_clock * 10 );
-			break; }
-		case edid1_monitor_name:
-			SHOW_INFO( 0, "Monitor Name: %s", monitor->data.serial_number );
-			break;
-		case edid1_add_colour_pointer: {
-			for( j = 0; j < EDID1_NUM_EXTRA_WHITEPOINTS; ++j ) {
-				edid1_whitepoint *whitepoint = &monitor->data.whitepoint[j];
-				
-				if( whitepoint->index == 0 )
-					continue;
 
-				sprintf( buffer, "Additional whitepoint: (X,Y)=(%f,%f) gamma=%f index=%i",
-					whitepoint->white_x / 1024.0, 
-					whitepoint->white_y / 1024.0, 
-					(whitepoint->gamma + 100) / 100.0, 
-					whitepoint->index );
-				SHOW_INFO( 0, "%s", buffer );
+	dprintf("Vendor: %s\n", edid->vendor.manufacturer);
+	dprintf("Product ID: %d\n", (int)edid->vendor.prod_id);
+	dprintf("Serial #: %d\n", (int)edid->vendor.serial);
+	dprintf("Produced in week/year: %d/%d\n", edid->vendor.week, edid->vendor.year);
+
+	dprintf("EDID version: %d.%d\n", edid->version.version, edid->version.revision);
+
+	dprintf("Type: %s\n", edid->display.input_type ? "Digital" : "Analog");
+	dprintf("Size: %d cm x %d cm\n", edid->display.h_size, edid->display.v_size);
+	dprintf("Gamma=%.3f\n", (edid->display.gamma + 100) / 100.0);
+	dprintf("White (X,Y)=(%.3f,%.3f)\n", edid->display.white_x / 1024.0,
+		edid->display.white_y / 1024.0);
+
+	dprintf("Supported Future Video Modes:\n");
+	for (i = 0; i < EDID1_NUM_STD_TIMING; ++i) {
+		if (edid->std_timing[i].h_size <= 256)
+			continue;
+
+		dprintf("%dx%d@%dHz (id=%d)\n", 
+			edid->std_timing[i].h_size, edid->std_timing[i].v_size,
+			edid->std_timing[i].refresh, edid->std_timing[i].id);
+	}
+
+	dprintf("Supported VESA Video Modes:\n");
+	if (edid->established_timing.res_720x400x70)
+		dprintf("720x400@70\n");
+	if (edid->established_timing.res_720x400x88)
+		dprintf("720x400@88\n");
+	if (edid->established_timing.res_640x480x60)
+		dprintf("640x480@60\n");
+	if (edid->established_timing.res_640x480x67)
+		dprintf("640x480x67\n");
+	if (edid->established_timing.res_640x480x72)
+		dprintf("640x480x72\n");
+	if (edid->established_timing.res_640x480x75)
+		dprintf("640x480x75\n");
+	if (edid->established_timing.res_800x600x56)
+		dprintf("800x600@56\n");
+	if (edid->established_timing.res_800x600x60)
+		dprintf("800x600@60\n");
+
+	if (edid->established_timing.res_800x600x72)
+		dprintf("800x600@72\n");
+	if (edid->established_timing.res_800x600x75)
+		dprintf("800x600@75\n");
+	if (edid->established_timing.res_832x624x75)
+		dprintf("832x624@75\n");
+	if (edid->established_timing.res_1024x768x87i)
+		dprintf("1024x768@87 interlaced\n");
+	if (edid->established_timing.res_1024x768x60)
+		dprintf("1024x768@60\n");
+	if (edid->established_timing.res_1024x768x70)
+		dprintf("1024x768@70\n");
+	if (edid->established_timing.res_1024x768x75)
+		dprintf("1024x768@75\n");
+	if (edid->established_timing.res_1280x1024x75)
+		dprintf("1280x1024@75\n");
+
+	if (edid->established_timing.res_1152x870x75)
+		dprintf("1152x870@75\n");
+
+	for (i = 0; i < EDID1_NUM_DETAILED_MONITOR_DESC; ++i) {
+		edid1_detailed_monitor *monitor = &edid->detailed_monitor[i];
+
+		switch(monitor->monitor_desc_type) {
+			case edid1_serial_number:
+				dprintf("Serial Number: %s\n", monitor->data.serial_number);
+				break;
+			case edid1_ascii_data:
+				dprintf(" %s\n", monitor->data.serial_number);
+				break;
+			case edid1_monitor_ranges: {
+				edid1_monitor_range monitor_range = monitor->data.monitor_range;
+
+				dprintf("Horizontal frequency range = %d..%d kHz\n",
+					monitor_range.min_h, monitor_range.max_h);
+				dprintf("Vertical frequency range = %d..%d Hz\n",
+					monitor_range.min_v, monitor_range.max_v);
+				dprintf("Maximum pixel clock = %d MHz\n", (uint16)monitor_range.max_clock * 10);
+				break;
 			}
-			break; }
-		case edid1_add_std_timing: {		
-			for( j = 0; j < EDID1_NUM_EXTRA_STD_TIMING; ++j ) {
-				edid1_std_timing *timing = &monitor->data.std_timing[j];
+			case edid1_monitor_name:
+				dprintf("Monitor Name: %s\n", monitor->data.serial_number);
+				break;
+			case edid1_add_colour_pointer: {
+				for (j = 0; j < EDID1_NUM_EXTRA_WHITEPOINTS; ++j) {
+					edid1_whitepoint *whitepoint = &monitor->data.whitepoint[j];
+
+					if (whitepoint->index == 0)
+						continue;
+
+					dprintf("Additional whitepoint: (X,Y)=(%f,%f) gamma=%f index=%i\n",
+						whitepoint->white_x / 1024.0, 
+						whitepoint->white_y / 1024.0, 
+						(whitepoint->gamma + 100) / 100.0, 
+						whitepoint->index);
+				}
+				break;
+			}
+			case edid1_add_std_timing: {		
+				for (j = 0; j < EDID1_NUM_EXTRA_STD_TIMING; ++j) {
+					edid1_std_timing *timing = &monitor->data.std_timing[j];
+
+					if (timing->h_size <= 256)
+						continue;
+
+					dprintf("%dx%d@%dHz (id=%d)\n", 
+						timing->h_size, timing->v_size,
+						timing->refresh, timing->id);
+				}
+				break;
+			}
+			case edid1_is_detailed_timing: {
+				edid1_detailed_timing *timing = &monitor->data.detailed_timing;
 				
-				if( timing->h_size <= 256 )
-					continue;
-					
-				SHOW_INFO( 0, "%dx%d@%dHz (id=%d)", 
-					timing->h_size, timing->v_size,
-					timing->refresh, timing->id );
+				dprintf("Additional Video Mode:\n");
+				dprintf("clock=%f MHz\n", timing->pixel_clock / 100.0);
+				dprintf("h: (%d, %d, %d, %d)\n", 
+					timing->h_active, timing->h_active + timing->h_sync_off,
+					timing->h_active + timing->h_sync_off + timing->h_sync_width,
+					timing->h_active + timing->h_blank);
+				dprintf("v: (%d, %d, %d, %d)\n", 
+					timing->v_active, timing->v_active + timing->v_sync_off,
+					timing->v_active + timing->v_sync_off + timing->v_sync_width,
+					timing->v_active + timing->v_blank);
+				dprintf("size: %.1f cm x %.1f cm\n", 
+					timing->h_size / 10.0, timing->v_size / 10.0);
+				dprintf("border: %.1f cm x %.1f cm\n",
+					timing->h_border / 10.0, timing->v_border / 10.0);
+				break;
 			}
-			break; }
-		case edid1_is_detailed_timing: {
-			edid1_detailed_timing *timing = &monitor->data.detailed_timing;
-			
-			SHOW_INFO0( 0, "Additional Video Mode:" );
-			sprintf( buffer, "clock=%f MHz", timing->pixel_clock / 100.0 );
-			SHOW_INFO( 0, "%s", buffer );
-			SHOW_INFO( 0, "h: (%d, %d, %d, %d)", 
-				timing->h_active, timing->h_active + timing->h_sync_off,
-				timing->h_active + timing->h_sync_off + timing->h_sync_width,
-				timing->h_active + timing->h_blank );
-			SHOW_INFO( 0, "v: (%d, %d, %d, %d)", 
-				timing->v_active, timing->v_active + timing->v_sync_off,
-				timing->v_active + timing->v_sync_off + timing->v_sync_width,
-				timing->v_active + timing->v_blank );
-			sprintf( buffer, "size: %.1f cm x %.1f cm", 
-				timing->h_size / 10.0, timing->v_size / 10.0 );
-			SHOW_INFO( 0, "%s", buffer );
-			sprintf( buffer, "border: %.1f cm x %.1f cm",
-				timing->h_border / 10.0, timing->v_border / 10.0 );
-			SHOW_INFO( 0, "%s", buffer );
-			break; }
 		}
 	}
 }