Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[gadamopoulos] 55556: [win32k] - Initilize ExDesktopObjectType->TypeInfo.ValidAccessMask and ExWindowStationObjectType->TypeInfo.ValidAccessMask to let win32k use access checks to desktop and windo...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Feb 12 10:13:16 2012 New Revision: 55556 URL: http://svn.reactos.org/svn/reactos?rev=55556&view=rev Log: [win32k] - Initilize ExDesktopObjectType->TypeInfo.ValidAccessMask and ExWindowStationObjectType->TypeInfo.ValidAccessMask to let win32k use access checks to desktop and window station objects - When opening a desktop and window station during THREADINFO initialization, give full access to the objects Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Sun Feb 12 10:13:16 2012 @@ -39,6 +39,32 @@ #define DF_DESKWNDDESTROYED 0x00010000 #define DF_DYING 0x00020000 +#define DESKTOP_READ STANDARD_RIGHTS_READ | \ + DESKTOP_ENUMERATE | \ + DESKTOP_READOBJECTS + +#define DESKTOP_WRITE STANDARD_RIGHTS_WRITE | \ + DESKTOP_CREATEMENU | \ + DESKTOP_CREATEWINDOW | \ + DESKTOP_HOOKCONTROL | \ + DESKTOP_JOURNALPLAYBACK | \ + DESKTOP_JOURNALRECORD | \ + DESKTOP_WRITEOBJECTS + +#define DESKTOP_EXECUTE STANDARD_RIGHTS_EXECUTE | \ + DESKTOP_SWITCHDESKTOP + +#define DESKTOP_ALL_ACCESS STANDARD_RIGHTS_REQUIRED | \ + DESKTOP_CREATEMENU | \ + DESKTOP_CREATEWINDOW | \ + DESKTOP_ENUMERATE | \ + DESKTOP_HOOKCONTROL | \ + DESKTOP_JOURNALPLAYBACK | \ + DESKTOP_JOURNALRECORD | \ + DESKTOP_READOBJECTS | \ + DESKTOP_SWITCHDESKTOP | \ + DESKTOP_WRITEOBJECTS + extern PDESKTOP InputDesktop; extern HDESK InputDesktopHandle; extern PCLS DesktopWindowClass; Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/winsta.h [iso-8859-1] Sun Feb 12 10:13:16 2012 @@ -69,6 +69,32 @@ extern PPROCESSINFO LogonProcess; extern HWND hwndSAS; +#define WINSTA_READ STANDARD_RIGHTS_READ | \ + WINSTA_ENUMDESKTOPS | \ + WINSTA_ENUMERATE | \ + WINSTA_READATTRIBUTES | \ + WINSTA_READSCREEN + +#define WINSTA_WRITE STANDARD_RIGHTS_WRITE | \ + WINSTA_ACCESSCLIPBOARD | \ + WINSTA_CREATEDESKTOP | \ + WINSTA_WRITEATTRIBUTES + +#define WINSTA_EXECUTE STANDARD_RIGHTS_EXECUTE | \ + WINSTA_ACCESSGLOBALATOMS | \ + WINSTA_EXITWINDOWS + +#define WINSTA_ACCESS_ALL STANDARD_RIGHTS_REQUIRED | \ + WINSTA_ACCESSCLIPBOARD | \ + WINSTA_ACCESSGLOBALATOMS | \ + WINSTA_CREATEDESKTOP | \ + WINSTA_ENUMDESKTOPS | \ + WINSTA_ENUMERATE | \ + WINSTA_EXITWINDOWS | \ + WINSTA_READATTRIBUTES | \ + WINSTA_READSCREEN | \ + WINSTA_WRITEATTRIBUTES + INIT_FUNCTION NTSTATUS NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Sun Feb 12 10:13:16 2012 @@ -23,28 +23,6 @@ PDESKTOP InputDesktop = NULL; HDESK InputDesktopHandle = NULL; HDC ScreenDeviceContext = NULL; - -GENERIC_MAPPING IntDesktopMapping = -{ - STANDARD_RIGHTS_READ | DESKTOP_ENUMERATE | - DESKTOP_READOBJECTS, - STANDARD_RIGHTS_WRITE | DESKTOP_CREATEMENU | - DESKTOP_CREATEWINDOW | - DESKTOP_HOOKCONTROL | - DESKTOP_JOURNALPLAYBACK | - DESKTOP_JOURNALRECORD | - DESKTOP_WRITEOBJECTS, - STANDARD_RIGHTS_EXECUTE | DESKTOP_SWITCHDESKTOP, - STANDARD_RIGHTS_REQUIRED | DESKTOP_CREATEMENU | - DESKTOP_CREATEWINDOW | - DESKTOP_ENUMERATE | - DESKTOP_HOOKCONTROL | - DESKTOP_JOURNALPLAYBACK | - DESKTOP_JOURNALRECORD | - DESKTOP_READOBJECTS | - DESKTOP_SWITCHDESKTOP | - DESKTOP_WRITEOBJECTS -}; /* OBJECT CALLBACKS **********************************************************/ @@ -195,9 +173,15 @@ NTAPI InitDesktopImpl(VOID) { + GENERIC_MAPPING IntDesktopMapping = { DESKTOP_READ, + DESKTOP_WRITE, + DESKTOP_EXECUTE, + DESKTOP_ALL_ACCESS}; + /* Set Desktop Object Attributes */ ExDesktopObjectType->TypeInfo.DefaultNonPagedPoolCharge = sizeof(DESKTOP); ExDesktopObjectType->TypeInfo.GenericMapping = IntDesktopMapping; + ExDesktopObjectType->TypeInfo.ValidAccessMask = DESKTOP_ALL_ACCESS; return STATUS_SUCCESS; } @@ -346,7 +330,7 @@ ExWindowStationObjectType, KernelMode, NULL, - 0, + WINSTA_ACCESS_ALL, NULL, (HANDLE*)hWinSta); @@ -380,7 +364,7 @@ ExDesktopObjectType, KernelMode, NULL, - 0, + DESKTOP_ALL_ACCESS, NULL, (HANDLE*)hDesktop); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Sun Feb 12 10:13:16 2012 @@ -22,17 +22,6 @@ /* INITALIZATION FUNCTIONS ****************************************************/ -static GENERIC_MAPPING IntWindowStationMapping = - { - STANDARD_RIGHTS_READ | WINSTA_ENUMDESKTOPS | WINSTA_ENUMERATE | WINSTA_READATTRIBUTES | WINSTA_READSCREEN, - STANDARD_RIGHTS_WRITE | WINSTA_ACCESSCLIPBOARD | WINSTA_CREATEDESKTOP | WINSTA_WRITEATTRIBUTES, - STANDARD_RIGHTS_EXECUTE | WINSTA_ACCESSGLOBALATOMS | WINSTA_EXITWINDOWS, - STANDARD_RIGHTS_REQUIRED | WINSTA_ACCESSCLIPBOARD | WINSTA_ACCESSGLOBALATOMS | WINSTA_CREATEDESKTOP | - WINSTA_ENUMDESKTOPS | WINSTA_ENUMERATE | WINSTA_EXITWINDOWS | - WINSTA_READATTRIBUTES | WINSTA_READSCREEN | WINSTA_WRITEATTRIBUTES - }; - - INIT_FUNCTION NTSTATUS NTAPI @@ -42,14 +31,17 @@ HANDLE WindowStationsDirectory; UNICODE_STRING UnicodeString; NTSTATUS Status; + GENERIC_MAPPING IntWindowStationMapping = { WINSTA_READ, + WINSTA_WRITE, + WINSTA_EXECUTE, + WINSTA_ACCESS_ALL}; /* * Create the '\Windows\WindowStations' directory */ RtlInitUnicodeString(&UnicodeString, WINSTA_ROOT_NAME); - InitializeObjectAttributes(&ObjectAttributes, &UnicodeString, - 0, NULL, NULL); + InitializeObjectAttributes(&ObjectAttributes, &UnicodeString, 0, NULL, NULL); Status = ZwCreateDirectoryObject(&WindowStationsDirectory, 0, &ObjectAttributes); if (!NT_SUCCESS(Status)) @@ -62,6 +54,7 @@ /* Set Winsta Object Attributes */ ExWindowStationObjectType->TypeInfo.DefaultNonPagedPoolCharge = sizeof(WINSTATION_OBJECT); ExWindowStationObjectType->TypeInfo.GenericMapping = IntWindowStationMapping; + ExWindowStationObjectType->TypeInfo.ValidAccessMask = WINSTA_ACCESS_ALL; return STATUS_SUCCESS; }

12 years, 7 months

[cgutman] 55555: [USB] - We proudly merge the first charge of the usb-bringup branch. We do want to stress hardware support is still under heavy development and testing in real hardware is experime...

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Feb 12 04:59:51 2012 New Revision: 55555 URL: http://svn.reactos.org/svn/reactos?rev=55555&view=rev Log: [USB] - We proudly merge the first charge of the usb-bringup branch. We do want to stress hardware support is still under heavy development and testing in real hardware is experimental - Merge the Human Interface Device Stack(HID) which is used for mice / keyboards and other devices which use the USB interface, consisting of hidusb, hidparse, hidclass, mouhid, kbdhid - Merge the composite driver, supports USB composite devices, laid out in usbccgp - Merge the generic hub driver, which supports the USB root hub and in future USB hubs. Driver is usbhub - Merge the Open Host Controller Interface driver (ohci) - Merge the Enhanced Host Controller Interface driver (ehci) - Merge the many fixes in other areas of ReactOS needed for USB to work (ntoskrnl, pci, inf, umpnpmgr, usetup) - Special thanks goes the Haiku team, whose excellent code has provided a great base for the development of the new ReactOS USB / HID stack - The development of the USB stack has shown the great potential when ReactOS developers team up together to achieve a common goal. The involved developers are here, listed alphabetically: Alex Ionescu Amine Khaldi Cameron Gutman Johannes Anderwald Michel Martin Thomas Faber Thomas Lotz(Haiku) Let's start the ReactOS revolution Added: trunk/reactos/drivers/filters/ - copied from r55543, branches/usb-bringup-trunk/drivers/filters/ trunk/reactos/drivers/hid/ (props changed) - copied from r55543, branches/usb-bringup-trunk/drivers/hid/ trunk/reactos/drivers/hid/directory.rbuild - copied unchanged from r55554, branches/usb-bringup-trunk/drivers/hid/directory.rbuild trunk/reactos/drivers/hid/hidclass/hidclass.rbuild - copied unchanged from r55554, branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.rbuild trunk/reactos/drivers/hid/hidparse/hidparse.rbuild - copied unchanged from r55554, branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.rbuild trunk/reactos/drivers/hid/hidusb/hidusb.rbuild - copied unchanged from r55554, branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.rbuild trunk/reactos/drivers/hid/kbdhid/kbdhid.rbuild - copied unchanged from r55554, branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.rbuild trunk/reactos/drivers/hid/mouhid/mouhid.rbuild - copied unchanged from r55554, branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.rbuild trunk/reactos/drivers/storage/class/disk_new/ (props changed) - copied from r55543, branches/usb-bringup-trunk/drivers/storage/class/disk_new/ trunk/reactos/drivers/storage/classpnp/classpnp.spec - copied unchanged from r55543, branches/usb-bringup-trunk/drivers/storage/classpnp/classpnp.spec trunk/reactos/drivers/usb/usbccgp/ (props changed) - copied from r55543, branches/usb-bringup-trunk/drivers/usb/usbccgp/ trunk/reactos/drivers/usb/usbccgp/usbccgp.rbuild - copied unchanged from r55554, branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.rbuild trunk/reactos/drivers/usb/usbehci/ (props changed) - copied from r55543, branches/usb-bringup-trunk/drivers/usb/usbehci/ trunk/reactos/drivers/usb/usbehci/usbehci.rbuild - copied unchanged from r55554, branches/usb-bringup-trunk/drivers/usb/usbehci/usbehci.rbuild trunk/reactos/drivers/usb/usbhub/ (props changed) - copied from r55543, branches/usb-bringup-trunk/drivers/usb/usbhub/ trunk/reactos/drivers/usb/usbhub/usbhub.rbuild - copied unchanged from r55554, branches/usb-bringup-trunk/drivers/usb/usbhub/usbhub.rbuild trunk/reactos/drivers/usb/usbohci/ (props changed) - copied from r55543, branches/usb-bringup-trunk/drivers/usb/usbohci/ trunk/reactos/drivers/usb/usbohci/usbohci.rbuild - copied unchanged from r55554, branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.rbuild trunk/reactos/drivers/usb/usbstor/descriptor.c - copied unchanged from r55543, branches/usb-bringup-trunk/drivers/usb/usbstor/descriptor.c trunk/reactos/drivers/usb/usbstor/disk.c - copied, changed from r55543, branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c trunk/reactos/drivers/usb/usbstor/error.c - copied, changed from r55543, branches/usb-bringup-trunk/drivers/usb/usbstor/error.c trunk/reactos/drivers/usb/usbstor/fdo.c - copied, changed from r55543, branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c trunk/reactos/drivers/usb/usbstor/misc.c - copied, changed from r55543, branches/usb-bringup-trunk/drivers/usb/usbstor/misc.c trunk/reactos/drivers/usb/usbstor/pdo.c - copied, changed from r55543, branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c trunk/reactos/drivers/usb/usbstor/queue.c - copied unchanged from r55543, branches/usb-bringup-trunk/drivers/usb/usbstor/queue.c trunk/reactos/drivers/usb/usbstor/scsi.c - copied, changed from r55543, branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c trunk/reactos/include/ddk/hidpddi.h - copied unchanged from r55543, branches/usb-bringup-trunk/include/ddk/hidpddi.h trunk/reactos/include/ddk/hidport.h - copied unchanged from r55543, branches/usb-bringup-trunk/include/ddk/hidport.h trunk/reactos/lib/drivers/hidparser/ (props changed) - copied from r55543, branches/usb-bringup-trunk/lib/drivers/hidparser/ trunk/reactos/lib/drivers/hidparser/hidparser.rbuild - copied unchanged from r55554, branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.rbuild trunk/reactos/media/inf/input.inf - copied unchanged from r55543, branches/usb-bringup-trunk/media/inf/input.inf Removed: trunk/reactos/drivers/storage/classpnp/class.spec Modified: trunk/reactos/ (props changed) trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/base/setup/usetup/interface/devinst.c trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/dll/win32/hid/hid.c trunk/reactos/dll/win32/hid/stubs.c trunk/reactos/drivers/CMakeLists.txt trunk/reactos/drivers/bus/acpi/buspdo.c trunk/reactos/drivers/bus/pci/fdo.c trunk/reactos/drivers/bus/pci/pci.h trunk/reactos/drivers/bus/pci/pdo.c trunk/reactos/drivers/bus/pcix/enum.c trunk/reactos/drivers/bus/pcix/fdo.c trunk/reactos/drivers/bus/pcix/pdo.c trunk/reactos/drivers/drivers.rbuild trunk/reactos/drivers/filters/mountmgr/CMakeLists.txt trunk/reactos/drivers/filters/mountmgr/mntmgr.h trunk/reactos/drivers/filters/mountmgr/mountmgr.c trunk/reactos/drivers/filters/mountmgr/mountmgr.rbuild trunk/reactos/drivers/hid/hidclass/ (props changed) trunk/reactos/drivers/hid/hidclass/CMakeLists.txt trunk/reactos/drivers/hid/hidclass/fdo.c trunk/reactos/drivers/hid/hidclass/hidclass.c trunk/reactos/drivers/hid/hidclass/pdo.c trunk/reactos/drivers/hid/hidparse/ (props changed) trunk/reactos/drivers/hid/hidparse/hidparse.c trunk/reactos/drivers/hid/hidusb/ (props changed) trunk/reactos/drivers/hid/hidusb/hidusb.c trunk/reactos/drivers/hid/kbdhid/ (props changed) trunk/reactos/drivers/hid/kbdhid/kbdhid.c trunk/reactos/drivers/hid/kbdhid/kbdhid.h trunk/reactos/drivers/hid/mouhid/ (props changed) trunk/reactos/drivers/hid/mouhid/mouhid.c trunk/reactos/drivers/hid/mouhid/mouhid.h trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/kbdclass/kbdclass.h trunk/reactos/drivers/input/mouclass/mouclass.c trunk/reactos/drivers/input/mouclass/mouclass.h trunk/reactos/drivers/storage/class/CMakeLists.txt trunk/reactos/drivers/storage/class/class2/class2.c trunk/reactos/drivers/storage/classpnp/CMakeLists.txt trunk/reactos/drivers/storage/classpnp/classpnp.rbuild trunk/reactos/drivers/usb/CMakeLists.txt trunk/reactos/drivers/usb/directory.rbuild trunk/reactos/drivers/usb/usbccgp/fdo.c trunk/reactos/drivers/usb/usbccgp/function.c trunk/reactos/drivers/usb/usbccgp/pdo.c trunk/reactos/drivers/usb/usbccgp/usbccgp.c trunk/reactos/drivers/usb/usbd/CMakeLists.txt trunk/reactos/drivers/usb/usbd/usbd.c trunk/reactos/drivers/usb/usbd/usbd.rbuild trunk/reactos/drivers/usb/usbd/usbd.spec trunk/reactos/drivers/usb/usbehci/CMakeLists.txt trunk/reactos/drivers/usb/usbehci/hardware.cpp trunk/reactos/drivers/usb/usbehci/hcd_controller.cpp trunk/reactos/drivers/usb/usbehci/hub_controller.cpp trunk/reactos/drivers/usb/usbehci/usb_device.cpp trunk/reactos/drivers/usb/usbehci/usb_queue.cpp trunk/reactos/drivers/usb/usbehci/usb_request.cpp trunk/reactos/drivers/usb/usbhub/fdo.c trunk/reactos/drivers/usb/usbhub/pdo.c trunk/reactos/drivers/usb/usbhub/usbhub.c trunk/reactos/drivers/usb/usbohci/hardware.cpp trunk/reactos/drivers/usb/usbohci/hcd_controller.cpp trunk/reactos/drivers/usb/usbohci/hub_controller.cpp trunk/reactos/drivers/usb/usbohci/usb_device.cpp trunk/reactos/drivers/usb/usbohci/usb_queue.cpp trunk/reactos/drivers/usb/usbohci/usb_request.cpp trunk/reactos/drivers/usb/usbohci/usbohci.cpp trunk/reactos/drivers/usb/usbstor/CMakeLists.txt trunk/reactos/drivers/usb/usbstor/usbstor.c trunk/reactos/drivers/usb/usbstor/usbstor.h trunk/reactos/drivers/usb/usbstor/usbstor.rbuild trunk/reactos/hal/halx86/acpi/halpnpdd.c trunk/reactos/hal/halx86/legacy/bussupp.c trunk/reactos/hal/halx86/legacy/halpnpdd.c trunk/reactos/include/ddk/hidclass.h trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/psdk/hidusage.h trunk/reactos/include/psdk/usb.h trunk/reactos/lib/drivers/CMakeLists.txt trunk/reactos/lib/drivers/directory.rbuild trunk/reactos/lib/drivers/hidparser/CMakeLists.txt trunk/reactos/lib/drivers/hidparser/hidparser.h trunk/reactos/lib/sdk/wdmguid/wdmguid.c trunk/reactos/media/inf/CMakeLists.txt trunk/reactos/media/inf/cdrom.inf trunk/reactos/media/inf/keyboard.inf trunk/reactos/media/inf/msmouse.inf trunk/reactos/media/inf/syssetup.inf trunk/reactos/media/inf/syssetup.inf.tpl trunk/reactos/media/inf/usb.inf trunk/reactos/media/inf/usbport.inf trunk/reactos/media/inf/usbstor.inf trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/deviface.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c trunk/reactos/ntoskrnl/io/iomgr/volume.c trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c trunk/reactos/ntoskrnl/ob/obname.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… Modified: trunk/reactos/base/setup/usetup/interface/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… Modified: trunk/reactos/dll/win32/hid/hid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/hid.c?rev=55… Modified: trunk/reactos/dll/win32/hid/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/stubs.c?rev=… Modified: trunk/reactos/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/CMakeLists.txt?rev… Modified: trunk/reactos/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?… Modified: trunk/reactos/drivers/bus/pci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/fdo.c?rev=… Modified: trunk/reactos/drivers/bus/pci/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.h?rev=… Modified: trunk/reactos/drivers/bus/pci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=… Modified: trunk/reactos/drivers/bus/pcix/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/enum.c?re… Modified: trunk/reactos/drivers/bus/pcix/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/fdo.c?rev… Modified: trunk/reactos/drivers/bus/pcix/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pdo.c?rev… Modified: trunk/reactos/drivers/drivers.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/drivers.rbuild?rev… Modified: trunk/reactos/drivers/filters/mountmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/C… Modified: trunk/reactos/drivers/filters/mountmgr/mntmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… Modified: trunk/reactos/drivers/filters/mountmgr/mountmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… Modified: trunk/reactos/drivers/filters/mountmgr/mountmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… Modified: trunk/reactos/drivers/hid/hidclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/CMake… Modified: trunk/reactos/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/fdo.c… Modified: trunk/reactos/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/hidcl… Modified: trunk/reactos/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/pdo.c… Modified: trunk/reactos/drivers/hid/hidparse/hidparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidparse/hidpa… Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… Modified: trunk/reactos/drivers/hid/kbdhid/kbdhid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/kbdhid/kbdhid.… Modified: trunk/reactos/drivers/hid/kbdhid/kbdhid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/kbdhid/kbdhid.… Modified: trunk/reactos/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/mouhid/mouhid.… Modified: trunk/reactos/drivers/hid/mouhid/mouhid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/mouhid/mouhid.… Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… Modified: trunk/reactos/drivers/input/mouclass/mouclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… Modified: trunk/reactos/drivers/storage/class/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/CMak… Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… Modified: trunk/reactos/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/C… Removed: trunk/reactos/drivers/storage/classpnp/class.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… Modified: trunk/reactos/drivers/storage/classpnp/classpnp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… Modified: trunk/reactos/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/CMakeLists.txt… Modified: trunk/reactos/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/directory.rbui… Modified: trunk/reactos/drivers/usb/usbccgp/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/fdo.c?… Modified: trunk/reactos/drivers/usb/usbccgp/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/functi… Modified: trunk/reactos/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/pdo.c?… Modified: trunk/reactos/drivers/usb/usbccgp/usbccgp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/usbccg… Modified: trunk/reactos/drivers/usb/usbd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbd/CMakeList… Modified: trunk/reactos/drivers/usb/usbd/usbd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbd/usbd.c?re… Modified: trunk/reactos/drivers/usb/usbd/usbd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbd/usbd.rbui… Modified: trunk/reactos/drivers/usb/usbd/usbd.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbd/usbd.spec… Modified: trunk/reactos/drivers/usb/usbehci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/CMakeL… Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… Modified: trunk/reactos/drivers/usb/usbehci/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hcd_co… Modified: trunk/reactos/drivers/usb/usbehci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hub_co… Modified: trunk/reactos/drivers/usb/usbehci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_de… Modified: trunk/reactos/drivers/usb/usbehci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_qu… Modified: trunk/reactos/drivers/usb/usbehci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_re… Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r… Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r… Modified: trunk/reactos/drivers/usb/usbhub/usbhub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.… Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… Modified: trunk/reactos/drivers/usb/usbohci/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hcd_co… Modified: trunk/reactos/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hub_co… Modified: trunk/reactos/drivers/usb/usbohci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usb_de… Modified: trunk/reactos/drivers/usb/usbohci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usb_qu… Modified: trunk/reactos/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usb_re… Modified: trunk/reactos/drivers/usb/usbohci/usbohci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usbohc… Modified: trunk/reactos/drivers/usb/usbstor/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/CMakeL… Copied: trunk/reactos/drivers/usb/usbstor/disk.c (from r55543, branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/disk.c… Copied: trunk/reactos/drivers/usb/usbstor/error.c (from r55543, branches/usb-bringup-trunk/drivers/usb/usbstor/error.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/error.… Copied: trunk/reactos/drivers/usb/usbstor/fdo.c (from r55543, branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/fdo.c?… Copied: trunk/reactos/drivers/usb/usbstor/misc.c (from r55543, branches/usb-bringup-trunk/drivers/usb/usbstor/misc.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/misc.c… Copied: trunk/reactos/drivers/usb/usbstor/pdo.c (from r55543, branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/pdo.c?… Copied: trunk/reactos/drivers/usb/usbstor/scsi.c (from r55543, branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/scsi.c… Modified: trunk/reactos/drivers/usb/usbstor/usbstor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/usbsto… Modified: trunk/reactos/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/usbsto… Modified: trunk/reactos/drivers/usb/usbstor/usbstor.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/usbsto… Modified: trunk/reactos/hal/halx86/acpi/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi/halpnpdd.c… Modified: trunk/reactos/hal/halx86/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bussupp.… Modified: trunk/reactos/hal/halx86/legacy/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/halpnpdd… Modified: trunk/reactos/include/ddk/hidclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/hidclass.h?rev… Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=55… Modified: trunk/reactos/include/psdk/hidusage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/hidusage.h?re… Modified: trunk/reactos/include/psdk/usb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usb.h?rev=555… Modified: trunk/reactos/lib/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/CMakeLists.txt… Modified: trunk/reactos/lib/drivers/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/directory.rbui… Modified: trunk/reactos/lib/drivers/hidparser/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/CMak… Modified: trunk/reactos/lib/drivers/hidparser/hidparser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/hidparser/hidp… Modified: trunk/reactos/lib/sdk/wdmguid/wdmguid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/wdmguid/wdmguid.c?… Modified: trunk/reactos/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/CMakeLists.txt?r… Modified: trunk/reactos/media/inf/cdrom.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cdrom.inf?rev=55… Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev… Modified: trunk/reactos/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/msmouse.inf?rev=… Modified: trunk/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev… Modified: trunk/reactos/media/inf/syssetup.inf.tpl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf.tpl… Modified: trunk/reactos/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usb.inf?rev=5555… Modified: trunk/reactos/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbport.inf?rev=… Modified: trunk/reactos/media/inf/usbstor.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbstor.inf?rev=… Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.… Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.… Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.… Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=5…

