[ros-diffs] [cgutman] 55020: [USB-BRINGUP-TRUNK] - Merge 54115-54859

cgutman at svn.reactos.org cgutman at svn.reactos.org
Fri Jan 20 21:19:37 UTC 2012 

Author: cgutman
Date: Fri Jan 20 21:19:37 2012
New Revision: 55020

URL: http://svn.reactos.org/svn/reactos?rev=55020&view=rev
Log:
[USB-BRINGUP-TRUNK]
- Merge 54115-54859

Added:
    branches/usb-bringup-trunk/drivers/hid/   (props changed)
      - copied from r54753, branches/usb-bringup/drivers/hid/
    branches/usb-bringup-trunk/drivers/hid/CMakeLists.txt
      - copied, changed from r54757, branches/usb-bringup/drivers/hid/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/hid/hidclass/   (props changed)
      - copied from r54759, branches/usb-bringup/drivers/hid/hidclass/
    branches/usb-bringup-trunk/drivers/hid/hidclass/fdo.c
      - copied, changed from r54787, branches/usb-bringup/drivers/hid/hidclass/fdo.c
    branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c
      - copied, changed from r54791, branches/usb-bringup/drivers/hid/hidclass/pdo.c
    branches/usb-bringup-trunk/drivers/hid/hidparse/   (props changed)
      - copied from r54756, branches/usb-bringup/drivers/hid/hidparse/
    branches/usb-bringup-trunk/drivers/hid/hidusb/   (props changed)
      - copied from r54754, branches/usb-bringup/drivers/hid/hidusb/
    branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.rc
      - copied unchanged from r54759, branches/usb-bringup/drivers/hid/hidusb/hidusb.rc
    branches/usb-bringup-trunk/drivers/hid/kbdhid/   (props changed)
      - copied from r54850, branches/usb-bringup/drivers/hid/kbdhid/
    branches/usb-bringup-trunk/drivers/hid/mouhid/   (props changed)
      - copied from r54762, branches/usb-bringup/drivers/hid/mouhid/
    branches/usb-bringup-trunk/lib/drivers/hidparser/   (props changed)
      - copied from r54834, branches/usb-bringup/lib/drivers/hidparser/
    branches/usb-bringup-trunk/media/inf/input.inf
      - copied, changed from r54838, branches/usb-bringup/media/inf/input.inf
Removed:
    branches/usb-bringup-trunk/drivers/usb/hidparse/
    branches/usb-bringup-trunk/drivers/usb/hidusb/
Modified:
    branches/usb-bringup-trunk/   (props changed)
    branches/usb-bringup-trunk/drivers/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c
    branches/usb-bringup-trunk/drivers/hid/hidclass/precomp.h
    branches/usb-bringup-trunk/drivers/hid/hidparse/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.c
    branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.h
    branches/usb-bringup-trunk/drivers/hid/hidusb/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c
    branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.h
    branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c
    branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h
    branches/usb-bringup-trunk/drivers/hid/mouhid/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c
    branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h
    branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.rc
    branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp
    branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c
    branches/usb-bringup-trunk/drivers/usb/usbohci/   (props changed)
    branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp
    branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.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/include/ddk/hidclass.h
    branches/usb-bringup-trunk/include/ddk/hidpddi.h
    branches/usb-bringup-trunk/include/ddk/hidport.h
    branches/usb-bringup-trunk/include/psdk/hidusage.h
    branches/usb-bringup-trunk/lib/drivers/CMakeLists.txt
    branches/usb-bringup-trunk/lib/drivers/hidparser/api.c
    branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c
    branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h
    branches/usb-bringup-trunk/lib/drivers/hidparser/parser.h
    branches/usb-bringup-trunk/media/inf/CMakeLists.txt
    branches/usb-bringup-trunk/media/inf/msmouse.inf
    branches/usb-bringup-trunk/media/inf/syssetup.inf.tpl
    branches/usb-bringup-trunk/ntoskrnl/ob/obname.c

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/usb-bringup-trunk/drivers/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/CMakeLists.txt?rev=55020&r1=55019&r2=55020&view=diff

