Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 20677: - PCHify vgamp.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- PCHify vgamp. - fix some definition problems. - make it build with msvc. Modified: trunk/reactos/drivers/video/miniport/vga/initvga.c Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.c Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.h Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.xml Modified: trunk/reactos/drivers/video/miniport/vga/vgavideo.h _____ Modified: trunk/reactos/drivers/video/miniport/vga/initvga.c --- trunk/reactos/drivers/video/miniport/vga/initvga.c 2006-01-07 22:03:31 UTC (rev 20676) +++ trunk/reactos/drivers/video/miniport/vga/initvga.c 2006-01-07 22:34:25 UTC (rev 20677) @@ -1,11 +1,5 @@ -#include <ntddk.h> -#include <miniport.h> -#include <video.h> -#include "vgavideo.h" +#include "vgamp.h" -#define NDEBUG -#include <debug.h> - static VGA_REGISTERS Mode12Regs = { /* CRT Controller Registers */ @@ -24,10 +18,10 @@ VGA_REGISTERS TextModeRegs; -STATIC VOID FASTCALL +static VOID FASTCALL vgaSaveRegisters(PVGA_REGISTERS Registers) { - UINT i; + SIZE_T i; for (i = 0; i < sizeof(Registers->CRT); i++) { @@ -57,10 +51,10 @@ Registers->Misc = VideoPortReadPortUchar(MISC); } -STATIC VOID FASTCALL +static VOID FASTCALL vgaSetRegisters(PVGA_REGISTERS Registers) { - UINT i; + SIZE_T i; /* Update misc output register */ VideoPortWritePortUchar(MISC, Registers->Misc); _____ Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.c --- trunk/reactos/drivers/video/miniport/vga/vgamp.c 2006-01-07 22:03:31 UTC (rev 20676) +++ trunk/reactos/drivers/video/miniport/vga/vgamp.c 2006-01-07 22:34:25 UTC (rev 20677) @@ -72,7 +72,7 @@ // RETURNS: // VP_STATUS -static VP_STATUS STDCALL +VP_STATUS STDCALL VGAFindAdapter(PVOID DeviceExtension, PVOID Context, PWSTR ArgumentString, @@ -82,7 +82,7 @@ /* FIXME: Determine if the adapter is present */ *Again = FALSE; - return STATUS_SUCCESS; + return NO_ERROR; /* FIXME: Claim any necessary memory/IO resources for the adapter */ /* FIXME: Map resources into system memory for the adapter */ @@ -104,7 +104,7 @@ // PVOID DeviceExtension // RETURNS: // BOOLEAN Success or failure -static BOOLEAN STDCALL +BOOLEAN STDCALL VGAInitialize(PVOID DeviceExtension) { return TRUE; @@ -161,13 +161,13 @@ // BOOLEAN This function must return TRUE, and complete the work or // set an error status in the VRP. -static BOOLEAN STDCALL +BOOLEAN STDCALL VGAStartIO(PVOID DeviceExtension, PVIDEO_REQUEST_PACKET RequestPacket) { - BOOL Result; + BOOLEAN Result; - RequestPacket->StatusBlock->Status = STATUS_UNSUCCESSFUL; + RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION; switch (RequestPacket->IoControlCode) { @@ -216,7 +216,8 @@ break; case IOCTL_VIDEO_RESET_DEVICE: - Result = VGAResetDevice(RequestPacket->StatusBlock); + VGAResetDevice(RequestPacket->StatusBlock); + Result = TRUE; break; case IOCTL_VIDEO_SET_COLOR_REGISTERS: @@ -275,7 +276,7 @@ RequestPacket->StatusBlock); break; case IOCTL_VIDEO_SET_PALETTE_REGISTERS: - Result = VGASetPaletteRegisters((PWORD) RequestPacket->InputBuffer, + Result = VGASetPaletteRegisters((PUSHORT) RequestPacket->InputBuffer, RequestPacket->StatusBlock); break; @@ -318,12 +319,12 @@ #endif default: - RequestPacket->StatusBlock->Status = STATUS_NOT_IMPLEMENTED; + RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION; return FALSE; } if (Result) - RequestPacket->StatusBlock->Status = STATUS_SUCCESS; + RequestPacket->StatusBlock->Status = NO_ERROR; return TRUE; } @@ -367,7 +368,7 @@ // BOOLEAN TRUE if no further action is necessary, FALSE if the system // needs to still do a BIOS int 10 reset. -static BOOLEAN STDCALL +BOOLEAN STDCALL VGAResetHw(PVOID DeviceExtension, ULONG Columns, ULONG Rows) @@ -397,7 +398,7 @@ #endif -BOOL VGAMapVideoMemory(IN PVOID DeviceExtension, +BOOLEAN VGAMapVideoMemory(IN PVOID DeviceExtension, IN PVIDEO_MEMORY RequestedAddress, OUT PVIDEO_MEMORY_INFORMATION MapInformation, OUT PSTATUS_BLOCK StatusBlock) @@ -428,14 +429,14 @@ return TRUE; } -BOOL VGAQueryAvailModes(OUT PVIDEO_MODE_INFORMATION ReturnedModes, +BOOLEAN VGAQueryAvailModes(OUT PVIDEO_MODE_INFORMATION ReturnedModes, OUT PSTATUS_BLOCK StatusBlock) { /* Only one mode exists in VGA (640x480), so use VGAQueryCurrentMode */ return VGAQueryCurrentMode(ReturnedModes, StatusBlock); } -BOOL VGAQueryCurrentMode(OUT PVIDEO_MODE_INFORMATION CurrentMode, +BOOLEAN VGAQueryCurrentMode(OUT PVIDEO_MODE_INFORMATION CurrentMode, OUT PSTATUS_BLOCK StatusBlock) { CurrentMode->Length = sizeof(VIDEO_MODE_INFORMATION); @@ -464,7 +465,7 @@ return TRUE; } -BOOL VGAQueryNumAvailModes(OUT PVIDEO_NUM_MODES NumberOfModes, +BOOLEAN VGAQueryNumAvailModes(OUT PVIDEO_NUM_MODES NumberOfModes, OUT PSTATUS_BLOCK StatusBlock) { NumberOfModes->NumModes = 1; @@ -473,7 +474,7 @@ return TRUE; } -BOOL VGASetPaletteRegisters(IN PWORD PaletteRegisters, +BOOLEAN VGASetPaletteRegisters(IN PUSHORT PaletteRegisters, OUT PSTATUS_BLOCK StatusBlock) { ; @@ -502,7 +503,7 @@ return TRUE; } -BOOL VGASetColorRegisters(IN PVIDEO_CLUT ColorLookUpTable, +BOOLEAN VGASetColorRegisters(IN PVIDEO_CLUT ColorLookUpTable, OUT PSTATUS_BLOCK StatusBlock) { int i; @@ -518,7 +519,7 @@ return TRUE; } -BOOL VGASetCurrentMode(IN PVIDEO_MODE RequestedMode, +BOOLEAN VGASetCurrentMode(IN PVIDEO_MODE RequestedMode, OUT PSTATUS_BLOCK StatusBlock) { if(RequestedMode->RequestedMode == 12) @@ -531,17 +532,17 @@ } } -BOOL VGAShareVideoMemory(IN PVIDEO_SHARE_MEMORY RequestedMemory, +BOOLEAN VGAShareVideoMemory(IN PVIDEO_SHARE_MEMORY RequestedMemory, OUT PVIDEO_MEMORY_INFORMATION ReturnedMemory, OUT PSTATUS_BLOCK StatusBlock) { UNIMPLEMENTED; - StatusBlock->Status = STATUS_NOT_IMPLEMENTED; + StatusBlock->Status = ERROR_INVALID_FUNCTION; return FALSE; } -BOOL VGAUnmapVideoMemory(IN PVOID DeviceExtension, +BOOLEAN VGAUnmapVideoMemory(IN PVOID DeviceExtension, IN PVIDEO_MEMORY MemoryToUnmap, OUT PSTATUS_BLOCK StatusBlock) { @@ -553,11 +554,11 @@ return FALSE; } -BOOL VGAUnshareVideoMemory(IN PVIDEO_MEMORY MemoryToUnshare, +BOOLEAN VGAUnshareVideoMemory(IN PVIDEO_MEMORY MemoryToUnshare, OUT PSTATUS_BLOCK StatusBlock) { UNIMPLEMENTED; - StatusBlock->Status = STATUS_NOT_IMPLEMENTED; + StatusBlock->Status = ERROR_INVALID_FUNCTION; return FALSE; } _____ Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.h --- trunk/reactos/drivers/video/miniport/vga/vgamp.h 2006-01-07 22:03:31 UTC (rev 20676) +++ trunk/reactos/drivers/video/miniport/vga/vgamp.h 2006-01-07 22:34:25 UTC (rev 20677) @@ -23,17 +23,25 @@ /* INCLUDES *******************************************************************/ +#ifdef _MSC_VER +#include "dderror.h" +#include "devioctl.h" +#else #include <ntddk.h> -#include <miniport.h> -#include <video.h> +#endif +#include "miniport.h" +#include "ntddvdeo.h" +#include "video.h" +#include "vgavideo.h" + #define UNIMPLEMENTED \ VideoPortDebugPrint(Error, "WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); void InitVGAMode(); -static VP_STATUS STDCALL +VP_STATUS STDCALL VGAFindAdapter( PVOID DeviceExtension, PVOID Context, @@ -41,11 +49,11 @@ PVIDEO_PORT_CONFIG_INFO ConfigInfo, PUCHAR Again); -static BOOLEAN STDCALL +BOOLEAN STDCALL VGAInitialize( PVOID DeviceExtension); -static BOOLEAN STDCALL +BOOLEAN STDCALL VGAStartIO( PVOID DeviceExtension, PVIDEO_REQUEST_PACKET RequestPacket); @@ -53,7 +61,7 @@ /*static BOOLEAN STDCALL VGAInterrupt(PVOID DeviceExtension);*/ -static BOOLEAN STDCALL +BOOLEAN STDCALL VGAResetHw( PVOID DeviceExtension, ULONG Columns, @@ -63,59 +71,59 @@ VGATimer(PVOID DeviceExtension);*/ /* Mandatory IoControl routines */ -BOOL +BOOLEAN VGAMapVideoMemory( IN PVOID DeviceExtension, IN PVIDEO_MEMORY RequestedAddress, OUT PVIDEO_MEMORY_INFORMATION MapInformation, OUT PSTATUS_BLOCK StatusBlock); -BOOL +BOOLEAN VGAQueryAvailModes( OUT PVIDEO_MODE_INFORMATION ReturnedModes, OUT PSTATUS_BLOCK StatusBlock); -BOOL +BOOLEAN VGAQueryCurrentMode( OUT PVIDEO_MODE_INFORMATION CurrentMode, OUT PSTATUS_BLOCK StatusBlock); -BOOL +BOOLEAN VGAQueryNumAvailModes( OUT PVIDEO_NUM_MODES NumberOfModes, OUT PSTATUS_BLOCK StatusBlock); -BOOL +VOID VGAResetDevice(OUT PSTATUS_BLOCK StatusBlock); -BOOL +BOOLEAN VGASetColorRegisters( IN PVIDEO_CLUT ColorLookUpTable, OUT PSTATUS_BLOCK StatusBlock); -BOOL +BOOLEAN VGASetPaletteRegisters( - IN PWORD PaletteRegisters, + IN PUSHORT PaletteRegisters, OUT PSTATUS_BLOCK StatusBlock); -BOOL +BOOLEAN VGASetCurrentMode( IN PVIDEO_MODE RequestedMode, OUT PSTATUS_BLOCK StatusBlock); -BOOL +BOOLEAN VGAShareVideoMemory( IN PVIDEO_SHARE_MEMORY RequestedMemory, OUT PVIDEO_MEMORY_INFORMATION ReturnedMemory, OUT PSTATUS_BLOCK StatusBlock); -BOOL +BOOLEAN VGAUnmapVideoMemory( IN PVOID DeviceExtension, IN PVIDEO_MEMORY MemoryToUnmap, OUT PSTATUS_BLOCK StatusBlock); -BOOL +BOOLEAN VGAUnshareVideoMemory( IN PVIDEO_MEMORY MemoryToUnshare, OUT PSTATUS_BLOCK StatusBlock); _____ Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.xml --- trunk/reactos/drivers/video/miniport/vga/vgamp.xml 2006-01-07 22:03:31 UTC (rev 20676) +++ trunk/reactos/drivers/video/miniport/vga/vgamp.xml 2006-01-07 22:34:25 UTC (rev 20677) @@ -5,4 +5,5 @@ <file>initvga.c</file> <file>vgamp.c</file> <file>vgamp.rc</file> + <pch>vgamp.h</pch> </module> _____ Modified: trunk/reactos/drivers/video/miniport/vga/vgavideo.h --- trunk/reactos/drivers/video/miniport/vga/vgavideo.h 2006-01-07 22:03:31 UTC (rev 20676) +++ trunk/reactos/drivers/video/miniport/vga/vgavideo.h 2006-01-07 22:34:25 UTC (rev 20677) @@ -1,5 +1,3 @@ -#include <ntddk.h> -#include <ntddvdeo.h> #define VGA_NORMAL 0 #define VGA_AND 8

