Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 47688: [ZLIB] Revert r47411. This is a test to see if it fixes the sysreg crash in 1st stage.
by tkreuzer＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: tkreuzer Date: Tue Jun 8 01:39:37 2010 New Revision: 47688 URL: http://svn.reactos.org/svn/reactos?rev=47688&view=rev Log: [ZLIB] Revert r47411. This is a test to see if it fixes the sysreg crash in 1st stage. Added: trunk/reactos/lib/3rdparty/zlib/Makefile.host - copied unchanged from r47410, trunk/reactos/lib/3rdparty/zlib/Makefile.host trunk/reactos/lib/3rdparty/zlib/gzio.c - copied unchanged from r47410, trunk/reactos/lib/3rdparty/zlib/gzio.c trunk/reactos/lib/3rdparty/zlib/zconf.in.h - copied unchanged from r47410, trunk/reactos/lib/3rdparty/zlib/zconf.in.h Removed: trunk/reactos/lib/3rdparty/zlib/gzclose.c trunk/reactos/lib/3rdparty/zlib/gzguts.h trunk/reactos/lib/3rdparty/zlib/gzlib.c trunk/reactos/lib/3rdparty/zlib/gzread.c trunk/reactos/lib/3rdparty/zlib/gzwrite.c Modified: trunk/reactos/lib/3rdparty/zlib/ChangeLog trunk/reactos/lib/3rdparty/zlib/FAQ trunk/reactos/lib/3rdparty/zlib/INDEX trunk/reactos/lib/3rdparty/zlib/Makefile.in trunk/reactos/lib/3rdparty/zlib/README trunk/reactos/lib/3rdparty/zlib/adler32.c trunk/reactos/lib/3rdparty/zlib/algorithm.txt trunk/reactos/lib/3rdparty/zlib/compress.c trunk/reactos/lib/3rdparty/zlib/configure trunk/reactos/lib/3rdparty/zlib/crc32.c trunk/reactos/lib/3rdparty/zlib/deflate.c trunk/reactos/lib/3rdparty/zlib/deflate.h trunk/reactos/lib/3rdparty/zlib/example.c trunk/reactos/lib/3rdparty/zlib/infback.c trunk/reactos/lib/3rdparty/zlib/inffast.c trunk/reactos/lib/3rdparty/zlib/inffast.h trunk/reactos/lib/3rdparty/zlib/inflate.c trunk/reactos/lib/3rdparty/zlib/inflate.h trunk/reactos/lib/3rdparty/zlib/inftrees.c trunk/reactos/lib/3rdparty/zlib/inftrees.h trunk/reactos/lib/3rdparty/zlib/minigzip.c trunk/reactos/lib/3rdparty/zlib/trees.c trunk/reactos/lib/3rdparty/zlib/uncompr.c trunk/reactos/lib/3rdparty/zlib/zconf.h trunk/reactos/lib/3rdparty/zlib/zlib.h trunk/reactos/lib/3rdparty/zlib/zlib.rbuild trunk/reactos/lib/3rdparty/zlib/zutil.c trunk/reactos/lib/3rdparty/zlib/zutil.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/lib/3rdparty/zlib/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/ChangeLo… Modified: trunk/reactos/lib/3rdparty/zlib/FAQ URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/FAQ?rev=… Modified: trunk/reactos/lib/3rdparty/zlib/INDEX URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/INDEX?re… Modified: trunk/reactos/lib/3rdparty/zlib/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/Makefile… Modified: trunk/reactos/lib/3rdparty/zlib/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/README?r… Modified: trunk/reactos/lib/3rdparty/zlib/adler32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/adler32.… Modified: trunk/reactos/lib/3rdparty/zlib/algorithm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/algorith… Modified: trunk/reactos/lib/3rdparty/zlib/compress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/compress… Modified: trunk/reactos/lib/3rdparty/zlib/configure URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/configur… Modified: trunk/reactos/lib/3rdparty/zlib/crc32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/crc32.c?… Modified: trunk/reactos/lib/3rdparty/zlib/deflate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/deflate.… Modified: trunk/reactos/lib/3rdparty/zlib/deflate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/deflate.… Modified: trunk/reactos/lib/3rdparty/zlib/example.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/example.… Removed: trunk/reactos/lib/3rdparty/zlib/gzclose.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/gzclose.… Removed: trunk/reactos/lib/3rdparty/zlib/gzguts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/gzguts.h… Removed: trunk/reactos/lib/3rdparty/zlib/gzlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/gzlib.c?… Removed: trunk/reactos/lib/3rdparty/zlib/gzread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/gzread.c… Removed: trunk/reactos/lib/3rdparty/zlib/gzwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/gzwrite.… Modified: trunk/reactos/lib/3rdparty/zlib/infback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/infback.… Modified: trunk/reactos/lib/3rdparty/zlib/inffast.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/inffast.… Modified: trunk/reactos/lib/3rdparty/zlib/inffast.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/inffast.… Modified: trunk/reactos/lib/3rdparty/zlib/inflate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/inflate.… Modified: trunk/reactos/lib/3rdparty/zlib/inflate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/inflate.… Modified: trunk/reactos/lib/3rdparty/zlib/inftrees.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/inftrees… Modified: trunk/reactos/lib/3rdparty/zlib/inftrees.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/inftrees… Modified: trunk/reactos/lib/3rdparty/zlib/minigzip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/minigzip… Modified: trunk/reactos/lib/3rdparty/zlib/trees.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/trees.c?… Modified: trunk/reactos/lib/3rdparty/zlib/uncompr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/uncompr.… Modified: trunk/reactos/lib/3rdparty/zlib/zconf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/zconf.h?… Modified: trunk/reactos/lib/3rdparty/zlib/zlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/zlib.h?r… Modified: trunk/reactos/lib/3rdparty/zlib/zlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/zlib.rbu… Modified: trunk/reactos/lib/3rdparty/zlib/zutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/zutil.c?… Modified: trunk/reactos/lib/3rdparty/zlib/zutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/zlib/zutil.h?…

