X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fpowerpc%2Fxmon%2Fxmon.c;fp=arch%2Fpowerpc%2Fxmon%2Fxmon.c;h=7d02fa2a899029d3df4023ef804f4b14588b539c;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=179b10ced8c773ee75d6c5dfb290dd35b84d25f0;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 179b10ced..7d02fa2a8 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -8,6 +8,7 @@
  *      as published by the Free Software Foundation; either version
  *      2 of the License, or (at your option) any later version.
  */
+#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/smp.h>
@@ -25,6 +26,9 @@
 #include <asm/prom.h>
 #include <asm/machdep.h>
 #include <asm/xmon.h>
+#ifdef CONFIG_PMAC_BACKLIGHT
+#include <asm/backlight.h>
+#endif
 #include <asm/processor.h>
 #include <asm/pgtable.h>
 #include <asm/mmu.h>
@@ -187,7 +191,6 @@ Commands:\n\
   di	dump instructions\n\
   df	dump float values\n\
   dd	dump double values\n\
-  dr	dump stream of raw bytes\n\
   e	print exception information\n\
   f	flush cache\n\
   la	lookup symbol+offset of specified address\n\
@@ -1935,28 +1938,6 @@ bsesc(void)
 	return c;
 }
 
-static void xmon_rawdump (unsigned long adrs, long ndump)
-{
-	long n, m, r, nr;
-	unsigned char temp[16];
-
-	for (n = ndump; n > 0;) {
-		r = n < 16? n: 16;
-		nr = mread(adrs, temp, r);
-		adrs += nr;
-		for (m = 0; m < r; ++m) {
-			if (m < nr)
-				printf("%.2x", temp[m]);
-			else
-				printf("%s", fault_chars[fault_type]);
-		}
-		n -= r;
-		if (nr < r)
-			break;
-	}
-	printf("\n");
-}
-
 #define isxdigit(c)	(('0' <= (c) && (c) <= '9') \
 			 || ('a' <= (c) && (c) <= 'f') \
 			 || ('A' <= (c) && (c) <= 'F'))
@@ -1979,13 +1960,6 @@ dump(void)
 			nidump = MAX_DUMP;
 		adrs += ppc_inst_dump(adrs, nidump, 1);
 		last_cmd = "di\n";
-	} else if (c == 'r') {
-		scanhex(&ndump);
-		if (ndump == 0)
-			ndump = 64;
-		xmon_rawdump(adrs, ndump);
-		adrs += ndump;
-		last_cmd = "dr\n";
 	} else {
 		scanhex(&ndump);
 		if (ndump == 0)