1 0

[ion] 20676: - make vga buildable on msvc.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- make vga buildable on msvc. Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h _____ Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c --- trunk/reactos/drivers/video/displays/vga/objects/bitblt.c 2006-01-07 21:55:47 UTC (rev 20675) +++ trunk/reactos/drivers/video/displays/vga/objects/bitblt.c 2006-01-07 22:03:31 UTC (rev 20676) @@ -7,7 +7,7 @@ #include <debug.h> typedef BOOL (*PFN_VGABlt)(SURFOBJ*, SURFOBJ*, XLATEOBJ*, RECTL*, POINTL*); -typedef BOOL STDCALL (*PBLTRECTFUNC)(SURFOBJ* OutputObj, +typedef BOOL (STDCALL *PBLTRECTFUNC)(SURFOBJ* OutputObj, SURFOBJ* InputObj, SURFOBJ* Mask, XLATEOBJ* ColorTranslation, _____ Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c --- trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2006-01-07 21:55:47 UTC (rev 20675) +++ trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2006-01-07 22:03:31 UTC (rev 20676) @@ -35,37 +35,7 @@ #define READ_REGISTER_UCHAR(p) (*((volatile UCHAR *)(p))) #define WRITE_REGISTER_UCHAR(p,c) (*((volatile CHAR *)(p))) = (c) -INT abs(INT nm) -{ - if(nm<0) - { - return nm * -1; - } else - { - return nm; - } -} -div_t div(int num, int denom) -{ - div_t r; - if (num > 0 && denom < 0) { - num = -num; - denom = -denom; - } - r.quot = num / denom; - r.rem = num % denom; - if (num < 0 && denom > 0) - { - if (r.rem > 0) - { - r.quot++; - r.rem -= denom; - } - } - return r; -} - /*int mod(int num, int denom) { div_t dvt = div(num, denom); _____ Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h --- trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h 2006-01-07 21:55:47 UTC (rev 20675) +++ trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h 2006-01-07 22:03:31 UTC (rev 20676) @@ -50,7 +50,7 @@ INT vgaGetPixel(INT x, INT y); BOOL vgaHLine(INT x, INT y, INT len, UCHAR c); BOOL vgaVLine(INT x, INT y, INT len, UCHAR c); -INT abs(INT nm); +INT __cdecl abs(INT nm); BOOL VGADDIIntersectRect(PRECTL prcDst, PRECTL prcSrc1, PRECTL prcSrc2); #define SEQ_I 0x3C4 /* Sequencer Index */

1 0

[ion] 20675: disk, diskdump, pciidex, scsiport.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