1 0

[janderwald] 47687: [WDMAUD_KERNEL] - Extend the mdl hack
by janderwald＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: janderwald Date: Tue Jun 8 01:00:04 2010 New Revision: 47687 URL: http://svn.reactos.org/svn/reactos?rev=47687&view=rev Log: [WDMAUD_KERNEL] - Extend the mdl hack Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Tue Jun 8 01:00:04 2010 @@ -457,14 +457,15 @@ Status = KsProbeStreamIrp(Irp, KSPROBE_STREAMREAD | KSPROBE_ALLOCATEMDL | KSPROBE_PROBEANDLOCK, Length); } + if (!NT_SUCCESS(Status)) + { + DPRINT1("KsProbeStreamIrp failed with Status %x Cancel %u\n", Status, Irp->Cancel); + Irp->MdlAddress = Mdl; + return SetIrpIoStatus(Irp, Status, 0); + } + /* now free the mdl */ IoFreeMdl(Mdl); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("KsProbeStreamIrp failed with Status %x Cancel %u\n", Status, Irp->Cancel); - return SetIrpIoStatus(Irp, Status, 0); - } /* get device info */ DeviceInfo = (PWDMAUD_DEVICE_INFO)Irp->AssociatedIrp.SystemBuffer;

1 0

[spetreolle] 47686: Revert 47685.
by spetreolle＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: spetreolle Date: Mon Jun 7 23:38:49 2010 New Revision: 47686 URL: http://svn.reactos.org/svn/reactos?rev=47686&view=rev Log: Revert 47685. Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/setup/usetup/chkdsk.c trunk/reactos/base/setup/usetup/drivesup.c trunk/reactos/base/setup/usetup/filequeue.c trunk/reactos/base/setup/usetup/filesup.c trunk/reactos/base/setup/usetup/format.c trunk/reactos/base/setup/usetup/fslist.c trunk/reactos/base/setup/usetup/genlist.c trunk/reactos/base/setup/usetup/inffile.c trunk/reactos/base/setup/usetup/inicache.c trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/progress.c trunk/reactos/base/setup/usetup/registry.c trunk/reactos/base/setup/usetup/settings.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Mon Jun 7 23:38:49 2010 @@ -26,7 +26,7 @@ #include "usetup.h" -#define YDEBUG +#define NDEBUG #include <debug.h> #define SECTORSIZE 512 Modified: trunk/reactos/base/setup/usetup/chkdsk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/chkdsk.c… ============================================================================== --- trunk/reactos/base/setup/usetup/chkdsk.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/chkdsk.c [iso-8859-1] Mon Jun 7 23:38:49 2010 @@ -27,7 +27,7 @@ #include "usetup.h" -#define YDEBUG +#define NDEBUG #include <debug.h> static PPROGRESSBAR ChkdskProgressBar = NULL; Modified: trunk/reactos/base/setup/usetup/drivesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/drivesup… ============================================================================== --- trunk/reactos/base/setup/usetup/drivesup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/drivesup.c [iso-8859-1] Mon Jun 7 23:38:49 2010 @@ -28,7 +28,7 @@ #include "usetup.h" -#define YDEBUG +#define NDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/base/setup/usetup/filequeue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filequeu… ============================================================================== --- trunk/reactos/base/setup/usetup/filequeue.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/filequeue.c [iso-8859-1] Mon Jun 7 23:38:49 2010 @@ -28,7 +28,7 @@ #include "usetup.h" -#define YDEBUG +#define NDEBUG #include <debug.h> /* INCLUDES *****************************************************************/ Modified: trunk/reactos/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filesup.… ============================================================================== --- trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] Mon Jun 7 23:38:49 2010 @@ -28,7 +28,7 @@ #include "usetup.h" -#define YDEBUG +#define NDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/base/setup/usetup/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/format.c… ============================================================================== --- trunk/reactos/base/setup/usetup/format.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/format.c [iso-8859-1] Mon Jun 7 23:38:49 2010 @@ -27,7 +27,7 @@ #include "usetup.h" -#define YDEBUG +#define NDEBUG #include <debug.h> static PPROGRESSBAR FormatProgressBar = NULL; Modified: trunk/reactos/base/setup/usetup/fslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.c… ============================================================================== --- trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] Mon Jun 7 23:38:49 2010 @@ -27,7 +27,7 @@ #include "usetup.h" -#define YDEBUG +#define NDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] Mon Jun 7 23:38:49 2010 @@ -28,7 +28,7 @@ #include "usetup.h" -#define YDEBUG +#define NDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/base/setup/usetup/inffile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inffile.… ============================================================================== --- trunk/reactos/base/setup/usetup/inffile.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/inffile.c [iso-8859-1] Mon Jun 7 23:38:49 2010 @@ -32,7 +32,7 @@ #include <infros.h> #endif -#define YDEBUG +#define NDEBUG #include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/base/setup/usetup/inicache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inicache… ============================================================================== --- trunk/reactos/base/setup/usetup/inicache.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/inicache.c [iso-8859-1] Mon Jun 7 23:38:49 2010 @@ -29,7 +29,7 @@ #include "usetup.h" -#define YDEBUG +#define NDEBUG #include <debug.h> /* PRIVATE FUNCTIONS ********************************************************/ Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Mon Jun 7 23:38:49 2010 @@ -31,7 +31,7 @@ #include "muifonts.h" #include "muilanguages.h" -#define YDEBUG +#define NDEBUG #include <debug.h> extern Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Mon Jun 7 23:38:49 2010 @@ -26,7 +26,7 @@ #include "usetup.h" -#define YDEBUG +#define NDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/base/setup/usetup/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/progress… ============================================================================== --- trunk/reactos/base/setup/usetup/progress.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/progress.c [iso-8859-1] Mon Jun 7 23:38:49 2010 @@ -3,7 +3,7 @@ #include "usetup.h" -#define YDEBUG +#define NDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/base/setup/usetup/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/registry… ============================================================================== --- trunk/reactos/base/setup/usetup/registry.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/registry.c [iso-8859-1] Mon Jun 7 23:38:49 2010 @@ -28,7 +28,7 @@ #include "usetup.h" -#define YDEBUG +#define NDEBUG #include <debug.h> #ifdef __REACTOS__ Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Mon Jun 7 23:38:49 2010 @@ -28,7 +28,7 @@ #include "usetup.h" -#define YDEBUG +#define NDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/

