Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 48307: [UNICODE] include string.h, for memcpy
by tkreuzer＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: tkreuzer Date: Tue Jul 27 15:47:04 2010 New Revision: 48307 URL: http://svn.reactos.org/svn/reactos?rev=48307&view=rev Log: [UNICODE] include string.h, for memcpy Modified: trunk/reactos/tools/unicode/string.c Modified: trunk/reactos/tools/unicode/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/string.c?rev… ============================================================================== --- trunk/reactos/tools/unicode/string.c [iso-8859-1] (original) +++ trunk/reactos/tools/unicode/string.c [iso-8859-1] Tue Jul 27 15:47:04 2010 @@ -21,6 +21,7 @@ #include <assert.h> #include <limits.h> #include <stdio.h> +#include <string.h> #define WINE_UNICODE_INLINE /* nothing */ #include "wine/unicode.h"

1 0

[tkreuzer] 48306: [dbghelp.h] / [imagehlp.h] - fix LOADED_IMAGE, UpdateDebugInfoFile, UpdateDebugInfoFileEx, ReBaseImage
by tkreuzer＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: tkreuzer Date: Tue Jul 27 14:08:36 2010 New Revision: 48306 URL: http://svn.reactos.org/svn/reactos?rev=48306&view=rev Log: [dbghelp.h] / [imagehlp.h] - fix LOADED_IMAGE, UpdateDebugInfoFile, UpdateDebugInfoFileEx, ReBaseImage Modified: trunk/reactos/include/psdk/dbghelp.h trunk/reactos/include/psdk/imagehlp.h Modified: trunk/reactos/include/psdk/dbghelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbghelp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/dbghelp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dbghelp.h [iso-8859-1] Tue Jul 27 14:08:36 2010 @@ -33,7 +33,11 @@ PSTR ModuleName; HANDLE hFile; PUCHAR MappedAddress; - PIMAGE_NT_HEADERS FileHeader; +#ifdef _IMAGEHLP64 + PIMAGE_NT_HEADERS64 FileHeader; +#else + PIMAGE_NT_HEADERS32 FileHeader; +#endif PIMAGE_SECTION_HEADER LastRvaSection; ULONG NumberOfSections; PIMAGE_SECTION_HEADER Sections; Modified: trunk/reactos/include/psdk/imagehlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imagehlp.h?re… ============================================================================== --- trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] Tue Jul 27 14:08:36 2010 @@ -108,16 +108,22 @@ } IMAGEHLP_STATUS_REASON; typedef BOOL(WINAPI*PIMAGEHLP_STATUS_ROUTINE)(IMAGEHLP_STATUS_REASON,LPSTR,LPSTR,ULONG,ULONG); typedef struct _LOADED_IMAGE { - LPSTR ModuleName; + PSTR ModuleName; HANDLE hFile; PUCHAR MappedAddress; - PIMAGE_NT_HEADERS FileHeader; +#ifdef _IMAGEHLP64 + PIMAGE_NT_HEADERS64 FileHeader; +#else + PIMAGE_NT_HEADERS32 FileHeader; +#endif PIMAGE_SECTION_HEADER LastRvaSection; ULONG NumberOfSections; PIMAGE_SECTION_HEADER Sections; ULONG Characteristics; BOOLEAN fSystemImage; BOOLEAN fDOSImage; + BOOLEAN fReadOnly; + UCHAR Version; LIST_ENTRY Links; ULONG SizeOfImage; } LOADED_IMAGE,*PLOADED_IMAGE; @@ -259,11 +265,11 @@ BOOL IMAGEAPI SplitSymbols(LPSTR,LPSTR,LPSTR,DWORD); HANDLE IMAGEAPI FindDebugInfoFile(LPSTR,LPSTR,LPSTR); HANDLE IMAGEAPI FindExecutableImage(LPSTR,LPSTR,LPSTR); -BOOL IMAGEAPI UpdateDebugInfoFile(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS); -BOOL IMAGEAPI UpdateDebugInfoFileEx(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS,DWORD); +BOOL IMAGEAPI UpdateDebugInfoFile(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS32); +BOOL IMAGEAPI UpdateDebugInfoFileEx(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS32,DWORD); BOOL IMAGEAPI BindImage(IN LPSTR,IN LPSTR,IN LPSTR); BOOL IMAGEAPI BindImageEx(IN DWORD,IN LPSTR,IN LPSTR,IN LPSTR,IN PIMAGEHLP_STATUS_ROUTINE); -BOOL IMAGEAPI ReBaseImage(IN LPSTR,IN LPSTR,IN BOOL, IN BOOL,IN BOOL, IN ULONG, OUT ULONG*, OUT ULONG*, OUT ULONG*, IN OUT ULONG*, IN ULONG); +BOOL IMAGEAPI ReBaseImage(IN LPSTR,IN LPSTR,IN BOOL, IN BOOL,IN BOOL, IN ULONG, OUT ULONG*, OUT ULONG_PTR*, OUT ULONG*, IN OUT ULONG_PTR*, IN ULONG); PLOADED_IMAGE IMAGEAPI ImageLoad(LPSTR,LPSTR); BOOL IMAGEAPI ImageUnload(PLOADED_IMAGE);

1 0