disk, diskdump, pciidex, scsiport. Modified: trunk/reactos/drivers/storage/disk/disk.c Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c Modified: trunk/reactos/drivers/storage/pciidex/miniport.c Modified: trunk/reactos/drivers/storage/pciidex/pciidex.h Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h _____ Modified: trunk/reactos/drivers/storage/disk/disk.c --- trunk/reactos/drivers/storage/disk/disk.c 2006-01-07 21:53:47 UTC (rev 20674) +++ trunk/reactos/drivers/storage/disk/disk.c 2006-01-07 21:55:47 UTC (rev 20675) @@ -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 _____ Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c --- trunk/reactos/drivers/storage/diskdump/diskdump.c 2006-01-07 21:53:47 UTC (rev 20674) +++ trunk/reactos/drivers/storage/diskdump/diskdump.c 2006-01-07 21:55:47 UTC (rev 20675) @@ -367,9 +367,9 @@ } 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); _____ Modified: trunk/reactos/drivers/storage/pciidex/miniport.c --- trunk/reactos/drivers/storage/pciidex/miniport.c 2006-01-07 21:53:47 UTC (rev 20674) +++ trunk/reactos/drivers/storage/pciidex/miniport.c 2006-01-07 21:55:47 UTC (rev 20675) @@ -98,7 +98,7 @@ IN ULONG BufferLength) { PFDO_DEVICE_EXTENSION FdoDeviceExtension; - PBYTE CurrentBuffer = NULL; + PUCHAR CurrentBuffer = NULL; ULONG i, BytesWritten; NTSTATUS Status; @@ -117,7 +117,7 @@ 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) _____ Modified: trunk/reactos/drivers/storage/pciidex/pciidex.h --- trunk/reactos/drivers/storage/pciidex/pciidex.h 2006-01-07 21:53:47 UTC (rev 20674) +++ trunk/reactos/drivers/storage/pciidex/pciidex.h 2006-01-07 21:55:47 UTC (rev 20675) @@ -1,5 +1,5 @@ +#include <ntifs.h> #include <ntddk.h> -#include <ntifs.h> #include <ide.h> #include <wdmguid.h> #include <stdio.h> @@ -34,7 +34,7 @@ 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 _____ Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c --- trunk/reactos/drivers/storage/scsiport/scsiport.c 2006-01-07 21:53:47 UTC (rev 20674) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c 2006-01-07 21:55:47 UTC (rev 20675) @@ -35,6 +35,7 @@ #include <ntddstor.h> #include <ntdddisk.h> #include <stdio.h> +#include <stdarg.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h --- trunk/reactos/drivers/storage/scsiport/scsiport_int.h 2006-01-07 21:53:47 UTC (rev 20674) +++ trunk/reactos/drivers/storage/scsiport/scsiport_int.h 2006-01-07 21:55:47 UTC (rev 20675) @@ -130,7 +130,7 @@ ULONG Target; SCSI_REQUEST_BLOCK Srb; UCHAR DataBuffer[256]; - BOOL Active; + BOOLEAN Active; } SCSI_PORT_SCAN_ADAPTER, *PSCSI_PORT_SCAN_ADAPTER;

1 0

[fireball] 20674: Merge r20668
by fireball＠svn.reactos.org 07 Jan '06

07 Jan '06

Merge r20668 Added: branches/usb2_6/reactos/w32api/include/pshpck16.h _____ Added: branches/usb2_6/reactos/w32api/include/pshpck16.h --- branches/usb2_6/reactos/w32api/include/pshpck16.h 2006-01-07 21:50:29 UTC (rev 20673) +++ branches/usb2_6/reactos/w32api/include/pshpck16.h 2006-01-07 21:53:47 UTC (rev 20674) @@ -0,0 +1,7 @@ +#ifndef RC_INVOKED +# if ( __FreeBSD__ == 5 ) +# pragma pack(16) +# else +# pragma pack(push,16) +# endif // __FreeBSD__ +#endif // RC_INVOKED Property changes on: branches/usb2_6/reactos/w32api/include/pshpck16.h ___________________________________________________________________ Name: svn:eol-style + native

1 0

[ion] 20673: atapi, buslogic, cdrom, class2.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