12 years, 7 months

[cgutman] 55554: [BUILD] - Add rbuild files - Fix dumb dependencies in cmake files [DEBUG] - Kill more debugging

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Feb 12 03:48:54 2012 New Revision: 55554 URL: http://svn.reactos.org/svn/reactos?rev=55554&view=rev Log: [BUILD] - Add rbuild files - Fix dumb dependencies in cmake files [DEBUG] - Kill more debugging Added: branches/usb-bringup-trunk/drivers/hid/directory.rbuild (with props) branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.rbuild (with props) branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.rbuild (with props) branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.rbuild (with props) branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.rbuild (with props) branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.rbuild (with props) branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.rbuild (with props) branches/usb-bringup-trunk/drivers/usb/usbehci/usbehci.rbuild (with props) branches/usb-bringup-trunk/drivers/usb/usbhub/usbhub.rbuild (with props) branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.rbuild (with props) branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.rbuild (with props) Modified: branches/usb-bringup-trunk/drivers/drivers.rbuild branches/usb-bringup-trunk/drivers/filters/mountmgr/CMakeLists.txt branches/usb-bringup-trunk/drivers/filters/mountmgr/mountmgr.rbuild branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h branches/usb-bringup-trunk/drivers/usb/directory.rbuild branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c branches/usb-bringup-trunk/drivers/usb/usbd/usbd.rbuild branches/usb-bringup-trunk/drivers/usb/usbehci/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.rbuild branches/usb-bringup-trunk/lib/drivers/directory.rbuild branches/usb-bringup-trunk/lib/drivers/hidparser/CMakeLists.txt branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h Modified: branches/usb-bringup-trunk/drivers/drivers.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/drive… ============================================================================== --- branches/usb-bringup-trunk/drivers/drivers.rbuild [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/drivers.rbuild [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -18,6 +18,9 @@ </directory> <directory name="filesystems"> <xi:include href="filesystems/directory.rbuild" /> +</directory> +<directory name="hid"> + <xi:include href="hid/directory.rbuild" /> </directory> <directory name="filters> <xi:include href="filters/directory.rbuild" /> Modified: branches/usb-bringup-trunk/drivers/filters/mountmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/filte… ============================================================================== --- branches/usb-bringup-trunk/drivers/filters/mountmgr/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/filters/mountmgr/CMakeLists.txt [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -15,4 +15,4 @@ set_module_type(mountmgr kernelmodedriver) add_importlibs(mountmgr ntoskrnl hal) add_pch(mountmgr mntmgr.h) -#add_cd_file(TARGET mountmgr DESTINATION reactos/system32/drivers NO_CAB FOR all) +add_cd_file(TARGET mountmgr DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: branches/usb-bringup-trunk/drivers/filters/mountmgr/mountmgr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/filte… ============================================================================== --- branches/usb-bringup-trunk/drivers/filters/mountmgr/mountmgr.rbuild [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/filters/mountmgr/mountmgr.rbuild [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="mountmgr" type="kernelmodedriver" installbase="system32/drivers" installname="mountmgr.sys"> - <bootstrap installbase="$(CDOUTPUT)" /> +<module name="mountmgr" type="kernelmodedriver" installbase="system32/drivers" installname="mountmgr.sys" allowwarnings="true"> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <define name="NTDDI_VERSION">0x05020400</define> <include base="mountmgr">.</include> <library>ntoskrnl</library> Added: branches/usb-bringup-trunk/drivers/hid/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/d… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/directory.rbuild (added) +++ branches/usb-bringup-trunk/drivers/hid/directory.rbuild [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -1,0 +1,19 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="hidclass"> + <xi:include href="hidclass/hidclass.rbuild" /> + </directory> + <directory name="hidparse"> + <xi:include href="hidparse/hidparse.rbuild" /> + </directory> + <directory name="hidusb"> + <xi:include href="hidusb/hidusb.rbuild" /> + </directory> + <directory name="kbdhid"> + <xi:include href="kbdhid/kbdhid.rbuild" /> + </directory> + <directory name="mouhid"> + <xi:include href="mouhid/mouhid.rbuild" /> + </directory> +</group> Propchange: branches/usb-bringup-trunk/drivers/hid/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -11,7 +11,6 @@ add_library(hidclass SHARED ${SOURCE}) set_entrypoint(hidclass 0) -set_image_base(hidclass 0x00010000) set_subsystem(hidclass native) set_target_properties(hidclass PROPERTIES SUFFIX ".sys") Added: branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.rbuild (added) +++ branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.rbuild [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -1,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="hidclass" type="kernelmodedriver" entrypoint="0" installbase="system32/drivers" installname="hidclass.sys"> + <importlibrary definition="hidclass.spec" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> + <library>ntoskrnl</library> + <library>hidparse</library> + <library>hal</library> + <file>fdo.c</file> + <file>hidclass.c</file> + <file>hidclass.rc</file> + <file>pdo.c</file> +</module> Propchange: branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.rbuild (added) +++ branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.rbuild [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -1,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="hidparse" type="kernelmodedriver" installbase="system32/drivers" installname="hidparse.sys"> + <importlibrary definition="hidparse.spec" /> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> + <define name="DEBUG_MODE" /> + <include base="ntoskrnl">include</include> + <include base="ReactOS">lib/drivers/hidparser</include> + <library>ntoskrnl</library> + <library>hidparser</library> + <file>hidparse.c</file> + <file>hidparse.rc</file> +</module> Propchange: branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.rbuild (added) +++ branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.rbuild [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -1,0 +1,11 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="hidusb" type="kernelmodedriver" installbase="system32/drivers" installname="hidusb.sys"> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> + <library>ntoskrnl</library> + <library>hidclass</library> + <library>usbd</library> + <library>hal</library> + <file>hidusb.c</file> + <file>hidusb.rc</file> +</module> Propchange: branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/k… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -5,6 +5,7 @@ #include <hidclass.h> #include <hidpddi.h> #include <hidpi.h> +#define NDEBUG #include <debug.h> #include <kbdmou.h> //#include <kbd.h> Added: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/k… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.rbuild (added) +++ branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.rbuild [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -1,0 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kbdhid" type="kernelmodedriver" installbase="system32/drivers" installname="kbdhid.sys"> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> + <define name="DEBUG_MODE" /> + <include base="ntoskrnl">include</include> + <library>ntoskrnl</library> + <library>hal</library> + <library>hidparse</library> + <file>kbdhid.c</file> + <file>kbdhid.rc</file> +</module> Propchange: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/m… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -5,6 +5,7 @@ #include <hidclass.h> #include <hidpddi.h> #include <hidpi.h> +#define NDEBUG #include <debug.h> #include <ntddmou.h> #include <kbdmou.h> Added: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/m… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.rbuild (added) +++ branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.rbuild [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -1,0 +1,11 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="mouhid" type="kernelmodedriver" installbase="system32/drivers" installname="mouhid.sys"> + <define name="DEBUG_MODE" /> + <include base="ntoskrnl">include</include> + <library>ntoskrnl</library> + <library>hal</library> + <library>hidparse</library> + <file>mouhid.c</file> + <file>mouhid.rc</file> +</module> Propchange: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/usb-bringup-trunk/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/d… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/directory.rbuild [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/directory.rbuild [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -1,13 +1,22 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="usbccgp"> + <xi:include href="usbccgp/usbccgp.rbuild" /> + </directory> <directory name="usbd"> <xi:include href="usbd/usbd.rbuild" /> </directory> -  + </directory> </group> Added: branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.rbuild (added) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.rbuild [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -1,0 +1,19 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="usbccgp" type="kernelmodedriver" installbase="system32/drivers" installname="usbccgp.sys"> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> + <redefine name="_WIN32_WINNT">0x600</redefine> + <define name="DEBUG_MODE" /> + <include base="ntoskrnl">include</include> + <library>ntoskrnl</library> + <library>hal</library> + <library>usbd</library> + <library>pseh</library> + <file>descriptor.c</file> + <file>fdo.c</file> + <file>function.c</file> + <file>misc.c</file> + <file>pdo.c</file> + <file>usbccgp.c</file> + <file>usbccgp.rc</file> +</module> Propchange: branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -34,6 +34,7 @@ #include <ntddk.h> #include <usbdi.h> +#define NDEBUG #include <debug.h> #ifndef PLUGPLAY_REGKEY_DRIVER #define PLUGPLAY_REGKEY_DRIVER 2 Modified: branches/usb-bringup-trunk/drivers/usb/usbd/usbd.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbd/usbd.rbuild [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbd/usbd.rbuild [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -1,6 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="usbd" type="kernelmodedriver" installbase="system32/drivers" installname="usbd.sys"> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <importlibrary definition="usbd.spec" /> <library>ntoskrnl</library> <library>hal</library> Modified: branches/usb-bringup-trunk/drivers/usb/usbehci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -29,6 +29,6 @@ endif(MSVC) set_module_type(usbehci kernelmodedriver) -add_importlibs(usbehci ntoskrnl ks drmk hal) +add_importlibs(usbehci ntoskrnl hal) add_cd_file(TARGET usbehci DESTINATION reactos/system32/drivers NO_CAB FOR all) Added: branches/usb-bringup-trunk/drivers/usb/usbehci/usbehci.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci/usbehci.rbuild (added) +++ branches/usb-bringup-trunk/drivers/usb/usbehci/usbehci.rbuild [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -1,0 +1,22 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="usbehci" type="kernelmodedriver" installbase="system32/drivers" installname="usbehci.sys"> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> + <redefine name="_WIN32_WINNT">0x600</redefine> + <library>ntoskrnl</library> + <library>hal</library> + <library>pseh</library> + <file>usbehci.cpp</file> + <file>usb_device.cpp</file> + <file>usb_request.cpp</file> + <file>usb_queue.cpp</file> + <file>hcd_controller.cpp</file> + <file>hardware.cpp</file> + <file>misc.cpp</file> + <file>purecall.cpp</file> + <file>hub_controller.cpp</file> + <file>memory_manager.cpp</file> + <file>usbehci.rc</file> + <compilerflag>-fno-rtti</compilerflag> + <compilerflag>-fno-exceptions</compilerflag> +</module> Propchange: branches/usb-bringup-trunk/drivers/usb/usbehci/usbehci.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup-trunk/drivers/usb/usbhub/usbhub.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub/usbhub.rbuild (added) +++ branches/usb-bringup-trunk/drivers/usb/usbhub/usbhub.rbuild [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="usbhub" type="kernelmodedriver" installbase="system32/drivers" installname="usbhub.sys"> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> + <define name="DEBUG_MODE" /> + <include base="ntoskrnl">include</include> + <library>ntoskrnl</library> + <library>hal</library> + <library>usbd</library> + <library>pseh</library> + <file>fdo.c</file> + <file>misc.c</file> + <file>pdo.c</file> + <file>usbhub.c</file> + <file>usbhub.rc</file> +</module> Propchange: branches/usb-bringup-trunk/drivers/usb/usbhub/usbhub.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.rbuild (added) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.rbuild [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -1,0 +1,23 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="usbohci" type="kernelmodedriver" installbase="system32/drivers" installname="usbohci.sys"> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> + <redefine name="_WIN32_WINNT">0x600</redefine> + <library>ntoskrnl</library> + <library>hal</library> + <library>usbd</library> + <library>pseh</library> + <file>usbohci.cpp</file> + <file>usb_device.cpp</file> + <file>usb_request.cpp</file> + <file>usb_queue.cpp</file> + <file>hcd_controller.cpp</file> + <file>hardware.cpp</file> + <file>misc.cpp</file> + <file>purecall.cpp</file> + <file>hub_controller.cpp</file> + <file>memory_manager.cpp</file> + <file>usbohci.rc</file> + <compilerflag>-fno-rtti</compilerflag> + <compilerflag>-fno-exceptions</compilerflag> +</module> Propchange: branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -2,7 +2,7 @@ #pragma once #include <ntddk.h> -#define YDEBUG +#define NDEBUG #include <debug.h> #include <usbdi.h> #include <hubbusif.h> Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.rbuild [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.rbuild [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -1,10 +1,20 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="usbstor" type="kernelmodedriver" installbase="system32/drivers" installname="usbstor.sys"> + <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> <define name="DEBUG_MODE" /> <include base="ntoskrnl">include</include> <library>ntoskrnl</library> <library>hal</library> + <library>usbd</library> + <file>descriptor.c</file> + <file>disk.c</file> + <file>fdo.c</file> + <file>misc.c</file> + <file>pdo.c</file> + <file>queue.c</file> + <file>error.c</file> + <file>scsi.c</file> <file>usbstor.c</file> <file>usbstor.rc</file> </module> Modified: branches/usb-bringup-trunk/lib/drivers/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/d… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/directory.rbuild [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/directory.rbuild [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -3,6 +3,9 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="csq"> <xi:include href="csq/csq.rbuild" /> + </directory> + <directory name="hidparser"> + <xi:include href="hidparser/hidparser.rbuild" /> </directory> <directory name="ip"> <xi:include href="ip/ip.rbuild" /> Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/CMakeLists.txt [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -1,7 +1,7 @@ add_definitions( -DUNICODE -D_UNICODE - -DNDEBUG=1) + -DNDEBUG) list(APPEND SOURCE context.c Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -15,6 +15,7 @@ #include <ntddk.h> #include <hidpddi.h> #include <hidpi.h> +#define NDEBUG #include <debug.h> // Added: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… ============================================================================== --- branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.rbuild (added) +++ branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.rbuild [iso-8859-1] Sun Feb 12 03:48:54 2012 @@ -1,0 +1,11 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="hidparser" type="staticlibrary"> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="NDEBUG" /> + <file>hidparser.c</file> + <file>parser.c</file> + <file>context.c</file> + <file>api.c</file> +</module> Propchange: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