[tkreuzer] 48305: reduce diff to trunk
by tkreuzer＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: tkreuzer Date: Tue Jul 27 13:42:36 2010 New Revision: 48305 URL: http://svn.reactos.org/svn/reactos?rev=48305&view=rev Log: reduce diff to trunk Modified: branches/ros-amd64-bringup/reactos/dll/3rdparty/dxtn/dxtn.rbuild branches/ros-amd64-bringup/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild branches/ros-amd64-bringup/reactos/dll/3rdparty/libxslt/libxslt.rbuild branches/ros-amd64-bringup/reactos/drivers/usb/directory.rbuild branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/directory.rbuild branches/ros-amd64-bringup/reactos/hal/hal.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/hal_mini.rbuild branches/ros-amd64-bringup/reactos/lib/drivers/ip/transport/tcp/tcp.c branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/mm.h Modified: branches/ros-amd64-bringup/reactos/dll/3rdparty/dxtn/dxtn.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/dxtn/dxtn.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/dxtn/dxtn.rbuild [iso-8859-1] Tue Jul 27 13:42:36 2010 @@ -1,9 +1,5 @@ <module name="dxtn" type="win32dll" entrypoint="0" installbase="system32" installname="dxtn.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="dxtn.spec" /> - <if property="ARCH" value="amd64"> -  - <define name="dllexport">aligned(1)</define> - </if> <include base="dxtn">.</include> <file>fxt1.c</file> <file>dxtn.c</file> Modified: branches/ros-amd64-bringup/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild [iso-8859-1] Tue Jul 27 13:42:36 2010 @@ -6,10 +6,6 @@ <define name="_MBCS" /> <define name="JPEG_DLL" /> <define name="main">mainptr</define> - <if property="ARCH" value="amd64"> -  - <define name="dllexport">aligned(1)</define> - </if> <include base="libjpeg">.</include> <include base="ReactOS">include/reactos/libs/libjpeg</include> <include base="ReactOS">include/reactos/libs/zlib</include> Modified: branches/ros-amd64-bringup/reactos/dll/3rdparty/libxslt/libxslt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/libxslt/libxslt.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/libxslt/libxslt.rbuild [iso-8859-1] Tue Jul 27 13:42:36 2010 @@ -1,13 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="libxslt" type="win32dll" entrypoint="0" installbase="system32" installname="libxslt.dll" allowwarnings="true" crt="msvcrt"> - - <if property="ARCH" value="amd64"> -  - <define name="dllexport">aligned(1)</define> - <importlibrary definition="libxslt.spec" /> - </if> - <define name="HAVE_CONFIG_H" /> <define name="WIN32" /> <define name="_WINDOWS" /> Modified: branches/ros-amd64-bringup/reactos/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/usb/directory.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/usb/directory.rbuild [iso-8859-1] Tue Jul 27 13:42:36 2010 @@ -1,9 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -  + </directory> <directory name="usbd"> <xi:include href="usbd/usbd.rbuild" /> </directory> Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/directory.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/directory.rbuild [iso-8859-1] Tue Jul 27 13:42:36 2010 @@ -1,9 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -  + </directory> <directory name="portcls"> <xi:include href="portcls/portcls.rbuild" /> </directory> Modified: branches/ros-amd64-bringup/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/hal.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/hal.rbuild [iso-8859-1] Tue Jul 27 13:42:36 2010 @@ -4,7 +4,6 @@ <if property="ARCH" value="i386"> <directory name="halx86"> - <xi:include href="halx86/hal_mini.rbuild" /> <xi:include href="halx86/directory.rbuild" /> </directory> </if> Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] Tue Jul 27 13:42:36 2010 @@ -1,7 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> -<if property="ARCH" value="i386"> <module name="hal_generic_up" type="objectlibrary"> <include>include</include> <include base="ntoskrnl">include</include> @@ -15,5 +14,4 @@ <file>processor.c</file> </directory> </module> -</if> </group> Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_mini.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_mini.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_mini.rbuild [iso-8859-1] Tue Jul 27 13:42:36 2010 @@ -33,17 +33,15 @@ <file>sysinfo.c</file> <file>timer.c</file> <file>usage.c</file> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>portio.c</file> - <file>systimer.S</file> - </directory> - </if> - </directory> + <directory name="i386"> + <file>portio.c</file> + <file>systimer.S</file> + </directory> + </directory> <directory name="up"> <file>halinit_up.c</file> <file>pic.c</file> <file>processor.c</file> </directory> </module> -</group> +</group> Modified: branches/ros-amd64-bringup/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Tue Jul 27 13:42:36 2010 @@ -20,192 +20,192 @@ VOID HandleSignalledConnection(PCONNECTION_ENDPOINT Connection) { - PTDI_BUCKET Bucket; - PLIST_ENTRY Entry; + PTDI_BUCKET Bucket; + PLIST_ENTRY Entry; NTSTATUS Status; - PIRP Irp; - PMDL Mdl; + PIRP Irp; + PMDL Mdl; KIRQL OldIrql; PTCP_COMPLETION_ROUTINE Complete; if (ClientInfo.Unlocked) LockObjectAtDpcLevel(Connection); - TI_DbgPrint(MID_TRACE,("Handling signalled state on %x (%x)\n", - Connection, Connection->SocketContext)); - - /* Things that can happen when we try the initial connection */ - if( Connection->SignalState & SEL_CONNECT ) { + TI_DbgPrint(MID_TRACE,("Handling signalled state on %x (%x)\n", + Connection, Connection->SocketContext)); + + /* Things that can happen when we try the initial connection */ + if( Connection->SignalState & SEL_CONNECT ) { while (!IsListEmpty(&Connection->ConnectRequest)) { Entry = RemoveHeadList( &Connection->ConnectRequest ); - - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); Bucket->Status = STATUS_SUCCESS; Bucket->Information = 0; InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); - } - } - - if( Connection->SignalState & SEL_ACCEPT ) { - /* Handle readable on a listening socket -- - * TODO: Implement filtering - */ - TI_DbgPrint(DEBUG_TCP,("Accepting new connection on %x (Queue: %s)\n", - Connection, - IsListEmpty(&Connection->ListenRequest) ? - "empty" : "nonempty")); + } + } + + if( Connection->SignalState & SEL_ACCEPT ) { + /* Handle readable on a listening socket -- + * TODO: Implement filtering + */ + TI_DbgPrint(DEBUG_TCP,("Accepting new connection on %x (Queue: %s)\n", + Connection, + IsListEmpty(&Connection->ListenRequest) ? + "empty" : "nonempty")); while (!IsListEmpty(&Connection->ListenRequest)) { - PIO_STACK_LOCATION IrpSp; + PIO_STACK_LOCATION IrpSp; Entry = RemoveHeadList( &Connection->ListenRequest ); - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - - Irp = Bucket->Request.RequestContext; - IrpSp = IoGetCurrentIrpStackLocation( Irp ); - - TI_DbgPrint(DEBUG_TCP,("Getting the socket\n")); - - Status = TCPServiceListeningSocket - ( Connection->AddressFile->Listener, - Bucket->AssociatedEndpoint, - (PTDI_REQUEST_KERNEL)&IrpSp->Parameters ); - - TI_DbgPrint(DEBUG_TCP,("Socket: Status: %x\n")); + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + + Irp = Bucket->Request.RequestContext; + IrpSp = IoGetCurrentIrpStackLocation( Irp ); + + TI_DbgPrint(DEBUG_TCP,("Getting the socket\n")); + + Status = TCPServiceListeningSocket + ( Connection->AddressFile->Listener, + Bucket->AssociatedEndpoint, + (PTDI_REQUEST_KERNEL)&IrpSp->Parameters ); + + TI_DbgPrint(DEBUG_TCP,("Socket: Status: %x\n")); if( Status == STATUS_PENDING && !(Connection->SignalState & SEL_FIN) ) { InsertHeadList( &Connection->ListenRequest, &Bucket->Entry ); - break; - } else { + break; + } else { Bucket->Status = (Status == STATUS_PENDING) ? STATUS_CANCELLED : Status; Bucket->Information = 0; DereferenceObject(Bucket->AssociatedEndpoint); InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); - } - } - } - - /* Things that happen after we're connected */ - if( Connection->SignalState & SEL_READ ) { - TI_DbgPrint(DEBUG_TCP,("Readable: irp list %s\n", - IsListEmpty(&Connection->ReceiveRequest) ? - "empty" : "nonempty")); + } + } + } + + /* Things that happen after we're connected */ + if( Connection->SignalState & SEL_READ ) { + TI_DbgPrint(DEBUG_TCP,("Readable: irp list %s\n", + IsListEmpty(&Connection->ReceiveRequest) ? + "empty" : "nonempty")); while (!IsListEmpty(&Connection->ReceiveRequest)) { - OSK_UINT RecvLen = 0, Received = 0; - PVOID RecvBuffer = 0; + OSK_UINT RecvLen = 0, Received = 0; + PVOID RecvBuffer = 0; Entry = RemoveHeadList( &Connection->ReceiveRequest ); - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - - Irp = Bucket->Request.RequestContext; - Mdl = Irp->MdlAddress; - - TI_DbgPrint(DEBUG_TCP, - ("Getting the user buffer from %x\n", Mdl)); - - NdisQueryBuffer( Mdl, &RecvBuffer, &RecvLen ); - - TI_DbgPrint(DEBUG_TCP, - ("Reading %d bytes to %x\n", RecvLen, RecvBuffer)); - - TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); - TI_DbgPrint + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + + Irp = Bucket->Request.RequestContext; + Mdl = Irp->MdlAddress; + + TI_DbgPrint(DEBUG_TCP, + ("Getting the user buffer from %x\n", Mdl)); + + NdisQueryBuffer( Mdl, &RecvBuffer, &RecvLen ); + + TI_DbgPrint(DEBUG_TCP, + ("Reading %d bytes to %x\n", RecvLen, RecvBuffer)); + + TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); + TI_DbgPrint + (DEBUG_TCP, + ("Connection->SocketContext: %x\n", + Connection->SocketContext)); + TI_DbgPrint(DEBUG_TCP, ("RecvBuffer: %x\n", RecvBuffer)); + + Status = TCPTranslateError + ( OskitTCPRecv( Connection->SocketContext, + RecvBuffer, + RecvLen, + &Received, + 0 ) ); + + TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Received)); + + if( Status == STATUS_PENDING && !(Connection->SignalState & SEL_FIN) ) { + InsertHeadList( &Connection->ReceiveRequest, &Bucket->Entry ); + break; + } else { + TI_DbgPrint(DEBUG_TCP, + ("Completing Receive request: %x %x\n", + Bucket->Request, Status)); + + Bucket->Status = (Status == STATUS_PENDING) ? STATUS_CANCELLED : Status; + Bucket->Information = (Bucket->Status == STATUS_SUCCESS) ? Received : 0; + + InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); + } + } + } + if( Connection->SignalState & SEL_WRITE ) { + TI_DbgPrint(DEBUG_TCP,("Writeable: irp list %s\n", + IsListEmpty(&Connection->SendRequest) ? + "empty" : "nonempty")); + + while (!IsListEmpty(&Connection->SendRequest)) { + OSK_UINT SendLen = 0, Sent = 0; + PVOID SendBuffer = 0; + + Entry = RemoveHeadList( &Connection->SendRequest ); + + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + + Irp = Bucket->Request.RequestContext; + Mdl = Irp->MdlAddress; + + TI_DbgPrint(DEBUG_TCP, + ("Getting the user buffer from %x\n", Mdl)); + + NdisQueryBuffer( Mdl, &SendBuffer, &SendLen ); + + TI_DbgPrint(DEBUG_TCP, + ("Writing %d bytes to %x\n", SendLen, SendBuffer)); + + TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); + TI_DbgPrint (DEBUG_TCP, ("Connection->SocketContext: %x\n", Connection->SocketContext)); - TI_DbgPrint(DEBUG_TCP, ("RecvBuffer: %x\n", RecvBuffer)); - - Status = TCPTranslateError - ( OskitTCPRecv( Connection->SocketContext, - RecvBuffer, - RecvLen, - &Received, - 0 ) ); - - TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Received)); - - if( Status == STATUS_PENDING && !(Connection->SignalState & SEL_FIN) ) { - InsertHeadList( &Connection->ReceiveRequest, &Bucket->Entry ); - break; - } else { - TI_DbgPrint(DEBUG_TCP, - ("Completing Receive request: %x %x\n", - Bucket->Request, Status)); - - Bucket->Status = (Status == STATUS_PENDING) ? STATUS_CANCELLED : Status; - Bucket->Information = (Bucket->Status == STATUS_SUCCESS) ? Received : 0; - - InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); - } - } - } - if( Connection->SignalState & SEL_WRITE ) { - TI_DbgPrint(DEBUG_TCP,("Writeable: irp list %s\n", - IsListEmpty(&Connection->SendRequest) ? - "empty" : "nonempty")); - - while (!IsListEmpty(&Connection->SendRequest)) { - OSK_UINT SendLen = 0, Sent = 0; - PVOID SendBuffer = 0; - - Entry = RemoveHeadList( &Connection->SendRequest ); - - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - - Irp = Bucket->Request.RequestContext; - Mdl = Irp->MdlAddress; - - TI_DbgPrint(DEBUG_TCP, - ("Getting the user buffer from %x\n", Mdl)); - - NdisQueryBuffer( Mdl, &SendBuffer, &SendLen ); - - TI_DbgPrint(DEBUG_TCP, - ("Writing %d bytes to %x\n", SendLen, SendBuffer)); - - TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); - TI_DbgPrint - (DEBUG_TCP, - ("Connection->SocketContext: %x\n", - Connection->SocketContext)); - - Status = TCPTranslateError - ( OskitTCPSend( Connection->SocketContext, - SendBuffer, - SendLen, - &Sent, - 0 ) ); - - TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Sent)); + + Status = TCPTranslateError + ( OskitTCPSend( Connection->SocketContext, + SendBuffer, + SendLen, + &Sent, + 0 ) ); + + TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Sent)); if( Status == STATUS_PENDING && !(Connection->SignalState & SEL_FIN) ) { InsertHeadList( &Connection->SendRequest, &Bucket->Entry ); - break; - } else { - TI_DbgPrint(DEBUG_TCP, - ("Completing Send request: %x %x\n", - Bucket->Request, Status)); + break; + } else { + TI_DbgPrint(DEBUG_TCP, + ("Completing Send request: %x %x\n", + Bucket->Request, Status)); Bucket->Status = (Status == STATUS_PENDING) ? STATUS_CANCELLED : Status; Bucket->Information = (Bucket->Status == STATUS_SUCCESS) ? Sent : 0; InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); - } - } - } + } + } + } ReferenceObject(Connection); if (ClientInfo.Unlocked) { UnlockObjectFromDpcLevel(Connection); KeReleaseSpinLock(&ClientInfo.Lock, ClientInfo.OldIrql); -} + } else { UnlockObject(Connection, Connection->OldIrql); @@ -394,7 +394,7 @@ while ( 1 ) { if (Next == NextFast) { NextFast += 2; - } + } if (Next == NextSlow) { NextSlow += 5; } @@ -586,7 +586,7 @@ return STATUS_NETWORK_UNREACHABLE; } - AddressToBind.sin_addr.s_addr = NCE->Interface->Unicast.Address.IPv4Address; + AddressToBind.sin_addr.s_addr = NCE->Interface->Unicast.Address.IPv4Address; } else { @@ -620,7 +620,7 @@ Bucket->Request.RequestNotifyObject = (PVOID)Complete; Bucket->Request.RequestContext = Context; - + InsertTailList( &Connection->ConnectRequest, &Bucket->Entry ); } } @@ -805,14 +805,14 @@ Bucket->Request.RequestNotifyObject = Complete; Bucket->Request.RequestContext = Context; *BytesSent = 0; - + InsertTailList( &Connection->SendRequest, &Bucket->Entry ); TI_DbgPrint(DEBUG_TCP,("Queued write irp\n")); } else { TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Sent)); *BytesSent = Sent; } - + UnlockObject(Connection, OldIrql); TI_DbgPrint(DEBUG_TCP,("Status %x\n", Status)); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Tue Jul 27 13:42:36 2010 @@ -25,7 +25,6 @@ #define PDE_BASE 0xC0300000 #define PDE_TOP 0xC0300FFF #define PTE_TOP 0xC03FFFFF -#define PDE_TOP 0xC0300FFF #define PTE_PER_PAGE 1024 #define HYPER_SPACE 0xC0400000 #define HYPER_SPACE_END 0xC07FFFFF

