Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 18:42:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

revert r57274. Looks like testbot doesn't like it.

Browse source 
svn path=/trunk/; revision=57275
This commit is contained in:
Timo Kreuzer 2012-09-11 12:17:38 +00:00
parent a199ef70d7
commit 022973aa4f
3 changed files with 25 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

43
reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c
View file

@ -113,47 +113,32 @@ static LONG DiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId)
static LONG DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) static LONG DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count)
{ {
DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); DISKCONTEXT* Context = FsGetDeviceSpecific(FileId);
UCHAR * Ptr = (UCHAR*)Buffer; UCHAR* Ptr = (UCHAR*)Buffer;
ULONG Length, TotalSectors, MaxSectors, ReadSectors; ULONG i, Length;
BOOLEAN ret; BOOLEAN ret;
ULONGLONG SectorOffset;
TotalSectors = (N + Context->SectorSize - 1) / Context->SectorSize; *Count = 0;
MaxSectors = DISKREADBUFFER_SIZE / Context->SectorSize; i = 0;
SectorOffset = Context->SectorNumber + Context->SectorOffset; while (N > 0)
ret = 0;
while (TotalSectors)
{ {
ReadSectors = TotalSectors; Length = N;
if (ReadSectors > MaxSectors) if (Length > Context->SectorSize)
ReadSectors = MaxSectors; Length = Context->SectorSize;
ret = MachDiskReadLogicalSectors( ret = MachDiskReadLogicalSectors(
Context->DriveNumber, Context->DriveNumber,
SectorOffset, Context->SectorNumber + Context->SectorOffset + i,
ReadSectors, 1,
(PVOID)DISKREADBUFFER); (PVOID)DISKREADBUFFER);
if (!ret) if (!ret)
break; return EIO;
Length = ReadSectors * Context->SectorSize;
if (Length > N)
Length = N;
RtlCopyMemory(Ptr, (PVOID)DISKREADBUFFER, Length); RtlCopyMemory(Ptr, (PVOID)DISKREADBUFFER, Length);
Ptr += Length; Ptr += Length;
*Count += Length;
N -= Length; N -= Length;
i++;
SectorOffset += ReadSectors;
TotalSectors -= ReadSectors;
} }
*Count = Ptr - (UCHAR *)Buffer; return ESUCCESS;
return (!ret) ? EIO : ESUCCESS;
} }
static LONG DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) static LONG DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode)

9
reactos/boot/freeldr/freeldr/arch/i386/pcmem.c
View file