12 years, 7 months

[cgutman] 55553: [HIDCLASS][HIDPARSE][HIDUSB][KBDHID][MOUHID][USBCCGP][USBD][USBEHCI][USBOHCI][USBHUB][USBSTOR] - Massive debug spam reduction

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Feb 12 02:53:34 2012 New Revision: 55553 URL: http://svn.reactos.org/svn/reactos?rev=55553&view=rev Log: [HIDCLASS][HIDPARSE][HIDUSB][KBDHID][MOUHID][USBCCGP][USBD][USBEHCI][USBOHCI][USBHUB][USBSTOR] - Massive debug spam reduction Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/fdo.c branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.c branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c branches/usb-bringup-trunk/drivers/usb/usbccgp/function.c branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c branches/usb-bringup-trunk/drivers/usb/usbehci/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbehci/hcd_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbehci/hub_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbehci/usb_device.cpp branches/usb-bringup-trunk/drivers/usb/usbehci/usb_queue.cpp branches/usb-bringup-trunk/drivers/usb/usbehci/usb_request.cpp branches/usb-bringup-trunk/drivers/usb/usbhub/fdo.c branches/usb-bringup-trunk/drivers/usb/usbhub/pdo.c branches/usb-bringup-trunk/drivers/usb/usbhub/usbhub.c branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/hcd_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/usb_request.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.cpp branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c branches/usb-bringup-trunk/drivers/usb/usbstor/error.c branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c branches/usb-bringup-trunk/drivers/usb/usbstor/misc.c branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.c Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidclass/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidclass/fdo.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -183,7 +183,7 @@ // // call driver // - DPRINT1("IoStack MajorFunction %x MinorFunction %x\n", IoStack->MajorFunction, IoStack->MinorFunction); + DPRINT("IoStack MajorFunction %x MinorFunction %x\n", IoStack->MajorFunction, IoStack->MinorFunction); Status = CommonDeviceExtension->DriverExtension->MajorFunction[IoStack->MajorFunction](DeviceObject, Irp); // Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -177,9 +177,9 @@ // IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("ShareAccess %x\n", IoStack->Parameters.Create.ShareAccess); - DPRINT1("Options %x\n", IoStack->Parameters.Create.Options); - DPRINT1("DesiredAccess %x\n", IoStack->Parameters.Create.SecurityContext->DesiredAccess); + DPRINT("ShareAccess %x\n", IoStack->Parameters.Create.ShareAccess); + DPRINT("Options %x\n", IoStack->Parameters.Create.Options); + DPRINT("DesiredAccess %x\n", IoStack->Parameters.Create.SecurityContext->DesiredAccess); // // allocate context Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -131,7 +131,7 @@ // // store result // - DPRINT1("NewBuffer %S\n", NewBuffer); + DPRINT("NewBuffer %S\n", NewBuffer); Irp->IoStatus.Information = (ULONG_PTR)NewBuffer; return STATUS_SUCCESS; } @@ -510,14 +510,14 @@ // now register the device interface // Status = IoRegisterDeviceInterface(PDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject, &GUID_DEVINTERFACE_HID, NULL, &PDODeviceExtension->DeviceInterface); - DPRINT1("[HIDCLASS] IoRegisterDeviceInterfaceState Status %x\n", Status); + DPRINT("[HIDCLASS] IoRegisterDeviceInterfaceState Status %x\n", Status); if (NT_SUCCESS(Status)) { // // enable device interface // Status = IoSetDeviceInterfaceState(&PDODeviceExtension->DeviceInterface, TRUE); - DPRINT1("[HIDCLASS] IoSetDeviceInterFaceState %x\n", Status); + DPRINT("[HIDCLASS] IoSetDeviceInterFaceState %x\n", Status); } // Modified: branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -640,6 +640,6 @@ IN PUNICODE_STRING RegPath) { - DPRINT1("********* HID PARSE *********\n"); + DPRINT("********* HID PARSE *********\n"); return STATUS_SUCCESS; } Modified: branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -305,7 +305,7 @@ // // informal debug print // - DPRINT1("HIDUSB Request: %x\n", IoStack->MajorFunction); + DPRINT("HIDUSB Request: %x\n", IoStack->MajorFunction); // // done @@ -324,7 +324,7 @@ PHID_USB_RESET_CONTEXT ResetContext; PHID_DEVICE_EXTENSION DeviceExtension; - DPRINT1("[HIDUSB] ResetWorkerRoutine\n"); + DPRINT("[HIDUSB] ResetWorkerRoutine\n"); // // get context @@ -340,7 +340,7 @@ // get port status // Status = HidUsb_GetPortStatus(ResetContext->DeviceObject, &PortStatus); - DPRINT1("[HIDUSB] ResetWorkerRoutine GetPortStatus %x PortStatus %x\n", Status, PortStatus); + DPRINT("[HIDUSB] ResetWorkerRoutine GetPortStatus %x PortStatus %x\n", Status, PortStatus); if (NT_SUCCESS(Status)) { if (!(PortStatus & USB_PORT_STATUS_ENABLE)) @@ -661,7 +661,7 @@ // get current stack location // IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("[HIDUSB] GetReportDescriptor: Status %x ReportLength %lu OutputBufferLength %lu TransferredLength %lu\n", Status, HidDeviceExtension->HidDescriptor->DescriptorList[0].wReportLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, BufferLength); + DPRINT("[HIDUSB] GetReportDescriptor: Status %x ReportLength %lu OutputBufferLength %lu TransferredLength %lu\n", Status, HidDeviceExtension->HidDescriptor->DescriptorList[0].wReportLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, BufferLength); // // get length to copy @@ -727,7 +727,7 @@ // // store result // - DPRINT1("[HIDUSB] IOCTL_HID_GET_DEVICE_ATTRIBUTES\n"); + DPRINT("[HIDUSB] IOCTL_HID_GET_DEVICE_ATTRIBUTES\n"); ASSERT(HidDeviceExtension->DeviceDescriptor); Irp->IoStatus.Information = sizeof(HID_DESCRIPTOR); Attributes = (PHID_DEVICE_ATTRIBUTES)Irp->UserBuffer; @@ -749,7 +749,7 @@ // sanity check // ASSERT(HidDeviceExtension->HidDescriptor); - DPRINT1("[HIDUSB] IOCTL_HID_GET_DEVICE_DESCRIPTOR DescriptorLength %lu OutputBufferLength %lu\n", HidDeviceExtension->HidDescriptor->bLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength); + DPRINT("[HIDUSB] IOCTL_HID_GET_DEVICE_DESCRIPTOR DescriptorLength %lu OutputBufferLength %lu\n", HidDeviceExtension->HidDescriptor->bLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength); // // store length @@ -774,7 +774,7 @@ case IOCTL_HID_GET_REPORT_DESCRIPTOR: { Status = HidUsb_GetReportDescriptor(DeviceObject, Irp); - DPRINT1("[HIDUSB] IOCTL_HID_GET_REPORT_DESCRIPTOR Status %x\n", Status); + DPRINT("[HIDUSB] IOCTL_HID_GET_REPORT_DESCRIPTOR Status %x\n", Status); Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; @@ -1000,7 +1000,7 @@ Status = IoStatus.Status; } - DPRINT1("[HIDUSB] DispatchUrb %x\n", Status); + DPRINT("[HIDUSB] DispatchUrb %x\n", Status); // @@ -1291,7 +1291,7 @@ // // print status // - DPRINT1("Status %x\n", Status); + DPRINT("Status %x\n", Status); return Status; } @@ -1358,7 +1358,7 @@ // // print status // - DPRINT1("Status %x Protocol %x\n", Status, Protocol[0] & 0xFF); + DPRINT("Status %x Protocol %x\n", Status, Protocol[0] & 0xFF); // // assert when boot protocol is still active @@ -1501,7 +1501,7 @@ // // done // - DPRINT1("[HIDUSB] SelectConfiguration %x\n", Status); + DPRINT("[HIDUSB] SelectConfiguration %x\n", Status); return Status; } @@ -1536,7 +1536,7 @@ // get current stack location // IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("[HIDUSB] Pnp %x\n", IoStack->MinorFunction); + DPRINT("[HIDUSB] Pnp %x\n", IoStack->MinorFunction); // // handle requests based on request type @@ -1714,7 +1714,7 @@ // complete request // Irp->IoStatus.Status = Status; - DPRINT1("[HIDUSB] IRP_MN_START_DEVICE Status %x\n", Status); + DPRINT("[HIDUSB] IRP_MN_START_DEVICE Status %x\n", Status); IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -1807,8 +1807,8 @@ // // informal debug // - DPRINT1("********* HIDUSB *********\n"); - DPRINT1("HIDUSB Registration Status %x\n", Status); + DPRINT("********* HIDUSB *********\n"); + DPRINT("HIDUSB Registration Status %x\n", Status); return Status; } Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/k… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -51,7 +51,7 @@ for(Index = 0; Index < Length; Index++) { - DPRINT1("[KBDHID] ScanCode Index %lu ScanCode %x\n", Index, NewScanCodes[Index] & 0xFF); + DPRINT("[KBDHID] ScanCode Index %lu ScanCode %x\n", Index, NewScanCodes[Index] & 0xFF); /* init input data */ RtlZeroMemory(&InputData, sizeof(KEYBOARD_INPUT_DATA)); @@ -114,7 +114,7 @@ // print out raw report // ASSERT(DeviceExtension->ReportLength >= 9); - DPRINT1("[KBDHID] ReadCompletion %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", DeviceExtension->Report[0], DeviceExtension->Report[1], DeviceExtension->Report[2], + DPRINT("[KBDHID] ReadCompletion %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", DeviceExtension->Report[0], DeviceExtension->Report[1], DeviceExtension->Report[2], DeviceExtension->Report[3], DeviceExtension->Report[4], DeviceExtension->Report[5], DeviceExtension->Report[6], DeviceExtension->Report[7], DeviceExtension->Report[8]); @@ -207,7 +207,7 @@ KEVENT Event; PKBDHID_DEVICE_EXTENSION DeviceExtension; - DPRINT1("[KBDHID]: IRP_MJ_CREATE\n"); + DPRINT("[KBDHID]: IRP_MJ_CREATE\n"); /* get device extension */ DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -256,7 +256,7 @@ /* initiating read */ Status = KbdHid_InitiateRead(DeviceExtension); - DPRINT1("[KBDHID] KbdHid_InitiateRead: status %x\n", Status); + DPRINT("[KBDHID] KbdHid_InitiateRead: status %x\n", Status); if (Status == STATUS_PENDING) { /* report irp is pending */ @@ -323,7 +323,7 @@ /* get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("[KBDHID] InternalDeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); + DPRINT("[KBDHID] InternalDeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); /* get device extension */ DeviceExtension = (PKBDHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -622,7 +622,7 @@ return Status; } - DPRINT1("[KBDHID] Usage %x UsagePage %x InputReportLength %lu\n", Capabilities.Usage, Capabilities.UsagePage, Capabilities.InputReportByteLength); + DPRINT("[KBDHID] Usage %x UsagePage %x InputReportLength %lu\n", Capabilities.Usage, Capabilities.UsagePage, Capabilities.InputReportByteLength); /* init input report*/ DeviceExtension->ReportLength = Capabilities.InputReportByteLength; @@ -640,7 +640,7 @@ /* get max number of buttons */ Buttons = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_KEYBOARD, PreparsedData); - DPRINT1("[KBDHID] Buttons %lu\n", Buttons); + DPRINT("[KBDHID] Buttons %lu\n", Buttons); ASSERT(Buttons > 0); /* now allocate an array for those buttons */ @@ -735,7 +735,7 @@ /* get current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("[KBDHID] IRP_MJ_PNP Request: %x\n", IoStack->MinorFunction); + DPRINT("[KBDHID] IRP_MJ_PNP Request: %x\n", IoStack->MinorFunction); if (IoStack->MinorFunction == IRP_MN_STOP_DEVICE || IoStack->MinorFunction == IRP_MN_CANCEL_REMOVE_DEVICE || @@ -803,7 +803,7 @@ /* lets start the device */ Status = KbdHid_StartDevice(DeviceObject); - DPRINT1("KbdHid_StartDevice %x\n", Status); + DPRINT("KbdHid_StartDevice %x\n", Status); /* complete request */ Irp->IoStatus.Status = Status; Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/m… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -298,7 +298,7 @@ KEVENT Event; PMOUHID_DEVICE_EXTENSION DeviceExtension; - DPRINT1("MOUHID: IRP_MJ_CREATE\n"); + DPRINT("MOUHID: IRP_MJ_CREATE\n"); /* get device extension */ DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -347,7 +347,7 @@ /* initiating read */ Status = MouHid_InitiateRead(DeviceExtension); - DPRINT1("[MOUHID] MouHid_InitiateRead: status %x\n", Status); + DPRINT("[MOUHID] MouHid_InitiateRead: status %x\n", Status); if (Status == STATUS_PENDING) { /* report irp is pending */ @@ -414,7 +414,7 @@ /* get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("[MOUHID] InternalDeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); + DPRINT("[MOUHID] InternalDeviceControl %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); /* get device extension */ DeviceExtension = (PMOUHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -447,10 +447,10 @@ /* queue length */ Attributes->InputDataQueueLength = 2; - DPRINT1("[MOUHID] MouseIdentifier %x\n", Attributes->MouseIdentifier); - DPRINT1("[MOUHID] NumberOfButtons %x\n", Attributes->NumberOfButtons); - DPRINT1("[MOUHID] SampleRate %x\n", Attributes->SampleRate); - DPRINT1("[MOUHID] InputDataQueueLength %x\n", Attributes->InputDataQueueLength); + DPRINT("[MOUHID] MouseIdentifier %x\n", Attributes->MouseIdentifier); + DPRINT("[MOUHID] NumberOfButtons %x\n", Attributes->NumberOfButtons); + DPRINT("[MOUHID] SampleRate %x\n", Attributes->SampleRate); + DPRINT("[MOUHID] InputDataQueueLength %x\n", Attributes->InputDataQueueLength); /* complete request */ Irp->IoStatus.Information = sizeof(MOUSE_ATTRIBUTES); @@ -645,7 +645,7 @@ return Status; } - DPRINT1("[MOUHID] Usage %x UsagePage %x InputReportLength %lu\n", Capabilities.Usage, Capabilities.UsagePage, Capabilities.InputReportByteLength); + DPRINT("[MOUHID] Usage %x UsagePage %x InputReportLength %lu\n", Capabilities.Usage, Capabilities.UsagePage, Capabilities.InputReportByteLength); /* verify capabilities */ if ((Capabilities.Usage != HID_USAGE_GENERIC_POINTER && Capabilities.Usage != HID_USAGE_GENERIC_MOUSE) || Capabilities.UsagePage != HID_USAGE_PAGE_GENERIC) @@ -671,7 +671,7 @@ /* get max number of buttons */ Buttons = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON, PreparsedData); - DPRINT1("[MOUHID] Buttons %lu\n", Buttons); + DPRINT("[MOUHID] Buttons %lu\n", Buttons); ASSERT(Buttons > 0); /* now allocate an array for those buttons */ @@ -713,7 +713,7 @@ /* mouse has wheel support */ DeviceExtension->MouseIdentifier = WHEELMOUSE_HID_HARDWARE; DeviceExtension->WheelUsagePage = ValueCaps.UsagePage; - DPRINT1("[MOUHID] mouse wheel support detected\n", Status); + DPRINT("[MOUHID] mouse wheel support detected\n", Status); } else { @@ -725,7 +725,7 @@ /* wheel support */ DeviceExtension->MouseIdentifier = WHEELMOUSE_HID_HARDWARE; DeviceExtension->WheelUsagePage = ValueCaps.UsagePage; - DPRINT1("[MOUHID] mouse wheel support detected with z-axis\n", Status); + DPRINT("[MOUHID] mouse wheel support detected with z-axis\n", Status); } } @@ -786,7 +786,7 @@ /* get current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("[MOUHID] IRP_MJ_PNP Request: %x\n", IoStack->MinorFunction); + DPRINT("[MOUHID] IRP_MJ_PNP Request: %x\n", IoStack->MinorFunction); if (IoStack->MinorFunction == IRP_MN_STOP_DEVICE || IoStack->MinorFunction == IRP_MN_CANCEL_REMOVE_DEVICE || @@ -867,7 +867,7 @@ /* lets start the device */ Status = MouHid_StartDevice(DeviceObject); - DPRINT1("MouHid_StartDevice %x\n", Status); + DPRINT("MouHid_StartDevice %x\n", Status); /* complete request */ Irp->IoStatus.Status = Status; Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -404,7 +404,7 @@ // // done // - DPRINT1("[USBCCGP] FDO initialized successfully\n"); + DPRINT("[USBCCGP] FDO initialized successfully\n"); return Status; } @@ -424,7 +424,7 @@ // get stack location IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("[USBCCGP] PnP Minor %x\n", IoStack->MinorFunction); + DPRINT("[USBCCGP] PnP Minor %x\n", IoStack->MinorFunction); switch(IoStack->MinorFunction) { case IRP_MN_REMOVE_DEVICE: @@ -536,7 +536,7 @@ // get stack location IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("FDO_HandleResetCyclePort IOCTL %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); + DPRINT("FDO_HandleResetCyclePort IOCTL %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_USB_RESET_PORT) { @@ -671,7 +671,7 @@ // handle reset / cycle ports // Status = FDO_HandleResetCyclePort(DeviceObject, Irp); - DPRINT1("FDO_HandleResetCyclePort Status %x\n", Status); + DPRINT("FDO_HandleResetCyclePort Status %x\n", Status); if (Status != STATUS_PENDING) { // Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/function.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/function.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/function.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -131,7 +131,7 @@ DeviceObject, FDODeviceExtension->PhysicalDeviceObject); - DPRINT1("USBCCGP_CustomEnumWithInterface Status %x\n", Status); + DPRINT("USBCCGP_CustomEnumWithInterface Status %x\n", Status); if (!NT_SUCCESS(Status)) { // @@ -140,8 +140,8 @@ return Status; } - DPRINT1("FunctionDescriptorBufferLength %lu\n", FunctionDescriptorBufferLength); - DPRINT1("FunctionDescriptorBuffer %p\n", FunctionDescriptorBuffer); + DPRINT("FunctionDescriptorBufferLength %lu\n", FunctionDescriptorBufferLength); + DPRINT("FunctionDescriptorBuffer %p\n", FunctionDescriptorBuffer); // // assume length % function buffer size @@ -777,7 +777,7 @@ // // this is an composite audio device // - DPRINT1("[USBCCGP] Audio Composite Device detected\n"); + DPRINT("[USBCCGP] Audio Composite Device detected\n"); // // audio interfaces are all grouped into one single function Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -75,7 +75,7 @@ PDEVICE_RELATIONS DeviceRelations; PIO_STACK_LOCATION IoStack; - DPRINT1("USBCCGP_PdoHandleDeviceRelations\n"); + DPRINT("USBCCGP_PdoHandleDeviceRelations\n"); // // get current irp stack location @@ -165,7 +165,7 @@ { StringLength = swprintf(String, L"%s&MI_%02x", DeviceId) + 1; Length = wcslen(DeviceId) + 1; - DPRINT1("String %p\n", String); + DPRINT("String %p\n", String); // // next string @@ -222,7 +222,7 @@ // ASSERT(Irp->IoStatus.Information); swprintf(Buffer, L"%s&MI_%02x", (LPWSTR)Irp->IoStatus.Information, PDODeviceExtension->FunctionDescriptor->FunctionNumber); - DPRINT1("BusQueryDeviceID %S\n", Buffer); + DPRINT("BusQueryDeviceID %S\n", Buffer); ExFreePool((PVOID)Irp->IoStatus.Information); Irp->IoStatus .Information = (ULONG_PTR)Buffer; @@ -410,7 +410,7 @@ // // no-op for PDO // - DPRINT1("[USBCCGP] PDO IRP_MN_START\n"); + DPRINT("[USBCCGP] PDO IRP_MN_START\n"); Status = STATUS_SUCCESS; break; } @@ -466,7 +466,7 @@ // IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("USBCCGP_BuildConfigurationDescriptor\n"); + DPRINT("USBCCGP_BuildConfigurationDescriptor\n"); // // get device extension @@ -694,7 +694,7 @@ InterfaceInformation = &Urb->UrbSelectConfiguration.Interface; Index = 0; Entry = NULL; - DPRINT1("Count %x\n", InterfaceInformationCount); + DPRINT("Count %x\n", InterfaceInformationCount); do { DPRINT1("[USBCCGP] SelectConfiguration Function %x InterfaceNumber %x Alternative %x\n", PDODeviceExtension->FunctionDescriptor->FunctionNumber, InterfaceInformation->InterfaceNumber, InterfaceInformation->AlternateSetting); Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -140,7 +140,7 @@ { // initialize driver object - DPRINT1("[USBCCGP] DriverEntry\n"); + DPRINT("[USBCCGP] DriverEntry\n"); DriverObject->DriverExtension->AddDevice = USBCCGP_AddDevice; DriverObject->MajorFunction[IRP_MJ_CREATE] = USBCCGP_Dispatch; DriverObject->MajorFunction[IRP_MJ_CLOSE] = USBCCGP_Dispatch; Modified: branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbd/usbd.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -440,7 +440,7 @@ if ((ULONG_PTR)CommonDescriptor >= ((ULONG_PTR)DescriptorBuffer + TotalLength)) { /* end reached */ - DPRINT1("End reached %p\n", CommonDescriptor); + DPRINT("End reached %p\n", CommonDescriptor); return NULL; } Modified: branches/usb-bringup-trunk/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -163,7 +163,7 @@ NTSTATUS Status; ULONG BytesRead; - DPRINT1("CUSBHardwareDevice::Initialize\n"); + DPRINT("CUSBHardwareDevice::Initialize\n"); // // Create DMAMemoryManager for use with QueueHeads and Transfer Descriptors. @@ -306,7 +306,7 @@ UCHAR Value; UCHAR PortCount; - DPRINT1("CUSBHardwareDevice::PnpStart\n"); + DPRINT("CUSBHardwareDevice::PnpStart\n"); for(Index = 0; Index < TranslatedResources->List[0].PartialResourceList.Count; Index++) { // @@ -680,7 +680,7 @@ if ((UsbSts & (EHCI_STS_PSS | EHCI_STS_ASS))) { DPRINT1("Failed to stop running schedules %x\n", UsbSts); - ASSERT(FALSE); + //ASSERT(FALSE); } @@ -767,14 +767,14 @@ if (UsbSts & EHCI_STS_HALT) { DPRINT1("Could not start execution on the controller\n"); - ASSERT(FALSE); + //ASSERT(FALSE); return STATUS_UNSUCCESSFUL; } if (!(UsbSts & EHCI_STS_PSS)) { DPRINT1("Could not enable periodic scheduling\n"); - ASSERT(FALSE); + //ASSERT(FALSE); return STATUS_UNSUCCESSFUL; } @@ -815,7 +815,7 @@ if (!(UsbSts & EHCI_STS_ASS)) { DPRINT1("Failed to enable async schedule UsbSts %x\n", UsbSts); - ASSERT(FALSE); + //ASSERT(FALSE); return STATUS_UNSUCCESSFUL; } @@ -996,7 +996,11 @@ // // this must be enabled now // - ASSERT(PortStatus & EHCI_PRT_ENABLED); + if (PortStatus & EHCI_PRT_ENABLED) + { + DPRINT1("Port is not enabled after reset\n"); + //ASSERT(FALSE); + } return STATUS_SUCCESS; } @@ -1281,7 +1285,7 @@ CStatus = This->EHCI_READ_REGISTER_ULONG(EHCI_USBSTS); CStatus &= (EHCI_ERROR_INT | EHCI_STS_INT | EHCI_STS_IAA | EHCI_STS_PCD | EHCI_STS_FLR); - DPRINT1("CStatus %x\n", CStatus); + DPRINT("CStatus %x\n", CStatus); // // Check that it belongs to EHCI @@ -1350,7 +1354,7 @@ // controller reported error // DPRINT1("CStatus %x\n", CStatus); - ASSERT(FALSE); + //ASSERT(FALSE); } // Modified: branches/usb-bringup-trunk/drivers/usb/usbehci/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci/hcd_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci/hcd_controller.cpp [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -394,7 +394,7 @@ { case IRP_MN_START_DEVICE: { - DPRINT1("CHCDController::HandlePnp IRP_MN_START FDO\n"); + DPRINT("CHCDController::HandlePnp IRP_MN_START FDO\n"); // // first start lower device object @@ -423,12 +423,12 @@ Status = SetSymbolicLink(TRUE); } - DPRINT1("CHCDController::HandlePnp IRP_MN_START FDO: Status %x\n", Status); + DPRINT("CHCDController::HandlePnp IRP_MN_START FDO: Status %x\n", Status); break; } case IRP_MN_QUERY_DEVICE_RELATIONS: { - DPRINT1("CHCDController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %lx\n", IoStack->Parameters.QueryDeviceRelations.Type); + DPRINT("CHCDController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %lx\n", IoStack->Parameters.QueryDeviceRelations.Type); if (m_HubController == NULL) { @@ -508,7 +508,7 @@ } case IRP_MN_STOP_DEVICE: { - DPRINT1("CHCDController::HandlePnp IRP_MN_STOP_DEVICE\n"); + DPRINT("CHCDController::HandlePnp IRP_MN_STOP_DEVICE\n"); if (m_Hardware) { @@ -550,7 +550,7 @@ } case IRP_MN_REMOVE_DEVICE: { - DPRINT1("CHCDController::HandlePnp IRP_MN_REMOVE_DEVICE FDO\n"); + DPRINT("CHCDController::HandlePnp IRP_MN_REMOVE_DEVICE FDO\n"); // // delete the symbolic link @@ -673,7 +673,7 @@ // m_FDODeviceNumber = UsbDeviceNumber; - DPRINT1("CreateFDO: DeviceName %wZ\n", &DeviceName); + DPRINT("CreateFDO: DeviceName %wZ\n", &DeviceName); /* done */ return Status; Modified: branches/usb-bringup-trunk/drivers/usb/usbehci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci/hub_controller.cpp [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -430,7 +430,7 @@ { case IRP_MN_START_DEVICE: { - DPRINT1("CHubController::HandlePnp IRP_MN_START_DEVICE\n"); + DPRINT("CHubController::HandlePnp IRP_MN_START_DEVICE\n"); // // register device interface // @@ -448,7 +448,7 @@ } case IRP_MN_QUERY_ID: { - DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_ID Type %x\n", IoStack->Parameters.QueryId.IdType); + DPRINT("CHubController::HandlePnp IRP_MN_QUERY_ID Type %x\n", IoStack->Parameters.QueryId.IdType); if (IoStack->Parameters.QueryId.IdType == BusQueryDeviceID) { @@ -474,7 +474,7 @@ swprintf(Buffer, L"USB\\ROOT_HUB"); } - DPRINT1("Name %S\n", Buffer); + DPRINT("Name %S\n", Buffer); // // calculate length @@ -585,7 +585,7 @@ } case IRP_MN_QUERY_CAPABILITIES: { - DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_CAPABILITIES\n"); + DPRINT("CHubController::HandlePnp IRP_MN_QUERY_CAPABILITIES\n"); DeviceCapabilities = (PDEVICE_CAPABILITIES)IoStack->Parameters.DeviceCapabilities.Capabilities; @@ -617,7 +617,7 @@ } case IRP_MN_QUERY_INTERFACE: { - DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_INTERFACE\n"); + DPRINT("CHubController::HandlePnp IRP_MN_QUERY_INTERFACE\n"); // // handle device interface requests @@ -627,7 +627,7 @@ } case IRP_MN_REMOVE_DEVICE: { - DPRINT1("CHubController::HandlePnp IRP_MN_REMOVE_DEVICE\n"); + DPRINT("CHubController::HandlePnp IRP_MN_REMOVE_DEVICE\n"); // // deactivate device interface for BUS PDO @@ -657,7 +657,7 @@ } case IRP_MN_QUERY_DEVICE_RELATIONS: { - DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %x\n", IoStack->Parameters.QueryDeviceRelations.Type); + DPRINT("CHubController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %x\n", IoStack->Parameters.QueryDeviceRelations.Type); if (IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation) { @@ -698,7 +698,7 @@ } case IRP_MN_QUERY_BUS_INFORMATION: { - DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_BUS_INFORMATION\n"); + DPRINT("CHubController::HandlePnp IRP_MN_QUERY_BUS_INFORMATION\n"); // // allocate buffer for bus information @@ -731,7 +731,7 @@ } case IRP_MN_STOP_DEVICE: { - DPRINT1("CHubController::HandlePnp IRP_MN_STOP_DEVICE\n"); + DPRINT("CHubController::HandlePnp IRP_MN_STOP_DEVICE\n"); // // stop device // @@ -847,7 +847,7 @@ // // Else pend the IRP, to be completed when a device connects or disconnects. // - DPRINT1("Pending SCE Irp\n");; + DPRINT("Pending SCE Irp\n"); m_PendingSCEIrp = Irp; IoMarkIrpPending(Irp); return STATUS_PENDING; Modified: branches/usb-bringup-trunk/drivers/usb/usbehci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci/usb_device.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci/usb_device.cpp [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -270,7 +270,7 @@ } DPRINT1("CUSBDevice::GetType Unknown bcdUSB Type %x\n", m_DeviceDescriptor.bcdUSB); - PC_ASSERT(FALSE); + //PC_ASSERT(FALSE); return Usb11Device; } Modified: branches/usb-bringup-trunk/drivers/usb/usbehci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -195,7 +195,7 @@ // DPRINT1("Failed to allocate sync frame list\n"); ExFreePool(m_SyncFrameListQueueHeads); - ASSERT(FALSE); + //ASSERT(FALSE); return STATUS_INSUFFICIENT_RESOURCES; } @@ -800,7 +800,7 @@ return; } DPRINT1("Unable to create a new QueueHead\n"); - PC_ASSERT(FALSE); + //ASSERT(FALSE); // // Else there was a problem @@ -808,7 +808,11 @@ UrbStatus = USBD_STATUS_INSUFFICIENT_RESOURCES; } - if (UrbStatus != USBD_STATUS_SUCCESS) PC_ASSERT(FALSE); + if (UrbStatus != USBD_STATUS_SUCCESS) + { + DPRINT1("URB failed with status 0x%x\n", UrbStatus); + //PC_ASSERT(FALSE); + } // // notify request that a transfer has completed Modified: branches/usb-bringup-trunk/drivers/usb/usbehci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -329,7 +329,7 @@ } default: DPRINT1("URB Function: not supported %x\n", Urb->UrbHeader.Function); - PC_ASSERT(FALSE); + //ASSERT(FALSE); } // @@ -1014,7 +1014,7 @@ // //DumpQueueHead(QueueHead); - DPRINT1("BuildControlTransferQueueHead done\n"); + DPRINT("BuildControlTransferQueueHead done\n"); // // done // @@ -1711,7 +1711,7 @@ // DPRINT1("Found halted queue head %p\n", QueueHead); DumpQueueHead(QueueHead); - ASSERT(FALSE); + //ASSERT(FALSE); return TRUE; } Modified: branches/usb-bringup-trunk/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub/fdo.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -262,7 +262,7 @@ LONG PortId; BOOLEAN SignalResetComplete = FALSE; - DPRINT1("Entered DeviceStatusChangeThread, Context %x\n", Context); + DPRINT("Entered DeviceStatusChangeThread, Context %x\n", Context); WorkItemData = (PWORK_ITEM_DATA)Context; DeviceObject = (PDEVICE_OBJECT)WorkItemData->Context; @@ -418,7 +418,7 @@ // // Send another SCE Request // - DPRINT1("Sending another SCE!\n"); + DPRINT("Sending another SCE!\n"); QueryStatusChangeEndpoint(DeviceObject); // @@ -450,7 +450,7 @@ // // NOTE: USBPORT frees this IRP // - DPRINT1("Received Irp %x, HubDeviceExtension->PendingSCEIrp %x\n", Irp, HubDeviceExtension->PendingSCEIrp); + DPRINT("Received Irp %x, HubDeviceExtension->PendingSCEIrp %x\n", Irp, HubDeviceExtension->PendingSCEIrp); //IoFreeIrp(Irp); // @@ -464,7 +464,7 @@ } WorkItemData->Context = RealDeviceObject; - DPRINT1("Queuing work item\n"); + DPRINT("Queuing work item\n"); // // Queue the work item to handle initializing the device @@ -524,7 +524,7 @@ HubDeviceExtension->PendingSCEIrp = IoAllocateIrp(RootHubDeviceObject->StackSize, FALSE); */ - DPRINT1("Allocated IRP %x\n", HubDeviceExtension->PendingSCEIrp); + DPRINT("Allocated IRP %x\n", HubDeviceExtension->PendingSCEIrp); if (!HubDeviceExtension->PendingSCEIrp) { @@ -567,8 +567,8 @@ // // Send to RootHub // - DPRINT1("DeviceObject is %x\n", DeviceObject); - DPRINT1("Iocalldriver %x with irp %x\n", RootHubDeviceObject, HubDeviceExtension->PendingSCEIrp); + DPRINT("DeviceObject is %x\n", DeviceObject); + DPRINT("Iocalldriver %x with irp %x\n", RootHubDeviceObject, HubDeviceExtension->PendingSCEIrp); Status = IoCallDriver(RootHubDeviceObject, HubDeviceExtension->PendingSCEIrp); return STATUS_PENDING; @@ -791,13 +791,12 @@ ExFreePool(StringDesc); return STATUS_INSUFFICIENT_RESOURCES; } - DPRINT1("Buffer %p\n", Buffer); + DPRINT("Buffer %p\n", Buffer); RtlZeroMemory(Buffer, SizeNeeded); - DPRINT1("Buffer %p\n", Buffer); - DPRINT1("SizeNeeded %lu\n", SizeNeeded); - DPRINT1("Offset %lu\n", FIELD_OFFSET(USB_STRING_DESCRIPTOR, bLength)); - DPRINT1("Length %lu\n", SizeNeeded - FIELD_OFFSET(USB_STRING_DESCRIPTOR, bLength)); + DPRINT("SizeNeeded %lu\n", SizeNeeded); + DPRINT("Offset %lu\n", FIELD_OFFSET(USB_STRING_DESCRIPTOR, bLength)); + DPRINT("Length %lu\n", SizeNeeded - FIELD_OFFSET(USB_STRING_DESCRIPTOR, bLength)); // // Copy the string to destination @@ -978,7 +977,7 @@ UsbChildExtension->usCompatibleIds.Buffer = DeviceString; UsbChildExtension->usCompatibleIds.Length = Index * sizeof(WCHAR); UsbChildExtension->usCompatibleIds.MaximumLength = (Index + 1) * sizeof(WCHAR); - DPRINT1("usCompatibleIds %wZ\n", &UsbChildExtension->usCompatibleIds); + DPRINT("usCompatibleIds %wZ\n", &UsbChildExtension->usCompatibleIds); // // Construct DeviceId string @@ -1004,7 +1003,7 @@ UsbChildExtension->usDeviceId.Buffer = DeviceString; UsbChildExtension->usDeviceId.Length = (Index-1) * sizeof(WCHAR); UsbChildExtension->usDeviceId.MaximumLength = Index * sizeof(WCHAR); - DPRINT1("usDeviceId %wZ\n", &UsbChildExtension->usDeviceId); + DPRINT("usDeviceId %wZ\n", &UsbChildExtension->usDeviceId); // // Construct HardwareIds @@ -1037,7 +1036,7 @@ UsbChildExtension->usHardwareIds.Buffer = DeviceString; UsbChildExtension->usHardwareIds.Length = (Index + 1) * sizeof(WCHAR); UsbChildExtension->usHardwareIds.MaximumLength = (Index + 1) * sizeof(WCHAR); - DPRINT1("usHardWareIds %wZ\n", &UsbChildExtension->usHardwareIds); + DPRINT("usHardWareIds %wZ\n", &UsbChildExtension->usHardwareIds); // // FIXME: Handle Lang ids @@ -1061,7 +1060,7 @@ else { UsbChildExtension->usTextDescription.MaximumLength = UsbChildExtension->usTextDescription.Length; - DPRINT1("Usb TextDescription %wZ\n", &UsbChildExtension->usTextDescription); + DPRINT("Usb TextDescription %wZ\n", &UsbChildExtension->usTextDescription); } } @@ -1082,7 +1081,7 @@ } UsbChildExtension->usInstanceId.MaximumLength = UsbChildExtension->usInstanceId.Length; - DPRINT1("Usb InstanceId %wZ\n", &UsbChildExtension->usInstanceId); + DPRINT("Usb InstanceId %wZ\n", &UsbChildExtension->usInstanceId); } else { @@ -1104,7 +1103,7 @@ RtlCopyMemory(UsbChildExtension->usInstanceId.Buffer, Buffer, Index * sizeof(WCHAR)); UsbChildExtension->usInstanceId.Length = UsbChildExtension->usInstanceId.MaximumLength = Index * sizeof(WCHAR); - DPRINT1("usDeviceId %wZ\n", &UsbChildExtension->usInstanceId); + DPRINT("usDeviceId %wZ\n", &UsbChildExtension->usInstanceId); } return Status; @@ -1120,7 +1119,7 @@ PDEVICE_OBJECT ChildDeviceObject = NULL; ULONG Index = 0; - DPRINT1("Removing device on port %d (Child index: %d)\n", PortId, Index); + DPRINT("Removing device on port %d (Child index: %d)\n", PortId, Index); for (Index = 0; Index < USB_MAXCHILDREN; Index++) { @@ -1185,7 +1184,7 @@ { if (HubDeviceExtension->ChildDeviceObject[ChildDeviceCount] == NULL) { - DPRINT1("Found unused entry at %d\n", ChildDeviceCount); + DPRINT("Found unused entry at %d\n", ChildDeviceCount); break; } } @@ -1243,7 +1242,7 @@ return Status; } - DPRINT1("USBHUB: Created Device %x\n", NewChildDeviceObject); + DPRINT("USBHUB: Created Device %x\n", NewChildDeviceObject); break; } @@ -1281,7 +1280,7 @@ goto Cleanup; } - DPRINT1("Usb Device Handle %x\n", UsbChildExtension->UsbDeviceHandle); + DPRINT("Usb Device Handle %x\n", UsbChildExtension->UsbDeviceHandle); ConfigDescSize = sizeof(USB_CONFIGURATION_DESCRIPTOR); DeviceDescSize = sizeof(USB_DEVICE_DESCRIPTOR); @@ -1451,7 +1450,7 @@ HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; - DPRINT1("RootHubInitCallbackFunction Sending the initial SCE Request %x\n", DeviceObject); + DPRINT("RootHubInitCallbackFunction Sending the initial SCE Request %x\n", DeviceObject); // // Send the first SCE Request @@ -1524,7 +1523,7 @@ PURB ConfigUrb = NULL; ULONG HubStatus; - DPRINT1("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); // // Allocated size including the sizeof USBD_INTERFACE_LIST_ENTRY @@ -1543,7 +1542,7 @@ RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; ASSERT(HubDeviceExtension->RootHubPhysicalDeviceObject); ASSERT(HubDeviceExtension->RootHubFunctionalDeviceObject); - DPRINT1("RootPdo %x, RootFdo %x\n", + DPRINT("RootPdo %x, RootFdo %x\n", HubDeviceExtension->RootHubPhysicalDeviceObject, HubDeviceExtension->RootHubFunctionalDeviceObject); @@ -1670,7 +1669,7 @@ sizeof(USB_CONFIGURATION_DESCRIPTOR) + sizeof(USB_INTERFACE_DESCRIPTOR) + sizeof(USB_ENDPOINT_DESCRIPTOR), NULL); - DPRINT1("RootHub Handle %x\n", HubDeviceExtension->RootHubHandle); + DPRINT("RootHub Handle %x\n", HubDeviceExtension->RootHubHandle); Urb->UrbHeader.UsbdDeviceHandle = NULL;//HubDeviceExtension->RootHubHandle; Status = SubmitRequestToRootHub(RootHubDeviceObject, @@ -1782,7 +1781,7 @@ HubDeviceExtension->ConfigurationHandle = ConfigUrb->UrbSelectConfiguration.ConfigurationHandle; HubDeviceExtension->PipeHandle = ConfigUrb->UrbSelectConfiguration.Interface.Pipes[0].PipeHandle; - DPRINT1("Configuration Handle %x\n", HubDeviceExtension->ConfigurationHandle); + DPRINT("Configuration Handle %x\n", HubDeviceExtension->ConfigurationHandle); // // check if function is available @@ -1799,7 +1798,7 @@ // Status = HubDeviceExtension->HubInterface.Initialize20Hub(HubInterfaceBusContext, HubDeviceExtension->RootHubHandle, 1); - DPRINT1("Status %x\n", Status); + DPRINT("Status %x\n", Status); // // FIXME handle error @@ -1814,7 +1813,7 @@ // Enable power on all ports // - DPRINT1("Enabling PortPower on all ports!\n"); + DPRINT("Enabling PortPower on all ports!\n"); for (PortId = 1; PortId <= HubDeviceExtension->HubDescriptor.bNumberOfPorts; PortId++) { @@ -1827,7 +1826,7 @@ DPRINT1("Failed to power on port %d\n", PortId); } - DPRINT1("RootHubInitNotification %x\n", HubDeviceExtension->HubInterface.RootHubInitNotification); + DPRINT("RootHubInitNotification %x\n", HubDeviceExtension->HubInterface.RootHubInitNotification); // // init root hub notification @@ -1901,7 +1900,7 @@ case BusRelations: { PDEVICE_RELATIONS DeviceRelations = NULL; - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); Status = USBHUB_FdoQueryBusRelations(DeviceObject, &DeviceRelations); @@ -1910,11 +1909,11 @@ } case RemovalRelations: { - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); return ForwardIrpAndForget(DeviceObject, Irp); } default: - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", Stack->Parameters.QueryDeviceRelations.Type); return ForwardIrpAndForget(DeviceObject, Irp); } @@ -1938,22 +1937,22 @@ } case IRP_MN_QUERY_BUS_INFORMATION: { - DPRINT1("IRP_MN_QUERY_BUS_INFORMATION\n"); + DPRINT("IRP_MN_QUERY_BUS_INFORMATION\n"); break; } case IRP_MN_QUERY_ID: { - DPRINT1("IRP_MN_QUERY_ID\n"); + DPRINT("IRP_MN_QUERY_ID\n"); break; } case IRP_MN_QUERY_CAPABILITIES: { - DPRINT1("IRP_MN_QUERY_CAPABILITIES\n"); + DPRINT("IRP_MN_QUERY_CAPABILITIES\n"); break; } default: { - DPRINT1(" IRP_MJ_PNP / unknown minor function 0x%lx\n", Stack->MinorFunction); + DPRINT(" IRP_MJ_PNP / unknown minor function 0x%lx\n", Stack->MinorFunction); return ForwardIrpAndForget(DeviceObject, Irp); } } Modified: branches/usb-bringup-trunk/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub/pdo.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -160,7 +160,7 @@ { PHUB_DEVICE_EXTENSION DeviceExtension; - DPRINT1("IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO\n"); + DPRINT("IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO\n"); if (Irp->AssociatedIrp.SystemBuffer == NULL || Stack->Parameters.DeviceIoControl.OutputBufferLength != sizeof(PVOID)) { @@ -273,7 +273,7 @@ // USBD_PORT_ENABLED (bit 0) or USBD_PORT_CONNECTED (bit 1) // DPRINT1("IOCTL_INTERNAL_USB_GET_PORT_STATUS\n"); - DPRINT1("Arg1 %x\n", *PortStatusBits); + DPRINT("Arg1 %x\n", *PortStatusBits); *PortStatusBits = 0; if (Stack->Parameters.Others.Argument1) { @@ -282,8 +282,8 @@ Status = GetPortStatusAndChange(RootHubDeviceObject, PortId, &PortStatus); if (NT_SUCCESS(Status)) { - DPRINT1("Connect %x\n", ((PortStatus.Status & USB_PORT_STATUS_CONNECT) << 1) << ((PortId - 1) * 2)); - DPRINT1("Enable %x\n", ((PortStatus.Status & USB_PORT_STATUS_ENABLE) >> 1) << ((PortId - 1) * 2)); + DPRINT("Connect %x\n", ((PortStatus.Status & USB_PORT_STATUS_CONNECT) << 1) << ((PortId - 1) * 2)); + DPRINT("Enable %x\n", ((PortStatus.Status & USB_PORT_STATUS_ENABLE) >> 1) << ((PortId - 1) * 2)); *PortStatusBits += (((PortStatus.Status & USB_PORT_STATUS_CONNECT) << 1) << ((PortId - 1) * 2)) + (((PortStatus.Status & USB_PORT_STATUS_ENABLE) >> 1) << ((PortId - 1) * 2)); @@ -329,7 +329,7 @@ { PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; //NTSTATUS Status; - DPRINT1("USBHUB_PdoStartDevice %x\n", DeviceObject); + DPRINT("USBHUB_PdoStartDevice %x\n", DeviceObject); ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; // @@ -364,25 +364,25 @@ { case BusQueryDeviceID: { - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); SourceString = &ChildDeviceExtension->usDeviceId; break; } case BusQueryHardwareIDs: { - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); SourceString = &ChildDeviceExtension->usHardwareIds; break; } case BusQueryCompatibleIDs: { - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); SourceString = &ChildDeviceExtension->usCompatibleIds; break; } case BusQueryInstanceID: { - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); SourceString = &ChildDeviceExtension->usInstanceId; break; } @@ -442,7 +442,7 @@ case DeviceTextDescription: case DeviceTextLocationInformation: { - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); // // does the device provide a text description @@ -497,7 +497,7 @@ { case IRP_MN_START_DEVICE: { - DPRINT1("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); Status = USBHUB_PdoStartDevice(DeviceObject, Irp); break; } @@ -505,7 +505,7 @@ { PDEVICE_CAPABILITIES DeviceCapabilities; ULONG i; - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_CAPABILITIES\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_CAPABILITIES\n"); DeviceCapabilities = (PDEVICE_CAPABILITIES)Stack->Parameters.DeviceCapabilities.Capabilities; // FIXME: capabilities can change with connected device @@ -533,7 +533,7 @@ } case IRP_MN_QUERY_RESOURCES: { - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_RESOURCES\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_RESOURCES\n"); Information = Irp->IoStatus.Information; Status = Irp->IoStatus.Status; @@ -541,7 +541,7 @@ } case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: { - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); Information = Irp->IoStatus.Information; Status = Irp->IoStatus.Status; @@ -576,7 +576,7 @@ PHUB_DEVICE_EXTENSION HubDeviceExtension = (PHUB_DEVICE_EXTENSION)UsbChildExtension->ParentDeviceObject->DeviceExtension; PUSB_BUS_INTERFACE_HUB_V5 HubInterface = &HubDeviceExtension->HubInterface; - DPRINT1("IRP_MJ_PNP / IRP_MN_REMOVE_DEVICE\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_REMOVE_DEVICE\n"); /* remove us from pdo list */ bFound = FALSE; Modified: branches/usb-bringup-trunk/drivers/usb/usbhub/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub/usbhub.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub/usbhub.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -16,7 +16,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT1("USBHUB: IRP_MJ_CREATE\n"); + DPRINT("USBHUB: IRP_MJ_CREATE\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; @@ -29,7 +29,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT1("USBHUB: IRP_MJ_CLOSE\n"); + DPRINT("USBHUB: IRP_MJ_CLOSE\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; @@ -42,7 +42,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT1("USBHUB: IRP_MJ_CLEANUP\n"); + DPRINT("USBHUB: IRP_MJ_CLEANUP\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; @@ -59,7 +59,7 @@ PDEVICE_OBJECT DeviceObject; PHUB_DEVICE_EXTENSION HubDeviceExtension; NTSTATUS Status; - DPRINT1("USBHUB: AddDevice\n"); + DPRINT("USBHUB: AddDevice\n"); // // Create the Device Object // @@ -148,7 +148,7 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT1("Usbhub: DispatchDeviceControl\n"); + DPRINT("Usbhub: DispatchDeviceControl\n"); if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) return USBHUB_FdoHandleDeviceControl(DeviceObject, Irp); else @@ -160,7 +160,7 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - //DPRINT1("Usbhub: DispatchInternalDeviceControl\n"); + DPRINT("Usbhub: DispatchInternalDeviceControl\n"); if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) return USBHUB_IrpStub(DeviceObject, Irp); else @@ -172,7 +172,7 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT1("USBHUB: DispatchPnp\n"); + DPRINT("USBHUB: DispatchPnp\n"); if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) return USBHUB_FdoHandlePnp(DeviceObject, Irp); else @@ -205,7 +205,7 @@ DriverObject->DriverExtension->AddDevice = USBHUB_AddDevice; DriverObject->DriverUnload = USBHUB_Unload; - DPRINT1("USBHUB: DriverEntry\n"); + DPRINT("USBHUB: DriverEntry\n"); DriverObject->MajorFunction[IRP_MJ_CREATE] = USBHUB_Create; DriverObject->MajorFunction[IRP_MJ_CLOSE] = USBHUB_Close; Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -159,7 +159,7 @@ NTSTATUS Status; ULONG BytesRead; - DPRINT1("CUSBHardwareDevice::Initialize\n"); + DPRINT("CUSBHardwareDevice::Initialize\n"); // // Create DMAMemoryManager for use with QueueHeads and Transfer Descriptors. @@ -271,7 +271,7 @@ NTSTATUS Status; ULONG Version; - DPRINT1("CUSBHardwareDevice::PnpStart\n"); + DPRINT("CUSBHardwareDevice::PnpStart\n"); for(Index = 0; Index < TranslatedResources->List[0].PartialResourceList.Count; Index++) { // @@ -329,7 +329,7 @@ // Version = READ_REGISTER_ULONG((PULONG)((ULONG_PTR)ResourceBase + OHCI_REVISION_OFFSET)); - DPRINT1("Version %x\n", Version); + DPRINT("Version %x\n", Version); // // Store Resource base @@ -400,7 +400,6 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to Initialize the controller \n"); - ASSERT(FALSE); return Status; } @@ -422,7 +421,6 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to stop the controller \n"); - ASSERT(FALSE); return Status; } @@ -565,7 +563,7 @@ // Periodic = OHCI_PERIODIC(m_IntervalValue); WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_PERIODIC_START_OFFSET), Periodic); - DPRINT1("Periodic Start %x\n", Periodic); + DPRINT("Periodic Start %x\n", Periodic); // // start the controller @@ -950,7 +948,7 @@ } else { - DPRINT1("SMM has given up ownership\n"); + DPRINT("SMM has given up ownership\n"); } } else @@ -959,7 +957,7 @@ // read contents of control register // Control = (READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)) & OHCI_HC_FUNCTIONAL_STATE_MASK); - DPRINT1("Controller State %x\n", Control); + DPRINT("Controller State %x\n", Control); if (Control != OHCI_HC_FUNCTIONAL_STATE_RESET) { @@ -1263,7 +1261,7 @@ { ULONG Value; - DPRINT1("CUSBHardwareDevice::SetPortFeature PortId %x Feature %x\n", PortId, Feature); + DPRINT("CUSBHardwareDevice::SetPortFeature PortId %x Feature %x\n", PortId, Feature); // // read port status @@ -1426,7 +1424,7 @@ Number = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_NUMBER_OFFSET)); - DPRINT1("FrameNumberInterval %x Frame %x\n", Number, m_HCCA->CurrentFrameNumber); + DPRINT("FrameNumberInterval %x Frame %x\n", Number, m_HCCA->CurrentFrameNumber); // // remove reserved bits @@ -1484,7 +1482,7 @@ // the interrupt was not caused by DoneHead update // check if something important happened // - DPRINT1("InterruptStatus %x InterruptEnable %x\n", READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_STATUS_OFFSET)), + DPRINT("InterruptStatus %x InterruptEnable %x\n", READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_STATUS_OFFSET)), READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_ENABLE_OFFSET))); Status = READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_STATUS_OFFSET)) & READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_ENABLE_OFFSET)) & (~OHCI_WRITEBACK_DONE_HEAD); if (Status == 0) Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hcd_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hcd_controller.cpp [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -234,7 +234,7 @@ // PC_ASSERT(DeviceExtension->IsFDO); - DPRINT1("HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu OutputBufferLength %lu\n", + DPRINT("HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu OutputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength); @@ -394,7 +394,7 @@ { case IRP_MN_START_DEVICE: { - DPRINT1("CHCDController::HandlePnp IRP_MN_START FDO\n"); + DPRINT("CHCDController::HandlePnp IRP_MN_START FDO\n"); // // first start lower device object @@ -423,12 +423,12 @@ Status = SetSymbolicLink(TRUE); } - DPRINT1("CHCDController::HandlePnp IRP_MN_START FDO: Status %x\n", Status); + DPRINT("CHCDController::HandlePnp IRP_MN_START FDO: Status %x\n", Status); break; } case IRP_MN_QUERY_DEVICE_RELATIONS: { - DPRINT1("CHCDController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %lx\n", IoStack->Parameters.QueryDeviceRelations.Type); + DPRINT("CHCDController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %lx\n", IoStack->Parameters.QueryDeviceRelations.Type); if (m_HubController == NULL) { @@ -508,7 +508,7 @@ } case IRP_MN_STOP_DEVICE: { - DPRINT1("CHCDController::HandlePnp IRP_MN_STOP_DEVICE\n"); + DPRINT("CHCDController::HandlePnp IRP_MN_STOP_DEVICE\n"); if (m_Hardware) { @@ -550,7 +550,7 @@ } case IRP_MN_REMOVE_DEVICE: { - DPRINT1("CHCDController::HandlePnp IRP_MN_REMOVE_DEVICE FDO\n"); + DPRINT("CHCDController::HandlePnp IRP_MN_REMOVE_DEVICE FDO\n"); // // delete the symbolic link @@ -673,7 +673,7 @@ // m_FDODeviceNumber = UsbDeviceNumber; - DPRINT1("CreateFDO: DeviceName %wZ\n", &DeviceName); + DPRINT("CreateFDO: DeviceName %wZ\n", &DeviceName); /* done */ return Status; Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -193,7 +193,7 @@ USHORT VendorID, DeviceID; ULONG Dummy1; - DPRINT1("CHubController::Initialize\n"); + DPRINT("CHubController::Initialize\n"); // // initialize members @@ -308,7 +308,7 @@ // Get the number of ports and check each one for device connected // m_Hardware->GetDeviceDetails(NULL, NULL, &PortCount, NULL); - DPRINT1("SCE Request %p TransferBufferLength %lu Flags %x MDL %p\n", Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, Urb->UrbBulkOrInterruptTransfer.TransferFlags, Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL); + DPRINT("SCE Request %p TransferBufferLength %lu Flags %x MDL %p\n", Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, Urb->UrbBulkOrInterruptTransfer.TransferFlags, Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL); TransferBuffer = (PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer; @@ -319,7 +319,7 @@ { m_Hardware->GetPortStatus(PortId, &PortStatus, &PortChange); - DPRINT1("Port %d: Status %x, Change %x\n", PortId, PortStatus, PortChange); + DPRINT("Port %d: Status %x, Change %x\n", PortId, PortStatus, PortChange); // @@ -430,7 +430,7 @@ { case IRP_MN_START_DEVICE: { - DPRINT1("CHubController::HandlePnp IRP_MN_START_DEVICE\n"); + DPRINT("CHubController::HandlePnp IRP_MN_START_DEVICE\n"); // // register device interface // @@ -448,7 +448,7 @@ } case IRP_MN_QUERY_ID: { - DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_ID Type %x\n", IoStack->Parameters.QueryId.IdType); + DPRINT("CHubController::HandlePnp IRP_MN_QUERY_ID Type %x\n", IoStack->Parameters.QueryId.IdType); if (IoStack->Parameters.QueryId.IdType == BusQueryDeviceID) { @@ -474,7 +474,7 @@ swprintf(Buffer, L"USB\\ROOT_HUB"); } - DPRINT1("Name %S\n", Buffer); + DPRINT("Name %S\n", Buffer); // // calculate length @@ -551,7 +551,7 @@ Index++; - DPRINT1("Name %S\n", Buffer); + DPRINT("Name %S\n", Buffer); // // allocate buffer @@ -585,7 +585,7 @@ } case IRP_MN_QUERY_CAPABILITIES: { - DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_CAPABILITIES\n"); + DPRINT("CHubController::HandlePnp IRP_MN_QUERY_CAPABILITIES\n"); DeviceCapabilities = (PDEVICE_CAPABILITIES)IoStack->Parameters.DeviceCapabilities.Capabilities; @@ -617,7 +617,7 @@ } case IRP_MN_QUERY_INTERFACE: { - DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_INTERFACE\n"); + DPRINT("CHubController::HandlePnp IRP_MN_QUERY_INTERFACE\n"); // // handle device interface requests @@ -627,7 +627,7 @@ } case IRP_MN_REMOVE_DEVICE: { - DPRINT1("CHubController::HandlePnp IRP_MN_REMOVE_DEVICE\n"); + DPRINT("CHubController::HandlePnp IRP_MN_REMOVE_DEVICE\n"); // // deactivate device interface for BUS PDO @@ -657,7 +657,7 @@ } case IRP_MN_QUERY_DEVICE_RELATIONS: { - DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %x\n", IoStack->Parameters.QueryDeviceRelations.Type); + DPRINT("CHubController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %x\n", IoStack->Parameters.QueryDeviceRelations.Type); if (IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation) { @@ -698,7 +698,7 @@ } case IRP_MN_QUERY_BUS_INFORMATION: { - DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_BUS_INFORMATION\n"); + DPRINT("CHubController::HandlePnp IRP_MN_QUERY_BUS_INFORMATION\n"); // // allocate buffer for bus information @@ -731,7 +731,7 @@ } case IRP_MN_STOP_DEVICE: { - DPRINT1("CHubController::HandlePnp IRP_MN_STOP_DEVICE\n"); + DPRINT("CHubController::HandlePnp IRP_MN_STOP_DEVICE\n"); // // stop device // @@ -847,7 +847,7 @@ // // Else pend the IRP, to be completed when a device connects or disconnects. // - DPRINT1("Pending SCE Irp\n");; + DPRINT("Pending SCE Irp\n");; m_PendingSCEIrp = Irp; IoMarkIrpPending(Irp); return STATUS_PENDING; @@ -1224,7 +1224,7 @@ // Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer); ASSERT(Status == STATUS_SUCCESS); - DPRINT1("CHubController::HandleGetStatusFromDevice Status %x Length %lu DeviceStatus %x\n", Status, Urb->UrbControlDescriptorRequest.TransferBufferLength, *DeviceStatus); + DPRINT("CHubController::HandleGetStatusFromDevice Status %x Length %lu DeviceStatus %x\n", Status, Urb->UrbControlDescriptorRequest.TransferBufferLength, *DeviceStatus); // // done @@ -2442,7 +2442,7 @@ { CHubController * Controller = (CHubController*)BusContext; - DPRINT1("USBH_InterfaceReference\n"); + DPRINT("USBH_InterfaceReference\n"); // // add reference @@ -2457,7 +2457,7 @@ { CHubController * Controller = (CHubController*)BusContext; - DPRINT1("USBH_InterfaceDereference\n"); + DPRINT("USBH_InterfaceDereference\n"); // // release @@ -2481,7 +2481,7 @@ CHubController * Controller; NTSTATUS Status; - DPRINT1("USBHI_CreateUsbDevice PortStatus %x\n", PortStatus); + DPRINT("USBHI_CreateUsbDevice PortStatus %x\n", PortStatus); // // first get hub controller @@ -2571,7 +2571,7 @@ NTSTATUS Status; ULONG Index = 0; - DPRINT1("USBHI_InitializeUsbDevice\n"); + DPRINT("USBHI_InitializeUsbDevice\n"); // // first get controller @@ -2667,7 +2667,7 @@ PUSBDEVICE UsbDevice; CHubController * Controller; - DPRINT1("USBHI_GetUsbDescriptors\n"); + DPRINT("USBHI_GetUsbDescriptors\n"); // // sanity check @@ -2736,7 +2736,7 @@ CHubController * Controller; NTSTATUS Status; - DPRINT1("USBHI_RemoveUsbDevice\n"); + DPRINT("USBHI_RemoveUsbDevice\n"); // // first get controller @@ -2809,7 +2809,7 @@ PUSBDEVICE OldUsbDevice, NewUsbDevice; CHubController * Controller; - DPRINT1("USBHI_RestoreUsbDevice\n"); + DPRINT("USBHI_RestoreUsbDevice\n"); // // first get controller @@ -2831,8 +2831,8 @@ PC_ASSERT(Controller->ValidateUsbDevice(NewUsbDevice)); PC_ASSERT(Controller->ValidateUsbDevice(OldUsbDevice)); - DPRINT1("NewUsbDevice: DeviceAddress %x\n", NewUsbDevice->GetDeviceAddress()); - DPRINT1("OldUsbDevice: DeviceAddress %x\n", OldUsbDevice->GetDeviceAddress()); + DPRINT("NewUsbDevice: DeviceAddress %x\n", NewUsbDevice->GetDeviceAddress()); + DPRINT("OldUsbDevice: DeviceAddress %x\n", OldUsbDevice->GetDeviceAddress()); // // remove old device handle @@ -2855,7 +2855,7 @@ PUSBDEVICE UsbDevice; CHubController * Controller; - DPRINT1("USBHI_QueryDeviceInformation %p\n", BusContext); + DPRINT("USBHI_QueryDeviceInformation %p\n", BusContext); // // sanity check @@ -2977,7 +2977,7 @@ { PUSB_CONTROLLER_INFORMATION_0 ControllerInfo; - DPRINT1("USBHI_GetControllerInformation\n"); + DPRINT("USBHI_GetControllerInformation\n"); // // sanity checks @@ -3040,7 +3040,7 @@ USHORT Dummy1; NTSTATUS Status; - DPRINT1("USBHI_GetExtendedHubInformation\n"); + DPRINT("USBHI_GetExtendedHubInformation\n"); // // sanity checks @@ -3219,7 +3219,7 @@ // looks like we need apply a dragon voodoo to fixup the device stack // otherwise usbhub will cause a bugcheck // - DPRINT1("USBHI_SetDeviceHandleData %p\n", UsbDevicePdo); + DPRINT("USBHI_SetDeviceHandleData %p\n", UsbDevicePdo); // // sanity check @@ -3256,7 +3256,7 @@ ULONG Speed, Dummy2; USHORT Dummy1; - DPRINT1("USBDI_GetUSBDIVersion\n"); + DPRINT("USBDI_GetUSBDIVersion\n"); // // get controller @@ -3336,7 +3336,7 @@ ULONG Speed, Dummy2; USHORT Dummy1; - DPRINT1("USBDI_IsDeviceHighSpeed\n"); + DPRINT("USBDI_IsDeviceHighSpeed\n"); // // get controller @@ -3659,7 +3659,7 @@ } } - DPRINT1("CHubController::CreatePDO: DeviceName %wZ\n", &DeviceName); + DPRINT("CHubController::CreatePDO: DeviceName %wZ\n", &DeviceName); // // fixup device stack voodoo part #1 @@ -3717,7 +3717,7 @@ Irp = This->m_PendingSCEIrp; if (!Irp) { - DPRINT1("There was no pending IRP for SCE. Did the usb hub 2.0 driver (usbhub2) load?\n"); + DPRINT("There was no pending IRP for SCE. Did the usb hub 2.0 driver (usbhub2) load?\n"); return; } Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -275,7 +275,7 @@ } DPRINT1("CUSBDevice::GetType Unknown bcdUSB Type %x\n", m_DeviceDescriptor.bcdUSB); - PC_ASSERT(FALSE); + //PC_ASSERT(FALSE); return Usb11Device; } Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -258,7 +258,7 @@ // CurrentDescriptor = (POHCI_ISO_TD)Descriptor->HeadLogicalDescriptor; - DPRINT1("ISO: NextFrameNumber %x\n", FrameNumber); + DPRINT("ISO: NextFrameNumber %x\n", FrameNumber); Frame = (FrameNumber & 0xFFFF); while(CurrentDescriptor) @@ -284,7 +284,7 @@ // m_Hardware->GetCurrentFrameNumber(&FrameNumber); - DPRINT1("Hardware 1ms %p Iso %p\n",m_InterruptEndpoints[0], m_IsoHeadEndpointDescriptor); + DPRINT("Hardware 1ms %p Iso %p\n",m_InterruptEndpoints[0], m_IsoHeadEndpointDescriptor); ASSERT(m_InterruptEndpoints[0]->NextPhysicalEndpoint == m_IsoHeadEndpointDescriptor->PhysicalAddress.LowPart); PrintEndpointList(m_IsoHeadEndpointDescriptor); @@ -684,8 +684,8 @@ // // cleanup endpoint // - DPRINT1("ISO endpoint complete\n"); - ASSERT(FALSE); + DPRINT("ISO endpoint complete\n"); + //ASSERT(FALSE); CleanupEndpointDescriptor(EndpointDescriptor, PreviousEndpointDescriptor); // Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -768,7 +768,7 @@ // store buffer offset // CurrentDescriptor->Offset[SubIndex] = Urb->UrbIsochronousTransfer.IsoPacket[Index+SubIndex].Offset + PageOffset; - DPRINT1("Index %lu PacketOffset %lu FinalOffset %lu\n", SubIndex+Index, Urb->UrbIsochronousTransfer.IsoPacket[Index+SubIndex].Offset, CurrentDescriptor->Offset[SubIndex]); + DPRINT("Index %lu PacketOffset %lu FinalOffset %lu\n", SubIndex+Index, Urb->UrbIsochronousTransfer.IsoPacket[Index+SubIndex].Offset, CurrentDescriptor->Offset[SubIndex]); } // @@ -817,7 +817,7 @@ // store as previous descriptor // PreviousDescriptor = CurrentDescriptor; - DPRINT1("Current Descriptor %p Logical %lx StartAddress %x EndAddress %x\n", CurrentDescriptor, CurrentDescriptor->PhysicalAddress.LowPart, CurrentDescriptor->BufferPhysical, CurrentDescriptor->LastPhysicalByteAddress); + DPRINT("Current Descriptor %p Logical %lx StartAddress %x EndAddress %x\n", CurrentDescriptor, CurrentDescriptor->PhysicalAddress.LowPart, CurrentDescriptor->BufferPhysical, CurrentDescriptor->LastPhysicalByteAddress); // // fire interrupt as soon transfer is finished @@ -1575,11 +1575,11 @@ // PacketCount = OHCI_ITD_GET_FRAME_COUNT(IsoTransferDescriptor->Flags); - DPRINT1("CUSBRequest::FreeEndpointDescriptor Descriptor %p Logical %x Buffer Physical %x EndAddress %x PacketCount %lu\n", IsoTransferDescriptor, IsoTransferDescriptor->PhysicalAddress.LowPart, IsoTransferDescriptor->BufferPhysical, IsoTransferDescriptor->LastPhysicalByteAddress, PacketCount); + DPRINT("CUSBRequest::FreeEndpointDescriptor Descriptor %p Logical %x Buffer Physical %x EndAddress %x PacketCount %lu\n", IsoTransferDescriptor, IsoTransferDescriptor->PhysicalAddress.LowPart, IsoTransferDescriptor->BufferPhysical, IsoTransferDescriptor->LastPhysicalByteAddress, PacketCount); for(Index = 0; Index < PacketCount; Index++) { - DPRINT1("PSW Index %lu Value %x\n", Index, IsoTransferDescriptor->Offset[Index]); + DPRINT("PSW Index %lu Value %x\n", Index, IsoTransferDescriptor->Offset[Index]); } // Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.cpp [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -24,7 +24,7 @@ NTSTATUS Status; PHCDCONTROLLER HcdController; - DPRINT1("OHCI_AddDevice\n"); + DPRINT("OHCI_AddDevice\n"); /* first create the controller object */ Status = CreateHCDController(&HcdController); Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -251,7 +251,7 @@ ANSI_STRING AnsiString; NTSTATUS Status; - DPRINT1("USBSTOR_HandleQueryProperty\n"); + DPRINT("USBSTOR_HandleQueryProperty\n"); // // get current stack location @@ -305,7 +305,7 @@ // if (PropertyQuery->PropertyId == StorageDeviceProperty) { - DPRINT1("USBSTOR_HandleQueryProperty StorageDeviceProperty OutputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.OutputBufferLength); + DPRINT("USBSTOR_HandleQueryProperty StorageDeviceProperty OutputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.OutputBufferLength); // // get device extension @@ -467,7 +467,7 @@ // // adapter property query request // - DPRINT1("USBSTOR_HandleQueryProperty StorageAdapterProperty OutputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.OutputBufferLength); + DPRINT("USBSTOR_HandleQueryProperty StorageAdapterProperty OutputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.OutputBufferLength); if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_ADAPTER_DESCRIPTOR)) { Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/error.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/error.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/error.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -23,7 +23,7 @@ // // allocate urb // - DPRINT1("Allocating URB\n"); + DPRINT("Allocating URB\n"); Urb = (PURB)AllocateItem(NonPagedPool, sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST)); if (!Urb) { @@ -69,7 +69,7 @@ // // allocate urb // - DPRINT1("Allocating URB\n"); + DPRINT("Allocating URB\n"); Urb = (PURB)AllocateItem(NonPagedPool, sizeof(struct _URB_PIPE_REQUEST)); if (!Urb) { Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -126,7 +126,7 @@ { NTSTATUS Status; - DPRINT1("Handling FDO removal\n"); + DPRINT("Handling FDO removal\n"); /* We don't need to request removal of our children here */ @@ -200,7 +200,7 @@ ASSERT(InterfaceDesc->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE); ASSERT(InterfaceDesc->bLength == sizeof(USB_INTERFACE_DESCRIPTOR)); - DPRINT1("bInterfaceSubClass %x\n", InterfaceDesc->bInterfaceSubClass); + DPRINT("bInterfaceSubClass %x\n", InterfaceDesc->bInterfaceSubClass); if (InterfaceDesc->bInterfaceProtocol != 0x50) { DPRINT1("USB Device is not a bulk only device and is not currently supported\n"); @@ -303,7 +303,7 @@ // // fdo is now initialized // - DPRINT1("USBSTOR_FdoHandleStartDevice FDO is initialized\n"); + DPRINT("USBSTOR_FdoHandleStartDevice FDO is initialized\n"); return STATUS_SUCCESS; } @@ -346,7 +346,7 @@ } case IRP_MN_REMOVE_DEVICE: { - DPRINT1("IRP_MN_REMOVE_DEVICE\n"); + DPRINT("IRP_MN_REMOVE_DEVICE\n"); return USBSTOR_FdoHandleRemoveDevice(DeviceObject, DeviceExtension, Irp); } Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/misc.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/misc.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/misc.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -371,7 +371,7 @@ // Status = USBSTOR_ClassRequest(DeviceObject, DeviceExtension, USB_BULK_GET_MAX_LUN, DeviceExtension->InterfaceInformation->InterfaceNumber, USBD_TRANSFER_DIRECTION_IN, sizeof(UCHAR), Buffer); - DPRINT1("MaxLUN: %x\n", *Buffer); + DPRINT("MaxLUN: %x\n", *Buffer); if (*Buffer > 0xF) { Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -196,7 +196,7 @@ if (IoStack->Parameters.QueryDeviceText.DeviceTextType == DeviceTextDescription) { - DPRINT1("USBSTOR_PdoHandleQueryDeviceText DeviceTextDescription\n"); + DPRINT("USBSTOR_PdoHandleQueryDeviceText DeviceTextDescription\n"); // // allocate item @@ -224,7 +224,7 @@ } else { - DPRINT1("USBSTOR_PdoHandleQueryDeviceText DeviceTextLocationInformation\n"); + DPRINT("USBSTOR_PdoHandleQueryDeviceText DeviceTextLocationInformation\n"); // // allocate item @@ -339,7 +339,7 @@ Irp->IoStatus.Information = (ULONG_PTR)DeviceId.Buffer; } - DPRINT1("DeviceId %wZ Status %x\n", &DeviceId, Status); + DPRINT("DeviceId %wZ Status %x\n", &DeviceId, Status); // // done @@ -451,7 +451,7 @@ Offset += CopyField(InquiryData->Product, &Id1[Offset], 16); Offset += CopyField(InquiryData->Revision, &Id1[Offset], 4); Id1Length = strlen(Id1) + 1; - DPRINT1("USBSTOR_PdoHandleQueryHardwareId HardwareId1 %s\n", Id1); + DPRINT("USBSTOR_PdoHandleQueryHardwareId HardwareId1 %s\n", Id1); // // generate id 2 @@ -464,7 +464,7 @@ Offset += CopyField(InquiryData->Vendor, &Id2[Offset], 8); Offset += CopyField(InquiryData->Product, &Id2[Offset], 16); Id2Length = strlen(Id2) + 1; - DPRINT1("USBSTOR_PdoHandleQueryHardwareId HardwareId2 %s\n", Id2); + DPRINT("USBSTOR_PdoHandleQueryHardwareId HardwareId2 %s\n", Id2); // // generate id 3 @@ -476,7 +476,7 @@ Offset += sprintf(&Id3[Offset], DeviceType); Offset += CopyField(InquiryData->Vendor, &Id3[Offset], 8); Id3Length = strlen(Id3) + 1; - DPRINT1("USBSTOR_PdoHandleQueryHardwareId HardwareId3 %s\n", Id3); + DPRINT("USBSTOR_PdoHandleQueryHardwareId HardwareId3 %s\n", Id3); // // generate id 4 @@ -490,7 +490,7 @@ Offset += CopyField(InquiryData->Product, &Id4[Offset], 16); Offset += CopyField(InquiryData->Revision, &Id4[Offset], 1); Id4Length = strlen(Id4) + 1; - DPRINT1("USBSTOR_PdoHandleQueryHardwareId HardwareId4 %s\n", Id4); + DPRINT("USBSTOR_PdoHandleQueryHardwareId HardwareId4 %s\n", Id4); // // generate id 5 @@ -501,7 +501,7 @@ Offset = sprintf(&Id5[Offset], "USBSTOR\\"); Offset += sprintf(&Id5[Offset], GenericType); Id5Length = strlen(Id5) + 1; - DPRINT1("USBSTOR_PdoHandleQueryHardwareId HardwareId5 %s\n", Id5); + DPRINT("USBSTOR_PdoHandleQueryHardwareId HardwareId5 %s\n", Id5); // // generate id 6 @@ -511,7 +511,7 @@ Offset = 0; Offset = sprintf(&Id6[Offset], GenericType); Id6Length = strlen(Id6) + 1; - DPRINT1("USBSTOR_PdoHandleQueryHardwareId HardwareId6 %s\n", Id6); + DPRINT("USBSTOR_PdoHandleQueryHardwareId HardwareId6 %s\n", Id6); // // compute total length @@ -619,7 +619,7 @@ USBSTOR_ConvertToUnicodeString(Buffer, Length, 0, InstanceId, &Offset); USBSTOR_ConvertToUnicodeString(&Buffer[Offset], Length, Offset, InstanceId, &Offset); - DPRINT1("USBSTOR_PdoHandleQueryCompatibleId %S\n", InstanceId); + DPRINT("USBSTOR_PdoHandleQueryCompatibleId %S\n", InstanceId); // // store result @@ -694,7 +694,7 @@ // wcscpy(InstanceId, Buffer); - DPRINT1("USBSTOR_PdoHandleQueryInstanceId %S\n", InstanceId); + DPRINT("USBSTOR_PdoHandleQueryInstanceId %S\n", InstanceId); // // store result @@ -715,7 +715,7 @@ PDEVICE_RELATIONS DeviceRelations; PIO_STACK_LOCATION IoStack; - DPRINT1("USBSTOR_PdoHandleDeviceRelations\n"); + DPRINT("USBSTOR_PdoHandleDeviceRelations\n"); // // get current irp stack location @@ -844,7 +844,7 @@ } case IRP_MN_REMOVE_DEVICE: { - DPRINT1("IRP_MN_REMOVE_DEVICE\n"); + DPRINT("IRP_MN_REMOVE_DEVICE\n"); if(*DeviceExtension->PDODeviceObject != NULL) { Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -549,7 +549,7 @@ Command, Context->cbw); - DPRINT1("CBW %p\n", Context->cbw); + DPRINT("CBW %p\n", Context->cbw); // // now initialize the urb @@ -767,7 +767,7 @@ KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); KeResetEvent(&Event); - DPRINT1("Resending request\n"); + DPRINT("Resending request\n"); // // now send the request @@ -1204,7 +1204,7 @@ } else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_MODE_SENSE) { - DPRINT1("SCSIOP_MODE_SENSE DataTransferLength %lu\n", Request->DataTransferLength); + DPRINT("SCSIOP_MODE_SENSE DataTransferLength %lu\n", Request->DataTransferLength); ASSERT(pCDB->MODE_SENSE.AllocationLength == Request->DataTransferLength); ASSERT(Request->DataBuffer); Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.c [iso-8859-1] Sun Feb 12 02:53:34 2012 @@ -224,7 +224,7 @@ IN PUNICODE_STRING RegPath) { - DPRINT1("********* USB Storage *********\n"); + DPRINT("********* USB Storage *********\n"); // // driver unload routine

