diff options
author | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
commit | a00428f5b149e36b8225b2a0812742a6dfb07b8c (patch) | |
tree | a78869cd67cf78a0eb091fb0ea5d397734bd6738 /arch/ppc/xmon/xmon.c | |
parent | 774fee58c465ea1c7e9775e347ec307bcf2deeb3 (diff) | |
parent | fb5c594c2acc441f0d2d8f457484a0e0e9285db3 (diff) |
Merge ../powerpc-merge
Diffstat (limited to 'arch/ppc/xmon/xmon.c')
-rw-r--r-- | arch/ppc/xmon/xmon.c | 108 |
1 files changed, 0 insertions, 108 deletions
diff --git a/arch/ppc/xmon/xmon.c b/arch/ppc/xmon/xmon.c index bdaf6597b4c2..06fa44b5c647 100644 --- a/arch/ppc/xmon/xmon.c +++ b/arch/ppc/xmon/xmon.c | |||
@@ -12,8 +12,6 @@ | |||
12 | #include <linux/kallsyms.h> | 12 | #include <linux/kallsyms.h> |
13 | #include <asm/ptrace.h> | 13 | #include <asm/ptrace.h> |
14 | #include <asm/string.h> | 14 | #include <asm/string.h> |
15 | #include <asm/prom.h> | ||
16 | #include <asm/bootx.h> | ||
17 | #include <asm/machdep.h> | 15 | #include <asm/machdep.h> |
18 | #include <asm/xmon.h> | 16 | #include <asm/xmon.h> |
19 | #include "nonstdio.h" | 17 | #include "nonstdio.h" |
@@ -101,9 +99,6 @@ void cacheflush(void); | |||
101 | static void cpu_cmd(void); | 99 | static void cpu_cmd(void); |
102 | #endif /* CONFIG_SMP */ | 100 | #endif /* CONFIG_SMP */ |
103 | static void csum(void); | 101 | static void csum(void); |
104 | #ifdef CONFIG_BOOTX_TEXT | ||
105 | static void vidcmds(void); | ||
106 | #endif | ||
107 | static void bootcmds(void); | 102 | static void bootcmds(void); |
108 | static void proccall(void); | 103 | static void proccall(void); |
109 | static void printtime(void); | 104 | static void printtime(void); |
@@ -522,11 +517,6 @@ cmds(struct pt_regs *excp) | |||
522 | cpu_cmd(); | 517 | cpu_cmd(); |
523 | break; | 518 | break; |
524 | #endif /* CONFIG_SMP */ | 519 | #endif /* CONFIG_SMP */ |
525 | #ifdef CONFIG_BOOTX_TEXT | ||
526 | case 'v': | ||
527 | vidcmds(); | ||
528 | break; | ||
529 | #endif | ||
530 | case 'z': | 520 | case 'z': |
531 | bootcmds(); | 521 | bootcmds(); |
532 | break; | 522 | break; |
@@ -618,43 +608,6 @@ static void cpu_cmd(void) | |||
618 | } | 608 | } |
619 | #endif /* CONFIG_SMP */ | 609 | #endif /* CONFIG_SMP */ |
620 | 610 | ||
621 | #ifdef CONFIG_BOOTX_TEXT | ||
622 | extern boot_infos_t disp_bi; | ||
623 | |||
624 | static void vidcmds(void) | ||
625 | { | ||
626 | int c = inchar(); | ||
627 | unsigned int val, w; | ||
628 | extern int boot_text_mapped; | ||
629 | |||
630 | if (!boot_text_mapped) | ||
631 | return; | ||
632 | if (c != '\n' && scanhex(&val)) { | ||
633 | switch (c) { | ||
634 | case 'd': | ||
635 | w = disp_bi.dispDeviceRowBytes | ||
636 | / (disp_bi.dispDeviceDepth >> 3); | ||
637 | disp_bi.dispDeviceDepth = val; | ||
638 | disp_bi.dispDeviceRowBytes = w * (val >> 3); | ||
639 | return; | ||
640 | case 'p': | ||
641 | disp_bi.dispDeviceRowBytes = val; | ||
642 | return; | ||
643 | case 'w': | ||
644 | disp_bi.dispDeviceRect[2] = val; | ||
645 | return; | ||
646 | case 'h': | ||
647 | disp_bi.dispDeviceRect[3] = val; | ||
648 | return; | ||
649 | } | ||
650 | } | ||
651 | printf("W = %d (0x%x) H = %d (0x%x) D = %d (0x%x) P = %d (0x%x)\n", | ||
652 | disp_bi.dispDeviceRect[2], disp_bi.dispDeviceRect[2], | ||
653 | disp_bi.dispDeviceRect[3], disp_bi.dispDeviceRect[3], | ||
654 | disp_bi.dispDeviceDepth, disp_bi.dispDeviceDepth, | ||
655 | disp_bi.dispDeviceRowBytes, disp_bi.dispDeviceRowBytes); | ||
656 | } | ||
657 | #endif /* CONFIG_BOOTX_TEXT */ | ||
658 | 611 | ||
659 | static unsigned short fcstab[256] = { | 612 | static unsigned short fcstab[256] = { |
660 | 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, | 613 | 0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf, |
@@ -1020,7 +973,6 @@ dump_hash_table(void) | |||
1020 | } | 973 | } |
1021 | #else | 974 | #else |
1022 | 975 | ||
1023 | #ifndef CONFIG_PPC64BRIDGE | ||
1024 | static void | 976 | static void |
1025 | dump_hash_table_seg(unsigned seg, unsigned start, unsigned end) | 977 | dump_hash_table_seg(unsigned seg, unsigned start, unsigned end) |
1026 | { | 978 | { |
@@ -1079,66 +1031,6 @@ dump_hash_table_seg(unsigned seg, unsigned start, unsigned end) | |||
1079 | printf(" ... %x\n", last_va); | 1031 | printf(" ... %x\n", last_va); |
1080 | } | 1032 | } |
1081 | 1033 | ||
1082 | #else /* CONFIG_PPC64BRIDGE */ | ||
1083 | static void | ||
1084 | dump_hash_table_seg(unsigned seg, unsigned start, unsigned end) | ||
1085 | { | ||
1086 | extern void *Hash; | ||
1087 | extern unsigned long Hash_size; | ||
1088 | unsigned *htab = Hash; | ||
1089 | unsigned hsize = Hash_size; | ||
1090 | unsigned v, hmask, va, last_va; | ||
1091 | int found, last_found, i; | ||
1092 | unsigned *hg, w1, last_w2, last_va0; | ||
1093 | |||
1094 | last_found = 0; | ||
1095 | hmask = hsize / 128 - 1; | ||
1096 | va = start; | ||
1097 | start = (start >> 12) & 0xffff; | ||
1098 | end = (end >> 12) & 0xffff; | ||
1099 | for (v = start; v < end; ++v) { | ||
1100 | found = 0; | ||
1101 | hg = htab + (((v ^ seg) & hmask) * 32); | ||
1102 | w1 = 1 | (seg << 12) | ((v & 0xf800) >> 4); | ||
1103 | for (i = 0; i < 8; ++i, hg += 4) { | ||
1104 | if (hg[1] == w1) { | ||
1105 | found = 1; | ||
1106 | break; | ||
1107 | } | ||
1108 | } | ||
1109 | if (!found) { | ||
1110 | w1 ^= 2; | ||
1111 | hg = htab + ((~(v ^ seg) & hmask) * 32); | ||
1112 | for (i = 0; i < 8; ++i, hg += 4) { | ||
1113 | if (hg[1] == w1) { | ||
1114 | found = 1; | ||
1115 | break; | ||
1116 | } | ||
1117 | } | ||
1118 | } | ||
1119 | if (!(last_found && found && (hg[3] & ~0x180) == last_w2 + 4096)) { | ||
1120 | if (last_found) { | ||
1121 | if (last_va != last_va0) | ||
1122 | printf(" ... %x", last_va); | ||
1123 | printf("\n"); | ||
1124 | } | ||
1125 | if (found) { | ||
1126 | printf("%x to %x", va, hg[3]); | ||
1127 | last_va0 = va; | ||
1128 | } | ||
1129 | last_found = found; | ||
1130 | } | ||
1131 | if (found) { | ||
1132 | last_w2 = hg[3] & ~0x180; | ||
1133 | last_va = va; | ||
1134 | } | ||
1135 | va += 4096; | ||
1136 | } | ||
1137 | if (last_found) | ||
1138 | printf(" ... %x\n", last_va); | ||
1139 | } | ||
1140 | #endif /* CONFIG_PPC64BRIDGE */ | ||
1141 | |||
1142 | static unsigned hash_ctx; | 1034 | static unsigned hash_ctx; |
1143 | static unsigned hash_start; | 1035 | static unsigned hash_start; |
1144 | static unsigned hash_end; | 1036 | static unsigned hash_end; |