disk, diskdump, pciidex, scsiport.

svn path=/trunk/; revision=20675
This commit is contained in:
Alex Ionescu 2006-01-07 21:55:47 +00:00
parent b4c020d06b
commit 9611be1fd4
6 changed files with 9 additions and 7 deletions

View file

@ -41,6 +41,7 @@
#define SCSI_DISK_TIMEOUT 10 /* Default timeout: 10 seconds */
#define MODE_DATA_SIZE 192
#define MAX_PATH 260
typedef struct _DISK_DATA

View file

@ -367,9 +367,9 @@ DiskDumpPrepare(PDEVICE_OBJECT DeviceObject, PDUMP_POINTERS DumpPointers)
}
else // hint-name
{
Name = (PCHAR)((DWORD)DriverBase +
Name = (PCHAR)((ULONG)DriverBase +
*FunctionNameList + 2);
Hint = *(PWORD)((DWORD)DriverBase + *FunctionNameList);
Hint = *(PUSHORT)((ULONG)DriverBase + *FunctionNameList);
}
#if 0
DPRINT(" Hint:%04x Name:%s\n", Hint, pName);

View file

@ -98,7 +98,7 @@ PciIdeXSetBusData(
IN ULONG BufferLength)
{
PFDO_DEVICE_EXTENSION FdoDeviceExtension;
PBYTE CurrentBuffer = NULL;
PUCHAR CurrentBuffer = NULL;
ULONG i, BytesWritten;
NTSTATUS Status;
@ -117,7 +117,7 @@ PciIdeXSetBusData(
goto cleanup;
for (i = 0; i < BufferLength; i++)
CurrentBuffer[i] = (CurrentBuffer[i] & ~((PBYTE)DataMask)[i]) | (((PBYTE)DataMask)[i] & ((PBYTE)Buffer)[i]);
CurrentBuffer[i] = (CurrentBuffer[i] & ~((PUCHAR)DataMask)[i]) | (((PUCHAR)DataMask)[i] & ((PUCHAR)Buffer)[i]);
FdoDeviceExtension = CONTAINING_RECORD(DeviceExtension, FDO_DEVICE_EXTENSION, MiniControllerExtension);
if (!FdoDeviceExtension->BusInterface)

View file

@ -1,5 +1,5 @@
#include <ntddk.h>
#include <ntifs.h>
#include <ntddk.h>
#include <ide.h>
#include <wdmguid.h>
#include <stdio.h>
@ -34,7 +34,7 @@ typedef struct _FDO_DEVICE_EXTENSION
PDEVICE_OBJECT Pdo[MAX_IDE_CHANNEL];
USHORT VendorId;
USHORT DeviceId;
PBYTE MiniControllerExtension[0];
PUCHAR MiniControllerExtension[0];
} FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION;
typedef struct _PDO_DEVICE_EXTENSION

View file

@ -35,6 +35,7 @@
#include <ntddstor.h>
#include <ntdddisk.h>
#include <stdio.h>
#include <stdarg.h>
#define NDEBUG
#include <debug.h>

View file

@ -130,7 +130,7 @@ typedef struct _SCSI_PORT_SCAN_ADAPTER
ULONG Target;
SCSI_REQUEST_BLOCK Srb;
UCHAR DataBuffer[256];
BOOL Active;
BOOLEAN Active;
} SCSI_PORT_SCAN_ADAPTER, *PSCSI_PORT_SCAN_ADAPTER;