1 0

[spetreolle] 47685: Enable debug in usetup. This will be reverted in next commit.
by spetreolle＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: spetreolle Date: Mon Jun 7 23:36:37 2010 New Revision: 47685 URL: http://svn.reactos.org/svn/reactos?rev=47685&view=rev Log: Enable debug in usetup. This will be reverted in next commit. Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/base/setup/usetup/chkdsk.c trunk/reactos/base/setup/usetup/drivesup.c trunk/reactos/base/setup/usetup/filequeue.c trunk/reactos/base/setup/usetup/filesup.c trunk/reactos/base/setup/usetup/format.c trunk/reactos/base/setup/usetup/fslist.c trunk/reactos/base/setup/usetup/genlist.c trunk/reactos/base/setup/usetup/inffile.c trunk/reactos/base/setup/usetup/inicache.c trunk/reactos/base/setup/usetup/mui.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/progress.c trunk/reactos/base/setup/usetup/registry.c trunk/reactos/base/setup/usetup/settings.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Mon Jun 7 23:36:37 2010 @@ -26,7 +26,7 @@ #include "usetup.h" -#define NDEBUG +#define YDEBUG #include <debug.h> #define SECTORSIZE 512 Modified: trunk/reactos/base/setup/usetup/chkdsk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/chkdsk.c… ============================================================================== --- trunk/reactos/base/setup/usetup/chkdsk.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/chkdsk.c [iso-8859-1] Mon Jun 7 23:36:37 2010 @@ -27,7 +27,7 @@ #include "usetup.h" -#define NDEBUG +#define YDEBUG #include <debug.h> static PPROGRESSBAR ChkdskProgressBar = NULL; Modified: trunk/reactos/base/setup/usetup/drivesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/drivesup… ============================================================================== --- trunk/reactos/base/setup/usetup/drivesup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/drivesup.c [iso-8859-1] Mon Jun 7 23:36:37 2010 @@ -28,7 +28,7 @@ #include "usetup.h" -#define NDEBUG +#define YDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/base/setup/usetup/filequeue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filequeu… ============================================================================== --- trunk/reactos/base/setup/usetup/filequeue.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/filequeue.c [iso-8859-1] Mon Jun 7 23:36:37 2010 @@ -28,7 +28,7 @@ #include "usetup.h" -#define NDEBUG +#define YDEBUG #include <debug.h> /* INCLUDES *****************************************************************/ Modified: trunk/reactos/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filesup.… ============================================================================== --- trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] Mon Jun 7 23:36:37 2010 @@ -28,7 +28,7 @@ #include "usetup.h" -#define NDEBUG +#define YDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/base/setup/usetup/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/format.c… ============================================================================== --- trunk/reactos/base/setup/usetup/format.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/format.c [iso-8859-1] Mon Jun 7 23:36:37 2010 @@ -27,7 +27,7 @@ #include "usetup.h" -#define NDEBUG +#define YDEBUG #include <debug.h> static PPROGRESSBAR FormatProgressBar = NULL; Modified: trunk/reactos/base/setup/usetup/fslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.c… ============================================================================== --- trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] Mon Jun 7 23:36:37 2010 @@ -27,7 +27,7 @@ #include "usetup.h" -#define NDEBUG +#define YDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/base/setup/usetup/genlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/genlist.… ============================================================================== --- trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/genlist.c [iso-8859-1] Mon Jun 7 23:36:37 2010 @@ -28,7 +28,7 @@ #include "usetup.h" -#define NDEBUG +#define YDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/base/setup/usetup/inffile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inffile.… ============================================================================== --- trunk/reactos/base/setup/usetup/inffile.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/inffile.c [iso-8859-1] Mon Jun 7 23:36:37 2010 @@ -32,7 +32,7 @@ #include <infros.h> #endif -#define NDEBUG +#define YDEBUG #include <debug.h> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/base/setup/usetup/inicache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inicache… ============================================================================== --- trunk/reactos/base/setup/usetup/inicache.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/inicache.c [iso-8859-1] Mon Jun 7 23:36:37 2010 @@ -29,7 +29,7 @@ #include "usetup.h" -#define NDEBUG +#define YDEBUG #include <debug.h> /* PRIVATE FUNCTIONS ********************************************************/ Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.c [iso-8859-1] Mon Jun 7 23:36:37 2010 @@ -31,7 +31,7 @@ #include "muifonts.h" #include "muilanguages.h" -#define NDEBUG +#define YDEBUG #include <debug.h> extern Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Mon Jun 7 23:36:37 2010 @@ -26,7 +26,7 @@ #include "usetup.h" -#define NDEBUG +#define YDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/base/setup/usetup/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/progress… ============================================================================== --- trunk/reactos/base/setup/usetup/progress.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/progress.c [iso-8859-1] Mon Jun 7 23:36:37 2010 @@ -3,7 +3,7 @@ #include "usetup.h" -#define NDEBUG +#define YDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/ Modified: trunk/reactos/base/setup/usetup/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/registry… ============================================================================== --- trunk/reactos/base/setup/usetup/registry.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/registry.c [iso-8859-1] Mon Jun 7 23:36:37 2010 @@ -28,7 +28,7 @@ #include "usetup.h" -#define NDEBUG +#define YDEBUG #include <debug.h> #ifdef __REACTOS__ Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Mon Jun 7 23:36:37 2010 @@ -28,7 +28,7 @@ #include "usetup.h" -#define NDEBUG +#define YDEBUG #include <debug.h> /* FUNCTIONS ****************************************************************/