1 0

[akhaldi] 48304: [CMAKE] - Add ext2lib, ntfslib, vfatlib and vfatxlib to build.
by akhaldi＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: akhaldi Date: Tue Jul 27 13:09:55 2010 New Revision: 48304 URL: http://svn.reactos.org/svn/reactos?rev=48304&view=rev Log: [CMAKE] - Add ext2lib, ntfslib, vfatlib and vfatxlib to build. Added: branches/cmake-bringup/lib/fslib/CMakeLists.txt (with props) branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt (with props) branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt (with props) branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt (with props) branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt (with props) Modified: branches/cmake-bringup/lib/CMakeLists.txt Modified: branches/cmake-bringup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Tue Jul 27 13:09:55 2010 @@ -10,7 +10,7 @@ add_subdirectory(dnslib) add_subdirectory(drivers) add_subdirectory(epsapi) -#add_subdirectory(fslib) +add_subdirectory(fslib) add_subdirectory(lsalib) add_subdirectory(nls) #add_subdirectory(pseh) Added: branches/cmake-bringup/lib/fslib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/CMakeLi… ============================================================================== --- branches/cmake-bringup/lib/fslib/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/fslib/CMakeLists.txt [iso-8859-1] Tue Jul 27 13:09:55 2010 @@ -1,0 +1,5 @@ + +add_subdirectory(ext2lib) +add_subdirectory(ntfslib) +add_subdirectory(vfatlib) +add_subdirectory(vfatxlib) Propchange: branches/cmake-bringup/lib/fslib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/ext2lib… ============================================================================== --- branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt [iso-8859-1] Tue Jul 27 13:09:55 2010 @@ -1,0 +1,4 @@ + +include_directories(.) +file(GLOB_RECURSE SOURCE "*.c") +add_library(ext2lib ${SOURCE}) Propchange: branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/ntfslib… ============================================================================== --- branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt [iso-8859-1] Tue Jul 27 13:09:55 2010 @@ -1,0 +1,4 @@ + +include_directories(.) +file(GLOB_RECURSE SOURCE "*.c") +add_library(ntfslib ${SOURCE}) Propchange: branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/vfatlib… ============================================================================== --- branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt [iso-8859-1] Tue Jul 27 13:09:55 2010 @@ -1,0 +1,5 @@ + +include_directories(.) +file(GLOB_RECURSE SOURCE "*.c") +add_library(vfatlib ${SOURCE}) +add_dependencies(vfatlib psdk) Propchange: branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/vfatxli… ============================================================================== --- branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] Tue Jul 27 13:09:55 2010 @@ -1,0 +1,4 @@ + +include_directories(.) +file(GLOB_RECURSE SOURCE "*.c") +add_library(vfatxlib ${SOURCE}) Propchange: branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48303: [CMAKE] - Add proper dependencies on psdk. - Parallel build works now.
by akhaldi＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: akhaldi Date: Tue Jul 27 12:53:24 2010 New Revision: 48303 URL: http://svn.reactos.org/svn/reactos?rev=48303&view=rev Log: [CMAKE] - Add proper dependencies on psdk. - Parallel build works now. Modified: branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt branches/cmake-bringup/lib/inflib/CMakeLists.txt branches/cmake-bringup/lib/newinflib/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/adns… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt [iso-8859-1] Tue Jul 27 12:53:24 2010 @@ -5,4 +5,5 @@ file(GLOB_RECURSE SOURCE "/src/*.c" "./adns_win32/*.c") -add_library(adns ${SOURCE}) +add_library(adns ${SOURCE}) +add_dependencies(adns psdk) Modified: branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/card… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt [iso-8859-1] Tue Jul 27 12:53:24 2010 @@ -1,3 +1,4 @@ file(GLOB_RECURSE SOURCE "*.cpp") -add_library(cardlib ${SOURCE}) +add_library(cardlib ${SOURCE}) +add_dependencies(cardlib psdk) Modified: branches/cmake-bringup/lib/inflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/inflib/CMakeL… ============================================================================== --- branches/cmake-bringup/lib/inflib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/inflib/CMakeLists.txt [iso-8859-1] Tue Jul 27 12:53:24 2010 @@ -6,6 +6,7 @@ file(GLOB_RECURSE SOURCE "infros*.c") add_library(inflib ${GLOBAL_FILES} ${SOURCE}) +add_dependencies(inflib psdk) else() Modified: branches/cmake-bringup/lib/newinflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/newinflib/CMa… ============================================================================== --- branches/cmake-bringup/lib/newinflib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/newinflib/CMakeLists.txt [iso-8859-1] Tue Jul 27 12:53:24 2010 @@ -6,6 +6,7 @@ file(GLOB_RECURSE SOURCE "infros*.c") add_library(newinflib ${GLOBAL_FILES} ${SOURCE}) +add_dependencies(newinflib psdk) else()

