[ros-diffs] [hpoussin] 28805: Add missing svn:eol-style=native properties

[hpoussin at svn.reactos.org]

Author: hpoussin
Date: Mon Sep  3 11:39:30 2007
New Revision: 28805

URL: http://svn.reactos.org/svn/reactos?rev=28805&view=rev
Log:
Add missing svn:eol-style=native properties

Modified:
    trunk/reactos/boot/freeldr/freeldr/arch/powerpc/compat.h   (props changed)
    trunk/reactos/boot/freeldr/freeldr/arch/powerpc/loader.c   (props changed)
    trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c   (props changed)
    trunk/reactos/boot/freeldr/freeldr/arch/powerpc/ofw_util.s   (props changed)
    trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c   (props changed)
    trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h   (props changed)
    trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c   (props changed)
    trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_pci.c   (props changed)
    trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_vga.c   (props changed)
    trunk/reactos/boot/freeldr/freeldr/fs/fs.c
    trunk/reactos/boot/freeldr/freeldr/include/bytesex.h   (props changed)
    trunk/reactos/boot/freeldr/freeldr/include/freeldr.h
    trunk/reactos/boot/freeldr/freeldr/mm/mm.c

Propchange: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/compat.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/loader.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/ofw_util.s
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_pci.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/prep_vga.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs.c?rev=28805&r1=28804&r2=28805&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/fs/fs.c (original)
+++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c Mon Sep  3 11:39:30 2007
@@ -26,8 +26,8 @@
 // DATA
 /////////////////////////////////////////////////////////////////////////////////////////////
 
-ULONG			FsType = 0;	// Type of filesystem on boot device, set by FsOpenVolume()
-PVOID                   FsStaticBufferDisk = 0, FsStaticBufferData = 0;
+ULONG FsType = 0;	// Type of filesystem on boot device, set by FsOpenVolume()
+PVOID FsStaticBufferDisk = 0, FsStaticBufferData = 0;
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 // FUNCTIONS
@@ -52,20 +52,17 @@
 {
 	CHAR ErrorText[80];
 
-	printf("FsOpenVolume: (disk=%d,start=%d,count=%d,type=%d)\n",
-	       DriveNumber, StartSector, SectorCount, Type);
-
 	FsType = Type;
 
 	if( !FsStaticBufferDisk )
-	    FsStaticBufferDisk = MmAllocateMemory( 0x20000 );
+		FsStaticBufferDisk = MmAllocateMemory( 0x20000 );
 	if( !FsStaticBufferDisk )
 	{
-	        FileSystemError("could not allocate filesystem static buffer");
+		FileSystemError("could not allocate filesystem static buffer");
 		return FALSE;
 	}
 	FsStaticBufferData = ((PCHAR)FsStaticBufferDisk) + 0x10000;
-	    
+
 	switch (FsType)
 	{
 	case FS_FAT:
@@ -165,7 +162,6 @@
 		break;
 	}
 
-#ifdef DEBUG
 	//
 	// Check return value
 	//
@@ -177,7 +173,6 @@
 	{
 		DbgPrint((DPRINT_FILESYSTEM, "FsOpenFile() failed.\n"));
 	}
-#endif // defined DEBUG
 
 	return FileHandle;
 }

Propchange: trunk/reactos/boot/freeldr/freeldr/include/bytesex.h
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/include/freeldr.h?rev=28805&r1=28804&r2=28805&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h (original)
+++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Mon Sep  3 11:39:30 2007
@@ -90,7 +90,10 @@
 /* Swap */
 #include <bytesex.h>
 
+/* arch defines */
+#ifdef _X86_
 #define Ke386EraseFlags(x)     __asm__ __volatile__("pushl $0 ; popfl\n")
+#endif
 
 extern BOOLEAN UserInterfaceUp;	/* Tells us if the user interface is displayed */
 

Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm.c?rev=28805&r1=28804&r2=28805&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/mm/mm.c (original)
+++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c Mon Sep  3 11:39:30 2007
@@ -85,21 +85,24 @@
 	// satisfy this allocation
 	PagesNeeded = ROUND_UP(MemorySize, MM_PAGE_SIZE) / MM_PAGE_SIZE;
 
+#ifdef _M_PPC
+	{
+		// We don't have enough reserve, claim some memory from openfirmware
+		ULONG ptr;
+		ptr = ofw_claim(0,MemorySize,MM_PAGE_SIZE);
+		MemPointer = (PVOID)(ptr);
+		if (MemPointer)
+			return MemPointer;
+	}
+#endif
+
 	// If we don't have enough available mem
 	// then return NULL
 	if (FreePagesInLookupTable < PagesNeeded)
 	{
-#ifdef _M_PPC
-               ULONG ptr;
-               printf("Allocating %d bytes directly ...\n", MemorySize);
-               ptr = ofw_claim(0,MemorySize,MM_PAGE_SIZE);
-               MemPointer = (PVOID)(ptr);
-               return MemPointer;
-#else
 		DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateMemory(). Not enough free memory to allocate %d bytes. AllocationCount: %d\n", MemorySize, AllocationCount));
 		UiMessageBoxCritical("Memory allocation failed: out of memory.");
 		return NULL;
-#endif
 	}
 
 	FirstFreePageFromEnd = MmFindAvailablePages(PageLookupTableAddress, TotalPagesInLookupTable, PagesNeeded, AllocateFromEnd);