Author: hbelusca
Date: Wed Feb 3 14:07:18 2016
New Revision: 70682
URL: http://svn.reactos.org/svn/reactos?rev=70682&view=rev
Log:
[FREELDR]
- Move some code where it should better belong to.
- Add few source code file headers.
- Add missing partition IDs.
Modified:
trunk/reactos/boot/freeldr/freeldr/arch/archwsup.c
trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c
trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c
trunk/reactos/boot/freeldr/freeldr/bootmgr.c
trunk/reactos/boot/freeldr/freeldr/include/disk.h
trunk/reactos/boot/freeldr/freeldr/include/ntoskrnl.h
Modified: trunk/reactos/boot/freeldr/freeldr/arch/archwsup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/archwsup.c?rev=70682&r1=70681&r2=70682&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/archwsup.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/archwsup.c [iso-8859-1] Wed Feb 3
14:07:18 2016
@@ -15,6 +15,11 @@
/* GLOBALS
********************************************************************/
PCONFIGURATION_COMPONENT_DATA FldrArcHwTreeRoot;
+
+// ARC Disk Information
+ARC_DISK_SIGNATURE reactos_arc_disk_info[32];
+ULONG reactos_disk_count = 0;
+CHAR reactos_arc_strings[32][256];
/* FUNCTIONS
******************************************************************/
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c?rev=70682&r1=70681&r2=70682&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c [iso-8859-1]
(original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/halstub.c [iso-8859-1]
Wed Feb 3 14:07:18 2016
@@ -1,10 +1,10 @@
/*
-* PROJECT: ReactOS Kernel
-* LICENSE: GPL - See COPYING in the top level directory
-* FILE: boot/freeldr/freeldr/arch/i386/halstub.c
-* PURPOSE: I/O Stub HAL Routines
-* PROGRAMMERS: Alex Ionescu ([email protected])
-*/
+ * PROJECT: ReactOS Kernel
+ * LICENSE: GPL - See COPYING in the top level directory
+ * FILE: boot/freeldr/freeldr/arch/i386/halstub.c
+ * PURPOSE: I/O Stub HAL Routines
+ * PROGRAMMERS: Alex Ionescu ([email protected])
+ */
/* INCLUDES ******************************************************************/
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c?rev=70682&r1=70681&r2=70682&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c [iso-8859-1]
(original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c [iso-8859-1]
Wed Feb 3 14:07:18 2016
@@ -1,9 +1,21 @@
+/*
+ * PROJECT: ReactOS Kernel
+ * LICENSE: GPL - See COPYING in the top level directory
+ * FILE: boot/freeldr/freeldr/arch/i386/ntoskrnl.c
+ * PURPOSE: NTOS glue routines for the MINIHAL library
+ * PROGRAMMERS: Hervé Poussineau <[email protected]>
+ */
+
+/* INCLUDES ******************************************************************/
+
#include <ntoskrnl.h>
/* For KeStallExecutionProcessor */
#if defined(_M_IX86) || defined(_M_AMD64)
#include <arch/pc/pcbios.h>
#endif
+
+/* FUNCTIONS *****************************************************************/
VOID
NTAPI
@@ -37,7 +49,6 @@
{
}
-NTKERNELAPI
VOID
FASTCALL
IoAssignDriveLetters(
@@ -48,7 +59,6 @@
{
}
-NTKERNELAPI
NTSTATUS
FASTCALL
IoSetPartitionInformation(
@@ -60,7 +70,18 @@
return STATUS_NOT_IMPLEMENTED;
}
-NTKERNELAPI
+/*
+ * NTSTATUS
+ * FASTCALL
+ * IoReadPartitionTable(
+ * IN PDEVICE_OBJECT DeviceObject,
+ * IN ULONG SectorSize,
+ * IN BOOLEAN ReturnRecognizedPartitions,
+ * OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer);
+ *
+ * See boot/freeldr/freeldr/disk/partition.c
+ */
+
NTSTATUS
FASTCALL
IoWritePartitionTable(
@@ -68,12 +89,11 @@
IN ULONG SectorSize,
IN ULONG SectorsPerTrack,
IN ULONG NumberOfHeads,
- IN struct _DRIVE_LAYOUT_INFORMATION *PartitionBuffer)
+ IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer)
{
return STATUS_NOT_IMPLEMENTED;
}
-NTHALAPI
VOID
NTAPI
KeStallExecutionProcessor(
Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootmgr.c?rev=70682&r1=70681&r2=70682&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Wed Feb 3
14:07:18 2016
@@ -24,11 +24,6 @@
/* GLOBALS
********************************************************************/
-// ARC Disk Information
-ARC_DISK_SIGNATURE reactos_arc_disk_info[32];
-ULONG reactos_disk_count = 0;
-CHAR reactos_arc_strings[32][256];
-
typedef
VOID
(*OS_LOADING_METHOD)(IN OperatingSystemItem* OperatingSystem,
Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/include/disk.h?rev=70682&r1=70681&r2=70682&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] Wed Feb 3
14:07:18 2016
@@ -89,6 +89,7 @@
#define PARTITION_EXTENDED 0x05 // Extended partition entry
#define PARTITION_HUGE 0x06 // Huge partition MS-DOS V4
#define PARTITION_IFS 0x07 // IFS Partition
+#define PARTITION_OS2BOOTMGR 0x0A // OS/2 Boot
Manager/OPUS/Coherent swap
#define PARTITION_FAT32 0x0B // FAT32
#define PARTITION_FAT32_XINT13 0x0C // FAT32 using extended
int13 services
#define PARTITION_XINT13 0x0E // Win95 partition using
extended int13 services
@@ -97,6 +98,12 @@
#define PARTITION_PREP 0x41 // PowerPC Reference
Platform (PReP) Boot Partition
#define PARTITION_LDM 0x42 // Logical Disk Manager
partition
#define PARTITION_UNIX 0x63 // Unix
+#define VALID_NTFT 0xC0 // NTFT uses high order bits
+#define PARTITION_NTFT 0x80 // NTFT partition
+#ifdef __REACTOS__
+#define PARTITION_OLD_LINUX 0x43
+#define PARTITION_LINUX 0x83
+#endif
///////////////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/reactos/boot/freeldr/freeldr/include/ntoskrnl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/include/ntoskrnl.h?rev=70682&r1=70681&r2=70682&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/include/ntoskrnl.h [iso-8859-1]
(original)
+++ trunk/reactos/boot/freeldr/freeldr/include/ntoskrnl.h [iso-8859-1]
Wed Feb 3 14:07:18 2016
@@ -1,3 +1,11 @@
+/*
+ * PROJECT: ReactOS Kernel
+ * LICENSE: GPL - See COPYING in the top level directory
+ * FILE: boot/freeldr/freeldr/include/ntoskrnl.h
+ * PURPOSE: NTOS glue routines for the MINIHAL library
+ * PROGRAMMERS: Hervé Poussineau <[email protected]>
+ */
+
#include <ntdef.h>
#undef _NTHAL_
//#undef DECLSPEC_IMPORT