1 0

[akhaldi] 48302: [CMAKE] - cmlib depends on bugcodes.
by akhaldi＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: akhaldi Date: Tue Jul 27 11:12:09 2010 New Revision: 48302 URL: http://svn.reactos.org/svn/reactos?rev=48302&view=rev Log: [CMAKE] - cmlib depends on bugcodes. Modified: branches/cmake-bringup/lib/cmlib/CMakeLists.txt Modified: branches/cmake-bringup/lib/cmlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/cmlib/CMakeLi… ============================================================================== --- branches/cmake-bringup/lib/cmlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/cmlib/CMakeLists.txt [iso-8859-1] Tue Jul 27 11:12:09 2010 @@ -6,6 +6,7 @@ if(CMAKE_CROSSCOMPILING) add_library(cmlib ${SOURCE}) +add_dependencies(cmlib bugcodes) else()

1 0

[akhaldi] 48301: [CMAKE] - Add idna, normalize and scripts to build.
by akhaldi＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: akhaldi Date: Tue Jul 27 11:01:39 2010 New Revision: 48301 URL: http://svn.reactos.org/svn/reactos?rev=48301&view=rev Log: [CMAKE] - Add idna, normalize and scripts to build. Added: branches/cmake-bringup/lib/nls/CMakeLists.txt (with props) branches/cmake-bringup/lib/nls/idna/CMakeLists.txt (with props) branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt (with props) branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt (with props) Modified: branches/cmake-bringup/lib/CMakeLists.txt Modified: branches/cmake-bringup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Tue Jul 27 11:01:39 2010 @@ -12,7 +12,7 @@ add_subdirectory(epsapi) #add_subdirectory(fslib) add_subdirectory(lsalib) -#add_subdirectory(nls) +add_subdirectory(nls) #add_subdirectory(pseh) add_subdirectory(recyclebin) add_subdirectory(rossym) Added: branches/cmake-bringup/lib/nls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/CMakeList… ============================================================================== --- branches/cmake-bringup/lib/nls/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/nls/CMakeLists.txt [iso-8859-1] Tue Jul 27 11:01:39 2010 @@ -1,0 +1,4 @@ + +add_subdirectory(idna) +add_subdirectory(normalize) +add_subdirectory(scripts) Propchange: branches/cmake-bringup/lib/nls/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/nls/idna/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/idna/CMak… ============================================================================== --- branches/cmake-bringup/lib/nls/idna/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/nls/idna/CMakeLists.txt [iso-8859-1] Tue Jul 27 11:01:39 2010 @@ -1,0 +1,8 @@ + +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common) + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -UWINVER -DWINVER=0x600 -fno-exceptions -fno-rtti") + +file(GLOB_RECURSE SOURCE "*.cpp") + +add_library(idna ${SOURCE}) Propchange: branches/cmake-bringup/lib/nls/idna/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/normalize… ============================================================================== --- branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt [iso-8859-1] Tue Jul 27 11:01:39 2010 @@ -1,0 +1,8 @@ + +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common) + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -UWINVER -DWINVER=0x600 -fno-exceptions -fno-rtti") + +file(GLOB_RECURSE SOURCE "*.cpp") + +add_library(normalize ${SOURCE}) Propchange: branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/scripts/C… ============================================================================== --- branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt [iso-8859-1] Tue Jul 27 11:01:39 2010 @@ -1,0 +1,8 @@ + +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common) + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -UWINVER -DWINVER=0x600 -fno-exceptions -fno-rtti") + +file(GLOB_RECURSE SOURCE "*.cpp") + +add_library(scripts ${SOURCE}) Propchange: branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48300: [PSDK] - Mark TraceMessageVa as WMIAPI.
by akhaldi＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: akhaldi Date: Tue Jul 27 09:56:21 2010 New Revision: 48300 URL: http://svn.reactos.org/svn/reactos?rev=48300&view=rev Log: [PSDK] - Mark TraceMessageVa as WMIAPI. Modified: trunk/reactos/include/psdk/evntrace.h Modified: trunk/reactos/include/psdk/evntrace.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/evntrace.h?re… ============================================================================== --- trunk/reactos/include/psdk/evntrace.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/evntrace.h [iso-8859-1] Tue Jul 27 09:56:21 2010 @@ -1002,6 +1002,7 @@ EXTERN_C ULONG +WMIAPI TraceMessageVa( IN TRACEHANDLE LoggerHandle, IN ULONG MessageFlags,

1 0

[akhaldi] 48299: [XDK] - WmiTraceMessageVa is NTAPI, not __cdecl. [DDK] - Update wdm.h to reflect XDK changes.
by akhaldi＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: akhaldi Date: Tue Jul 27 09:14:13 2010 New Revision: 48299 URL: http://svn.reactos.org/svn/reactos?rev=48299&view=rev Log: [XDK] - WmiTraceMessageVa is NTAPI, not __cdecl. [DDK] - Update wdm.h to reflect XDK changes. Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/wmifuncs.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4829… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Tue Jul 27 09:14:13 2010 @@ -14241,7 +14241,7 @@ /* FIXME: Get va_list from where? */ NTKERNELAPI NTSTATUS -__cdecl +NTAPI WmiTraceMessageVa( IN TRACEHANDLE LoggerHandle, IN ULONG MessageFlags, Modified: trunk/reactos/include/xdk/wmifuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/wmifuncs.h?rev… ============================================================================== --- trunk/reactos/include/xdk/wmifuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/wmifuncs.h [iso-8859-1] Tue Jul 27 09:14:13 2010 @@ -32,7 +32,7 @@ /* FIXME: Get va_list from where? */ NTKERNELAPI NTSTATUS -__cdecl +NTAPI WmiTraceMessageVa( IN TRACEHANDLE LoggerHandle, IN ULONG MessageFlags,

1 0