@ -29,13 +29,15 @@ DBG_DEFAULT_CHANNEL(MEMORY);
#define MAX_BIOS_DESCRIPTORS 32 #define MAX_BIOS_DESCRIPTORS 32
#define FREELDR_BASE_PAGE (FREELDR_BASE / PAGE_SIZE) #define FREELDR_BASE_PAGE (FREELDR_BASE / PAGE_SIZE)
#define FILEBUF_BASE_PAGE (FILESYSBUFFER / PAGE_SIZE)
#define DISKBUF_BASE_PAGE (DISKREADBUFFER / PAGE_SIZE) #define DISKBUF_BASE_PAGE (DISKREADBUFFER / PAGE_SIZE)
#define STACK_BASE_PAGE (STACKLOWLIMIT / PAGE_SIZE) #define STACK_BASE_PAGE (DISKBUF_BASE_PAGE + 1)
#define STACK_END_PAGE (STACK32ADDR / PAGE_SIZE) #define STACK_END_PAGE (STACK32ADDR / PAGE_SIZE)
#define BIOSBUF_BASE_PAGE (BIOSCALLBUFFER / PAGE_SIZE) #define BIOSBUF_BASE_PAGE (BIOSCALLBUFFER / PAGE_SIZE)
#define FREELDR_PAGE_COUNT (DISKBUF_BASE_PAGE - FREELDR_BASE_PAGE) #define FREELDR_PAGE_COUNT (FILEBUF_BASE_PAGE - FREELDR_BASE_PAGE)
#define DISKBUF_PAGE_COUNT (STACK_BASE_PAGE - DISKBUF_BASE_PAGE) #define FILEBUF_PAGE_COUNT (DISKBUF_BASE_PAGE - FILEBUF_BASE_PAGE)
#define DISKBUF_PAGE_COUNT (1)
#define STACK_PAGE_COUNT (STACK_END_PAGE - STACK_BASE_PAGE) #define STACK_PAGE_COUNT (STACK_END_PAGE - STACK_BASE_PAGE)
#define BIOSBUF_PAGE_COUNT (1) #define BIOSBUF_PAGE_COUNT (1)
@ -47,6 +49,7 @@ FREELDR_MEMORY_DESCRIPTOR PcMemoryMap[MAX_BIOS_DESCRIPTORS + 1] =
{ LoaderFirmwarePermanent, 0x00, 1 }, // realmode int vectors { LoaderFirmwarePermanent, 0x00, 1 }, // realmode int vectors
{ LoaderFirmwareTemporary, 0x01, FREELDR_BASE_PAGE - 1 }, // freeldr stack + cmdline { LoaderFirmwareTemporary, 0x01, FREELDR_BASE_PAGE - 1 }, // freeldr stack + cmdline
{ LoaderLoadedProgram, FREELDR_BASE_PAGE, FREELDR_PAGE_COUNT }, // freeldr image { LoaderLoadedProgram, FREELDR_BASE_PAGE, FREELDR_PAGE_COUNT }, // freeldr image
{ LoaderFirmwareTemporary, FILEBUF_BASE_PAGE, FILEBUF_PAGE_COUNT }, // File system read buffer. FILESYSBUFFER
{ LoaderFirmwareTemporary, DISKBUF_BASE_PAGE, DISKBUF_PAGE_COUNT }, // Disk read buffer for int 13h. DISKREADBUFFER { LoaderFirmwareTemporary, DISKBUF_BASE_PAGE, DISKBUF_PAGE_COUNT }, // Disk read buffer for int 13h. DISKREADBUFFER
{ LoaderOsloaderStack, STACK_BASE_PAGE, STACK_PAGE_COUNT }, // prot mode stack. { LoaderOsloaderStack, STACK_BASE_PAGE, STACK_PAGE_COUNT }, // prot mode stack.
{ LoaderFirmwareTemporary, BIOSBUF_BASE_PAGE, BIOSBUF_PAGE_COUNT }, // BIOSCALLBUFFER { LoaderFirmwareTemporary, BIOSBUF_BASE_PAGE, BIOSBUF_PAGE_COUNT }, // BIOSCALLBUFFER

6
reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h
View file

@ -13,12 +13,12 @@
#define BSS_START HEX(6F00) #define BSS_START HEX(6F00)
#define FREELDR_BASE HEX(F800) #define FREELDR_BASE HEX(F800)
#define FREELDR_PE_BASE HEX(10000) #define FREELDR_PE_BASE HEX(10000)
#define DISKREADBUFFER HEX(80000) /* Buffer to store data read in from the disk via the BIOS */ #define FILESYSBUFFER HEX(80000) /* Buffer to store file system data (e.g. cluster buffer for FAT) */
#define STACKLOWLIMIT HEX(90000) #define DISKREADBUFFER HEX(90000) /* Buffer to store data read in from the disk via the BIOS */
#define STACK32ADDR HEX(98000) /* The 32-bit stack top will be at 9000:8000, or 0xA8000 */ #define STACK32ADDR HEX(98000) /* The 32-bit stack top will be at 9000:8000, or 0xA8000 */
#define STACK64ADDR HEX(98000) /* The 64-bit stack top will be at 98000 */ #define STACK64ADDR HEX(98000) /* The 64-bit stack top will be at 98000 */
#define BIOSCALLBUFFER HEX(98000) /* Buffer to store temporary data for any Int386() call */ #define BIOSCALLBUFFER HEX(98000) /* Buffer to store temporary data for any Int386() call */
#define DISKREADBUFFER_SIZE HEX(10000) #define DISKREADBUFFER_SIZE 512
#define BIOSCALLBUFSEGMENT (BIOSCALLBUFFER/16) /* Buffer to store temporary data for any Int386() call */ #define BIOSCALLBUFSEGMENT (BIOSCALLBUFFER/16) /* Buffer to store temporary data for any Int386() call */
#define BIOSCALLBUFOFFSET HEX(0000) /* Buffer to store temporary data for any Int386() call */ #define BIOSCALLBUFOFFSET HEX(0000) /* Buffer to store temporary data for any Int386() call */