Copied: branches/usb-bringup-trunk/drivers/hid/CMakeLists.txt (from r54757, branches/usb-bringup/drivers/hid/CMakeLists.txt)
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/CMakeLists.txt?p2=branches/usb-bringup-trunk/drivers/hid/CMakeLists.txt&p1=branches/usb-bringup/drivers/hid/CMakeLists.txt&r1=54757&r2=55020&rev=55020&view=diff

Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt?rev=55020&r1=54759&r2=55020&view=diff

Copied: branches/usb-bringup-trunk/drivers/hid/hidclass/fdo.c (from r54787, branches/usb-bringup/drivers/hid/hidclass/fdo.c)
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/hidclass/fdo.c?p2=branches/usb-bringup-trunk/drivers/hid/hidclass/fdo.c&p1=branches/usb-bringup/drivers/hid/hidclass/fdo.c&r1=54787&r2=55020&rev=55020&view=diff

Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c?rev=55020&r1=54759&r2=55020&view=diff

Copied: branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c (from r54791, branches/usb-bringup/drivers/hid/hidclass/pdo.c)
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c?p2=branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c&p1=branches/usb-bringup/drivers/hid/hidclass/pdo.c&r1=54791&r2=55020&rev=55020&view=diff

Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/precomp.h
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/hidclass/precomp.h?rev=55020&r1=54759&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/drivers/hid/hidparse/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/hidparse/CMakeLists.txt?rev=55020&r1=54756&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.c
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.c?rev=55020&r1=54756&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.h
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.h?rev=55020&r1=54756&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/drivers/hid/hidusb/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/hidusb/CMakeLists.txt?rev=55020&r1=54754&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c?rev=55020&r1=54754&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.h
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.h?rev=55020&r1=54754&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c?rev=55020&r1=54850&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h?rev=55020&r1=54850&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/mouhid/CMakeLists.txt?rev=55020&r1=54762&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c?rev=55020&r1=54762&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h?rev=55020&r1=54762&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.rc
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.rc?rev=55020&r1=54762&r2=55020&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=55020&r1=55019&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/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?rev=55020&r1=55019&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c?rev=55020&r1=55019&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp?rev=55020&r1=55019&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp?rev=55020&r1=55019&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp?rev=55020&r1=55019&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_request.cpp
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbohci/usb_request.cpp?rev=55020&r1=55019&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/include/ddk/hidclass.h
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/include/ddk/hidclass.h?rev=55020&r1=55019&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/include/ddk/hidpddi.h
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/include/ddk/hidpddi.h?rev=55020&r1=55019&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/include/ddk/hidport.h
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/include/ddk/hidport.h?rev=55020&r1=55019&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/include/psdk/hidusage.h
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/include/psdk/hidusage.h?rev=55020&r1=55019&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/lib/drivers/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/CMakeLists.txt?rev=55020&r1=55019&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/api.c
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/hidparser/api.c?rev=55020&r1=54834&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c?rev=55020&r1=54834&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h?rev=55020&r1=54834&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/parser.h
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/hidparser/parser.h?rev=55020&r1=54834&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/media/inf/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/CMakeLists.txt?rev=55020&r1=55019&r2=55020&view=diff

Copied: branches/usb-bringup-trunk/media/inf/input.inf (from r54838, branches/usb-bringup/media/inf/input.inf)
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/input.inf?p2=branches/usb-bringup-trunk/media/inf/input.inf&p1=branches/usb-bringup/media/inf/input.inf&r1=54838&r2=55020&rev=55020&view=diff

Modified: branches/usb-bringup-trunk/media/inf/msmouse.inf
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/msmouse.inf?rev=55020&r1=55019&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/media/inf/syssetup.inf.tpl
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/syssetup.inf.tpl?rev=55020&r1=55019&r2=55020&view=diff

Modified: branches/usb-bringup-trunk/ntoskrnl/ob/obname.c
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/ntoskrnl/ob/obname.c?rev=55020&r1=55019&r2=55020&view=diff

More information about the Ros-diffs mailing list