atapi, buslogic, cdrom, class2. Modified: trunk/reactos/drivers/storage/atapi/atapi.c Modified: trunk/reactos/drivers/storage/cdrom/cdrom.c Modified: trunk/reactos/drivers/storage/include/class2.h _____ Modified: trunk/reactos/drivers/storage/atapi/atapi.c --- trunk/reactos/drivers/storage/atapi/atapi.c 2006-01-07 21:45:51 UTC (rev 20672) +++ trunk/reactos/drivers/storage/atapi/atapi.c 2006-01-07 21:50:29 UTC (rev 20673) @@ -63,6 +63,10 @@ #define VERSION "0.0.1" +NTSTATUS NTAPI +DriverEntry(IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath); + // ------------------------------------------------------- File Static Data #ifdef ENABLE_DMA @@ -98,9 +102,9 @@ PUCHAR DataBuffer; ULONG DataTransferLength; - BOOLEAN FASTCALL (*Handler)(IN struct _ATAPI_MINIPORT_EXTENSION* DevExt); + BOOLEAN (FASTCALL *Handler)(IN struct _ATAPI_MINIPORT_EXTENSION* DevExt); #ifdef ENABLE_DMA - BOOL UseDma; + BOOLEAN UseDma; ULONG PRDCount; ULONG PRDMaxCount; PPRD PRDTable; @@ -168,7 +172,7 @@ static BOOLEAN AtapiInitDma(PATAPI_MINIPORT_EXTENSION DevExt, PSCSI_REQUEST_BLOCK Srb, - BYTE cmd); + UCHAR cmd); #endif static ULONG STDCALL @@ -208,8 +212,8 @@ static VOID AtapiExecuteCommand(PATAPI_MINIPORT_EXTENSION DevExt, - BYTE command, - BOOLEAN FASTCALL (*Handler)(PATAPI_MINIPORT_EXTENSION)); + UCHAR command, + BOOLEAN (FASTCALL *Handler)(PATAPI_MINIPORT_EXTENSION)); static BOOLEAN STDCALL AtapiInterrupt(IN PVOID DeviceExtension); @@ -338,7 +342,7 @@ // RETURNS: // NTSTATUS -STDCALL NTSTATUS +NTSTATUS NTAPI DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { @@ -1106,7 +1110,7 @@ AtapiInterrupt(IN PVOID DeviceExtension) { PATAPI_MINIPORT_EXTENSION DevExt; - BYTE Status; + UCHAR Status; DevExt = (PATAPI_MINIPORT_EXTENSION)DeviceExtension; if (DevExt->Handler == NULL) @@ -1149,7 +1153,7 @@ AtapiConfigDma(PATAPI_MINIPORT_EXTENSION DeviceExtension, ULONG UnitNumber) { BOOLEAN Result = FALSE; - BYTE Status; + UCHAR Status; if (UnitNumber < 2) { @@ -2156,7 +2160,7 @@ #ifdef ENABLE_DMA if (DeviceExtension->UseDma) { - BYTE DmaCommand; + UCHAR DmaCommand; /* start DMA */ DmaCommand = IDEReadDMACommand(DeviceExtension->BusMasterRegisterBase); IDEWriteDMACommand(DeviceExtension->BusMasterRegisterBase, DmaCommand|0x01); @@ -2382,7 +2386,7 @@ UCHAR Command; ULONG Retries; UCHAR Status; - BOOLEAN FASTCALL (*Handler)(PATAPI_MINIPORT_EXTENSION DevExt); + BOOLEAN (FASTCALL *Handler)(PATAPI_MINIPORT_EXTENSION DevExt); DPRINT("AtapiReadWrite() called!\n"); DPRINT("SCSIOP_WRITE: TargetId: %lu\n", @@ -2585,7 +2589,7 @@ #ifdef ENABLE_DMA if (DeviceExtension->UseDma) { - BYTE DmaCommand; + UCHAR DmaCommand; /* start DMA */ DmaCommand = IDEReadDMACommand(DeviceExtension->BusMasterRegisterBase); IDEWriteDMACommand(DeviceExtension->BusMasterRegisterBase, DmaCommand|0x01); @@ -2602,7 +2606,7 @@ /* Wait for controller ready */ for (Retries = 0; Retries < IDE_MAX_WRITE_RETRIES; Retries++) { - BYTE Status = IDEReadStatus(DeviceExtension->CommandPortBase); + UCHAR Status = IDEReadStatus(DeviceExtension->CommandPortBase); if (!(Status & IDE_SR_BUSY) || (Status & IDE_SR_ERR)) { break; @@ -2989,12 +2993,12 @@ static BOOLEAN FASTCALL AtapiDmaPacketInterrupt(PATAPI_MINIPORT_EXTENSION DevExt) { - BYTE SrbStatus; - BYTE DmaCommand; - BYTE DmaStatus; - BYTE Status; - BYTE Error; - BYTE SensKey; + UCHAR SrbStatus; + UCHAR DmaCommand; + UCHAR DmaStatus; + UCHAR Status; + UCHAR Error; + UCHAR SensKey; DPRINT("AtapiPacketDmaInterrupt\n"); @@ -3043,16 +3047,16 @@ AtapiPacketInterrupt(PATAPI_MINIPORT_EXTENSION DevExt) { PSCSI_REQUEST_BLOCK Srb; - BYTE Status; - BYTE IntReason; + UCHAR Status; + UCHAR IntReason; ULONG TransferSize; ULONG JunkSize = 0; - BOOL IsLastBlock; - PBYTE TargetAddress; + BOOLEAN IsLastBlock; + PUCHAR TargetAddress; ULONG Retries; - BYTE SrbStatus; - BYTE Error; - BYTE SensKey; + UCHAR SrbStatus; + UCHAR Error; + UCHAR SensKey; DPRINT("AtapiPacketInterrupt()\n"); @@ -3183,7 +3187,7 @@ static BOOLEAN FASTCALL AtapiNoDataInterrupt(PATAPI_MINIPORT_EXTENSION DevExt) { - BYTE Status; + UCHAR Status; DPRINT("AtapiNoDataInterrupt()\n"); @@ -3199,9 +3203,9 @@ static BOOLEAN FASTCALL AtapiDmaInterrupt(PATAPI_MINIPORT_EXTENSION DevExt) { - BYTE DmaCommand; - BYTE DmaStatus; - BYTE Status; + UCHAR DmaCommand; + UCHAR DmaStatus; + UCHAR Status; DPRINT("AtapiDmaInterrupt()\n"); @@ -3448,8 +3452,8 @@ static VOID AtapiExecuteCommand(PATAPI_MINIPORT_EXTENSION DevExt, - BYTE command, - BOOLEAN FASTCALL (*Handler)(PATAPI_MINIPORT_EXTENSION)) + UCHAR command, + BOOLEAN (FASTCALL *Handler)(PATAPI_MINIPORT_EXTENSION)) { if (DevExt->Handler != NULL) { @@ -3464,7 +3468,7 @@ static BOOLEAN AtapiInitDma(PATAPI_MINIPORT_EXTENSION DevExt, PSCSI_REQUEST_BLOCK Srb, - BYTE cmd) + UCHAR cmd) { PVOID StartAddress; PVOID EndAddress; @@ -3472,7 +3476,7 @@ SCSI_PHYSICAL_ADDRESS PhysicalAddress; ULONG Length; ULONG tmpLength; - BYTE Status; + UCHAR Status; DPRINT("AtapiInitDma()\n"); _____ Modified: trunk/reactos/drivers/storage/cdrom/cdrom.c --- trunk/reactos/drivers/storage/cdrom/cdrom.c 2006-01-07 21:45:51 UTC (rev 20672) +++ trunk/reactos/drivers/storage/cdrom/cdrom.c 2006-01-07 21:50:29 UTC (rev 20673) @@ -946,9 +946,9 @@ */ static NTSTATUS CdromClassReadTocEntry (PDEVICE_OBJECT DeviceObject, - UINT TrackNo, + SIZE_T TrackNo, PVOID Buffer, - UINT Length) + SIZE_T Length) { PDEVICE_EXTENSION DeviceExtension; SCSI_REQUEST_BLOCK Srb; @@ -978,9 +978,9 @@ static NTSTATUS CdromClassReadLastSession (PDEVICE_OBJECT DeviceObject, - UINT TrackNo, + SIZE_T TrackNo, PVOID Buffer, - UINT Length) + SIZE_T Length) { PDEVICE_EXTENSION DeviceExtension; SCSI_REQUEST_BLOCK Srb; _____ Modified: trunk/reactos/drivers/storage/include/class2.h --- trunk/reactos/drivers/storage/include/class2.h 2006-01-07 21:45:51 UTC (rev 20672) +++ trunk/reactos/drivers/storage/include/class2.h 2006-01-07 21:50:29 UTC (rev 20673) @@ -18,36 +18,36 @@ struct _CLASS_INIT_DATA; -typedef VOID STDCALL -(*PCLASS_ERROR)(IN PDEVICE_OBJECT DeviceObject, +typedef VOID +(STDCALL *PCLASS_ERROR)(IN PDEVICE_OBJECT DeviceObject, IN PSCSI_REQUEST_BLOCK Srb, IN OUT NTSTATUS *Status, IN OUT BOOLEAN *Retry); -typedef BOOLEAN STDCALL -(*PCLASS_DEVICE_CALLBACK)(IN PINQUIRYDATA); +typedef BOOLEAN +(STDCALL *PCLASS_DEVICE_CALLBACK)(IN PINQUIRYDATA); -typedef NTSTATUS STDCALL -(*PCLASS_READ_WRITE)(IN PDEVICE_OBJECT DeviceObject, +typedef NTSTATUS +(STDCALL *PCLASS_READ_WRITE)(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -typedef BOOLEAN STDCALL -(*PCLASS_FIND_DEVICES)(IN PDRIVER_OBJECT DriverObject, +typedef BOOLEAN +(STDCALL *PCLASS_FIND_DEVICES)(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath, IN struct _CLASS_INIT_DATA *InitializationData, IN PDEVICE_OBJECT PortDeviceObject, IN ULONG PortNumber); -typedef NTSTATUS STDCALL -(*PCLASS_DEVICE_CONTROL)(IN PDEVICE_OBJECT DeviceObject, +typedef NTSTATUS +(STDCALL *PCLASS_DEVICE_CONTROL)(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -typedef NTSTATUS STDCALL -(*PCLASS_SHUTDOWN_FLUSH)(IN PDEVICE_OBJECT DeviceObject, +typedef NTSTATUS +(STDCALL *PCLASS_SHUTDOWN_FLUSH)(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -typedef NTSTATUS STDCALL -(*PCLASS_CREATE_CLOSE)(IN PDEVICE_OBJECT DeviceObject, +typedef NTSTATUS +(STDCALL *PCLASS_CREATE_CLOSE)(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp);

1 0

[ion] 20672: - Get NE2000 driver to build on msvc/ddk.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Get NE2000 driver to build on msvc/ddk. Modified: trunk/reactos/drivers/net/dd/ne2000/include/ne2000.h Modified: trunk/reactos/w32api/include/ddk/ndis.h _____ Modified: trunk/reactos/drivers/net/dd/ne2000/include/ne2000.h --- trunk/reactos/drivers/net/dd/ne2000/include/ne2000.h 2006-01-07 21:38:40 UTC (rev 20671) +++ trunk/reactos/drivers/net/dd/ne2000/include/ne2000.h 2006-01-07 21:45:51 UTC (rev 20672) @@ -7,6 +7,9 @@ #ifndef __NE2000_H #define __NE2000_H +#define NDIS_MINIPORT_DRIVER 1 +#define NDIS_LEGACY_MINIPORT 1 +#define NDIS51_MINIPORT 1 #include <ndis.h> #include <8390.h> #include <debug.h> @@ -59,7 +62,7 @@ PNDIS_PACKET Next; } MINIPORT_RESERVED, *PMINIPORT_RESERVED; -#define RESERVED(Packet) ((PMINIPORT_RESERVED)((Packet)->u.s1.MiniportReserved)) +#define RESERVED(Packet) ((PMINIPORT_RESERVED)((Packet)->MiniportReserved)) typedef UCHAR DRIVER_HARDWARE_ADDRESS[DRIVER_LENGTH_OF_ADDRESS]; _____ Modified: trunk/reactos/w32api/include/ddk/ndis.h --- trunk/reactos/w32api/include/ddk/ndis.h 2006-01-07 21:38:40 UTC (rev 20671) +++ trunk/reactos/w32api/include/ddk/ndis.h 2006-01-07 21:45:51 UTC (rev 20672) @@ -412,15 +412,15 @@ struct { UCHAR MiniportReserved[2 * sizeof(PVOID)]; UCHAR WrapperReserved[2 * sizeof(PVOID)]; - } s1; + }; struct { UCHAR MiniportReservedEx[3 * sizeof(PVOID)]; UCHAR WrapperReservedEx[sizeof(PVOID)]; - } s2; + }; struct { UCHAR MacReserved[4 * sizeof(PVOID)]; - } s3; - } u; + }; + }; ULONG_PTR Reserved[2]; UCHAR ProtocolReserved[1]; } NDIS_PACKET, *PNDIS_PACKET, **PPNDIS_PACKET;

1 0