12 years, 7 months

[janderwald] 55552: [USBEHCI] - Enable async park mode when available - Use correct type for the pipe handle - Implement URB_FUNCTION_GET_STATUS_FROM_INTERFACE, URB_FUNCTION_GET_STATUS_FROM_ENDPOIN...

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Feb 12 00:49:18 2012 New Revision: 55552 URL: http://svn.reactos.org/svn/reactos?rev=55552&view=rev Log: [USBEHCI] - Enable async park mode when available - Use correct type for the pipe handle - Implement URB_FUNCTION_GET_STATUS_FROM_INTERFACE, URB_FUNCTION_GET_STATUS_FROM_ENDPOINT - Verify that there is buffer provided in SubmitSetupPacket [KBDCLASS] - Forward requests to lower device Modified: branches/usb-bringup-trunk/drivers/input/kbdclass/kbdclass.c branches/usb-bringup-trunk/drivers/usb/usbehci/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbehci/hub_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbehci/usb_device.cpp Modified: branches/usb-bringup-trunk/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/input… ============================================================================== --- branches/usb-bringup-trunk/drivers/input/kbdclass/kbdclass.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/input/kbdclass/kbdclass.c [iso-8859-1] Sun Feb 12 00:49:18 2012 @@ -878,7 +878,7 @@ } Irp->IoStatus.Status = Status; - if (NT_SUCCESS(Status)) + if (NT_SUCCESS(Status) || Status == STATUS_NOT_SUPPORTED) { IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(DeviceExtension->LowerDevice, Irp); Modified: branches/usb-bringup-trunk/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Sun Feb 12 00:49:18 2012 @@ -737,7 +737,18 @@ UsbCmd.IntThreshold = 0x8; //1ms UsbCmd.Run = TRUE; UsbCmd.FrameListSize = 0x0; //1024 + + if (m_Capabilities.HCCParams.ParkMode) + { + // + // enable async park mode + // + UsbCmd.AsyncParkEnable = TRUE; + UsbCmd.AsyncParkCount = 3; + } + SetCommandRegister(&UsbCmd); + // // Wait for execution to start Modified: branches/usb-bringup-trunk/drivers/usb/usbehci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci/hub_controller.cpp [iso-8859-1] Sun Feb 12 00:49:18 2012 @@ -827,7 +827,7 @@ PURB Urb) { PUSBDEVICE UsbDevice; - PUSB_ENDPOINT_DESCRIPTOR EndPointDesc = NULL; + PUSB_ENDPOINT EndPointDesc = NULL; // // First check if the request is for the Status Change Endpoint // @@ -856,13 +856,13 @@ // // Check PipeHandle to determine if this is a Bulk or Interrupt Transfer Request // - EndPointDesc = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbBulkOrInterruptTransfer.PipeHandle; + EndPointDesc = (PUSB_ENDPOINT)Urb->UrbBulkOrInterruptTransfer.PipeHandle; // // sanity checks // ASSERT(EndPointDesc); - ASSERT((EndPointDesc->bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_BULK || (EndPointDesc->bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_INTERRUPT); + ASSERT((EndPointDesc->EndPointDescriptor.bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_BULK || (EndPointDesc->EndPointDescriptor.bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_INTERRUPT); // // check if this is a valid usb device handle @@ -881,7 +881,6 @@ // get device // UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); - return UsbDevice->SubmitIrp(Irp); } @@ -1171,7 +1170,6 @@ // // sanity checks // - PC_ASSERT(Urb->UrbControlGetStatusRequest.Index == 0); PC_ASSERT(Urb->UrbControlGetStatusRequest.TransferBufferLength >= sizeof(USHORT)); PC_ASSERT(Urb->UrbControlGetStatusRequest.TransferBuffer); @@ -1215,9 +1213,25 @@ CtrlSetup.bRequest = USB_REQUEST_GET_STATUS; CtrlSetup.wValue.LowByte = 0; CtrlSetup.wValue.HiByte = 0; - CtrlSetup.wIndex.W = Urb->UrbControlGetStatusRequest.Index; + CtrlSetup.wIndex.W = Urb->UrbControlGetStatusRequest.Index; CtrlSetup.wLength = (USHORT)Urb->UrbControlGetStatusRequest.TransferBufferLength; CtrlSetup.bmRequestType.B = 0x80; + + + if (Urb->UrbHeader.Function == URB_FUNCTION_GET_STATUS_FROM_INTERFACE) + { + // + // add interface type + // + CtrlSetup.bmRequestType.B |= 0x01; + } + else if (Urb->UrbHeader.Function == URB_FUNCTION_GET_STATUS_FROM_ENDPOINT) + { + // + // add interface type + // + CtrlSetup.bmRequestType.B |= 0x02; + } // // submit setup packet @@ -2030,6 +2044,8 @@ Status = HandleClassDevice(Irp, Urb); break; case URB_FUNCTION_GET_STATUS_FROM_DEVICE: + case URB_FUNCTION_GET_STATUS_FROM_INTERFACE: + case URB_FUNCTION_GET_STATUS_FROM_ENDPOINT: Status = HandleGetStatusFromDevice(Irp, Urb); break; case URB_FUNCTION_SELECT_CONFIGURATION: @@ -2523,7 +2539,7 @@ // // now initialize device // - Status = NewUsbDevice->Initialize(PHUBCONTROLLER(Controller), Controller->GetUsbHardware(),PVOID(Controller), PortNumber, PortStatus); + Status = NewUsbDevice->Initialize(PHUBCONTROLLER(Controller), Controller->GetUsbHardware(), HubDeviceHandle, PortNumber, PortStatus); // // check for success Modified: branches/usb-bringup-trunk/drivers/usb/usbehci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci/usb_device.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci/usb_device.cpp [iso-8859-1] Sun Feb 12 00:49:18 2012 @@ -1038,27 +1038,40 @@ OUT PVOID Buffer) { NTSTATUS Status; - PMDL Mdl; - - // - // allocate mdl - // - Mdl = IoAllocateMdl(Buffer, BufferLength, FALSE, FALSE, 0); - - // - // HACK HACK HACK: assume the buffer is build from non paged pool - // - MmBuildMdlForNonPagedPool(Mdl); + PMDL Mdl = NULL; + + if (BufferLength) + { + // + // allocate mdl + // + Mdl = IoAllocateMdl(Buffer, BufferLength, FALSE, FALSE, 0); + if (!Mdl) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // HACK HACK HACK: assume the buffer is build from non paged pool + // + MmBuildMdlForNonPagedPool(Mdl); + } // // commit setup packet // Status = CommitSetupPacket(SetupPacket, 0, BufferLength, Mdl); - // - // free mdl - // - IoFreeMdl(Mdl); + if (Mdl != NULL) + { + // + // free mdl + // + IoFreeMdl(Mdl); + } // // done