1 0

[sir_richard] 47684: [HAL]: Use Bus Handler support for HalFindBusAddressTranslation. Implement HalpContextToBusHandler to support this. Seems to work fine with bootvid (only user). All the HAL's bus functions now use Bus Handlers on Legacy systems. There are still big issues with PCI cards. eVb: PCI-x should work now. More PCI-related HAL patches may follow later.
by sir_richard＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: sir_richard Date: Mon Jun 7 23:36:31 2010 New Revision: 47684 URL: http://svn.reactos.org/svn/reactos?rev=47684&view=rev Log: [HAL]: Use Bus Handler support for HalFindBusAddressTranslation. Implement HalpContextToBusHandler to support this. Seems to work fine with bootvid (only user). All the HAL's bus functions now use Bus Handlers on Legacy systems. There are still big issues with PCI cards. eVb: PCI-x should work now. More PCI-related HAL patches may follow later. Modified: trunk/reactos/hal/halx86/generic/legacy/bus/bushndlr.c trunk/reactos/hal/halx86/generic/legacy/bussupp.c trunk/reactos/hal/halx86/include/bus.h Modified: trunk/reactos/hal/halx86/generic/legacy/bus/bushndlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bus/bushndlr.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bus/bushndlr.c [iso-8859-1] Mon Jun 7 23:36:31 2010 @@ -199,6 +199,41 @@ { /* Lookup the configuration in the configuration table and add a reference */ return HalpLookupHandler(HalpConfigTable, ConfigType, BusNumber, TRUE); +} + +PBUS_HANDLER +NTAPI +HalpContextToBusHandler(IN ULONG_PTR ContextValue) +{ + PLIST_ENTRY NextEntry; + PHAL_BUS_HANDLER BusHandler, ThisHandler; + + /* Start lookup */ + NextEntry = HalpAllBusHandlers.Flink; + ThisHandler = CONTAINING_RECORD(NextEntry, HAL_BUS_HANDLER, AllHandlers); + if (ContextValue) + { + /* If the list is empty, quit */ + if (IsListEmpty(&HalpAllBusHandlers)) return NULL; + + /* Otherwise, scan the list */ + BusHandler = CONTAINING_RECORD(ContextValue, HAL_BUS_HANDLER, Handler); + do + { + /* Check if we've reached the right one */ + ThisHandler = CONTAINING_RECORD(NextEntry, HAL_BUS_HANDLER, AllHandlers); + if (ThisHandler == BusHandler) break; + + /* Try the next one */ + NextEntry = NextEntry->Flink; + } while (NextEntry != &HalpAllBusHandlers); + } + + /* If we looped back to the end, we didn't find anything */ + if (NextEntry == &HalpAllBusHandlers) return NULL; + + /* Otherwise return the handler */ + return &ThisHandler->Handler; } #ifndef _MINIHAL_ @@ -408,13 +443,7 @@ #endif HalPciAssignSlotResources = HalpAssignSlotResources; HalPciTranslateBusAddress = HaliTranslateBusAddress; /* PCI Driver can override */ - /* FIXME: Fix later */ -#if 0 if (!HalFindBusAddressTranslation) HalFindBusAddressTranslation = HaliFindBusAddressTranslation; -#else - /* These should be written by the PCI driver later, but we give defaults */ - HalFindBusAddressTranslation = HalpFindBusAddressTranslation; -#endif } /* EOF */ Modified: trunk/reactos/hal/halx86/generic/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] Mon Jun 7 23:36:31 2010 @@ -1152,50 +1152,75 @@ BOOLEAN NTAPI -HalpTranslateBusAddress(IN INTERFACE_TYPE InterfaceType, - IN ULONG BusNumber, - IN PHYSICAL_ADDRESS BusAddress, - IN OUT PULONG AddressSpace, - OUT PPHYSICAL_ADDRESS TranslatedAddress) -{ - /* Translation is easy */ - TranslatedAddress->QuadPart = BusAddress.QuadPart; - return TRUE; -} - -ULONG -NTAPI -HalpGetSystemInterruptVector_Acpi(IN ULONG BusNumber, - IN ULONG BusInterruptLevel, - IN ULONG BusInterruptVector, - OUT PKIRQL Irql, - OUT PKAFFINITY Affinity) -{ - ULONG Vector = IRQ2VECTOR(BusInterruptLevel); - *Irql = (KIRQL)VECTOR2IRQL(Vector); - *Affinity = 0xFFFFFFFF; - return Vector; -} - -BOOLEAN -NTAPI -HalpFindBusAddressTranslation(IN PHYSICAL_ADDRESS BusAddress, +HaliFindBusAddressTranslation(IN PHYSICAL_ADDRESS BusAddress, IN OUT PULONG AddressSpace, OUT PPHYSICAL_ADDRESS TranslatedAddress, IN OUT PULONG_PTR Context, IN BOOLEAN NextBus) { + PHAL_BUS_HANDLER BusHandler; + PBUS_HANDLER Handler; + PLIST_ENTRY NextEntry; + ULONG ContextValue; + /* Make sure we have a context */ if (!Context) return FALSE; - - /* If we have data in the context, then this shouldn't be a new lookup */ - if ((*Context) && (NextBus == TRUE)) return FALSE; - - /* Return bus data */ - TranslatedAddress->QuadPart = BusAddress.QuadPart; - - /* Set context value and return success */ - *Context = 1; + ASSERT((*Context) || (NextBus == TRUE)); + + /* Read the context */ + ContextValue = *Context; + + /* Find the bus handler */ + Handler = HalpContextToBusHandler(ContextValue); + if (!Handler) return FALSE; + + /* Check if this is an ongoing lookup */ + if (NextBus) + { + /* Get the HAL bus handler */ + BusHandler = CONTAINING_RECORD(Handler, HAL_BUS_HANDLER, Handler); + NextEntry = &BusHandler->AllHandlers; + + /* Get the next one if we were already with one */ + if (ContextValue) NextEntry = NextEntry->Flink; + + /* Start scanning */ + while (TRUE) + { + /* Check if this is the last one */ + if (NextEntry == &HalpAllBusHandlers) + { + /* Quit */ + *Context = 1; + return FALSE; + } + + /* Call this translator */ + BusHandler = CONTAINING_RECORD(NextEntry, HAL_BUS_HANDLER, AllHandlers); + if (HalTranslateBusAddress(BusHandler->Handler.InterfaceType, + BusHandler->Handler.BusNumber, + BusAddress, + AddressSpace, + TranslatedAddress)) break; + + /* Try the next one */ + NextEntry = NextEntry->Flink; + } + + /* If we made it, we're done */ + *Context = (ULONG_PTR)Handler; + return TRUE; + } + + /* Try the first one through */ + if (!HalTranslateBusAddress(Handler->InterfaceType, + Handler->BusNumber, + BusAddress, + AddressSpace, + TranslatedAddress)) return FALSE; + + /* Remember for next time */ + *Context = (ULONG_PTR)Handler; return TRUE; } Modified: trunk/reactos/hal/halx86/include/bus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/bus.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] Mon Jun 7 23:36:31 2010 @@ -376,16 +376,6 @@ OUT PPHYSICAL_ADDRESS TranslatedAddress ); -BOOLEAN -NTAPI -HaliTranslateBusAddress( - IN INTERFACE_TYPE InterfaceType, - IN ULONG BusNumber, - IN PHYSICAL_ADDRESS BusAddress, - IN OUT PULONG AddressSpace, - OUT PPHYSICAL_ADDRESS TranslatedAddress -); - NTSTATUS NTAPI HalpAssignSlotResources( @@ -417,6 +407,26 @@ /* LEGACY */ +BOOLEAN +NTAPI +HaliTranslateBusAddress( + IN INTERFACE_TYPE InterfaceType, + IN ULONG BusNumber, + IN PHYSICAL_ADDRESS BusAddress, + IN OUT PULONG AddressSpace, + OUT PPHYSICAL_ADDRESS TranslatedAddress +); + +BOOLEAN +NTAPI +HaliFindBusAddressTranslation( + IN PHYSICAL_ADDRESS BusAddress, + IN OUT PULONG AddressSpace, + OUT PPHYSICAL_ADDRESS TranslatedAddress, + IN OUT PULONG_PTR Context, + IN BOOLEAN NextBus +); + NTSTATUS NTAPI HalpAdjustPCIResourceList(IN PBUS_HANDLER BusHandler, @@ -460,6 +470,12 @@ ); PBUS_HANDLER +NTAPI +HalpContextToBusHandler( + IN ULONG_PTR ContextValue +); + +PBUS_HANDLER FASTCALL HaliReferenceHandlerForConfigSpace( IN BUS_DATA_TYPE ConfigType, @@ -534,5 +550,6 @@ extern BOOLEAN HalpPCIConfigInitialized; extern BUS_HANDLER HalpFakePciBusHandler; extern ULONG HalpMinPciBus, HalpMaxPciBus; +extern LIST_ENTRY HalpAllBusHandlers; /* EOF */

