linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / powerpc / xmon / xmon.c

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 179b10c..7d02fa2 100644 (file)
--- 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)