xnu-517.tar.gz

[apple/xnu.git] / osfmk / ppc / Firmware.h

diff --git a/osfmk/ppc/Firmware.h b/osfmk/ppc/Firmware.h
index bd9a00569d751bc24add36cfa26e45e4ab79d96b..d22e18e1e01945866ca2ce9f673e1575160ac6fe 100644 (file)
--- a/osfmk/ppc/Firmware.h
+++ b/osfmk/ppc/Firmware.h
@@ -41,6 +41,9 @@
 #error This file is only useful on PowerPC.
 #endif
 
+#include <mach/vm_types.h>
+#include <ppc/Diagnostics.h>
+
 /*
  *     This routine is used to write debug output to either the modem or printer port.
  *     parm 1 is printer (0) or modem (1); parm 2 is ID (printed directly); parm 3 converted to hex
@@ -51,14 +54,18 @@ void dbgLog(unsigned int d0, unsigned int d1, unsigned int d2, unsigned int d3);
 void dbgLog2(unsigned int type, unsigned int p1, unsigned int p2);
 void dbgDispLL(unsigned int port, unsigned int id, unsigned int data);
 void fwSCCinit(unsigned int port);
+void fwEmMck(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int);      /* Start injecting */ 
+void fwSCOM(scomcomm *);       /* Read/Write SCOM */ 
+void setPmon(unsigned int, unsigned int);      /* Set perf mon stuff */ 
 
-extern void dbgTrace(unsigned int item1, unsigned int item2, unsigned int item3);
+extern void dbgTrace(unsigned int item1, unsigned int item2, unsigned int item3, unsigned int item4);
 #if 0          /* (TEST/DEBUG) - eliminate inline */
-extern __inline__ void dbgTrace(unsigned int item1, unsigned int item2, unsigned int item3) {
+extern __inline__ void dbgTrace(unsigned int item1, unsigned int item2, unsigned int item3, unsigned int item4) {
  
                __asm__ volatile("mr   r3,%0" : : "r" (item1) : "r3");
                __asm__ volatile("mr   r4,%0" : : "r" (item2) : "r4");
                __asm__ volatile("mr   r5,%0" : : "r" (item3) : "r5");
+               __asm__ volatile("mr   r6,%0" : : "r" (item3) : "r6");
         __asm__ volatile("lis  r0,hi16(CutTrace)" : : : "r0");
         __asm__ volatile("ori  r0,r0,lo16(CutTrace)" : : : "r0");
         __asm__ volatile("sc");
@@ -110,7 +117,7 @@ extern __inline__ void ChokeSys(unsigned int ercd) {
 typedef struct Boot_Video bootBumbleC;
 
 extern void StoreReal(unsigned int val, unsigned int addr);
-extern void ReadReal(unsigned int raddr, unsigned int *vaddr);
+extern void ReadReal(addr64_t raddr, unsigned int *vaddr);
 extern void ClearReal(unsigned int addr, unsigned int lgn);
 extern void LoadDBATs(unsigned int *bat);
 extern void LoadIBATs(unsigned int *bat);
@@ -122,6 +129,7 @@ extern void GratefulDebInit(bootBumbleC *boot_video_info);
 extern void GratefulDebDisp(unsigned int coord, unsigned int data);
 extern void checkNMI(void);
 
+#pragma pack(4)                                                /* Make sure the structure stays as we defined it */
 typedef struct GDWorkArea {                    /* Grateful Deb work area one per processor */
 
 /*     Note that a lot of info is duplicated for each processor */
@@ -147,6 +155,7 @@ typedef struct GDWorkArea {                 /* Grateful Deb work area one per processor */
        unsigned int GDrowbuf2[128];    /* Buffer to an 8 character row */
 
 } GDWorkArea;
+#pragma pack()
 #define GDfontsize 16
 #define GDdispcols 2