1 0

[sir_richard] 47683: [HAL]: Use Bus Handlers for HalpAssignSlotResources. Warn that current PCI Slot assignment code is frelled. [HAL]: Add PAGED_CODE(); [HAL]: Fix HALACPI build break.
by sir_richard＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: sir_richard Date: Mon Jun 7 23:26:09 2010 New Revision: 47683 URL: http://svn.reactos.org/svn/reactos?rev=47683&view=rev Log: [HAL]: Use Bus Handlers for HalpAssignSlotResources. Warn that current PCI Slot assignment code is frelled. [HAL]: Add PAGED_CODE(); [HAL]: Fix HALACPI build break. Modified: trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c trunk/reactos/hal/halx86/generic/legacy/bussupp.c trunk/reactos/hal/halx86/include/bus.h Modified: trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c [iso-8859-1] Mon Jun 7 23:26:09 2010 @@ -648,6 +648,7 @@ PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; PCI_SLOT_NUMBER SlotNumber; ULONG WriteBuffer; + DPRINT1("WARNING: PCI Slot Resource Assignment is FOOBAR\n"); /* FIXME: Should handle 64-bit addresses */ Modified: trunk/reactos/hal/halx86/generic/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] Mon Jun 7 23:26:09 2010 @@ -1126,25 +1126,28 @@ IN ULONG SlotNumber, IN OUT PCM_RESOURCE_LIST *AllocatedResources) { - BUS_HANDLER BusHandler; + PBUS_HANDLER Handler; + NTSTATUS Status; PAGED_CODE(); - - /* Only PCI is supported */ - if (BusType != PCIBus) return STATUS_NOT_IMPLEMENTED; - - /* Setup fake PCI Bus handler */ - RtlCopyMemory(&BusHandler, &HalpFakePciBusHandler, sizeof(BUS_HANDLER)); - BusHandler.BusNumber = BusNumber; - - /* Call the PCI function */ - return HalpAssignPCISlotResources(&BusHandler, - &BusHandler, - RegistryPath, - DriverClassName, - DriverObject, - DeviceObject, - SlotNumber, - AllocatedResources); + DPRINT1("Slot assignment for %d on bus %d\n", BusType, BusNumber); + + /* Find the handler */ + Handler = HalReferenceHandlerForBus(BusType, BusNumber); + if (!Handler) return STATUS_NOT_FOUND; + + /* Do the assignment */ + Status = Handler->AssignSlotResources(Handler, + Handler, + RegistryPath, + DriverClassName, + DriverObject, + DeviceObject, + SlotNumber, + AllocatedResources); + + /* Dereference the handler and return */ + HalDereferenceBusHandler(Handler); + return Status; } BOOLEAN @@ -1238,6 +1241,7 @@ { PBUS_HANDLER Handler; ULONG Status; + PAGED_CODE(); /* Find the handler */ Handler = HalReferenceHandlerForBus((*ResourceList)->InterfaceType, @@ -1268,6 +1272,8 @@ IN ULONG SlotNumber, IN OUT PCM_RESOURCE_LIST *AllocatedResources) { + PAGED_CODE(); + /* Check the bus type */ if (BusType != PCIBus) { Modified: trunk/reactos/hal/halx86/include/bus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/bus.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] Mon Jun 7 23:26:09 2010 @@ -368,6 +368,16 @@ BOOLEAN NTAPI +HalpTranslateBusAddress( + IN INTERFACE_TYPE InterfaceType, + IN ULONG BusNumber, + IN PHYSICAL_ADDRESS BusAddress, + IN OUT PULONG AddressSpace, + OUT PPHYSICAL_ADDRESS TranslatedAddress +); + +BOOLEAN +NTAPI HaliTranslateBusAddress( IN INTERFACE_TYPE InterfaceType, IN ULONG BusNumber,