[evb] 48298: Add all pci bridge control function (PciBridgeIoBase, PciBridgeIoLimit, PciBridgeMemoryBase, PciBridgeMemoryLimit, PciBridgePrefetchMemoryBase, PciBridgePrefetchMemoryLimit, PciBridgeMemoryWorstCasealignment, PciBridgeIsPositiveDecode, PciBridgeIsSubtractiveDecode) More support ICH0/1/2/3/4 hub Add all PCI2PCI bridge limit/current resource codes (PPBridge_*), now is BAR setup okay, and Device_* must be implement Support ISA+VGA legacy decode, 20+64-bit decode, ROM BAR, prefetch BAR
by evb＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: evb Date: Tue Jul 27 03:24:24 2010 New Revision: 48298 URL: http://svn.reactos.org/svn/reactos?rev=48298&view=rev Log: Add all pci bridge control function (PciBridgeIoBase, PciBridgeIoLimit, PciBridgeMemoryBase, PciBridgeMemoryLimit, PciBridgePrefetchMemoryBase, PciBridgePrefetchMemoryLimit, PciBridgeMemoryWorstCasealignment, PciBridgeIsPositiveDecode, PciBridgeIsSubtractiveDecode) More support ICH0/1/2/3/4 hub Add all PCI2PCI bridge limit/current resource codes (PPBridge_*), now is BAR setup okay, and Device_* must be implement Support ISA+VGA legacy decode, 20+64-bit decode, ROM BAR, prefetch BAR Modified: trunk/reactos/drivers/bus/pcix/pci.h trunk/reactos/drivers/bus/pcix/pci/ppbridge.c trunk/reactos/drivers/bus/pcix/utils.c Modified: trunk/reactos/drivers/bus/pcix/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci.h?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] Tue Jul 27 03:24:24 2010 @@ -1072,6 +1072,14 @@ BOOLEAN NTAPI +PciCreateIoDescriptorFromBarLimit( + PIO_RESOURCE_DESCRIPTOR ResourceDescriptor, + IN PULONG BarArray, + IN BOOLEAN Rom +); + +BOOLEAN +NTAPI PciIsSlotPresentInParentMethod( IN PPCI_PDO_EXTENSION PdoExtension, IN ULONG Method Modified: trunk/reactos/drivers/bus/pcix/pci/ppbridge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/ppbri… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/ppbridge.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/ppbridge.c [iso-8859-1] Tue Jul 27 03:24:24 2010 @@ -16,36 +16,612 @@ /* FUNCTIONS ******************************************************************/ +ULONG +NTAPI +PciBridgeIoBase(IN PPCI_COMMON_HEADER PciData) +{ + BOOLEAN Is32Bit; + ULONG Base, IoBase; + ASSERT(PCI_CONFIGURATION_TYPE(PciData) == PCI_BRIDGE_TYPE); + + /* Get the base */ + Base = PciData->u.type1.IOLimit; + + /* Low bit specifies 32-bit address, top bits specify the base */ + Is32Bit = (Base & 0xF) == 1; + IoBase = (Base & 0xF0) << 8; + + /* Is it 32-bit? */ + if (Is32Bit) + { + /* Read the upper 16-bits from the other register */ + IoBase |= PciData->u.type1.IOBaseUpper16 << 16; + ASSERT(PciData->u.type1.IOLimit & 0x1); + } + + /* Return the base address */ + return IoBase; +} + +ULONG +NTAPI +PciBridgeIoLimit(IN PPCI_COMMON_HEADER PciData) +{ + BOOLEAN Is32Bit; + ULONG Limit, IoLimit; + ASSERT(PCI_CONFIGURATION_TYPE(PciData) == PCI_BRIDGE_TYPE); + + /* Get the limit */ + Limit = PciData->u.type1.IOLimit; + + /* Low bit specifies 32-bit address, top bits specify the limit */ + Is32Bit = (Limit & 0xF) == 1; + IoLimit = (Limit & 0xF0) << 8; + + /* Is it 32-bit? */ + if (Is32Bit) + { + /* Read the upper 16-bits from the other register */ + IoLimit |= PciData->u.type1.IOLimitUpper16 << 16; + ASSERT(PciData->u.type1.IOBase & 0x1); + } + + /* Return the I/O limit */ + return IoLimit | 0xFFF; +} + +ULONG +NTAPI +PciBridgeMemoryBase(IN PPCI_COMMON_HEADER PciData) +{ + ASSERT(PCI_CONFIGURATION_TYPE(PciData) == PCI_BRIDGE_TYPE); + + /* Return the memory base */ + return (PciData->u.type1.MemoryBase << 16); +} + +ULONG +NTAPI +PciBridgeMemoryLimit(IN PPCI_COMMON_HEADER PciData) +{ + ASSERT(PCI_CONFIGURATION_TYPE(PciData) == PCI_BRIDGE_TYPE); + + /* Return the memory limit */ + return (PciData->u.type1.MemoryLimit << 16) | 0xFFFFF; +} + +PHYSICAL_ADDRESS +NTAPI +PciBridgePrefetchMemoryBase(IN PPCI_COMMON_HEADER PciData) +{ + BOOLEAN Is64Bit; + LARGE_INTEGER Base; + USHORT PrefetchBase; + ASSERT(PCI_CONFIGURATION_TYPE(PciData) == PCI_BRIDGE_TYPE); + + /* Get the base */ + PrefetchBase = PciData->u.type1.PrefetchBase; + + /* Low bit specifies 64-bit address, top bits specify the base */ + Is64Bit = (PrefetchBase & 0xF) == 1; + Base.LowPart = ((PrefetchBase & 0xFFF0) << 16); + + /* Is it 64-bit? */ + if (Is64Bit) + { + /* Read the upper 32-bits from the other register */ + Base.HighPart = PciData->u.type1.PrefetchBaseUpper32; + } + + /* Return the base */ + return Base; +} + +PHYSICAL_ADDRESS +NTAPI +PciBridgePrefetchMemoryLimit(IN PPCI_COMMON_HEADER PciData) +{ + BOOLEAN Is64Bit; + LARGE_INTEGER Limit; + USHORT PrefetchLimit; + ASSERT(PCI_CONFIGURATION_TYPE(PciData) == PCI_BRIDGE_TYPE); + + /* Get the base */ + PrefetchLimit = PciData->u.type1.PrefetchLimit; + + /* Low bit specifies 64-bit address, top bits specify the limit */ + Is64Bit = (PrefetchLimit & 0xF) == 1; + Limit.LowPart = (PrefetchLimit << 16) | 0xFFFFF; + + /* Is it 64-bit? */ + if (Is64Bit) + { + /* Read the upper 32-bits from the other register */ + Limit.HighPart = PciData->u.type1.PrefetchLimitUpper32; + } + + /* Return the limit */ + return Limit; +} + +ULONG +NTAPI +PciBridgeMemoryWorstCaseAlignment(IN ULONG Length) +{ + ULONG Alignment; + ASSERT(Length != 0); + + /* Start with highest alignment (2^31) */ + Alignment = 0x80000000; + + /* Keep dividing until we reach the correct power of two */ + while (!(Length & Alignment)) Alignment >>= 1; + + /* Return the alignment */ + return Alignment; +} + +BOOLEAN +NTAPI +PciBridgeIsPositiveDecode(IN PPCI_PDO_EXTENSION PdoExtension) +{ + /* Undocumented ACPI Method PDEC to get positive decode settings */ + return PciIsSlotPresentInParentMethod(PdoExtension, 'CEDP'); +} + +BOOLEAN +NTAPI +PciBridgeIsSubtractiveDecode(IN PPCI_CONFIGURATOR_CONTEXT Context) +{ + PPCI_COMMON_HEADER Current, PciData; + PPCI_PDO_EXTENSION PdoExtension; + + /* Get pointers from context */ + Current = Context->Current; + PciData = Context->PciData; + PdoExtension = Context->PdoExtension; + + /* Only valid for PCI-to-PCI bridges */ + ASSERT((Current->BaseClass == PCI_CLASS_BRIDGE_DEV) && + (Current->SubClass == PCI_SUBCLASS_BR_PCI_TO_PCI)); + + /* Check for hacks first, then check the ProgIf of the bridge */ + if (!(PdoExtension->HackFlags & PCI_HACK_SUBTRACTIVE_DECODE) && + (Current->ProgIf != 1) && + ((PciData->u.type1.IOLimit & 0xF0) == 0xF0)) + { + /* A subtractive decode bridge would have a ProgIf 1, and no I/O limit */ + DPRINT("Subtractive decode does not seem to be enabled\n"); + return FALSE; + } + + /* + * Check for Intel ICH PCI-to-PCI (i82801) bridges (used on the i810, + * i820, i840, i845 Chipsets) that have subtractive decode broken. + */ + if (((PdoExtension->VendorId == 0x8086) && + ((PdoExtension->DeviceId == 0x2418) || + (PdoExtension->DeviceId == 0x2428) || + (PdoExtension->DeviceId == 0x244E) || + (PdoExtension->DeviceId == 0x2448))) || + (PdoExtension->HackFlags & PCI_HACK_BROKEN_SUBTRACTIVE_DECODE)) + { + /* Check if the ACPI BIOS says positive decode should be enabled */ + if (PciBridgeIsPositiveDecode(PdoExtension)) + { + /* Obey ACPI */ + DPRINT1("Putting bridge in positive decode because of PDEC\n"); + return FALSE; + } + } + + /* If we found subtractive decode, we'll need a resource update later */ + DPRINT1("PCI : Subtractive decode on 0x%x\n", Current->u.type1.SecondaryBus); + PdoExtension->UpdateHardware = TRUE; + return TRUE; +} + VOID NTAPI PPBridge_SaveCurrentSettings(IN PPCI_CONFIGURATOR_CONTEXT Context) { - UNIMPLEMENTED; - while (TRUE); + NTSTATUS Status; + PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDescriptor; + PIO_RESOURCE_DESCRIPTOR IoDescriptor; + PPCI_FUNCTION_RESOURCES Resources; + PCI_COMMON_HEADER BiosData; + PPCI_COMMON_HEADER Current; + PPCI_COMMON_CONFIG SavedConfig; + ULONG i, Bar, BarMask; + PULONG BarArray; + PHYSICAL_ADDRESS Limit, Base, Length; + BOOLEAN HaveIoLimit, CheckAlignment; + PPCI_PDO_EXTENSION PdoExtension; + + /* Get the pointers from the extension */ + PdoExtension = Context->PdoExtension; + Resources = PdoExtension->Resources; + Current = Context->Current; + + /* Check if decodes are disabled */ + if (!(Context->Command & (PCI_ENABLE_IO_SPACE | PCI_ENABLE_MEMORY_SPACE))) + { + /* Well, we're going to need them from somewhere, use the registry data */ + Status = PciGetBiosConfig(PdoExtension, &BiosData); + if (NT_SUCCESS(Status)) Current = &BiosData; + } + + /* Scan all current and limit descriptors for each BAR needed */ + BarArray = Current->u.type1.BaseAddresses; + for (i = 0; i < 6; i++) + { + /* Get the current resource descriptor, and the limit requirement */ + CmDescriptor = &Resources->Current[i]; + IoDescriptor = &Resources->Limit[i]; + + /* Copy descriptor data, skipping null descriptors */ + CmDescriptor->Type = IoDescriptor->Type; + if (CmDescriptor->Type == CmResourceTypeNull) continue; + CmDescriptor->Flags = IoDescriptor->Flags; + CmDescriptor->ShareDisposition = IoDescriptor->ShareDisposition; + + /* Initialize the high-parts to zero, since most stuff is 32-bit only */ + Base.QuadPart = Limit.QuadPart = Length.QuadPart = 0; + + /* Check if we're handling PCI BARs, or the ROM BAR */ + if ((i < PCI_TYPE1_ADDRESSES) || (i == 5)) + { + /* Is this the ROM BAR? */ + if (i == 5) + { + /* Read the correct bar, with the appropriate mask */ + Bar = Current->u.type1.ROMBaseAddress; + BarMask = PCI_ADDRESS_ROM_ADDRESS_MASK; + + /* Decode the base address, and write down the length */ + Base.LowPart = Bar & BarMask; + DPRINT1("ROM BAR Base: %lx\n", Base.LowPart); + CmDescriptor->u.Memory.Length = IoDescriptor->u.Memory.Length; + } + else + { + /* Otherwise, get the BAR from the array */ + Bar = BarArray[i]; + + /* Is this an I/O BAR? */ + if (Bar & PCI_ADDRESS_IO_SPACE) + { + /* Set the correct mask */ + ASSERT(CmDescriptor->Type == CmResourceTypePort); + BarMask = PCI_ADDRESS_IO_ADDRESS_MASK; + } + else + { + /* This is a memory BAR, set the correct base */ + ASSERT(CmDescriptor->Type == CmResourceTypeMemory); + BarMask = PCI_ADDRESS_MEMORY_ADDRESS_MASK; + + /* IS this a 64-bit BAR? */ + if ((Bar & PCI_ADDRESS_MEMORY_TYPE_MASK) == PCI_TYPE_64BIT) + { + /* Read the next 32-bits as well, ie, the next BAR */ + Base.HighPart = BarArray[i + 1]; + } + } + + /* Decode the base address, and write down the length */ + Base.LowPart = Bar & BarMask; + DPRINT1("BAR Base: %lx\n", Base.LowPart); + CmDescriptor->u.Generic.Length = IoDescriptor->u.Generic.Length; + } + } + else + { + /* Reset loop conditions */ + HaveIoLimit = FALSE; + CheckAlignment = FALSE; + + /* Check which descriptor is being parsed */ + if (i == 2) + { + /* I/O Port Requirements */ + Base.LowPart = PciBridgeIoBase(Current); + Limit.LowPart = PciBridgeIoLimit(Current); + DPRINT1("Bridge I/O Base and Limit: %lx %lx\n", + Base.LowPart, Limit.LowPart); + + /* Do we have any I/O Port data? */ + if (!(Base.LowPart) && (Current->u.type1.IOLimit)) + { + /* There's a limit */ + HaveIoLimit = TRUE; + } + } + else if (i == 3) + { + /* Memory requirements */ + Base.LowPart = PciBridgeMemoryBase(Current); + Limit.LowPart = PciBridgeMemoryLimit(Current); + + /* These should always be there, so check their alignment */ + DPRINT1("Bridge MEM Base and Limit: %lx %lx\n", + Base.LowPart, Limit.LowPart); + CheckAlignment = TRUE; + } + else if (i == 4) + { + /* This should only be present for prefetch memory */ + ASSERT(CmDescriptor->Flags & CM_RESOURCE_MEMORY_PREFETCHABLE); + Base = PciBridgePrefetchMemoryBase(Current); + Limit = PciBridgePrefetchMemoryLimit(Current); + + /* If it's there, check the alignment */ + DPRINT1("Bridge Prefetch MEM Base and Limit: %I64x %I64x\n", Base, Limit); + CheckAlignment = TRUE; + } + + /* Check for invalid base address */ + if (Base.QuadPart >= Limit.QuadPart) + { + /* Assume the descriptor is bogus */ + CmDescriptor->Type = CmResourceTypeNull; + IoDescriptor->Type = CmResourceTypeNull; + continue; + } + + /* Check if there's no memory, and no I/O port either */ + if (!(Base.LowPart) && !(HaveIoLimit)) + { + /* This seems like a bogus requirement, ignore it */ + CmDescriptor->Type = CmResourceTypeNull; + continue; + } + + /* Set the length to be the limit - the base; should always be 32-bit */ + Length.QuadPart = Limit.LowPart - Base.LowPart + 1; + ASSERT(Length.HighPart == 0); + CmDescriptor->u.Generic.Length = Length.LowPart; + + /* Check if alignment should be set */ + if (CheckAlignment) + { + /* Compute the required alignment for this length */ + ASSERT(CmDescriptor->u.Memory.Length > 0); + IoDescriptor->u.Memory.Alignment = + PciBridgeMemoryWorstCaseAlignment(CmDescriptor->u.Memory.Length); + } + } + + /* Now set the base address */ + CmDescriptor->u.Generic.Start.LowPart = Base.LowPart; + } + + /* Save PCI settings into the PDO extension for easy access later */ + PdoExtension->Dependent.type1.PrimaryBus = Current->u.type1.PrimaryBus; + PdoExtension->Dependent.type1.SecondaryBus = Current->u.type1.SecondaryBus; + PdoExtension->Dependent.type1.SubordinateBus = Current->u.type1.SubordinateBus; + + /* Check for subtractive decode bridges */ + if (PdoExtension->Dependent.type1.SubtractiveDecode) + { + /* Check if legacy VGA decodes are enabled */ + DPRINT1("Subtractive decode bridge\n"); + if (Current->u.type1.BridgeControl & PCI_ENABLE_BRIDGE_VGA) + { + /* Save this setting for later */ + DPRINT1("VGA Bridge\n"); + PdoExtension->Dependent.type1.VgaBitSet = TRUE; + } + + /* Legacy ISA decoding is not compatible with subtractive decode */ + ASSERT(PdoExtension->Dependent.type1.IsaBitSet == FALSE); + } + else + { + /* Check if legacy VGA decodes are enabled */ + if (Current->u.type1.BridgeControl & PCI_ENABLE_BRIDGE_VGA) + { + /* Save this setting for later */ + DPRINT1("VGA Bridge\n"); + PdoExtension->Dependent.type1.VgaBitSet = TRUE; + + /* And on positive decode, we'll also need extra resources locked */ + PdoExtension->AdditionalResourceCount = 4; + } + + /* Check if legacy ISA decoding is enabled */ + if (Current->u.type1.BridgeControl & PCI_ENABLE_BRIDGE_ISA) + { + /* Save this setting for later */ + DPRINT1("ISA Bridge\n"); + PdoExtension->Dependent.type1.IsaBitSet = TRUE; + } + } + + /* + * Check for Intel ICH PCI-to-PCI (i82801) bridges (used on the i810, + * i820, i840, i845 Chipsets) that have subtractive decode broken. + */ + if (((PdoExtension->VendorId == 0x8086) && + ((PdoExtension->DeviceId == 0x2418) || + (PdoExtension->DeviceId == 0x2428) || + (PdoExtension->DeviceId == 0x244E) || + (PdoExtension->DeviceId == 0x2448))) || + (PdoExtension->HackFlags & PCI_HACK_BROKEN_SUBTRACTIVE_DECODE)) + { + /* Check if subtractive decode is actually enabled */ + if (PdoExtension->Dependent.type1.SubtractiveDecode) + { + /* We're going to need a copy of the configuration for later use */ + DPRINT1("apply config save hack to ICH subtractive decode\n"); + SavedConfig = ExAllocatePoolWithTag(0, PCI_COMMON_HDR_LENGTH, 'PciP'); + PdoExtension->ParentFdoExtension->PreservedConfig = SavedConfig; + if (SavedConfig) RtlCopyMemory(SavedConfig, Current, PCI_COMMON_HDR_LENGTH); + } + } } VOID NTAPI PPBridge_SaveLimits(IN PPCI_CONFIGURATOR_CONTEXT Context) { - UNIMPLEMENTED; - while (TRUE); + PIO_RESOURCE_DESCRIPTOR Limit; + PULONG BarArray; + PHYSICAL_ADDRESS MemoryLimit; + ULONG i; + PPCI_COMMON_HEADER Working; + PPCI_PDO_EXTENSION PdoExtension; + + /* Get the pointers from the context */ + Working = Context->PciData; + PdoExtension = Context->PdoExtension; + + /* Scan the BARs into the limit descriptors */ + BarArray = Working->u.type1.BaseAddresses; + Limit = PdoExtension->Resources->Limit; + + /* First of all, loop all the BARs */ + for (i = 0; i < PCI_TYPE1_ADDRESSES; i++) + { + /* Create a descriptor for their limits */ + if (PciCreateIoDescriptorFromBarLimit(&Limit[i], &BarArray[i], FALSE)) + { + /* This was a 64-bit descriptor, make sure there's space */ + ASSERT((i + 1) < PCI_TYPE1_ADDRESSES); + + /* Skip the next descriptor since this one is double sized */ + i++; + (&Limit[i])->Type == CmResourceTypeNull; + } + } + + /* Check if this is a subtractive decode bridge */ + if (PciBridgeIsSubtractiveDecode(Context)) + { + /* This bridge is subtractive */ + PdoExtension->Dependent.type1.SubtractiveDecode = TRUE; + + /* Subtractive bridges cannot use legacy ISA or VGA functionality */ + PdoExtension->Dependent.type1.IsaBitSet = FALSE; + PdoExtension->Dependent.type1.VgaBitSet = FALSE; + } + + /* For normal decode bridges, we'll need to find the bridge limits too */ + if (!PdoExtension->Dependent.type1.SubtractiveDecode) + { + /* Loop the descriptors that are left, to store the bridge limits */ + for (i = PCI_TYPE1_ADDRESSES; i < 5; i++) + { + /* No 64-bit memory addresses, and set the address to 0 to begin */ + MemoryLimit.HighPart = 0; + (&Limit[i])->u.Port.MinimumAddress.QuadPart = 0; + + /* Are we getting the I/O limit? */ + if (i == 2) + { + /* There should be one, get it */ + ASSERT(Working->u.type1.IOLimit != 0); + ASSERT((Working->u.type1.IOLimit & 0x0E) == 0); + MemoryLimit.LowPart = PciBridgeIoLimit(Working); + + /* Build a descriptor for this limit */ + (&Limit[i])->Type = CmResourceTypePort; + (&Limit[i])->Flags = CM_RESOURCE_PORT_WINDOW_DECODE | + CM_RESOURCE_PORT_POSITIVE_DECODE; + (&Limit[i])->u.Port.Alignment = 0x1000; + (&Limit[i])->u.Port.MinimumAddress.QuadPart = 0; + (&Limit[i])->u.Port.MaximumAddress = MemoryLimit; + (&Limit[i])->u.Port.Length = 0; + } + else if (i == 3) + { + /* There should be a valid memory limit, get it */ + ASSERT((Working->u.type1.MemoryLimit & 0xF) == 0); + MemoryLimit.LowPart = PciBridgeMemoryLimit(Working); + + /* Build the descriptor for it */ + (&Limit[i])->Flags = CM_RESOURCE_MEMORY_READ_WRITE; + (&Limit[i])->Type = CmResourceTypeMemory; + (&Limit[i])->u.Memory.Alignment = 0x100000; + (&Limit[i])->u.Memory.MinimumAddress.QuadPart = 0; + (&Limit[i])->u.Memory.MaximumAddress = MemoryLimit; + (&Limit[i])->u.Memory.Length = 0; + } + else if (Working->u.type1.PrefetchLimit) + { + /* Get the prefetch memory limit, if there is one */ + MemoryLimit = PciBridgePrefetchMemoryLimit(Working); + + /* Write out the descriptor for it */ + (&Limit[i])->Flags = CM_RESOURCE_MEMORY_PREFETCHABLE; + (&Limit[i])->Type = CmResourceTypeMemory; + (&Limit[i])->u.Memory.Alignment = 0x100000; + (&Limit[i])->u.Memory.MinimumAddress.QuadPart = 0; + (&Limit[i])->u.Memory.MaximumAddress = MemoryLimit; + (&Limit[i])->u.Memory.Length = 0; + } + else + { + /* Blank descriptor */ + (&Limit[i])->Type = CmResourceTypeNull; + } + } + } + + /* Does the ROM have its own BAR? */ + if (Working->u.type1.ROMBaseAddress & PCI_ROMADDRESS_ENABLED) + { + /* Build a limit for it as well */ + PciCreateIoDescriptorFromBarLimit(&Limit[i], + &Working->u.type1.ROMBaseAddress, + TRUE); + } } VOID NTAPI PPBridge_MassageHeaderForLimitsDetermination(IN PPCI_CONFIGURATOR_CONTEXT Context) { - UNIMPLEMENTED; - while (TRUE); + PPCI_COMMON_HEADER PciData, Current; + + /* Get pointers from context */ + PciData = Context->PciData; + Current = Context->Current; + + /* + * Write FFh everywhere so that the PCI bridge ignores what it can't handle. + * Based on the bits that were ignored (still 0), this is how we can tell + * what the limit is. + */ + RtlFillMemory(PciData->u.type1.BaseAddresses, + FIELD_OFFSET(PCI_COMMON_HEADER, u.type1.CapabilitiesPtr) - + FIELD_OFFSET(PCI_COMMON_HEADER, u.type1.BaseAddresses), + 0xFF); + + /* Copy the saved settings from the current context into the PCI header */ + PciData->u.type1.PrimaryBus = Current->u.type1.PrimaryBus; + PciData->u.type1.SecondaryBus = Current->u.type1.SecondaryBus; + PciData->u.type1.SubordinateBus = Current->u.type1.SubordinateBus; + PciData->u.type1.SecondaryLatency = Current->u.type1.SecondaryLatency; + + /* No I/O limit or base. The bottom base bit specifies that FIXME */ + PciData->u.type1.IOBaseUpper16 = 0xFFFE; + PciData->u.type1.IOLimitUpper16 = 0xFFFF; + + /* Save secondary status before it gets cleared */ + Context->SecondaryStatus = Current->u.type1.SecondaryStatus; + + /* Clear secondary status */ + Current->u.type1.SecondaryStatus = 0; + PciData->u.type1.SecondaryStatus = 0; } VOID NTAPI PPBridge_RestoreCurrent(IN PPCI_CONFIGURATOR_CONTEXT Context) { - UNIMPLEMENTED; - while (TRUE); + /* Copy back the secondary status register */ + Context->Current->u.type1.SecondaryStatus = Context->SecondaryStatus; } VOID @@ -54,24 +630,56 @@ IN PPCI_COMMON_HEADER PciData, IN PIO_RESOURCE_DESCRIPTOR IoDescriptor) { + /* Does this bridge have VGA decodes on it? */ + if (PciData->u.type1.BridgeControl & PCI_ENABLE_BRIDGE_VGA) + { + /* Build a private descriptor with 3 entries */ + IoDescriptor->Type = CmResourceTypeDevicePrivate; + IoDescriptor->u.DevicePrivate.Data[0] = 3; + IoDescriptor->u.DevicePrivate.Data[1] = 3; + + /* First, the VGA range at 0xA0000 */ + IoDescriptor[1].Type = CmResourceTypeMemory; + IoDescriptor[1].Flags = CM_RESOURCE_MEMORY_READ_WRITE; + IoDescriptor[1].u.Port.Length = 0x20000; + IoDescriptor[1].u.Port.Alignment = 1; + IoDescriptor[1].u.Port.MinimumAddress.QuadPart = 0xA0000; + IoDescriptor[1].u.Port.MaximumAddress.QuadPart = 0xBFFFF; + + /* Then, the VGA registers at 0x3B0 */ + IoDescriptor[2].Type = CmResourceTypePort; + IoDescriptor[2].Flags = CM_RESOURCE_PORT_POSITIVE_DECODE | + CM_RESOURCE_PORT_10_BIT_DECODE; + IoDescriptor[2].u.Port.Length = 12; + IoDescriptor[2].u.Port.Alignment = 1; + IoDescriptor[2].u.Port.MinimumAddress.QuadPart = 0x3B0; + IoDescriptor[2].u.Port.MaximumAddress.QuadPart = 0x3BB; + + /* And finally the VGA registers at 0x3C0 */ + IoDescriptor[3].Type = CmResourceTypePort; + IoDescriptor[3].Flags = CM_RESOURCE_PORT_POSITIVE_DECODE | + CM_RESOURCE_PORT_10_BIT_DECODE; + IoDescriptor[3].u.Port.Length = 32; + IoDescriptor[3].u.Port.Alignment = 1; + IoDescriptor[3].u.Port.MinimumAddress.QuadPart = 0x3C0; + IoDescriptor[3].u.Port.MaximumAddress.QuadPart = 0x3DF; + } +} + +VOID +NTAPI +PPBridge_ResetDevice(IN PPCI_CONFIGURATOR_CONTEXT Context) +{ UNIMPLEMENTED; while (TRUE); } VOID NTAPI -PPBridge_ResetDevice(IN PPCI_CONFIGURATOR_CONTEXT Context) +PPBridge_ChangeResourceSettings(IN PPCI_CONFIGURATOR_CONTEXT Context) { UNIMPLEMENTED; while (TRUE); } -VOID -NTAPI -PPBridge_ChangeResourceSettings(IN PPCI_CONFIGURATOR_CONTEXT Context) -{ - UNIMPLEMENTED; - while (TRUE); -} - /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/utils.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] Tue Jul 27 03:24:24 2010 @@ -1130,6 +1130,115 @@ return FoundSlot; } +ULONG +NTAPI +PciGetLengthFromBar(IN ULONG Bar) +{ + ULONG Length; + + /* I/O addresses vs. memory addresses start differently due to alignment */ + Length = 1 << ((Bar & PCI_ADDRESS_IO_SPACE) ? 2 : 4); + + /* Keep going until a set bit */ + while (!(Length & Bar) && (Length)) Length <<= 1; + + /* Return the length (might be 0 on 64-bit because it's the low-word) */ + if ((Bar & PCI_ADDRESS_MEMORY_TYPE_MASK) != PCI_TYPE_64BIT) ASSERT(Length); + return Length; +} + +BOOLEAN +NTAPI +PciCreateIoDescriptorFromBarLimit(PIO_RESOURCE_DESCRIPTOR ResourceDescriptor, + IN PULONG BarArray, + IN BOOLEAN Rom) +{ + ULONG CurrentBar, BarLength, BarMask; + BOOLEAN Is64BitBar = FALSE; + + /* Check if the BAR is nor I/O nor memory */ + CurrentBar = BarArray[0]; + if (!(CurrentBar & ~PCI_ADDRESS_IO_SPACE)) + { + /* Fail this descriptor */ + ResourceDescriptor->Type = CmResourceTypeNull; + return FALSE; + } + + /* Set default flag and clear high words */ + ResourceDescriptor->Flags = 0; + ResourceDescriptor->u.Generic.MaximumAddress.HighPart = 0; + ResourceDescriptor->u.Generic.MinimumAddress.LowPart = 0; + ResourceDescriptor->u.Generic.MinimumAddress.HighPart = 0; + + /* Check for ROM Address */ + if (Rom) + { + /* Clean up the BAR to get just the address */ + CurrentBar &= PCI_ADDRESS_ROM_ADDRESS_MASK; + if (!CurrentBar) + { + /* Invalid ar, fail this descriptor */ + ResourceDescriptor->Type = CmResourceTypeNull; + return FALSE; + } + + /* ROM Addresses are always read only */ + ResourceDescriptor->Flags = CM_RESOURCE_MEMORY_READ_ONLY; + } + + /* Compute the length, assume it's the alignment for now */ + BarLength = PciGetLengthFromBar(CurrentBar); + ResourceDescriptor->u.Generic.Length = BarLength; + ResourceDescriptor->u.Generic.Alignment = BarLength; + + /* Check what kind of BAR this is */ + if (CurrentBar & PCI_ADDRESS_IO_SPACE) + { + /* Use correct mask to decode the address */ + BarMask = PCI_ADDRESS_IO_ADDRESS_MASK; + + /* Set this as an I/O Port descriptor */ + ResourceDescriptor->Type = CmResourceTypePort; + ResourceDescriptor->Flags = CM_RESOURCE_PORT_IO; + } + else + { + /* Use correct mask to decode the address */ + BarMask = PCI_ADDRESS_MEMORY_ADDRESS_MASK; + + /* Set this as a memory descriptor */ + ResourceDescriptor->Type = CmResourceTypeMemory; + + /* Check if it's 64-bit or 20-bit decode */ + if ((CurrentBar & PCI_ADDRESS_MEMORY_TYPE_MASK) == PCI_TYPE_64BIT) + { + /* The next BAR has the high word, read it */ + ResourceDescriptor->u.Port.MaximumAddress.HighPart = BarArray[1]; + Is64BitBar = TRUE; + } + else if ((CurrentBar & PCI_ADDRESS_MEMORY_TYPE_MASK) == PCI_TYPE_20BIT) + { + /* Use the correct mask to decode the address */ + BarMask = ~0xFFF0000F; + } + + /* Check if the BAR is listed as prefetchable memory */ + if (CurrentBar & PCI_ADDRESS_MEMORY_PREFETCHABLE) + { + /* Mark the descriptor in the same way */ + ResourceDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; + } + } + + /* Now write down the maximum address based on the base + length */ + ResourceDescriptor->u.Port.MaximumAddress.QuadPart = (CurrentBar & BarMask) + + BarLength - 1; + + /* Return if this is a 64-bit BAR, so the loop code knows to skip the next one */ + return Is64BitBar; +} + VOID NTAPI PciDecodeEnable(IN PPCI_PDO_EXTENSION PdoExtension,

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