12 years, 7 months

[tkreuzer] 55551: [FREELDR] Revert to using the old heap code, as it broke 2nd stage on some systems

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Feb 12 00:01:01 2012 New Revision: 55551 URL: http://svn.reactos.org/svn/reactos?rev=55551&view=rev Log: [FREELDR] Revert to using the old heap code, as it broke 2nd stage on some systems Added: trunk/reactos/boot/freeldr/freeldr/mm/heap.c (props changed) - copied unchanged from r55517, trunk/reactos/boot/freeldr/freeldr/mm/heap.c trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c - copied unchanged from r55550, trunk/reactos/boot/freeldr/freeldr/mm/heap.c trunk/reactos/boot/freeldr/freeldr/rtl/bget.c (props changed) - copied unchanged from r55517, trunk/reactos/boot/freeldr/freeldr/rtl/bget.c Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sun Feb 12 00:01:01 2012 @@ -155,6 +155,7 @@ list(APPEND FREELDR_BASE_SOURCE bootmgr.c # This file is compiled with custom definitions freeldr.c + rtl/bget.c rtl/libsupp.c) if (NOT MSVC) Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Sun Feb 12 00:01:01 2012 @@ -51,6 +51,7 @@ <file>binhive.c</file> </directory> <directory name="rtl"> + <file>bget.c</file> <file>libsupp.c</file> </directory> <directory name="ui"> Propchange: trunk/reactos/boot/freeldr/freeldr/mm/heap.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/freeldr/freeldr/mm/heap.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Propchange: trunk/reactos/boot/freeldr/freeldr/mm/heap.c ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Feb 12 00:01:01 2012 @@ -1,0 +1,13 @@ +/branches/GSoC_2011/GSoC_Network/boot/freeldr/freeldr/mm/heap.c:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver/boot/freeldr/freeldr/mm/heap.c:51550 +/branches/GSoC_2011/TcpIpDriver/boot/freeldr/freeldr/mm/heap.c:51551-53074,53076-53119 +/branches/GSoC_Network/boot/freeldr/freeldr/mm/heap.c:51545-51546 +/branches/cmake-bringup/boot/freeldr/freeldr/mm/heap.c:50484,50693,50719,51544-52564 +/branches/header-work/boot/freeldr/freeldr/mm/heap.c:45691-47721 +/branches/reactos-yarotows/boot/freeldr/freeldr/mm/heap.c:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos/boot/freeldr/freeldr/mm/heap.c:49994-49995 +/branches/ros-amd64-bringup/boot/freeldr/freeldr/mm/heap.c:36852 +/branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/mm/heap.c:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/shell32_new-bringup/boot/freeldr/freeldr/mm/heap.c:51893-53652,53661,53700 +/branches/tcp-rewrite-branch/boot/freeldr/freeldr/mm/heap.c:48720,48840-48841,49424-49426,49454 +/branches/wlan-bringup/boot/freeldr/freeldr/mm/heap.c:54809-54998 Propchange: trunk/reactos/boot/freeldr/freeldr/rtl/bget.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/boot/freeldr/freeldr/rtl/bget.c ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Feb 12 00:01:01 2012 @@ -1,0 +1,13 @@ +/branches/GSoC_2011/GSoC_Network/boot/freeldr/freeldr/rtl/bget.c:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver/boot/freeldr/freeldr/rtl/bget.c:51550 +/branches/GSoC_2011/TcpIpDriver/boot/freeldr/freeldr/rtl/bget.c:51551-53074,53076-53119 +/branches/GSoC_Network/boot/freeldr/freeldr/rtl/bget.c:51545-51546 +/branches/cmake-bringup/boot/freeldr/freeldr/rtl/bget.c:50484,50693,50719,51544-52564 +/branches/header-work/boot/freeldr/freeldr/rtl/bget.c:45691-47721 +/branches/reactos-yarotows/boot/freeldr/freeldr/rtl/bget.c:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos/boot/freeldr/freeldr/rtl/bget.c:49994-49995 +/branches/ros-amd64-bringup/boot/freeldr/freeldr/rtl/bget.c:36852 +/branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/rtl/bget.c:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/shell32_new-bringup/boot/freeldr/freeldr/rtl/bget.c:51893-53652,53661,53700 +/branches/tcp-rewrite-branch/boot/freeldr/freeldr/rtl/bget.c:48720,48840-48841,49424-49426,49454 +/branches/wlan-bringup/boot/freeldr/freeldr/rtl/bget.c:54809-54998 Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Sun Feb 12 00:01:01 2012 @@ -203,7 +203,7 @@ //BOOLEAN Status; /* Cleanup heap */ - HeapCleanupAll(); + //HeapCleanupAll(); // // Creating a suitable memory map for Windows can be tricky, so let's