1 0

[akhaldi] 47682: [PSDK] - Update/improve some usb related headers' headers.
by akhaldi＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: akhaldi Date: Mon Jun 7 23:19:24 2010 New Revision: 47682 URL: http://svn.reactos.org/svn/reactos?rev=47682&view=rev Log: [PSDK] - Update/improve some usb related headers' headers. Modified: branches/header-work/include/psdk/usb.h branches/header-work/include/psdk/usb100.h branches/header-work/include/psdk/usb200.h branches/header-work/include/psdk/usbcamdi.h branches/header-work/include/psdk/usbdi.h branches/header-work/include/psdk/usbioctl.h branches/header-work/include/psdk/usbiodef.h branches/header-work/include/psdk/usbrpmif.h branches/header-work/include/psdk/usbuser.h Modified: branches/header-work/include/psdk/usb.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/usb.h?… ============================================================================== --- branches/header-work/include/psdk/usb.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/usb.h [iso-8859-1] Mon Jun 7 23:19:24 2010 @@ -1,6 +1,26 @@ +/* + * usb.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + #pragma once -/* Helper macro to enable gcc's extension. */ +/* Helper macro to enable gcc's extension. */ #ifndef __GNU_EXTENSION #ifdef __GNUC__ #define __GNU_EXTENSION __extension__ Modified: branches/header-work/include/psdk/usb100.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/usb100… ============================================================================== --- branches/header-work/include/psdk/usb100.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/usb100.h [iso-8859-1] Mon Jun 7 23:19:24 2010 @@ -3,7 +3,7 @@ * * USB 1.0 support * - * This file is part of the w32api package. + * This file is part of the ReactOS PSDK package. * * Contributors: * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> Modified: branches/header-work/include/psdk/usb200.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/usb200… ============================================================================== --- branches/header-work/include/psdk/usb200.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/usb200.h [iso-8859-1] Mon Jun 7 23:19:24 2010 @@ -1,6 +1,26 @@ +/* + * usb200.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Magnus Olsen. + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + #pragma once -/* Helper macro to enable gcc's extension. */ +/* Helper macro to enable gcc's extension. */ #ifndef __GNU_EXTENSION #ifdef __GNUC__ #define __GNU_EXTENSION __extension__ Modified: branches/header-work/include/psdk/usbcamdi.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/usbcam… ============================================================================== --- branches/header-work/include/psdk/usbcamdi.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/usbcamdi.h [iso-8859-1] Mon Jun 7 23:19:24 2010 @@ -3,7 +3,7 @@ * * USB Camera driver interface. * - * This file is part of the w32api package. + * This file is part of the ReactOS PSDK package. * * Contributors: * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> Modified: branches/header-work/include/psdk/usbdi.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/usbdi.… ============================================================================== --- branches/header-work/include/psdk/usbdi.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/usbdi.h [iso-8859-1] Mon Jun 7 23:19:24 2010 @@ -5,7 +5,7 @@ * * FIXME : Obsolete header.. Use usb.h instead. * - * This file is part of the w32api package. + * This file is part of the ReactOS PSDK package. * * Contributors: * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> Modified: branches/header-work/include/psdk/usbioctl.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/usbioc… ============================================================================== --- branches/header-work/include/psdk/usbioctl.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/usbioctl.h [iso-8859-1] Mon Jun 7 23:19:24 2010 @@ -3,7 +3,7 @@ * * USB IOCTL interface. * - * This file is part of the w32api package. + * This file is part of the ReactOS PSDK package. * * Contributors: * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> Modified: branches/header-work/include/psdk/usbiodef.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/usbiod… ============================================================================== --- branches/header-work/include/psdk/usbiodef.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/usbiodef.h [iso-8859-1] Mon Jun 7 23:19:24 2010 @@ -1,3 +1,23 @@ +/* + * usbiodef.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + #pragma once #define USB_SUBMIT_URB 0 Modified: branches/header-work/include/psdk/usbrpmif.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/usbrpm… ============================================================================== --- branches/header-work/include/psdk/usbrpmif.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/usbrpmif.h [iso-8859-1] Mon Jun 7 23:19:24 2010 @@ -1,3 +1,23 @@ +/* + * usbrpmif.h + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Created by Amine Khaldi <amine.khaldi(a)reactos.org> + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + #pragma once #include "windef.h" Modified: branches/header-work/include/psdk/usbuser.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/usbuse… ============================================================================== --- branches/header-work/include/psdk/usbuser.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/usbuser.h [iso-8859-1] Mon Jun 7 23:19:24 2010 @@ -3,7 +3,7 @@ * * USB user mode IOCTL interface * - * This file is part of the w32api package. + * This file is part of the ReactOS PSDK package. * * Contributors: * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net>

