Get most of PICE to build again.

svn path=/trunk/; revision=8359

reactos/apps/utils/pice/module/disassembler.c

@@ -713,4 +713,4 @@ BOOLEAN Disasm(PULONG pOffset,PUCHAR pchDst)
 
     *pOffset += (ULONG)Disassembler( &dis);
     return TRUE;
-}
+}

reactos/apps/utils/pice/module/gpfault.c

@@ -60,14 +60,14 @@ void HandleGPFault(FRAME* ptr)
 //
 //*************************************************************************
 __asm__ ("\n\t \
-NewGPFaultHandler:\n\t \
+		NewGPFaultHandler:\n\t \
 		pushfl\n\t \
         cli\n\t \
         cld\n\t \
         pushal\n\t \
 	    pushl %ds\n\t \
 \n\t \
-		// test for v86 mode.
+		// test for v86 mode\n\t \
  		testl $0x20000,40(%esp)\n\t \
 		jnz notv86\n\t \
 		popl %ds\n\t \
@@ -75,7 +75,7 @@ NewGPFaultHandler:\n\t \
 		popfl\n\t \
 		.byte 0x2e\n\t \
 		jmp *_OldGPFaultHandler\n\t \
-notv86:\n\t \
+		notv86:\n\t \
 		// setup default data selectors\n\t \
 	    movw %ss,%ax\n\t \
 	    movw %ax,%ds\n\t \

reactos/apps/utils/pice/module/parse.c

@@ -3092,6 +3092,8 @@ COMMAND_PROTOTYPE(ShowPCI)
                             if(WaitForKey()==FALSE)goto CommonShowPCIExit;
                         }
                         ppciConfig = &pciConfig;
+						#if 0
+							// sedwards
                         SHOW_FIELD_WORD(ppciConfig,Status,TRUE);
                         SHOW_FIELD_WORD(ppciConfig,Command,TRUE);
                         SHOW_FIELD_BYTE(ppciConfig,RevisionID,TRUE);
@@ -3100,6 +3102,7 @@ COMMAND_PROTOTYPE(ShowPCI)
                         SHOW_FIELD_BYTE(ppciConfig,SubClass,TRUE);
                         SHOW_FIELD_BYTE(ppciConfig,CacheLineSize,TRUE);
                         SHOW_FIELD_BYTE(ppciConfig,LatencyTimer,TRUE);
+						#endif
                     }
                 }
             }

reactos/apps/utils/pice/module/parse.h

@@ -168,12 +168,13 @@ COMMAND_PROTOTYPE(ShowSysCallTable);
 COMMAND_PROTOTYPE(SetAltKey);
 COMMAND_PROTOTYPE(ShowContext);
 
-//ei make sure the following correspond to ntoskrnl/mm/i386/page.c
+//ei - make sure the following correspond to ntoskrnl/mm/i386/page.c
+//sedwards - Dont use them if you dont need them. Use DDK headers instead.
 #define PAGETABLE_MAP     (0xf0000000)
 #define PAGEDIRECTORY_MAP (0xf0000000 + (PAGETABLE_MAP / (1024)))
-#define PAGE_SHIFT      12
+//#define PAGE_SHIFT      12
 #define PTRS_PER_PTE    1024
-#define PAGE_SIZE       (1UL << PAGE_SHIFT)
+//#define PAGE_SIZE       (1UL << PAGE_SHIFT)
 #define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (4 * 1024 * 1024))
 #define ADDR_TO_PDE(v) (PULONG)(PAGEDIRECTORY_MAP + \
                                 (((ULONG)v / (1024 * 1024))&(~0x3)))

reactos/apps/utils/pice/module/pci_ids.h

@@ -902,4 +902,4 @@ struct _PCI_VENDOR_IDS
     {0xEA01 ,"EAGLE TECHNOLOGY"},
     {0xFA57 ,"FAST SEARCH & TRANSFER ASA"},
     {0xFEDA ,"EPIGRAM INC"}
-};
+};

reactos/apps/utils/pice/module/pice_ver.h

@@ -33,4 +33,4 @@ Copyright notice:
 #define PICE_MINOR_VERSION (99)
 // reset this on major or minor version change
 // increment this on every release build
-#define PICE_BUILD         (0007)  
+#define PICE_BUILD         (0007)  

reactos/apps/utils/pice/module/precomp.h

@@ -34,7 +34,7 @@ Copyright notice:
 #include <ddk/ntddk.h>
 #include <ntos/types.h>
 #include <ddk/types.h>
-#include <ddk/i386/tss.h>
+//#include <ddk/i386/tss.h>
 #include <internal/ob.h>
 #include <internal/i386/segment.h>
 #include <defines.h>

reactos/apps/utils/pice/module/scancodes.h

@@ -103,4 +103,4 @@ Copyright notice:
 #define SCANCODE_9              0x0A
 #define SCANCODE_0              0x0B
 
-#define SCANCODE_EXTENDED       0xE0
+#define SCANCODE_EXTENDED       0xE0

reactos/apps/utils/pice/module/symbols.h

@@ -29,10 +29,6 @@ Copyright notice:
 
 --*/
 
-// constant defines
-#define FIELD_OFFSET(Type,Field) (LONG)(&(((Type *)(0))->Field))
-#define CONTAINING_RECORD(Address,Type,Field) (Type *)(((LONG)Address) - FIELD_OFFSET(Type,Field))
-
 typedef struct _LOCAL_VARIABLE
 {
 	char type_name[64];