Author: cgutman
Date: Fri Jan 20 21:07:56 2012
New Revision: 55019
URL: http://svn.reactos.org/svn/reactos?rev=55019&view=rev
Log:
[USB-BRINGUP-TRUNK]
- Merge 51335-53500
Added:
branches/usb-bringup-trunk/drivers/usb/hidparse/ (props changed)
- copied from r54388, branches/usb-bringup/drivers/usb/hidparse/
branches/usb-bringup-trunk/drivers/usb/hidusb/ (props changed)
- copied from r54388, branches/usb-bringup/drivers/usb/hidusb/
branches/usb-bringup-trunk/drivers/usb/usbehci_new/ (props changed)
- copied from r51335, branches/usb-bringup/drivers/usb/usbehci_new/
branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h
- copied, changed from r51365,
branches/usb-bringup/drivers/usb/usbehci_new/hardware.h
branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp
- copied, changed from r51355,
branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp
branches/usb-bringup-trunk/drivers/usb/usbehci_new/memory_manager.cpp
- copied, changed from r51369,
branches/usb-bringup/drivers/usb/usbehci_new/memory_manager.cpp
branches/usb-bringup-trunk/drivers/usb/usbehci_new/misc.cpp
- copied, changed from r51343,
branches/usb-bringup/drivers/usb/usbehci_new/misc.cpp
branches/usb-bringup-trunk/drivers/usb/usbehci_new/purecall.cpp
- copied unchanged from r51348,
branches/usb-bringup/drivers/usb/usbehci_new/purecall.cpp
branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp
- copied, changed from r51372,
branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp
branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp
- copied unchanged from r54388,
branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp
branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp
- copied unchanged from r54388,
branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp
branches/usb-bringup-trunk/drivers/usb/usbhub_new/
- copied from r54388, branches/usb-bringup/drivers/usb/usbhub_new/
branches/usb-bringup-trunk/drivers/usb/usbohci/ (props changed)
- copied from r54388, branches/usb-bringup/drivers/usb/usbohci/
branches/usb-bringup-trunk/drivers/usb/usbstor/descriptor.c
- copied unchanged from r54388,
branches/usb-bringup/drivers/usb/usbstor/descriptor.c
branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c
- copied unchanged from r54388,
branches/usb-bringup/drivers/usb/usbstor/disk.c
branches/usb-bringup-trunk/drivers/usb/usbstor/error.c
- copied unchanged from r54388,
branches/usb-bringup/drivers/usb/usbstor/error.c
branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c
- copied unchanged from r54388,
branches/usb-bringup/drivers/usb/usbstor/fdo.c
branches/usb-bringup-trunk/drivers/usb/usbstor/misc.c
- copied unchanged from r54388,
branches/usb-bringup/drivers/usb/usbstor/misc.c
branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c
- copied unchanged from r54388,
branches/usb-bringup/drivers/usb/usbstor/pdo.c
branches/usb-bringup-trunk/drivers/usb/usbstor/queue.c
- copied unchanged from r54388,
branches/usb-bringup/drivers/usb/usbstor/queue.c
branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c
- copied unchanged from r54388,
branches/usb-bringup/drivers/usb/usbstor/scsi.c
branches/usb-bringup-trunk/include/ddk/hidpddi.h
- copied unchanged from r54388, branches/usb-bringup/include/ddk/hidpddi.h
branches/usb-bringup-trunk/include/ddk/hidport.h
- copied unchanged from r54388, branches/usb-bringup/include/ddk/hidport.h
Modified:
branches/usb-bringup-trunk/ (props changed)
branches/usb-bringup-trunk/dll/win32/hid/hid.c
branches/usb-bringup-trunk/dll/win32/hid/stubs.c
branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt
branches/usb-bringup-trunk/drivers/usb/usbd/usbd.spec
branches/usb-bringup-trunk/drivers/usb/usbehci_new/CMakeLists.txt
branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp
branches/usb-bringup-trunk/drivers/usb/usbehci_new/hcd_controller.cpp
branches/usb-bringup-trunk/drivers/usb/usbehci_new/interfaces.h
branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.cpp
branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h
branches/usb-bringup-trunk/drivers/usb/usbstor/CMakeLists.txt
branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.c
branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/usb-bringup-trunk/dll/win32/hid/hid.c
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/dll/win32/hid/hid.c?rev=55019&r1=55018&r2=55019&view=diff
Modified: branches/usb-bringup-trunk/dll/win32/hid/stubs.c
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/dll/win32/hid/stubs.c?rev=55019&r1=55018&r2=55019&view=diff
Modified: branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt?rev=55019&r1=55018&r2=55019&view=diff
Modified: branches/usb-bringup-trunk/drivers/usb/usbd/usbd.spec
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbd/usbd.spec?rev=55019&r1=55018&r2=55019&view=diff
Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbehci_new/CMakeLists.txt?rev=55019&r1=51335&r2=55019&view=diff
Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp?rev=55019&r1=51335&r2=55019&view=diff
Copied: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h (from
r51365, branches/usb-bringup/drivers/usb/usbehci_new/hardware.h)
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h?p2=branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h&p1=branches/usb-bringup/drivers/usb/usbehci_new/hardware.h&r1=51365&r2=55019&rev=55019&view=diff
Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hcd_controller.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbehci_new/hcd_controller.cpp?rev=55019&r1=51335&r2=55019&view=diff
Copied: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp
(from r51355, branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp)
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp?p2=branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp&p1=branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp&r1=51355&r2=55019&rev=55019&view=diff
Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/interfaces.h
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbehci_new/interfaces.h?rev=55019&r1=51335&r2=55019&view=diff
Copied: branches/usb-bringup-trunk/drivers/usb/usbehci_new/memory_manager.cpp
(from r51369, branches/usb-bringup/drivers/usb/usbehci_new/memory_manager.cpp)
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbehci_new/memory_manager.cpp?p2=branches/usb-bringup-trunk/drivers/usb/usbehci_new/memory_manager.cpp&p1=branches/usb-bringup/drivers/usb/usbehci_new/memory_manager.cpp&r1=51369&r2=55019&rev=55019&view=diff
Copied: branches/usb-bringup-trunk/drivers/usb/usbehci_new/misc.cpp (from
r51343, branches/usb-bringup/drivers/usb/usbehci_new/misc.cpp)
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbehci_new/misc.cpp?p2=branches/usb-bringup-trunk/drivers/usb/usbehci_new/misc.cpp&p1=branches/usb-bringup/drivers/usb/usbehci_new/misc.cpp&r1=51343&r2=55019&rev=55019&view=diff
Copied: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp (from
r51372, branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp)
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp?p2=branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp&p1=branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp&r1=51372&r2=55019&rev=55019&view=diff
Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.cpp?rev=55019&r1=51335&r2=55019&view=diff
Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h?rev=55019&r1=51335&r2=55019&view=diff
Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbstor/CMakeLists.txt?rev=55019&r1=55018&r2=55019&view=diff
Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.c
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.c?rev=55019&r1=55018&r2=55019&view=diff
Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h?rev=55019&r1=55018&r2=55019&view=diff