1 0

[akhaldi] 47681: [PSDK] - Fix a "FIXME! HACK!!!"
by akhaldi＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: akhaldi Date: Mon Jun 7 23:15:05 2010 New Revision: 47681 URL: http://svn.reactos.org/svn/reactos?rev=47681&view=rev Log: [PSDK] - Fix a "FIXME! HACK!!!" Modified: branches/header-work/include/psdk/basetsd.h branches/header-work/include/psdk/ntdef.h Modified: branches/header-work/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/basets… ============================================================================== --- branches/header-work/include/psdk/basetsd.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/basetsd.h [iso-8859-1] Mon Jun 7 23:15:05 2010 @@ -13,6 +13,32 @@ #ifndef __int64 #define __int64 long long #endif +#endif + +#if defined(_MSC_VER) && (_MSC_VER < 1300) +#error Old MSVC compiler version. +#endif + +#ifdef _MAC +#error Not supported. +#endif + +#if !defined(MIDL_PASS) && !defined(RC_INVOKED) + #define POINTER_64 __ptr64 + #if defined(_WIN64) + #define POINTER_32 __ptr32 + #else + #define POINTER_32 + #endif +#else + #define POINTER_64 + #define POINTER_32 +#endif /* !defined(MIDL_PASS) && !defined(RC_INVOKED) */ + +#if defined(_M_MRX000) || defined(_M_AMD64) || defined(_M_IA64) + typedef unsigned __int64 POINTER_64_INT; +#else + typedef unsigned long POINTER_64_INT; #endif #if defined(_WIN64) Modified: branches/header-work/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ntdef.… ============================================================================== --- branches/header-work/include/psdk/ntdef.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/ntdef.h [iso-8859-1] Mon Jun 7 23:15:05 2010 @@ -19,8 +19,6 @@ #define __GNU_EXTENSION #endif #endif - -typedef unsigned long POINTER_64; // FIXME! HACK!!! /* Pseudo Modifiers for Input Parameters */

1 0