12 years, 7 months

[gadamopoulos] 55550: [win32k] - In reactos when an application tries to use a desktop or window station object we never check if it should have access to the object. However the only exception to ...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Feb 11 22:17:46 2012 New Revision: 55550 URL: http://svn.reactos.org/svn/reactos?rev=55550&view=rev Log: [win32k] - In reactos when an application tries to use a desktop or window station object we never check if it should have access to the object. However the only exception to this is NtUserGetObjectInformation. Since desktops and windows stations are a mess, NtUserGetObjectInformation always fails. Ironically windows do such access checks everywhere except NtUserGetObjectInformation. Fix NtUserGetObjectInformation by removing access checks - Note: access checks for every other place will be fixed soon Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Sat Feb 11 22:17:46 2012 @@ -649,8 +649,8 @@ TRACE("Trying to open window station 0x%x\n", hObject); Status = IntValidateWindowStationHandle( hObject, - UserMode,/*ExGetPreviousMode(),*/ - GENERIC_READ, /* FIXME: is this ok? */ + UserMode, + 0, &WinStaObject); @@ -667,8 +667,8 @@ TRACE("Trying to open desktop 0x%x\n", hObject); Status = IntValidateDesktopHandle( hObject, - UserMode,/*ExGetPreviousMode(),*/ - GENERIC_READ, /* FIXME: is this ok? */ + UserMode, + 0, &DesktopObject); if (!NT_SUCCESS(Status)) {

