===================================================================
RCS file: /cvs/prex-old/boot/i386/pc/platform.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- prex-old/boot/i386/pc/platform.h	2008/06/03 10:38:41	1.1.1.1
+++ prex-old/boot/i386/pc/platform.h	2008/08/13 17:12:21	1.1.1.1.2.1
@@ -47,30 +47,12 @@
 /*
  * Page mapping
  */
-#define phys_to_virt(p_addr)	(void *)((u_long)(p_addr) + PAGE_OFFSET)
-#define virt_to_phys(v_addr)	(void *)((u_long)(v_addr) - PAGE_OFFSET)
+#define phys_to_virt(pa)	(void *)((char *)(pa) + PAGE_OFFSET)
+#define virt_to_phys(va)	(void *)((char *)(va) - PAGE_OFFSET)
 
-
-#if defined(DEBUG) && defined(CONFIG_DIAG_BOCHS)
-/*
- * Output Bochs virtual debug port.
- */
-static __inline void
-putc(int c)
-{
-	__asm__ __volatile__(
-		"inb $0xe9, %%al\n\t"
-		"cmpb $0xe9, %%al\n\t"
-		"jne 1f\n\t"
-		"movb %%bl, %%al\n\t"
-		"outb %%al, $0xe9\n\t"
-		"1:\n\t"
-		:
-		: "b" (c));
-}
-#endif
-
+extern void putchar(int c);
 extern void setup_bootinfo(struct boot_info **);
+extern void machine_panic(void);
 
 #endif /* !__ASSEMBLY__ */
 #endif /* !_PC_PLATFORM_H */