[ion] 20671: - Get NDIS to compile on msvc/ddk (thanks to filip for his help)
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Get NDIS to compile on msvc/ddk (thanks to filip for his help) - Get PCNET to compile on msvc/ddk. Modified: trunk/reactos/drivers/net/dd/pcnet/pcnet.h Modified: trunk/reactos/drivers/net/dd/pcnet/pcnet.xml Modified: trunk/reactos/drivers/net/ndis/include/miniport.h Modified: trunk/reactos/drivers/net/ndis/include/ndissys.h _____ Modified: trunk/reactos/drivers/net/dd/pcnet/pcnet.h --- trunk/reactos/drivers/net/dd/pcnet/pcnet.h 2006-01-07 20:52:25 UTC (rev 20670) +++ trunk/reactos/drivers/net/dd/pcnet/pcnet.h 2006-01-07 21:38:40 UTC (rev 20671) @@ -140,7 +140,7 @@ #define RESET_IN_PROGRESS 0x1 #if DBG -#define BREAKPOINT __asm__ ("int $3\n"); +#define BREAKPOINT DbgBreakPoint(); #else #define BREAKPOINT #endif _____ Modified: trunk/reactos/drivers/net/dd/pcnet/pcnet.xml --- trunk/reactos/drivers/net/dd/pcnet/pcnet.xml 2006-01-07 20:52:25 UTC (rev 20670) +++ trunk/reactos/drivers/net/dd/pcnet/pcnet.xml 2006-01-07 21:38:40 UTC (rev 20671) @@ -1,6 +1,9 @@ <module name="pcnet" type="kernelmodedriver" installbase="system32/drivers" installname="pcnet.sys"> <include base="pcnet">.</include> <define name="NDIS50_MINIPORT" /> + <define name="NDIS_MINIPORT_DRIVER" /> + <define name="NDIS_LEGACY_MINIPORT" /> + <define name="NDIS51_MINIPORT" /> <define name="__USE_W32API" /> <library>ndis</library> <library>ntoskrnl</library> _____ Modified: trunk/reactos/drivers/net/ndis/include/miniport.h --- trunk/reactos/drivers/net/ndis/include/miniport.h 2006-01-07 20:52:25 UTC (rev 20670) +++ trunk/reactos/drivers/net/ndis/include/miniport.h 2006-01-07 21:38:40 UTC (rev 20671) @@ -71,36 +71,6 @@ #define GET_MINIPORT_DRIVER(Handle)((PNDIS_M_DRIVER_BLOCK)Handle) -#ifndef NUMBER_OF_WORK_ITEM_TYPES - -typedef enum _NDIS_WORK_ITEM_TYPE { - NdisWorkItemRequest, - NdisWorkItemSend, - NdisWorkItemReturnPackets, - NdisWorkItemResetRequested, - NdisWorkItemResetInProgress, - NdisWorkItemHalt, - NdisWorkItemSendLoopback, - NdisWorkItemMiniportCallback, - NdisMaxWorkItems -} NDIS_WORK_ITEM_TYPE, *PNDIS_WORK_ITEM_TYPE; - -#define NUMBER_OF_WORK_ITEM_TYPES NdisMaxWorkItems -#define NUMBER_OF_SINGLE_WORK_ITEMS 6 - -typedef struct _NDIS_MINIPORT_WORK_ITEM { - SINGLE_LIST_ENTRY Link; - NDIS_WORK_ITEM_TYPE WorkItemType; - PVOID WorkItemContext; -} NDIS_MINIPORT_WORK_ITEM, *PNDIS_MINIPORT_WORK_ITEM; - -typedef struct _X_FILTER FDDI_FILTER, *PFDDI_FILTER; - -typedef VOID (NTAPI *W_MINIPORT_CALLBACK)( - IN NDIS_HANDLE MiniportAdapterContext, - IN PVOID CallbackContext); -#endif - /* Information about a logical adapter */ typedef struct _LOGICAL_ADAPTER { _____ Modified: trunk/reactos/drivers/net/ndis/include/ndissys.h --- trunk/reactos/drivers/net/ndis/include/ndissys.h 2006-01-07 20:52:25 UTC (rev 20670) +++ trunk/reactos/drivers/net/ndis/include/ndissys.h 2006-01-07 21:38:40 UTC (rev 20671) @@ -18,14 +18,6 @@ #include <afilter.h> #include <atm.h> -#if _MSC_VER -/* FIXME: These were removed and are no longer used! */ -#define NdisWorkItemSendLoopback NdisWorkItemReserved -#else /* _MSC_VER */ -/* FIXME: We miss the ATM headers. */ -typedef struct _ATM_ADDRESS *PATM_ADDRESS; -#endif /* _MSC_VER */ - struct _ADAPTER_BINDING; typedef struct _NDISI_PACKET_POOL { @@ -35,6 +27,460 @@ UCHAR Buffer[1]; } NDISI_PACKET_POOL, * PNDISI_PACKET_POOL; +/* WDK Compatibility. Taken from w32api DDK */ +#ifndef __NDIS_H +typedef struct _X_FILTER FDDI_FILTER, *PFDDI_FILTER; + +typedef VOID +(NTAPI *FDDI_RCV_COMPLETE_HANDLER)( + IN PFDDI_FILTER Filter); + +typedef VOID +(NTAPI *FDDI_RCV_INDICATE_HANDLER)( + IN PFDDI_FILTER Filter, + IN NDIS_HANDLE MacReceiveContext, + IN PCHAR Address, + IN UINT AddressLength, + IN PVOID HeaderBuffer, + IN UINT HeaderBufferSize, + IN PVOID LookaheadBuffer, + IN UINT LookaheadBufferSize, + IN UINT PacketSize); + +typedef enum _NDIS_WORK_ITEM_TYPE { + NdisWorkItemRequest, + NdisWorkItemSend, + NdisWorkItemReturnPackets, + NdisWorkItemResetRequested, + NdisWorkItemResetInProgress, + NdisWorkItemHalt, + NdisWorkItemSendLoopback, + NdisWorkItemMiniportCallback, + NdisMaxWorkItems +} NDIS_WORK_ITEM_TYPE, *PNDIS_WORK_ITEM_TYPE; + +#define NUMBER_OF_WORK_ITEM_TYPES NdisMaxWorkItems +#define NUMBER_OF_SINGLE_WORK_ITEMS 6 + +typedef struct _NDIS_MINIPORT_WORK_ITEM { + SINGLE_LIST_ENTRY Link; + NDIS_WORK_ITEM_TYPE WorkItemType; + PVOID WorkItemContext; +} NDIS_MINIPORT_WORK_ITEM, *PNDIS_MINIPORT_WORK_ITEM; + +typedef VOID (NTAPI *W_MINIPORT_CALLBACK)( + IN NDIS_HANDLE MiniportAdapterContext, + IN PVOID CallbackContext); + +typedef struct _NDIS_BIND_PATHS { + UINT Number; + NDIS_STRING Paths[1]; +} NDIS_BIND_PATHS, *PNDIS_BIND_PATHS; + +#if ARCNET +#define FILTERDBS_ARCNET_S \ + PARC_FILTER ArcDB; +#else /* !ARCNET */ +#define FILTERDBS_ARCNET_S \ + PVOID XXXDB; +#endif /* !ARCNET */ + +#define FILTERDBS_S \ + union { \ + PETH_FILTER EthDB; \ + PNULL_FILTER NullDB; \ + }; \ + PTR_FILTER TrDB; \ + PFDDI_FILTER FddiDB; \ + FILTERDBS_ARCNET_S + +typedef struct _NDIS_LOG { + PNDIS_MINIPORT_BLOCK Miniport; + KSPIN_LOCK LogLock; + PIRP Irp; + UINT TotalSize; + UINT CurrentSize; + UINT InPtr; + UINT OutPtr; + UCHAR LogBuf[1]; +} NDIS_LOG, *PNDIS_LOG; + +typedef enum _NDIS_PNP_DEVICE_STATE { + NdisPnPDeviceAdded, + NdisPnPDeviceStarted, + NdisPnPDeviceQueryStopped, + NdisPnPDeviceStopped, + NdisPnPDeviceQueryRemoved, + NdisPnPDeviceRemoved, + NdisPnPDeviceSurpriseRemoved +} NDIS_PNP_DEVICE_STATE; + +typedef struct _OID_LIST OID_LIST, *POID_LIST; + +struct _NDIS_MINIPORT_BLOCK { + PVOID Signature; + PNDIS_MINIPORT_BLOCK NextMiniport; + PNDIS_M_DRIVER_BLOCK DriverHandle; + NDIS_HANDLE MiniportAdapterContext; + UNICODE_STRING MiniportName; + PNDIS_BIND_PATHS BindPaths; + NDIS_HANDLE OpenQueue; + REFERENCE ShortRef; + NDIS_HANDLE DeviceContext; + UCHAR Padding1; + UCHAR LockAcquired; + UCHAR PmodeOpens; + UCHAR AssignedProcessor; + KSPIN_LOCK Lock; + PNDIS_REQUEST MediaRequest; + PNDIS_MINIPORT_INTERRUPT Interrupt; + ULONG Flags; + ULONG PnPFlags; + LIST_ENTRY PacketList; + PNDIS_PACKET FirstPendingPacket; + PNDIS_PACKET ReturnPacketsQueue; + ULONG RequestBuffer; + PVOID SetMCastBuffer; + PNDIS_MINIPORT_BLOCK PrimaryMiniport; + PVOID WrapperContext; + PVOID BusDataContext; + ULONG PnPCapabilities; + PCM_RESOURCE_LIST Resources; + NDIS_TIMER WakeUpDpcTimer; + UNICODE_STRING BaseName; + UNICODE_STRING SymbolicLinkName; + ULONG CheckForHangSeconds; + USHORT CFHangTicks; + USHORT CFHangCurrentTick; + NDIS_STATUS ResetStatus; + NDIS_HANDLE ResetOpen; + FILTERDBS_S + FILTER_PACKET_INDICATION_HANDLER PacketIndicateHandler; + NDIS_M_SEND_COMPLETE_HANDLER SendCompleteHandler; + NDIS_M_SEND_RESOURCES_HANDLER SendResourcesHandler; + NDIS_M_RESET_COMPLETE_HANDLER ResetCompleteHandler; + NDIS_MEDIUM MediaType; + ULONG BusNumber; + NDIS_INTERFACE_TYPE BusType; + NDIS_INTERFACE_TYPE AdapterType; + PDEVICE_OBJECT DeviceObject; + PDEVICE_OBJECT PhysicalDeviceObject; + PDEVICE_OBJECT NextDeviceObject; + PMAP_REGISTER_ENTRY MapRegisters; + PNDIS_AF_LIST CallMgrAfList; + PVOID MiniportThread; + PVOID SetInfoBuf; + USHORT SetInfoBufLen; + USHORT MaxSendPackets; + NDIS_STATUS FakeStatus; + PVOID LockHandler; + PUNICODE_STRING pAdapterInstanceName; + PNDIS_MINIPORT_TIMER TimerQueue; + UINT MacOptions; + PNDIS_REQUEST PendingRequest; + UINT MaximumLongAddresses; + UINT MaximumShortAddresses; + UINT CurrentLookahead; + UINT MaximumLookahead; + W_HANDLE_INTERRUPT_HANDLER HandleInterruptHandler; + W_DISABLE_INTERRUPT_HANDLER DisableInterruptHandler; + W_ENABLE_INTERRUPT_HANDLER EnableInterruptHandler; + W_SEND_PACKETS_HANDLER SendPacketsHandler; + NDIS_M_START_SENDS DeferredSendHandler; + ETH_RCV_INDICATE_HANDLER EthRxIndicateHandler; + TR_RCV_INDICATE_HANDLER TrRxIndicateHandler; + FDDI_RCV_INDICATE_HANDLER FddiRxIndicateHandler; + ETH_RCV_COMPLETE_HANDLER EthRxCompleteHandler; + TR_RCV_COMPLETE_HANDLER TrRxCompleteHandler; + FDDI_RCV_COMPLETE_HANDLER FddiRxCompleteHandler; + NDIS_M_STATUS_HANDLER StatusHandler; + NDIS_M_STS_COMPLETE_HANDLER StatusCompleteHandler; + NDIS_M_TD_COMPLETE_HANDLER TDCompleteHandler; + NDIS_M_REQ_COMPLETE_HANDLER QueryCompleteHandler; + NDIS_M_REQ_COMPLETE_HANDLER SetCompleteHandler; + NDIS_WM_SEND_COMPLETE_HANDLER WanSendCompleteHandler; + WAN_RCV_HANDLER WanRcvHandler; + WAN_RCV_COMPLETE_HANDLER WanRcvCompleteHandler; +#if defined(NDIS_WRAPPER) + PNDIS_MINIPORT_BLOCK NextGlobalMiniport; + SINGLE_LIST_ENTRY WorkQueue[NUMBER_OF_WORK_ITEM_TYPES]; + SINGLE_LIST_ENTRY SingleWorkItems[NUMBER_OF_SINGLE_WORK_ITEMS]; + UCHAR SendFlags; + UCHAR TrResetRing; + UCHAR ArcnetAddress; + UCHAR XState; + union { +#if ARCNET + PNDIS_ARC_BUF ArcBuf; +#endif + PVOID BusInterface; + }; + PNDIS_LOG Log; + ULONG SlotNumber; + PCM_RESOURCE_LIST AllocatedResources; + PCM_RESOURCE_LIST AllocatedResourcesTranslated; + SINGLE_LIST_ENTRY PatternList; + NDIS_PNP_CAPABILITIES PMCapabilities; + DEVICE_CAPABILITIES DeviceCaps; + ULONG WakeUpEnable; + DEVICE_POWER_STATE CurrentDevicePowerState; + PIRP pIrpWaitWake; + SYSTEM_POWER_STATE WaitWakeSystemState; + LARGE_INTEGER VcIndex; + KSPIN_LOCK VcCountLock; + LIST_ENTRY WmiEnabledVcs; + PNDIS_GUID pNdisGuidMap; + PNDIS_GUID pCustomGuidMap; + USHORT VcCount; + USHORT cNdisGuidMap; + USHORT cCustomGuidMap; + USHORT CurrentMapRegister; + PKEVENT AllocationEvent; + USHORT BaseMapRegistersNeeded; + USHORT SGMapRegistersNeeded; + ULONG MaximumPhysicalMapping; + NDIS_TIMER MediaDisconnectTimer; + USHORT MediaDisconnectTimeOut; + USHORT InstanceNumber; + NDIS_EVENT OpenReadyEvent; + NDIS_PNP_DEVICE_STATE PnPDeviceState; + NDIS_PNP_DEVICE_STATE OldPnPDeviceState; + PGET_SET_DEVICE_DATA SetBusData; + PGET_SET_DEVICE_DATA GetBusData; + KDPC DeferredDpc; +#if 0 + /* FIXME: */ + NDIS_STATS NdisStats; +#else + ULONG NdisStats; +#endif + PNDIS_PACKET IndicatedPacket[MAXIMUM_PROCESSORS]; + PKEVENT RemoveReadyEvent; + PKEVENT AllOpensClosedEvent; + PKEVENT AllRequestsCompletedEvent; + ULONG InitTimeMs; + NDIS_MINIPORT_WORK_ITEM WorkItemBuffer[NUMBER_OF_SINGLE_WORK_ITEMS]; + PDMA_ADAPTER SystemAdapterObject; + ULONG DriverVerifyFlags; + POID_LIST OidList; + USHORT InternalResetCount; + USHORT MiniportResetCount; + USHORT MediaSenseConnectCount; + USHORT MediaSenseDisconnectCount; + PNDIS_PACKET *xPackets; + ULONG UserModeOpenReferences; + union { + PVOID SavedSendHandler; + PVOID SavedWanSendHandler; + }; + PVOID SavedSendPacketsHandler; + PVOID SavedCancelSendPacketsHandler; + W_SEND_PACKETS_HANDLER WSendPacketsHandler; + ULONG MiniportAttributes; + PDMA_ADAPTER SavedSystemAdapterObject; + USHORT NumOpens; + USHORT CFHangXTicks; + ULONG RequestCount; + ULONG IndicatedPacketsCount; + ULONG PhysicalMediumType; + PNDIS_REQUEST LastRequest; + LONG DmaAdapterRefCount; + PVOID FakeMac; + ULONG LockDbg; + ULONG LockDbgX; + PVOID LockThread; + ULONG InfoFlags; + KSPIN_LOCK TimerQueueLock; + PKEVENT ResetCompletedEvent; + PKEVENT QueuedBindingCompletedEvent; + PKEVENT DmaResourcesReleasedEvent; + FILTER_PACKET_INDICATION_HANDLER SavedPacketIndicateHandler; + ULONG RegisteredInterrupts; + PNPAGED_LOOKASIDE_LIST SGListLookasideList; + ULONG ScatterGatherListSize; +#endif /* _NDIS_ */ +}; + +#if 1 +/* FIXME: */ +typedef PVOID QUEUED_CLOSE; +#endif + +#if defined(NDIS_WRAPPER) +#define NDIS_COMMON_OPEN_BLOCK_WRAPPER_S \ + ULONG Flags; \ + ULONG References; \ + KSPIN_LOCK SpinLock; \ + NDIS_HANDLE FilterHandle; \ + ULONG ProtocolOptions; \ + USHORT CurrentLookahead; \ + USHORT ConnectDampTicks; \ + USHORT DisconnectDampTicks; \ + W_SEND_HANDLER WSendHandler; \ + W_TRANSFER_DATA_HANDLER WTransferDataHandler; \ + W_SEND_PACKETS_HANDLER WSendPacketsHandler; \ + W_CANCEL_SEND_PACKETS_HANDLER CancelSendPacketsHandler; \ + ULONG WakeUpEnable; \ + PKEVENT CloseCompleteEvent; \ + QUEUED_CLOSE QC; \ + ULONG AfReferences; \ + PNDIS_OPEN_BLOCK NextGlobalOpen; +#else +#define NDIS_COMMON_OPEN_BLOCK_WRAPPER_S +#endif + +#define NDIS_COMMON_OPEN_BLOCK_S \ + PVOID MacHandle; \ + NDIS_HANDLE BindingHandle; \ + PNDIS_MINIPORT_BLOCK MiniportHandle; \ + PNDIS_PROTOCOL_BLOCK ProtocolHandle; \ + NDIS_HANDLE ProtocolBindingContext; \ + PNDIS_OPEN_BLOCK MiniportNextOpen; \ + PNDIS_OPEN_BLOCK ProtocolNextOpen; \ + NDIS_HANDLE MiniportAdapterContext; \ + BOOLEAN Reserved1; \ + BOOLEAN Reserved2; \ + BOOLEAN Reserved3; \ + BOOLEAN Reserved4; \ + PNDIS_STRING BindDeviceName; \ + KSPIN_LOCK Reserved5; \ + PNDIS_STRING RootDeviceName; \ + union { \ + SEND_HANDLER SendHandler; \ + WAN_SEND_HANDLER WanSendHandler; \ + }; \ + TRANSFER_DATA_HANDLER TransferDataHandler; \ + SEND_COMPLETE_HANDLER SendCompleteHandler; \ + TRANSFER_DATA_COMPLETE_HANDLER TransferDataCompleteHandler; \ + RECEIVE_HANDLER ReceiveHandler; \ + RECEIVE_COMPLETE_HANDLER ReceiveCompleteHandler; \ + WAN_RECEIVE_HANDLER WanReceiveHandler; \ + REQUEST_COMPLETE_HANDLER RequestCompleteHandler; \ + RECEIVE_PACKET_HANDLER ReceivePacketHandler; \ + SEND_PACKETS_HANDLER SendPacketsHandler; \ + RESET_HANDLER ResetHandler; \ + REQUEST_HANDLER RequestHandler; \ + RESET_COMPLETE_HANDLER ResetCompleteHandler; \ + STATUS_HANDLER StatusHandler; \ + STATUS_COMPLETE_HANDLER StatusCompleteHandler; \ + NDIS_COMMON_OPEN_BLOCK_WRAPPER_S + +typedef struct _NDIS_COMMON_OPEN_BLOCK { + NDIS_COMMON_OPEN_BLOCK_S +} NDIS_COMMON_OPEN_BLOCK; + +struct _NDIS_OPEN_BLOCK +{ +#ifdef __cplusplus + NDIS_COMMON_OPEN_BLOCK NdisCommonOpenBlock; +#else + NDIS_COMMON_OPEN_BLOCK_S +#endif +#if defined(NDIS_WRAPPER) + struct _NDIS_OPEN_CO + { + struct _NDIS_CO_AF_BLOCK * NextAf; + W_CO_CREATE_VC_HANDLER MiniportCoCreateVcHandler; + W_CO_REQUEST_HANDLER MiniportCoRequestHandler; + CO_CREATE_VC_HANDLER CoCreateVcHandler; + CO_DELETE_VC_HANDLER CoDeleteVcHandler; + PVOID CmActivateVcCompleteHandler; + PVOID CmDeactivateVcCompleteHandler; + PVOID CoRequestCompleteHandler; + LIST_ENTRY ActiveVcHead; + LIST_ENTRY InactiveVcHead; + LONG PendingAfNotifications; + PKEVENT AfNotifyCompleteEvent; + }; +#endif /* _NDIS_ */ +}; + +#define NDIS30_PROTOCOL_CHARACTERISTICS_S \ + UCHAR MajorNdisVersion; \ + UCHAR MinorNdisVersion; \ + USHORT Filler; \ + union { \ + UINT Reserved; \ + UINT Flags; \ + }; \ + OPEN_ADAPTER_COMPLETE_HANDLER OpenAdapterCompleteHandler; \ + CLOSE_ADAPTER_COMPLETE_HANDLER CloseAdapterCompleteHandler; \ + union { \ + SEND_COMPLETE_HANDLER SendCompleteHandler; \ + WAN_SEND_COMPLETE_HANDLER WanSendCompleteHandler; \ + }; \ + union { \ + TRANSFER_DATA_COMPLETE_HANDLER TransferDataCompleteHandler; \ + WAN_TRANSFER_DATA_COMPLETE_HANDLER WanTransferDataCompleteHandler; \ + }; \ + RESET_COMPLETE_HANDLER ResetCompleteHandler; \ + REQUEST_COMPLETE_HANDLER RequestCompleteHandler; \ + union { \ + RECEIVE_HANDLER ReceiveHandler; \ + WAN_RECEIVE_HANDLER WanReceiveHandler; \ + }; \ + RECEIVE_COMPLETE_HANDLER ReceiveCompleteHandler; \ + STATUS_HANDLER StatusHandler; \ + STATUS_COMPLETE_HANDLER StatusCompleteHandler; \ + NDIS_STRING Name; + +typedef struct _NDIS30_PROTOCOL_CHARACTERISTICS { + NDIS30_PROTOCOL_CHARACTERISTICS_S +} NDIS30_PROTOCOL_CHARACTERISTICS, *PNDIS30_PROTOCOL_CHARACTERISTICS; + +#define NDIS30_MINIPORT_CHARACTERISTICS_S \ + UCHAR MajorNdisVersion; \ + UCHAR MinorNdisVersion; \ + USHORT Filler; \ + UINT Reserved; \ + W_CHECK_FOR_HANG_HANDLER CheckForHangHandler; \ + W_DISABLE_INTERRUPT_HANDLER DisableInterruptHandler; \ + W_ENABLE_INTERRUPT_HANDLER EnableInterruptHandler; \ + W_HALT_HANDLER HaltHandler; \ + W_HANDLE_INTERRUPT_HANDLER HandleInterruptHandler; \ + W_INITIALIZE_HANDLER InitializeHandler; \ + W_ISR_HANDLER ISRHandler; \ + W_QUERY_INFORMATION_HANDLER QueryInformationHandler; \ + W_RECONFIGURE_HANDLER ReconfigureHandler; \ + W_RESET_HANDLER ResetHandler; \ + union { \ + W_SEND_HANDLER SendHandler; \ + WM_SEND_HANDLER WanSendHandler; \ + }u1; \ + W_SET_INFORMATION_HANDLER SetInformationHandler; \ + union { \ + W_TRANSFER_DATA_HANDLER TransferDataHandler; \ + WM_TRANSFER_DATA_HANDLER WanTransferDataHandler; \ + }u2; + +typedef struct _NDIS30_MINIPORT_CHARACTERISTICS { + NDIS30_MINIPORT_CHARACTERISTICS_S +} NDIS30_MINIPORT_CHARACTERISTICS, *PSNDIS30_MINIPORT_CHARACTERISTICS; + +#ifdef __cplusplus + +#define NDIS40_MINIPORT_CHARACTERISTICS_S \ + NDIS30_MINIPORT_CHARACTERISTICS Ndis30Chars; \ + W_RETURN_PACKET_HANDLER ReturnPacketHandler; \ + W_SEND_PACKETS_HANDLER SendPacketsHandler; \ + W_ALLOCATE_COMPLETE_HANDLER AllocateCompleteHandler; + +#else /* !__cplusplus */ + +#define NDIS40_MINIPORT_CHARACTERISTICS_S \ + NDIS30_MINIPORT_CHARACTERISTICS_S \ + W_RETURN_PACKET_HANDLER ReturnPacketHandler; \ + W_SEND_PACKETS_HANDLER SendPacketsHandler; \ + W_ALLOCATE_COMPLETE_HANDLER AllocateCompleteHandler; + +#endif /* !__cplusplus */ + +typedef struct _NDIS40_MINIPORT_CHARACTERISTICS { + NDIS40_MINIPORT_CHARACTERISTICS_S +} NDIS40_MINIPORT_CHARACTERISTICS, *PNDIS40_MINIPORT_CHARACTERISTICS; + +#endif + #include "miniport.h" #include "protocol.h"