12 years, 7 months

[gadamopoulos] 55549: [win32k] - Update pti->pClientInfo->hKL when pti->KeyboardLayout changes - Fixes assertion after activating a second keyboard layout

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Feb 11 22:09:01 2012 New Revision: 55549 URL: http://svn.reactos.org/svn/reactos?rev=55549&view=rev Log: [win32k] - Update pti->pClientInfo->hKL when pti->KeyboardLayout changes - Fixes assertion after activating a second keyboard layout Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c [iso-8859-1] Sat Feb 11 22:09:01 2012 @@ -377,6 +377,7 @@ UserDereferenceObject(pklPrev); pti->KeyboardLayout = pKl; + pti->pClientInfo->hKL = pKl->hkl; UserReferenceObject(pKl); if (Flags & KLF_SETFORPROCESS) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Sat Feb 11 22:09:01 2012 @@ -1087,6 +1087,7 @@ if (!pti->KeyboardLayout) { pti->KeyboardLayout = W32kGetDefaultKeyLayout(); + pti->pClientInfo->hKL = pti->KeyboardLayout ? pti->KeyboardLayout->hkl : NULL; pKbdTbl = pti->KeyboardLayout->spkf->pKbdTbl; } else

12 years, 7 months

[janderwald] 55548: [USBSTOR] - Implement retrieving endpoint halted status - Fix multiple bugs which leaded to crashes (wrong device object passed). Usbstor now successfully restarts requests afte...

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Feb 11 19:26:18 2012 New Revision: 55548 URL: http://svn.reactos.org/svn/reactos?rev=55548&view=rev Log: [USBSTOR] - Implement retrieving endpoint halted status - Fix multiple bugs which leaded to crashes (wrong device object passed). Usbstor now successfully restarts requests after handling the errors - Implement mass storage reset, not yet used - Add checks in CSW completion Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/error.c branches/usb-bringup-trunk/drivers/usb/usbstor/misc.c branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/error.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/error.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/error.c [iso-8859-1] Sat Feb 11 19:26:18 2012 @@ -12,6 +12,53 @@ #include "usbstor.h" NTSTATUS +USBSTOR_GetEndpointStatus( + IN PDEVICE_OBJECT DeviceObject, + IN UCHAR bEndpointAddress, + OUT PUSHORT Value) +{ + PURB Urb; + NTSTATUS Status; + + // + // allocate urb + // + DPRINT1("Allocating URB\n"); + Urb = (PURB)AllocateItem(NonPagedPool, sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST)); + if (!Urb) + { + // + // out of memory + // + DPRINT1("OutofMemory!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // build status + // + UsbBuildGetStatusRequest(Urb, URB_FUNCTION_GET_STATUS_FROM_ENDPOINT, bEndpointAddress & 0x0F, Value, NULL, NULL); + + // + // send the request + // + DPRINT1("Sending Request DeviceObject %x, Urb %x\n", DeviceObject, Urb); + Status = USBSTOR_SyncUrbRequest(DeviceObject, Urb); + + // + // free urb + // + FreeItem(Urb); + + // + // done + // + return Status; +} + + + +NTSTATUS USBSTOR_ResetPipeWithHandle( IN PDEVICE_OBJECT DeviceObject, IN USBD_PIPE_HANDLE PipeHandle) @@ -56,6 +103,7 @@ // return Status; } + NTSTATUS USBSTOR_HandleTransferError( @@ -95,7 +143,7 @@ // First attempt to reset the pipe // DPRINT1("Resetting Pipe\n"); - Status = USBSTOR_ResetPipeWithHandle(DeviceObject, PipeHandle); + Status = USBSTOR_ResetPipeWithHandle(Context->FDODeviceExtension->LowerDeviceObject, PipeHandle); if (NT_SUCCESS(Status)) { Status = STATUS_SUCCESS; @@ -149,7 +197,7 @@ { DPRINT1("Retrying\n"); - Status = USBSTOR_HandleExecuteSCSI(DeviceObject, Context->Irp); + Status = USBSTOR_HandleExecuteSCSI(*Context->PDODeviceExtension->PDODeviceObject, Context->Irp); /* Cleanup the old IRP context */ if (pCDB->AsByte[0] == SCSIOP_READ_CAPACITY) Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/misc.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/misc.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/misc.c [iso-8859-1] Sat Feb 11 19:26:18 2012 @@ -278,25 +278,80 @@ } NTSTATUS +USBSTOR_ClassRequest( + IN PDEVICE_OBJECT DeviceObject, + IN PFDO_DEVICE_EXTENSION DeviceExtension, + IN UCHAR RequestType, + IN USHORT Index, + IN ULONG TransferFlags, + IN ULONG TransferBufferLength, + IN PVOID TransferBuffer) + +{ + PURB Urb; + PUCHAR Buffer; + NTSTATUS Status; + + // + // first allocate urb + // + Urb = (PURB)AllocateItem(NonPagedPool, sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST)); + if (!Urb) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // allocate 1-byte buffer + // + Buffer = (PUCHAR)AllocateItem(NonPagedPool, sizeof(UCHAR)); + if (!Buffer) + { + // + // no memory + // + FreeItem(Buffer); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // initialize vendor request + // + Urb->UrbControlVendorClassRequest.Hdr.Length = sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST); + Urb->UrbControlVendorClassRequest.Hdr.Function = URB_FUNCTION_CLASS_INTERFACE; + Urb->UrbControlVendorClassRequest.TransferFlags = TransferFlags; + Urb->UrbControlVendorClassRequest.TransferBufferLength = TransferBufferLength; + Urb->UrbControlVendorClassRequest.TransferBuffer = TransferBuffer; + Urb->UrbControlVendorClassRequest.Request = RequestType; + Urb->UrbControlVendorClassRequest.Index = Index; + + // + // submit request + // + Status = USBSTOR_SyncUrbRequest(DeviceObject, Urb); + + // + // free urb + // + FreeItem(Urb); + + // + // done + // + return Status; +} + + +NTSTATUS USBSTOR_GetMaxLUN( IN PDEVICE_OBJECT DeviceObject, IN PFDO_DEVICE_EXTENSION DeviceExtension) { - PURB Urb; PUCHAR Buffer; NTSTATUS Status; - - // - // first allocate urb - // - Urb = (PURB)AllocateItem(NonPagedPool, sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST)); - if (!Urb) - { - // - // no memory - // - return STATUS_INSUFFICIENT_RESOURCES; - } // // allocate 1-byte buffer @@ -312,24 +367,9 @@ } // - // initialize vendor request - // - Urb->UrbControlVendorClassRequest.Hdr.Length = sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST); - Urb->UrbControlVendorClassRequest.Hdr.Function = URB_FUNCTION_CLASS_INTERFACE; - Urb->UrbControlVendorClassRequest.TransferFlags = USBD_TRANSFER_DIRECTION_IN; - Urb->UrbControlVendorClassRequest.TransferBufferLength = 1; - Urb->UrbControlVendorClassRequest.TransferBuffer = Buffer; - Urb->UrbControlVendorClassRequest.Request = USB_BULK_GET_MAX_LUN; - - // - // submit request - // - Status = USBSTOR_SyncUrbRequest(DeviceObject, Urb); - - // - // free urb - // - FreeItem(Urb); + // execute request + // + Status = USBSTOR_ClassRequest(DeviceObject, DeviceExtension, USB_BULK_GET_MAX_LUN, DeviceExtension->InterfaceInformation->InterfaceNumber, USBD_TRANSFER_DIRECTION_IN, sizeof(UCHAR), Buffer); DPRINT1("MaxLUN: %x\n", *Buffer); @@ -359,3 +399,23 @@ return Status; } + +NTSTATUS +USBSTOR_ResetDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PFDO_DEVICE_EXTENSION DeviceExtension) +{ + NTSTATUS Status; + + // + // execute request + // + Status = USBSTOR_ClassRequest(DeviceObject, DeviceExtension, USB_BULK_RESET_DEVICE, DeviceExtension->InterfaceInformation->InterfaceNumber, USBD_TRANSFER_DIRECTION_OUT, 0, NULL); + DPRINT1("Status %x\n", Status); + + // + // done + // + return Status; + +} Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c [iso-8859-1] Sat Feb 11 19:26:18 2012 @@ -268,6 +268,13 @@ } // + // sanity checks + // + ASSERT(Context->csw->Signature == CSW_SIGNATURE); + ASSERT(Context->csw->Tag == (ULONG)Context->csw); + ASSERT(Context->csw->Status == 0x00); + + // // free cbw // FreeItem(Context->cbw); @@ -535,12 +542,14 @@ // // now build the cbw // - USBSTOR_BuildCBW(0xDEADDEAD, // FIXME tag + USBSTOR_BuildCBW((ULONG)Context->cbw, TransferDataLength, PDODeviceExtension->LUN, CommandLength, Command, Context->cbw); + + DPRINT1("CBW %p\n", Context->cbw); // // now initialize the urb @@ -757,6 +766,21 @@ // KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + KeResetEvent(&Event); + DPRINT1("Resending request\n"); + + // + // now send the request + // + Status = USBSTOR_SendRequest(DeviceObject, NULL, &Event, UFI_INQUIRY_CMD_LEN, (PUCHAR)&Cmd, sizeof(UFI_INQUIRY_RESPONSE), (PUCHAR)Response); + + // + // wait for the action to complete + // + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + + + DPRINT1("Response %p\n", Response); DPRINT1("DeviceType %x\n", Response->DeviceType); DPRINT1("RMB %x\n", Response->RMB); @@ -791,16 +815,24 @@ UFI_CAPACITY_CMD Cmd; PUFI_CAPACITY_RESPONSE Response; PPDO_DEVICE_EXTENSION PDODeviceExtension; + PFDO_DEVICE_EXTENSION FDODeviceExtension; // // get PDO device extension // PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + + // // allocate capacity response // - Response = (PUFI_CAPACITY_RESPONSE)AllocateItem(NonPagedPool, sizeof(UFI_CAPACITY_RESPONSE)); + Response = (PUFI_CAPACITY_RESPONSE)AllocateItem(NonPagedPool, PAGE_SIZE); if (!Response) { // Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h [iso-8859-1] Sat Feb 11 19:26:18 2012 @@ -2,7 +2,7 @@ #pragma once #include <ntddk.h> -#define NDEBUG +#define YDEBUG #include <debug.h> #include <usbdi.h> #include <hubbusif.h> @@ -86,6 +86,7 @@ // max lun command identifier // #define USB_BULK_GET_MAX_LUN 0xFE +#define USB_BULK_RESET_DEVICE 0xFF #include <pshpack1.h> typedef struct @@ -103,6 +104,8 @@ #define CBW_SIGNATURE 0x43425355 +#define CSW_SIGNATURE 0x53425355 + #define MAX_LUN 0xF typedef struct @@ -351,6 +354,10 @@ PIRP Irp, PVOID Context); +NTSTATUS +USBSTOR_ResetDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PFDO_DEVICE_EXTENSION DeviceExtension); //--------------------------------------------------------------------- // @@ -443,3 +450,11 @@ USBSTOR_QueueTerminateRequest( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); + +/* error.c */ +NTSTATUS +USBSTOR_GetEndpointStatus( + IN PDEVICE_OBJECT DeviceObject, + IN UCHAR bEndpointAddress, + OUT PUSHORT Value); +

12 years, 7 months

[akhaldi] 55547: * Fix MSVC build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Feb 11 16:59:10 2012 New Revision: 55547 URL: http://svn.reactos.org/svn/reactos?rev=55547&view=rev Log: * Fix MSVC build. Modified: trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt Modified: trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt [iso-8859-1] Sat Feb 11 16:59:10 2012 @@ -24,7 +24,7 @@ set_module_type(iphlpapi win32dll UNICODE) target_link_libraries(iphlpapi wine tdilib) -add_importlibs(iphlpapi dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll) +add_importlibs(iphlpapi icmp dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll) add_pch(iphlpapi iphlpapi_private.h) add_cd_file(TARGET iphlpapi DESTINATION reactos/system32 FOR all) add_importlib_target(iphlpapi.spec)

12 years, 7 months

← Newer
1
...
36
37
38
39
40
41
42
...
58
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2012