[sir_richard] 47680: [HAL]: Implement HalAdjustResourceList using Bus Handler support. Previous HAL said this was "deprecated" and faked success. Although correct on ACPI HALs, this is a legacy HALs, so Bus Handlers have a chance to do ajdustment.
by sir_richard＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: sir_richard Date: Mon Jun 7 23:06:16 2010 New Revision: 47680 URL: http://svn.reactos.org/svn/reactos?rev=47680&view=rev Log: [HAL]: Implement HalAdjustResourceList using Bus Handler support. Previous HAL said this was "deprecated" and faked success. Although correct on ACPI HALs, this is a legacy HALs, so Bus Handlers have a chance to do ajdustment. Modified: trunk/reactos/hal/halx86/generic/legacy/bussupp.c Modified: trunk/reactos/hal/halx86/generic/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] Mon Jun 7 23:06:16 2010 @@ -1234,10 +1234,24 @@ */ NTSTATUS NTAPI -HalAdjustResourceList(IN PCM_RESOURCE_LIST Resources) -{ - /* Deprecated, return success */ - return STATUS_SUCCESS; +HalAdjustResourceList(IN PIO_RESOURCE_REQUIREMENTS_LIST *ResourceList) +{ + PBUS_HANDLER Handler; + ULONG Status; + + /* Find the handler */ + Handler = HalReferenceHandlerForBus((*ResourceList)->InterfaceType, + (*ResourceList)->BusNumber); + if (!Handler) return STATUS_SUCCESS; + + /* Do the assignment */ + Status = Handler->AdjustResourceList(Handler, + Handler, + ResourceList); + + /* Dereference the handler and return */ + HalDereferenceBusHandler(Handler); + return Status; } /*

1 0

[sir_richard] 47679: [HAL]: Implement HalTranslateBusAddress using Bus Handler support. The old HAL would just return whatever the caller gave (no translation was done). For example, with the new HAL, this now results in the translation of 0xCF800 in I/O space to fail (not sure which driver requests this), because this is not a valid I/O address on PC/AT systems (highest is 0xFFFF). This change also allows for the PCI driver to override the translation mechanism (which will piggy-back to the sys
by sir_richard＠svn.reactos.org 07 Jun '10

07 Jun '10

Author: sir_richard Date: Mon Jun 7 23:01:53 2010 New Revision: 47679 URL: http://svn.reactos.org/svn/reactos?rev=47679&view=rev Log: [HAL]: Implement HalTranslateBusAddress using Bus Handler support. The old HAL would just return whatever the caller gave (no translation was done). For example, with the new HAL, this now results in the translation of 0xCF800 in I/O space to fail (not sure which driver requests this), because this is not a valid I/O address on PC/AT systems (highest is 0xFFFF). This change also allows for the PCI driver to override the translation mechanism (which will piggy-back to the system bus translator) with its own. Please test. Modified: trunk/reactos/hal/halx86/generic/legacy/bus/bushndlr.c trunk/reactos/hal/halx86/generic/legacy/bussupp.c trunk/reactos/hal/halx86/include/bus.h Modified: trunk/reactos/hal/halx86/generic/legacy/bus/bushndlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bus/bushndlr.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bus/bushndlr.c [iso-8859-1] Mon Jun 7 23:01:53 2010 @@ -407,13 +407,12 @@ HalDereferenceBusHandler = HaliDereferenceBusHandler; #endif HalPciAssignSlotResources = HalpAssignSlotResources; + HalPciTranslateBusAddress = HaliTranslateBusAddress; /* PCI Driver can override */ /* FIXME: Fix later */ #if 0 - HalPciTranslateBusAddress = HaliTranslateBusAddress; if (!HalFindBusAddressTranslation) HalFindBusAddressTranslation = HaliFindBusAddressTranslation; #else /* These should be written by the PCI driver later, but we give defaults */ - HalPciTranslateBusAddress = HalpTranslateBusAddress; HalFindBusAddressTranslation = HalpFindBusAddressTranslation; #endif } Modified: trunk/reactos/hal/halx86/generic/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] Mon Jun 7 23:01:53 2010 @@ -1196,6 +1196,37 @@ return TRUE; } +BOOLEAN +NTAPI +HaliTranslateBusAddress(IN INTERFACE_TYPE InterfaceType, + IN ULONG BusNumber, + IN PHYSICAL_ADDRESS BusAddress, + IN OUT PULONG AddressSpace, + OUT PPHYSICAL_ADDRESS TranslatedAddress) +{ + PBUS_HANDLER Handler; + BOOLEAN Status; + + /* Find the handler */ + Handler = HalReferenceHandlerForBus(InterfaceType, BusNumber); + if (!(Handler) || !(Handler->TranslateBusAddress)) + { + DPRINT1("No translator!\n"); + return FALSE; + } + + /* Do the assignment */ + Status = Handler->TranslateBusAddress(Handler, + Handler, + BusAddress, + AddressSpace, + TranslatedAddress); + + /* Dereference the handler and return */ + HalDereferenceBusHandler(Handler); + return Status; +} + /* PUBLIC FUNCTIONS **********************************************************/ /* @@ -1423,9 +1454,12 @@ } else { - /* Translation is easy */ - TranslatedAddress->QuadPart = BusAddress.QuadPart; - return TRUE; + /* Call the bus handler */ + return HaliTranslateBusAddress(InterfaceType, + BusNumber, + BusAddress, + AddressSpace, + TranslatedAddress); } } Modified: trunk/reactos/hal/halx86/include/bus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/bus.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] Mon Jun 7 23:01:53 2010 @@ -368,7 +368,7 @@ BOOLEAN NTAPI -HalpTranslateBusAddress( +HaliTranslateBusAddress( IN INTERFACE_TYPE InterfaceType, IN ULONG BusNumber, IN PHYSICAL_ADDRESS BusAddress,

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