1 0

[ion] 20670: - Fix ndis build, thanks to Filip.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Fix ndis build, thanks to Filip. Modified: trunk/reactos/drivers/net/ndis/include/ndissys.h Modified: trunk/reactos/drivers/net/ndis/ndis.xml _____ Modified: trunk/reactos/drivers/net/ndis/include/ndissys.h --- trunk/reactos/drivers/net/ndis/include/ndissys.h 2006-01-07 20:33:48 UTC (rev 20669) +++ trunk/reactos/drivers/net/ndis/include/ndissys.h 2006-01-07 20:52:25 UTC (rev 20670) @@ -12,15 +12,8 @@ typedef unsigned long NDIS_STATS; -/* This magical flag combo seems to work. Filip should verify this */ -#undef NDIS_WRAPPER -#define NDIS_LEGACY_DRIVER 1 -#define NDIS_LEGACY_MINIPORT 1 -#define NDIS_LEGACY_PROTOCOL 1 -#define NDIS51_MINIPORT 1 -#define NDIS_MINIPORT_DRIVER 1 +#include <ntifs.h> #include <ndis.h> -#undef EXPORT #include <xfilter.h> #include <afilter.h> #include <atm.h> _____ Modified: trunk/reactos/drivers/net/ndis/ndis.xml --- trunk/reactos/drivers/net/ndis/ndis.xml 2006-01-07 20:33:48 UTC (rev 20669) +++ trunk/reactos/drivers/net/ndis/ndis.xml 2006-01-07 20:52:25 UTC (rev 20670) @@ -6,6 +6,10 @@ <define name="NDIS51" /> <define name="NDIS50_MINIPORT" /> <define name="NDIS51_MINIPORT" /> + <define name="NDIS_LEGACY_DRIVER" /> + <define name="NDIS_LEGACY_MINIPORT" /> + <define name="NDIS_LEGACY_PROTOCOL" /> + <define name="NDIS_MINIPORT_DRIVER" /> <library>ntoskrnl</library> <library>hal</library> <directory name="include">

1 0

[ion] 20669: - Get NDIS (almost) compiling with msvc/ddk.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Get NDIS (almost) compiling with msvc/ddk. Modified: trunk/reactos/drivers/net/ndis/include/miniport.h Modified: trunk/reactos/drivers/net/ndis/include/ndissys.h Modified: trunk/reactos/drivers/net/ndis/ndis/buffer.c _____ Modified: trunk/reactos/drivers/net/ndis/include/miniport.h --- trunk/reactos/drivers/net/ndis/include/miniport.h 2006-01-07 20:00:43 UTC (rev 20668) +++ trunk/reactos/drivers/net/ndis/include/miniport.h 2006-01-07 20:33:48 UTC (rev 20669) @@ -8,6 +8,7 @@ #ifndef __MINIPORT_H #define __MINIPORT_H +#include <ndis.h> #include <ndissys.h> struct _ADAPTER_BINDING; @@ -70,6 +71,36 @@ #define GET_MINIPORT_DRIVER(Handle)((PNDIS_M_DRIVER_BLOCK)Handle) +#ifndef NUMBER_OF_WORK_ITEM_TYPES + +typedef enum _NDIS_WORK_ITEM_TYPE { + NdisWorkItemRequest, + NdisWorkItemSend, + NdisWorkItemReturnPackets, + NdisWorkItemResetRequested, + NdisWorkItemResetInProgress, + NdisWorkItemHalt, + NdisWorkItemSendLoopback, + NdisWorkItemMiniportCallback, + NdisMaxWorkItems +} NDIS_WORK_ITEM_TYPE, *PNDIS_WORK_ITEM_TYPE; + +#define NUMBER_OF_WORK_ITEM_TYPES NdisMaxWorkItems +#define NUMBER_OF_SINGLE_WORK_ITEMS 6 + +typedef struct _NDIS_MINIPORT_WORK_ITEM { + SINGLE_LIST_ENTRY Link; + NDIS_WORK_ITEM_TYPE WorkItemType; + PVOID WorkItemContext; +} NDIS_MINIPORT_WORK_ITEM, *PNDIS_MINIPORT_WORK_ITEM; + +typedef struct _X_FILTER FDDI_FILTER, *PFDDI_FILTER; + +typedef VOID (NTAPI *W_MINIPORT_CALLBACK)( + IN NDIS_HANDLE MiniportAdapterContext, + IN PVOID CallbackContext); +#endif + /* Information about a logical adapter */ typedef struct _LOGICAL_ADAPTER { _____ Modified: trunk/reactos/drivers/net/ndis/include/ndissys.h --- trunk/reactos/drivers/net/ndis/include/ndissys.h 2006-01-07 20:00:43 UTC (rev 20668) +++ trunk/reactos/drivers/net/ndis/include/ndissys.h 2006-01-07 20:33:48 UTC (rev 20669) @@ -11,9 +11,19 @@ #define __NDISSYS_H typedef unsigned long NDIS_STATS; + +/* This magical flag combo seems to work. Filip should verify this */ +#undef NDIS_WRAPPER +#define NDIS_LEGACY_DRIVER 1 +#define NDIS_LEGACY_MINIPORT 1 +#define NDIS_LEGACY_PROTOCOL 1 +#define NDIS51_MINIPORT 1 +#define NDIS_MINIPORT_DRIVER 1 #include <ndis.h> +#undef EXPORT #include <xfilter.h> #include <afilter.h> +#include <atm.h> #if _MSC_VER /* FIXME: These were removed and are no longer used! */ @@ -23,13 +33,6 @@ typedef struct _ATM_ADDRESS *PATM_ADDRESS; #endif /* _MSC_VER */ -/* FIXME: This should go away once NDK will be compatible with MS DDK headers. */ -#if _MSC_VER -NTSTATUS NTAPI ZwDuplicateObject(IN HANDLE, IN HANDLE, IN HANDLE, OUT PHANDLE, IN ACCESS_MASK, IN ULONG, IN ULONG); -#else -#include <ndk/ntndk.h> -#endif - struct _ADAPTER_BINDING; typedef struct _NDISI_PACKET_POOL { _____ Modified: trunk/reactos/drivers/net/ndis/ndis/buffer.c --- trunk/reactos/drivers/net/ndis/ndis/buffer.c 2006-01-07 20:00:43 UTC (rev 20668) +++ trunk/reactos/drivers/net/ndis/ndis/buffer.c 2006-01-07 20:33:48 UTC (rev 20669) @@ -8,7 +8,7 @@ * CSH 01/08-2000 Created */ -#include <buffer.h> +#include <ndissys.h> __inline ULONG SkipToOffset(

1 0

[fireball] 20668: push-include for #pragma pack(16)
by fireball＠svn.reactos.org 07 Jan '06

07 Jan '06

push-include for #pragma pack(16) Added: trunk/reactos/w32api/include/pshpck16.h _____ Added: trunk/reactos/w32api/include/pshpck16.h --- trunk/reactos/w32api/include/pshpck16.h 2006-01-07 19:54:50 UTC (rev 20667) +++ trunk/reactos/w32api/include/pshpck16.h 2006-01-07 20:00:43 UTC (rev 20668) @@ -0,0 +1,7 @@ +#ifndef RC_INVOKED +# if ( __FreeBSD__ == 5 ) +# pragma pack(16) +# else +# pragma pack(push,16) +# endif // __FreeBSD__ +#endif // RC_INVOKED Property changes on: trunk/reactos/w32api/include/pshpck16.h ___________________________________________________________________ Name: svn:eol-style + native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs