Ros-diffs September 2017

ros-diffs@reactos.org

17 participants
284 discussions

[pschweitzer] 75790: [PSDK] Define FSCTL_GET_INTEGRITY_INFORMATION, FSCTL_SET_INTEGRITY_INFORMATION, FSCTL_DUPLICATE_EXTENTS_TO_FILE and their associated structures CORE-13763

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Sep 8 11:40:52 2017 New Revision: 75790 URL: http://svn.reactos.org/svn/reactos?rev=75790&view=rev Log: [PSDK] Define FSCTL_GET_INTEGRITY_INFORMATION, FSCTL_SET_INTEGRITY_INFORMATION, FSCTL_DUPLICATE_EXTENTS_TO_FILE and their associated structures CORE-13763 Modified: trunk/reactos/sdk/include/psdk/winioctl.h Modified: trunk/reactos/sdk/include/psdk/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winioctl.… ============================================================================== --- trunk/reactos/sdk/include/psdk/winioctl.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winioctl.h [iso-8859-1] Fri Sep 8 11:40:52 2017 @@ -635,12 +635,47 @@ #define FSCTL_IS_VOLUME_DIRTY CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 30, METHOD_BUFFERED, FILE_ANY_ACCESS) #endif +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) +#define FSCTL_GET_INTEGRITY_INFORMATION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 159, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define FSCTL_SET_INTEGRITY_INFORMATION CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 160, METHOD_BUFFERED, FILE_READ_DATA | FILE_WRITE_DATA) +#endif + +#if (_WIN32_WINNT >= _WIN32_WINNT_WINBLUE) +#define FSCTL_DUPLICATE_EXTENTS_TO_FILE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 209, METHOD_BUFFERED, FILE_WRITE_DATA) +#endif + #if (_WIN32_WINNT >= _WIN32_WINNT_WIN2K) #define VOLUME_IS_DIRTY (0x00000001) #define VOLUME_UPGRADE_SCHEDULED (0x00000002) #define VOLUME_SESSION_OPEN (0x00000004) #endif +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) +typedef struct _FSCTL_GET_INTEGRITY_INFORMATION_BUFFER { + WORD ChecksumAlgorithm; + WORD Reserved; + DWORD Flags; + DWORD ChecksumChunkSizeInBytes; + DWORD ClusterSizeInBytes; +} FSCTL_GET_INTEGRITY_INFORMATION_BUFFER, *PFSCTL_GET_INTEGRITY_INFORMATION_BUFFER; + +typedef struct _FSCTL_SET_INTEGRITY_INFORMATION_BUFFER { + WORD ChecksumAlgorithm; + WORD Reserved; + DWORD Flags; +} FSCTL_SET_INTEGRITY_INFORMATION_BUFFER, *PFSCTL_SET_INTEGRITY_INFORMATION_BUFFER; +#endif + +#if (_WIN32_WINNT >= _WIN32_WINNT_WINBLUE) +typedef struct _DUPLICATE_EXTENTS_DATA { + HANDLE FileHandle; + LARGE_INTEGER SourceFileOffset; + LARGE_INTEGER TargetFileOffset; + LARGE_INTEGER ByteCount; +} DUPLICATE_EXTENTS_DATA, *PDUPLICATE_EXTENTS_DATA; + +#endif + #endif #ifdef _MSC_VER

7 years

[pschweitzer] 75789: [XDK] Add a Win8.1 FSCTL CORE-13763

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Sep 8 11:39:17 2017 New Revision: 75789 URL: http://svn.reactos.org/svn/reactos?rev=75789&view=rev Log: [XDK] Add a Win8.1 FSCTL CORE-13763 Modified: trunk/reactos/sdk/include/xdk/iotypes.h Modified: trunk/reactos/sdk/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/xdk/iotypes.h?… ============================================================================== --- trunk/reactos/sdk/include/xdk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/xdk/iotypes.h [iso-8859-1] Fri Sep 8 11:39:17 2017 @@ -5828,6 +5828,12 @@ #endif +#if (_WIN32_WINNT >= 0x0603) + +#define FSCTL_DUPLICATE_EXTENTS_TO_FILE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 209, METHOD_BUFFERED, FILE_WRITE_DATA) + +#endif + #define FSCTL_MARK_AS_SYSTEM_HIVE FSCTL_SET_BOOTLOADER_ACCESSED typedef struct _PATHNAME_BUFFER {

7 years

[tfaber] 75788: [NTFS] - Delete autorun.inf, which SVN decided to improperly merge. See r71342. - Use trunk's version of the large MCB implementation, which already has Trevor's changes.

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Sep 8 10:36:40 2017 New Revision: 75788 URL: http://svn.reactos.org/svn/reactos?rev=75788&view=rev Log: [NTFS] - Delete autorun.inf, which SVN decided to improperly merge. See r71342. - Use trunk's version of the large MCB implementation, which already has Trevor's changes. Added: branches/GSoC_2016/NTFS/ntoskrnl/fsrtl/largemcb.c (props changed) - copied unchanged from r75747, trunk/reactos/ntoskrnl/fsrtl/largemcb.c Removed: branches/GSoC_2016/NTFS/boot/bootdata/autorun.inf Removed: branches/GSoC_2016/NTFS/boot/bootdata/autorun.inf URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/boot/bootdata/au… ============================================================================== --- branches/GSoC_2016/NTFS/boot/bootdata/autorun.inf [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/boot/bootdata/autorun.inf (removed) @@ -1,3 +0,0 @@ -[autorun] -open=reactos\welcome.exe -icon=icon.ico Propchange: branches/GSoC_2016/NTFS/ntoskrnl/fsrtl/largemcb.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/GSoC_2016/NTFS/ntoskrnl/fsrtl/largemcb.c ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Sep 8 10:36:40 2017 @@ -0,0 +1,25 @@ +/branches/GSoC_2011/GSoC_Network/ntoskrnl/fsrtl/largemcb.c:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver/ntoskrnl/fsrtl/largemcb.c:51550 +/branches/GSoC_2011/TcpIpDriver/ntoskrnl/fsrtl/largemcb.c:51551-53074,53076-53119 +/branches/GSoC_2016/AHCI/ntoskrnl/fsrtl/largemcb.c:71203-73603 +/branches/GSoC_2016/USB/ntoskrnl/fsrtl/largemcb.c:72365-73604 +/branches/GSoC_Network/ntoskrnl/fsrtl/largemcb.c:51545-51546 +/branches/cmake-bringup/ntoskrnl/fsrtl/largemcb.c:50484,50693,50719,51544-52564 +/branches/colins-printing-for-freedom/reactos/ntoskrnl/fsrtl/largemcb.c:67543-68405,68407-68414,68417-70595 +/branches/condrv_restructure/ntoskrnl/fsrtl/largemcb.c:63104-65657 +/branches/header-work/ntoskrnl/fsrtl/largemcb.c:45691-47721 +/branches/kd++/ntoskrnl/fsrtl/largemcb.c:58883-58973 +/branches/kernel-fun/reactos/ntoskrnl/fsrtl/largemcb.c:62291,62294,62301-62302,62304,62321-62322,62353,62531-62532,62853,64152,64173-64174,65253 +/branches/ntvdm/ntoskrnl/fsrtl/largemcb.c:59241-63176 +/branches/reactos-yarotows/ntoskrnl/fsrtl/largemcb.c:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos/ntoskrnl/fsrtl/largemcb.c:49994-49995 +/branches/ros-amd64-bringup/ntoskrnl/fsrtl/largemcb.c:36852 +/branches/ros-amd64-bringup/reactos/ntoskrnl/fsrtl/largemcb.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/ros-branch-0_3_15-lt2013/ntoskrnl/fsrtl/largemcb.c:59059 +/branches/ros-csrss/ntoskrnl/fsrtl/largemcb.c:57561-58762 +/branches/shell-experiments/ntoskrnl/fsrtl/largemcb.c:61927-65494 +/branches/shell32_new-bringup/ntoskrnl/fsrtl/largemcb.c:51893-53652,53661,53700 +/branches/tcp-rewrite-branch/ntoskrnl/fsrtl/largemcb.c:48720,48840-48841,49424-49426,49454 +/branches/usb-bringup/ntoskrnl/fsrtl/largemcb.c:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 +/branches/usb-bringup-trunk/ntoskrnl/fsrtl/largemcb.c:55019-55543,55548-55554,55556-55567 +/branches/wlan-bringup/ntoskrnl/fsrtl/largemcb.c:54809-54998

7 years

[pschweitzer] 75787: [BTRFS] Fix build CORE-13763

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Sep 8 08:15:21 2017 New Revision: 75787 URL: http://svn.reactos.org/svn/reactos?rev=75787&view=rev Log: [BTRFS] Fix build CORE-13763 Modified: trunk/reactos/drivers/filesystems/btrfs/balance.c trunk/reactos/sdk/include/psdk/ntddstor.h Modified: trunk/reactos/drivers/filesystems/btrfs/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… ============================================================================== --- trunk/reactos/drivers/filesystems/btrfs/balance.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/btrfs/balance.c [iso-8859-1] Fri Sep 8 08:15:21 2017 @@ -67,8 +67,10 @@ LIST_ENTRY list_entry; } data_reloc_ref; +#ifndef __REACTOS__ #ifndef _MSC_VER // not in mingw yet #define DEVICE_DSM_FLAG_TRIM_NOT_FS_ALLOCATED 0x80000000 +#endif #endif #define BALANCE_UNIT 0x100000 // only read 1 MB at a time Modified: trunk/reactos/sdk/include/psdk/ntddstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ntddstor.… ============================================================================== --- trunk/reactos/sdk/include/psdk/ntddstor.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/ntddstor.h [iso-8859-1] Fri Sep 8 08:15:21 2017 @@ -566,6 +566,8 @@ typedef ULONG DEVICE_DATA_MANAGEMENT_SET_ACTION; +#define DEVICE_DSM_FLAG_TRIM_NOT_FS_ALLOCATED 0x80000000 + typedef struct _DEVICE_DATA_SET_RANGE { LONGLONG StartingOffset; ULONGLONG LengthInBytes;

7 years

[pschweitzer] 75786: [BTRFS] Sync btrfs to 1.0. CORE-13763

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Sep 8 08:02:43 2017 New Revision: 75786 URL: http://svn.reactos.org/svn/reactos?rev=75786&view=rev Log: [BTRFS] Sync btrfs to 1.0. CORE-13763 Added: trunk/reactos/drivers/filesystems/btrfs/guid.c (with props) trunk/reactos/drivers/filesystems/btrfs/scrub.c (with props) trunk/reactos/drivers/filesystems/btrfs/send.c (with props) trunk/reactos/drivers/filesystems/btrfs/volume.c (with props) Modified: trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt trunk/reactos/drivers/filesystems/btrfs/balance.c trunk/reactos/drivers/filesystems/btrfs/btrfs.c trunk/reactos/drivers/filesystems/btrfs/btrfs.h trunk/reactos/drivers/filesystems/btrfs/btrfs.rc trunk/reactos/drivers/filesystems/btrfs/btrfs_drv.h trunk/reactos/drivers/filesystems/btrfs/btrfsioctl.h trunk/reactos/drivers/filesystems/btrfs/cache.c trunk/reactos/drivers/filesystems/btrfs/calcthread.c trunk/reactos/drivers/filesystems/btrfs/compress.c trunk/reactos/drivers/filesystems/btrfs/crc32c.c trunk/reactos/drivers/filesystems/btrfs/create.c trunk/reactos/drivers/filesystems/btrfs/devctrl.c trunk/reactos/drivers/filesystems/btrfs/dirctrl.c trunk/reactos/drivers/filesystems/btrfs/extent-tree.c trunk/reactos/drivers/filesystems/btrfs/fastio.c trunk/reactos/drivers/filesystems/btrfs/fileinfo.c trunk/reactos/drivers/filesystems/btrfs/flushthread.c trunk/reactos/drivers/filesystems/btrfs/free-space.c trunk/reactos/drivers/filesystems/btrfs/fsctl.c trunk/reactos/drivers/filesystems/btrfs/galois.c trunk/reactos/drivers/filesystems/btrfs/pnp.c trunk/reactos/drivers/filesystems/btrfs/read.c trunk/reactos/drivers/filesystems/btrfs/registry.c trunk/reactos/drivers/filesystems/btrfs/reparse.c trunk/reactos/drivers/filesystems/btrfs/search.c trunk/reactos/drivers/filesystems/btrfs/security.c trunk/reactos/drivers/filesystems/btrfs/treefuncs.c trunk/reactos/drivers/filesystems/btrfs/worker-thread.c trunk/reactos/drivers/filesystems/btrfs/write.c trunk/reactos/media/doc/README.FSD [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/filesystems/btrfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/btrfs_drv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/btrfsioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/calcthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/compress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/crc32c.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/devctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/dirctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/extent-tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/flushthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/free-space.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/galois.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/reparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/scrub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/search.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/send.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/treefuncs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Added: trunk/reactos/drivers/filesystems/btrfs/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/worker-thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/drivers/filesystems/btrfs/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/btrfs/… Modified: trunk/reactos/media/doc/README.FSD URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.FSD?rev=7…

7 years

[pschweitzer] 75785: [DDK] Define IDE_COMMAND_FLUSH_CACHE CORE-13763

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Sep 8 07:55:16 2017 New Revision: 75785 URL: http://svn.reactos.org/svn/reactos?rev=75785&view=rev Log: [DDK] Define IDE_COMMAND_FLUSH_CACHE CORE-13763 Modified: trunk/reactos/sdk/include/ddk/ata.h Modified: trunk/reactos/sdk/include/ddk/ata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/ata.h?rev=… ============================================================================== --- trunk/reactos/sdk/include/ddk/ata.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ddk/ata.h [iso-8859-1] Fri Sep 8 07:55:16 2017 @@ -252,6 +252,7 @@ } IDENTIFY_DEVICE_DATA, *PIDENTIFY_DEVICE_DATA; #include <poppack.h> -#define IDE_COMMAND_IDENTIFY 0xEC +#define IDE_COMMAND_FLUSH_CACHE 0xE7 +#define IDE_COMMAND_IDENTIFY 0xEC #endif

7 years

[tfaber] 75784: [USBPORT][USBHUB_NEW] - Add license headers

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Sep 8 07:32:39 2017 New Revision: 75784 URL: http://svn.reactos.org/svn/reactos?rev=75784&view=rev Log: [USBPORT][USBHUB_NEW] - Add license headers Modified: trunk/reactos/drivers/usb/usbhub_new/dbg_uhub.h trunk/reactos/drivers/usb/usbhub_new/debug.c trunk/reactos/drivers/usb/usbhub_new/ioctl.c trunk/reactos/drivers/usb/usbhub_new/pnp.c trunk/reactos/drivers/usb/usbhub_new/power.c trunk/reactos/drivers/usb/usbhub_new/usbhub.c trunk/reactos/drivers/usb/usbhub_new/usbhub.h trunk/reactos/drivers/usb/usbport/debug.c trunk/reactos/drivers/usb/usbport/device.c trunk/reactos/drivers/usb/usbport/endpoint.c trunk/reactos/drivers/usb/usbport/iface.c trunk/reactos/drivers/usb/usbport/ioctl.c trunk/reactos/drivers/usb/usbport/iso.c trunk/reactos/drivers/usb/usbport/pnp.c trunk/reactos/drivers/usb/usbport/power.c trunk/reactos/drivers/usb/usbport/queue.c trunk/reactos/drivers/usb/usbport/roothub.c trunk/reactos/drivers/usb/usbport/trfsplit.c trunk/reactos/drivers/usb/usbport/urb.c trunk/reactos/drivers/usb/usbport/usb2.c trunk/reactos/drivers/usb/usbport/usbdebug.h trunk/reactos/drivers/usb/usbport/usbport.c trunk/reactos/drivers/usb/usbport/usbport.h Modified: trunk/reactos/drivers/usb/usbhub_new/dbg_uhub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/dbg… ============================================================================== --- trunk/reactos/drivers/usb/usbhub_new/dbg_uhub.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub_new/dbg_uhub.h [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Hub Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBHub debugging declarations + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #ifndef DBG_UHUB_H__ #define DBG_UHUB_H__ Modified: trunk/reactos/drivers/usb/usbhub_new/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/deb… ============================================================================== --- trunk/reactos/drivers/usb/usbhub_new/debug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub_new/debug.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Hub Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBHub debugging functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbhub.h" //#define NDEBUG Modified: trunk/reactos/drivers/usb/usbhub_new/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/ioc… ============================================================================== --- trunk/reactos/drivers/usb/usbhub_new/ioctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub_new/ioctl.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Hub Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBHub I/O control functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbhub.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbhub_new/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/pnp… ============================================================================== --- trunk/reactos/drivers/usb/usbhub_new/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub_new/pnp.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Hub Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBHub plug and play functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbhub.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbhub_new/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/pow… ============================================================================== --- trunk/reactos/drivers/usb/usbhub_new/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub_new/power.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Hub Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBHub power handling functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbhub.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbhub_new/usbhub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/usb… ============================================================================== --- trunk/reactos/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Hub Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBHub main driver functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbhub.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbhub_new/usbhub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub_new/usb… ============================================================================== --- trunk/reactos/drivers/usb/usbhub_new/usbhub.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub_new/usbhub.h [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Hub Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBHub declarations + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #ifndef _USBHUB_H_ #define _USBHUB_H_ Modified: trunk/reactos/drivers/usb/usbport/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/debug.… ============================================================================== --- trunk/reactos/drivers/usb/usbport/debug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/debug.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort debugging functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/device… ============================================================================== --- trunk/reactos/drivers/usb/usbport/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/device.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort device functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/endpoint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/endpoi… ============================================================================== --- trunk/reactos/drivers/usb/usbport/endpoint.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/endpoint.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort endpoint functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/iface.… ============================================================================== --- trunk/reactos/drivers/usb/usbport/iface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/iface.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort interface functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/ioctl.… ============================================================================== --- trunk/reactos/drivers/usb/usbport/ioctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/ioctl.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort I/O control functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" //#define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/iso.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/iso.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbport/iso.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/iso.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort isochronous transfer functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/pnp.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbport/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/pnp.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort plug and play functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/power.… ============================================================================== --- trunk/reactos/drivers/usb/usbport/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/power.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort power handling functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/queue.… ============================================================================== --- trunk/reactos/drivers/usb/usbport/queue.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/queue.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort queue implementation + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/roothub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/roothu… ============================================================================== --- trunk/reactos/drivers/usb/usbport/roothub.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/roothub.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort root hub implementation + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/trfsplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/trfspl… ============================================================================== --- trunk/reactos/drivers/usb/usbport/trfsplit.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/trfsplit.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort split transfer functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/urb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/urb.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbport/urb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/urb.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort URB functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/usb2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usb2.c… ============================================================================== --- trunk/reactos/drivers/usb/usbport/usb2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/usb2.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort USB 2.0 functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" //#define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/usbdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usbdeb… ============================================================================== --- trunk/reactos/drivers/usb/usbport/usbdebug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/usbdebug.h [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort debugging declarations + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #ifndef USBDEBUG_H__ #define USBDEBUG_H__ Modified: trunk/reactos/drivers/usb/usbport/usbport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usbpor… ============================================================================== --- trunk/reactos/drivers/usb/usbport/usbport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/usbport.c [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort main driver functions + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #include "usbport.h" #define NDEBUG Modified: trunk/reactos/drivers/usb/usbport/usbport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usbpor… ============================================================================== --- trunk/reactos/drivers/usb/usbport/usbport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/usbport.h [iso-8859-1] Fri Sep 8 07:32:39 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS USB Port Driver + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: USBPort declarations + * COPYRIGHT: Copyright 2017 Vadim Galyant <vgal(a)rambler.ru> + */ + #ifndef USBPORT_H__ #define USBPORT_H__

7 years

[tfaber] 75783: [USBPORT] - Begin implementing split transfers. Patch by Vadim Galyant.

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Sep 8 07:17:34 2017 New Revision: 75783 URL: http://svn.reactos.org/svn/reactos?rev=75783&view=rev Log: [USBPORT] - Begin implementing split transfers. Patch by Vadim Galyant. Added: trunk/reactos/drivers/usb/usbport/trfsplit.c (with props) Modified: trunk/reactos/drivers/usb/usbport/CMakeLists.txt trunk/reactos/drivers/usb/usbport/endpoint.c trunk/reactos/drivers/usb/usbport/queue.c trunk/reactos/drivers/usb/usbport/usbport.c trunk/reactos/drivers/usb/usbport/usbport.h trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h Modified: trunk/reactos/drivers/usb/usbport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/CMakeL… ============================================================================== --- trunk/reactos/drivers/usb/usbport/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/CMakeLists.txt [iso-8859-1] Fri Sep 8 07:17:34 2017 @@ -12,6 +12,7 @@ power.c queue.c roothub.c + trfsplit.c urb.c usb2.c usbport.c Modified: trunk/reactos/drivers/usb/usbport/endpoint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/endpoi… ============================================================================== --- trunk/reactos/drivers/usb/usbport/endpoint.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/endpoint.c [iso-8859-1] Fri Sep 8 07:17:34 2017 @@ -1279,8 +1279,7 @@ if (Transfer->Flags & TRANSFER_FLAG_SPLITED) { - DPRINT1("USBPORT_DmaEndpointActive: FIXME call USBPORT_CancelSplitTransfer\n"); - ASSERT(FALSE); //USBPORT_CancelSplitTransfer(); + USBPORT_CancelSplitTransfer(Transfer); } else { Modified: trunk/reactos/drivers/usb/usbport/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/queue.… ============================================================================== --- trunk/reactos/drivers/usb/usbport/queue.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/queue.c [iso-8859-1] Fri Sep 8 07:17:34 2017 @@ -529,6 +529,8 @@ PUSBPORT_TRANSFER Transfer; PUSBPORT_ENDPOINT Endpoint; PIRP irp; + PUSBPORT_TRANSFER SplitTransfer; + PLIST_ENTRY Entry; KIRQL OldIrql; DPRINT_CORE("USBPORT_CancelActiveTransferIrp: Irp - %p\n", Irp); @@ -543,30 +545,52 @@ irp = USBPORT_FindActiveTransferIrp(FdoDevice, Irp); - if (irp) - { - Urb = URB_FROM_IRP(irp); - Transfer = Urb->UrbControlTransfer.hca.Reserved8[0]; - Endpoint = Transfer->Endpoint; - - DPRINT_CORE("USBPORT_CancelActiveTransferIrp: irp - %p, Urb - %p, Transfer - %p\n", - irp, - Urb, - Transfer); - - KeAcquireSpinLockAtDpcLevel(&Endpoint->EndpointSpinLock); - Transfer->Flags |= TRANSFER_FLAG_CANCELED; - KeReleaseSpinLockFromDpcLevel(&Endpoint->EndpointSpinLock); - + if (!irp) + { KeReleaseSpinLock(&FdoExtension->FlushTransferSpinLock, OldIrql); - - USBPORT_InvalidateEndpointHandler(FdoDevice, - Endpoint, - INVALIDATE_ENDPOINT_WORKER_THREAD); return; } + Urb = URB_FROM_IRP(irp); + Transfer = Urb->UrbControlTransfer.hca.Reserved8[0]; + Endpoint = Transfer->Endpoint; + + DPRINT_CORE("USBPORT_CancelActiveTransferIrp: irp - %p, Urb - %p, Transfer - %p\n", + irp, + Urb, + Transfer); + + KeAcquireSpinLockAtDpcLevel(&Endpoint->EndpointSpinLock); + + Transfer->Flags |= TRANSFER_FLAG_CANCELED; + + if (Transfer->Flags & TRANSFER_FLAG_PARENT) + { + KeAcquireSpinLockAtDpcLevel(&Transfer->TransferSpinLock); + + Entry = Transfer->SplitTransfersList.Flink; + + while (Entry && Entry != &Transfer->SplitTransfersList) + { + SplitTransfer = CONTAINING_RECORD(Entry, + USBPORT_TRANSFER, + SplitLink); + + SplitTransfer->Flags |= TRANSFER_FLAG_CANCELED; + + Entry = Entry->Flink; + } + + KeReleaseSpinLockFromDpcLevel(&Transfer->TransferSpinLock); + } + + KeReleaseSpinLockFromDpcLevel(&Endpoint->EndpointSpinLock); KeReleaseSpinLock(&FdoExtension->FlushTransferSpinLock, OldIrql); + + USBPORT_InvalidateEndpointHandler(FdoDevice, + Endpoint, + INVALIDATE_ENDPOINT_WORKER_THREAD); + return; } VOID Added: trunk/reactos/drivers/usb/usbport/trfsplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/trfspl… ============================================================================== --- trunk/reactos/drivers/usb/usbport/trfsplit.c (added) +++ trunk/reactos/drivers/usb/usbport/trfsplit.c [iso-8859-1] Fri Sep 8 07:17:34 2017 @@ -0,0 +1,329 @@ +#include "usbport.h" + +#define NDEBUG +#include <debug.h> + +ULONG +NTAPI +USBPORT_MakeSplitTransfer(IN PDEVICE_OBJECT FdoDevice, + IN PUSBPORT_TRANSFER Transfer, + IN PUSBPORT_TRANSFER SplitTransfer, + IN ULONG MaxTransferSize, + IN PULONG SgIdx, + IN PULONG SgOffset, + IN ULONG TransferRemainLen, + IN ULONG TransferOffset) +{ + PUSBPORT_SCATTER_GATHER_LIST SplitSgList; + PUSBPORT_SCATTER_GATHER_ELEMENT Element0; + PUSBPORT_SCATTER_GATHER_ELEMENT Element1; + SIZE_T SgLength; + SIZE_T SgRemainLen; + + DPRINT("USBPORT_MakeSplitTransfer: ... \n"); + + SplitSgList = &SplitTransfer->SgList; + Element0 = &SplitSgList->SgElement[0]; + + SgLength = Transfer->SgList.SgElement[*SgIdx].SgTransferLength - *SgOffset; + + if (SgLength > MaxTransferSize) + { + /* SgLength > MaxTransferSize */ + SplitTransfer->SgList.SgElementCount = 1; + + Element0->SgOffset = 0; + Element0->SgTransferLength = MaxTransferSize; + Element0->SgPhysicalAddress.LowPart = Transfer->SgList.SgElement[*SgIdx].SgPhysicalAddress.LowPart + *SgOffset; + + SplitTransfer->TransferParameters.IsTransferSplited = TRUE; + SplitTransfer->TransferParameters.TransferBufferLength = MaxTransferSize; + + SplitTransfer->SgList.CurrentVa = Transfer->SgList.CurrentVa + TransferOffset; + SplitTransfer->SgList.MappedSystemVa = (PVOID)((ULONG_PTR)Transfer->SgList.MappedSystemVa + TransferOffset); + + SplitTransfer->Flags |= TRANSFER_FLAG_SPLITED; + + *SgOffset += MaxTransferSize; + TransferRemainLen -= MaxTransferSize; + return TransferRemainLen; + } + + /* SgLength <= MaxTransferSize */ + SplitTransfer->SgList.SgElementCount = 1; + TransferRemainLen -= SgLength; + + Element0->SgOffset = 0; + Element0->SgTransferLength = SgLength; + Element0->SgPhysicalAddress.LowPart = Transfer->SgList.SgElement[*SgIdx].SgPhysicalAddress.LowPart + *SgOffset; + + SplitTransfer->TransferParameters.TransferBufferLength = SgLength; + SplitTransfer->TransferParameters.IsTransferSplited = TRUE; + + SplitTransfer->SgList.CurrentVa = Transfer->SgList.CurrentVa + TransferOffset; + SplitTransfer->SgList.MappedSystemVa = (PVOID)((ULONG_PTR)Transfer->SgList.MappedSystemVa + TransferOffset); + + SplitTransfer->Flags |= TRANSFER_FLAG_SPLITED; + + *SgOffset += SgLength; + + SgRemainLen = MaxTransferSize - SgLength; + + if (SgRemainLen > TransferRemainLen) + { + SgRemainLen = TransferRemainLen; + } + + if (!SgRemainLen) + { + /* SgLength == MaxTransferSize */ + ++*SgIdx; + *SgOffset = 0; + return TransferRemainLen; + } + + /* SgLength < MaxTransferSize */ + + DPRINT1("MakeSplitTransfer: SgRemainLen - %x\n", SgRemainLen); + DPRINT1("MakeSplitTransfer: SgIdx - %x\n", *SgIdx); + ++*SgIdx; + + *SgOffset = 0; + SplitTransfer->SgList.SgElementCount++; + + Element1 = &SplitSgList->SgElement[1]; + + Element1->SgOffset = SgRemainLen; + Element1->SgTransferLength = Element0->SgTransferLength; + Element1->SgPhysicalAddress.LowPart = Transfer->SgList.SgElement[*SgIdx].SgPhysicalAddress.LowPart + *SgOffset; + + SplitTransfer->TransferParameters.TransferBufferLength += SgRemainLen; + + *SgOffset += SgRemainLen; + TransferRemainLen -= SgRemainLen; + + return TransferRemainLen; +} + +VOID +NTAPI +USBPORT_SplitBulkInterruptTransfer(IN PDEVICE_OBJECT FdoDevice, + IN PUSBPORT_ENDPOINT Endpoint, + IN PUSBPORT_TRANSFER Transfer, + IN PLIST_ENTRY List) +{ + PUSBPORT_TRANSFER SplitTransfer; + LIST_ENTRY tmplist; + ULONG NeedSplits; + SIZE_T TransferBufferLength; + SIZE_T MaxTransferSize; + SIZE_T TransferOffset = 0; + SIZE_T RemainLength; + ULONG ix; + ULONG SgIdx = 0; + ULONG SgOffset = 0; + + DPRINT("USBPORT_SplitBulkInterruptTransfer: ... \n"); + + MaxTransferSize = Endpoint->EndpointProperties.TotalMaxPacketSize * + (Endpoint->EndpointProperties.MaxTransferSize / + Endpoint->EndpointProperties.TotalMaxPacketSize); + + if (Endpoint->EndpointProperties.MaxTransferSize > PAGE_SIZE) + { + KeBugCheckEx(BUGCODE_USB_DRIVER, 1, 0, 0, 0); + } + + TransferBufferLength = Transfer->TransferParameters.TransferBufferLength; + Transfer->Flags |= TRANSFER_FLAG_PARENT; + + NeedSplits = TransferBufferLength / MaxTransferSize + 1; + + InitializeListHead(&tmplist); + + DPRINT1("USBPORT_SplitBulkInterruptTransfer: TransferBufferLength - %x, NeedSplits - %x\n", + TransferBufferLength, NeedSplits); + + if (!NeedSplits) + { + DPRINT1("USBPORT_SplitBulkInterruptTransfer: DbgBreakPoint \n"); + DbgBreakPoint(); + goto Exit; + } + + for (ix = 0; ix < NeedSplits; ++ix) + { + SplitTransfer = ExAllocatePoolWithTag(NonPagedPool, + Transfer->FullTransferLength, + USB_PORT_TAG); + + if (!SplitTransfer) + { + DPRINT1("USBPORT_SplitBulkInterruptTransfer: DbgBreakPoint \n"); + DbgBreakPoint(); + goto Exit; + } + + RtlCopyMemory(SplitTransfer, Transfer, Transfer->FullTransferLength); + + SplitTransfer->MiniportTransfer = (PVOID)((ULONG_PTR)SplitTransfer + + SplitTransfer->PortTransferLength); + + InsertTailList(&tmplist, &SplitTransfer->TransferLink); + } + + if (Transfer->TransferParameters.TransferBufferLength == 0) + { + goto Exit; + } + + RemainLength = Transfer->TransferParameters.TransferBufferLength; + + do + { + SplitTransfer = CONTAINING_RECORD(tmplist.Flink, + USBPORT_TRANSFER, + TransferLink); + + RemoveHeadList(&tmplist); + + RemainLength = USBPORT_MakeSplitTransfer(FdoDevice, + Transfer, + SplitTransfer, + MaxTransferSize, + &SgIdx, + &SgOffset, + RemainLength, + TransferOffset); + + TransferOffset += SplitTransfer->TransferParameters.TransferBufferLength; + + InsertTailList(List, &SplitTransfer->TransferLink); + InsertTailList(&Transfer->SplitTransfersList,&SplitTransfer->SplitLink); + } + while (RemainLength != 0); + +Exit: + + while (!IsListEmpty(&tmplist)) + { + DPRINT1("USBPORT_SplitBulkInterruptTransfer: ... \n"); + + SplitTransfer = CONTAINING_RECORD(tmplist.Flink, + USBPORT_TRANSFER, + TransferLink); + RemoveHeadList(&tmplist); + + ExFreePoolWithTag(SplitTransfer, USB_PORT_TAG); + } + + return; +} + +VOID +NTAPI +USBPORT_SplitTransfer(IN PDEVICE_OBJECT FdoDevice, + IN PUSBPORT_ENDPOINT Endpoint, + IN PUSBPORT_TRANSFER Transfer, + IN PLIST_ENTRY List) +{ + ULONG TransferType; + + DPRINT("USBPORT_SplitTransfer ... \n"); + + InitializeListHead(List); + InitializeListHead(&Transfer->SplitTransfersList); + + Transfer->USBDStatus = USBD_STATUS_SUCCESS; + + if (Transfer->TransferParameters.TransferBufferLength > + Endpoint->EndpointProperties.MaxTransferSize) + { + TransferType = Endpoint->EndpointProperties.TransferType; + + if (TransferType == USBPORT_TRANSFER_TYPE_BULK || + TransferType == USBPORT_TRANSFER_TYPE_INTERRUPT) + { + USBPORT_SplitBulkInterruptTransfer(FdoDevice, + Endpoint, + Transfer, + List); + } + else if (TransferType == USBPORT_TRANSFER_TYPE_ISOCHRONOUS || + TransferType == USBPORT_TRANSFER_TYPE_CONTROL) + { + KeBugCheckEx(BUGCODE_USB_DRIVER, 1, 0, 0, 0); + } + else + { + DPRINT1("USBPORT_SplitTransfer: Unknown TransferType - %x\n", + TransferType); + } + } + else + { + InsertTailList(List, &Transfer->TransferLink); + } +} + +VOID +NTAPI +USBPORT_DoneSplitTransfer(IN PUSBPORT_TRANSFER SplitTransfer) +{ + PUSBPORT_TRANSFER ParentTransfer; + KIRQL OldIrql; + + DPRINT("USBPORT_DoneSplitTransfer: ... \n"); + + ParentTransfer = SplitTransfer->ParentTransfer; + ParentTransfer->CompletedTransferLen += SplitTransfer->CompletedTransferLen; + + if (SplitTransfer->USBDStatus != USBD_STATUS_SUCCESS) + { + DPRINT1("USBPORT_DoneSplitTransfer: SplitTransfer->USBDStatus - %X\n", + SplitTransfer->USBDStatus); + + ParentTransfer->USBDStatus = SplitTransfer->USBDStatus; + } + + KeAcquireSpinLock(&ParentTransfer->TransferSpinLock, &OldIrql); + + RemoveEntryList(&SplitTransfer->SplitLink); + ExFreePoolWithTag(SplitTransfer, USB_PORT_TAG); + + if (IsListEmpty(&ParentTransfer->SplitTransfersList)) + { + KeReleaseSpinLock(&ParentTransfer->TransferSpinLock, OldIrql); + USBPORT_DoneTransfer(ParentTransfer); + } + else + { + KeReleaseSpinLock(&ParentTransfer->TransferSpinLock, OldIrql); + } +} + +VOID +NTAPI +USBPORT_CancelSplitTransfer(IN PUSBPORT_TRANSFER SplitTransfer) +{ + PUSBPORT_TRANSFER ParentTransfer; + PUSBPORT_ENDPOINT Endpoint; + KIRQL OldIrql; + + DPRINT("USBPORT_CancelSplitTransfer \n"); + + Endpoint = SplitTransfer->Endpoint; + ParentTransfer = SplitTransfer->ParentTransfer; + ParentTransfer->CompletedTransferLen += SplitTransfer->CompletedTransferLen; + + KeAcquireSpinLock(&ParentTransfer->TransferSpinLock, &OldIrql); + RemoveEntryList(&SplitTransfer->SplitLink); + KeReleaseSpinLock(&ParentTransfer->TransferSpinLock, OldIrql); + + ExFreePool(SplitTransfer); + + if (IsListEmpty(&ParentTransfer->SplitTransfersList)) + { + InsertTailList(&Endpoint->CancelList, &ParentTransfer->TransferLink); + } +} Propchange: trunk/reactos/drivers/usb/usbport/trfsplit.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/usb/usbport/usbport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usbpor… ============================================================================== --- trunk/reactos/drivers/usb/usbport/usbport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/usbport.c [iso-8859-1] Fri Sep 8 07:17:34 2017 @@ -789,7 +789,7 @@ if ((Transfer->Flags & TRANSFER_FLAG_SPLITED)) { - ASSERT(FALSE);// USBPORT_DoneSplitTransfer(Transfer); + USBPORT_DoneSplitTransfer(Transfer); } else { @@ -1946,8 +1946,11 @@ IN ULONG TransferLength) { PUSBPORT_TRANSFER Transfer; - PDEVICE_OBJECT FdoDevice; - PUSBPORT_DEVICE_EXTENSION FdoExtension; + PUSBPORT_TRANSFER ParentTransfer; + PUSBPORT_TRANSFER SplitTransfer; + PLIST_ENTRY SplitHead; + PLIST_ENTRY Entry; + KIRQL OldIrql; DPRINT_CORE("USBPORT_MiniportCompleteTransfer: USBDStatus - %x, TransferLength - %x\n", USBDStatus, @@ -1957,20 +1960,47 @@ USBPORT_TRANSFER, TransferParameters); - FdoDevice = Transfer->Endpoint->FdoDevice; - FdoExtension = FdoDevice->DeviceExtension; - + Transfer->Flags |= TRANSFER_FLAG_COMPLETED; Transfer->CompletedTransferLen = TransferLength; - RemoveEntryList(&Transfer->TransferLink); - - Transfer->USBDStatus = USBDStatus; - - ExInterlockedInsertTailList(&FdoExtension->DoneTransferList, - &Transfer->TransferLink, - &FdoExtension->DoneTransferSpinLock); - - KeInsertQueueDpc(&FdoExtension->TransferFlushDpc, NULL, NULL); + if (((Transfer->Flags & TRANSFER_FLAG_SPLITED) == 0) || + TransferLength >= Transfer->TransferParameters.TransferBufferLength) + { + goto Exit; + } + + ParentTransfer = Transfer->ParentTransfer; + + KeAcquireSpinLock(&ParentTransfer->TransferSpinLock, &OldIrql); + + if (IsListEmpty(&ParentTransfer->SplitTransfersList)) + { + goto Exit; + } + + SplitHead = &ParentTransfer->SplitTransfersList; + Entry = SplitHead->Flink; + + while (Entry && !IsListEmpty(SplitHead)) + { + SplitTransfer = CONTAINING_RECORD(Entry, + USBPORT_TRANSFER, + SplitLink); + + if (!(SplitTransfer->Flags & TRANSFER_FLAG_SUBMITED)) + { + DPRINT1("USBPORT_MiniportCompleteTransfer: SplitTransfer->Flags - %X\n", + SplitTransfer->Flags); + //Add TRANSFER_FLAG_xxx + } + + Entry = Entry->Flink; + } + + KeReleaseSpinLock(&ParentTransfer->TransferSpinLock, OldIrql); + +Exit: + USBPORT_QueueDoneTransfer(Transfer, USBDStatus); } VOID @@ -2250,6 +2280,9 @@ SIZE_T ElementLength; PUSBPORT_DEVICE_HANDLE DeviceHandle; PDMA_OPERATIONS DmaOperations; + USBD_STATUS USBDStatus; + LIST_ENTRY List; + PUSBPORT_TRANSFER transfer; DPRINT_CORE("USBPORT_MapTransfer: ... \n"); @@ -2266,12 +2299,12 @@ Mdl = Urb->UrbControlTransfer.TransferBufferMDL; CurrentVa = (ULONG_PTR)MmGetMdlVirtualAddress(Mdl); - Transfer->SgList.CurrentVa = CurrentVa; - Transfer->SgList.MappedSystemVa = MmGetSystemAddressForMdlSafe(Mdl, NormalPagePriority); - sgList = &Transfer->SgList; + sgList->Flags = 0; - + sgList->CurrentVa = CurrentVa; + sgList->MappedSystemVa = MmGetSystemAddressForMdlSafe(Mdl, + NormalPagePriority); Transfer->MapRegisterBase = MapRegisterBase; ix = 0; @@ -2337,15 +2370,52 @@ } while (CurrentLength != Transfer->TransferParameters.TransferBufferLength); - Transfer->SgList.SgElementCount = ix; + sgList->SgElementCount = ix; + + if (Endpoint->EndpointProperties.DeviceSpeed == UsbHighSpeed) + { + Transfer->Flags |= TRANSFER_FLAG_HIGH_SPEED; + } + Transfer->Flags |= TRANSFER_FLAG_DMA_MAPPED; - ASSERT(Transfer->TransferParameters.TransferBufferLength <= - Endpoint->EndpointProperties.MaxTransferSize); - - KeAcquireSpinLock(&Endpoint->EndpointSpinLock, &Endpoint->EndpointOldIrql); - InsertTailList(&Endpoint->TransferList, &Transfer->TransferLink); - KeReleaseSpinLock(&Endpoint->EndpointSpinLock, Endpoint->EndpointOldIrql); + if ((Transfer->Flags & TRANSFER_FLAG_ISO) == 0) + { + KeAcquireSpinLock(&Endpoint->EndpointSpinLock, + &Endpoint->EndpointOldIrql); + + USBPORT_SplitTransfer(FdoDevice, Endpoint, Transfer, &List); + + while (!IsListEmpty(&List)) + { + transfer = CONTAINING_RECORD(List.Flink, + USBPORT_TRANSFER, + TransferLink); + + RemoveHeadList(&List); + InsertTailList(&Endpoint->TransferList, &transfer->TransferLink); + } + + KeReleaseSpinLock(&Endpoint->EndpointSpinLock, + Endpoint->EndpointOldIrql); + } + else + { + USBDStatus = USBPORT_InitializeIsoTransfer(FdoDevice, + &Urb->UrbIsochronousTransfer, + Transfer); + + if (USBDStatus != USBD_STATUS_SUCCESS) + { + KeAcquireSpinLock(&Endpoint->EndpointSpinLock, + &Endpoint->EndpointOldIrql); + + USBPORT_QueueDoneTransfer(Transfer, USBDStatus); + + KeReleaseSpinLock(&Endpoint->EndpointSpinLock, + Endpoint->EndpointOldIrql); + } + } DeviceHandle = Urb->UrbHeader.UsbdDeviceHandle; InterlockedDecrement(&DeviceHandle->DeviceHandleLock); @@ -2438,6 +2508,7 @@ PUSBPORT_TRANSFER Transfer; PUSBPORT_PIPE_HANDLE PipeHandle; USBD_STATUS USBDStatus; + SIZE_T IsoBlockLen = 0; DPRINT_CORE("USBPORT_AllocateTransfer: FdoDevice - %p, Urb - %p, DeviceHandle - %p, Irp - %p, Event - %p\n", FdoDevice, @@ -2458,15 +2529,24 @@ PagesNeed = ADDRESS_AND_SIZE_TO_SPAN_PAGES(VirtualAddr, TransferLength); + if (PagesNeed > 0) + { + PagesNeed--; + } } if (Urb->UrbHeader.Function == URB_FUNCTION_ISOCH_TRANSFER) { - DPRINT1("USBPORT_AllocateTransfer: ISOCH_TRANSFER UNIMPLEMENTED. FIXME.\n"); + DPRINT1("USBPORT_AllocateTransfer: ISOCH_TRANSFER UNIMPLEMENTED. FIXME\n"); + + //IsoBlockLen = sizeof(USBPORT_ISO_BLOCK) + + // Urb->UrbIsochronousTransfer.NumberOfPackets * + // sizeof(USBPORT_ISO_BLOCK_PACKET); } PortTransferLength = sizeof(USBPORT_TRANSFER) + - PagesNeed * sizeof(USBPORT_SCATTER_GATHER_ELEMENT); + PagesNeed * sizeof(USBPORT_SCATTER_GATHER_ELEMENT) + + IsoBlockLen; FullTransferLength = PortTransferLength + FdoExtension->MiniPortInterface->Packet.MiniPortTransferSize; @@ -2475,29 +2555,42 @@ FullTransferLength, USB_PORT_TAG); - if (Transfer) - { - RtlZeroMemory(Transfer, FullTransferLength); - - Transfer->Irp = Irp; - Transfer->Urb = Urb; - Transfer->Endpoint = PipeHandle->Endpoint; - Transfer->Event = Event; - Transfer->PortTransferLength = PortTransferLength; - Transfer->FullTransferLength = FullTransferLength; - - Transfer->MiniportTransfer = (PVOID)((ULONG_PTR)Transfer + - PortTransferLength); - - Urb->UrbControlTransfer.hca.Reserved8[0] = Transfer; - Urb->UrbHeader.UsbdFlags |= USBD_FLAG_ALLOCATED_TRANSFER; - - USBDStatus = USBD_STATUS_SUCCESS; - } - else - { - USBDStatus = USBD_STATUS_INSUFFICIENT_RESOURCES; - } + if (!Transfer) + { + DPRINT1("USBPORT_AllocateTransfer: Transfer not allocated!\n"); + return USBD_STATUS_INSUFFICIENT_RESOURCES; + } + + RtlZeroMemory(Transfer, FullTransferLength); + + Transfer->Irp = Irp; + Transfer->Urb = Urb; + Transfer->Endpoint = PipeHandle->Endpoint; + Transfer->Event = Event; + Transfer->PortTransferLength = PortTransferLength; + Transfer->FullTransferLength = FullTransferLength; + Transfer->IsoBlockPtr = NULL; + Transfer->Period = 0; + Transfer->ParentTransfer = Transfer; + + if (IsoBlockLen) + { + Transfer->IsoBlockPtr = (PVOID)((ULONG_PTR)Transfer + + PortTransferLength - IsoBlockLen); + + Transfer->Period = PipeHandle->Endpoint->EndpointProperties.Period; + Transfer->Flags |= TRANSFER_FLAG_ISO; + } + + Transfer->MiniportTransfer = (PVOID)((ULONG_PTR)Transfer + + PortTransferLength); + + KeInitializeSpinLock(&Transfer->TransferSpinLock); + + Urb->UrbControlTransfer.hca.Reserved8[0] = Transfer; + Urb->UrbHeader.UsbdFlags |= USBD_FLAG_ALLOCATED_TRANSFER; + + USBDStatus = USBD_STATUS_SUCCESS; DPRINT_CORE("USBPORT_AllocateTransfer: return USBDStatus - %x\n", USBDStatus); Modified: trunk/reactos/drivers/usb/usbport/usbport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/usbpor… ============================================================================== --- trunk/reactos/drivers/usb/usbport/usbport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/usbport.h [iso-8859-1] Fri Sep 8 07:17:34 2017 @@ -121,11 +121,14 @@ /* Transfer Flags (USBPORT_TRANSFER) */ #define TRANSFER_FLAG_CANCELED 0x00000001 #define TRANSFER_FLAG_DMA_MAPPED 0x00000002 +#define TRANSFER_FLAG_HIGH_SPEED 0x00000004 #define TRANSFER_FLAG_SUBMITED 0x00000008 #define TRANSFER_FLAG_ABORTED 0x00000010 #define TRANSFER_FLAG_ISO 0x00000020 #define TRANSFER_FLAG_DEVICE_GONE 0x00000080 #define TRANSFER_FLAG_SPLITED 0x00000100 +#define TRANSFER_FLAG_COMPLETED 0x00000200 +#define TRANSFER_FLAG_PARENT 0x00000400 extern KSPIN_LOCK USBPORT_SpinLock; extern LIST_ENTRY USBPORT_MiniPortDrivers; @@ -218,6 +221,8 @@ LIST_ENTRY FlushAbortLink; } USBPORT_ENDPOINT, *PUSBPORT_ENDPOINT; +typedef struct _USBPORT_ISO_BLOCK *PUSBPORT_ISO_BLOCK; + typedef struct _USBPORT_TRANSFER { ULONG Flags; PIRP Irp; @@ -237,8 +242,15 @@ PVOID MapRegisterBase; ULONG TimeOut; LARGE_INTEGER Time; + struct _USBPORT_TRANSFER * ParentTransfer; + KSPIN_LOCK TransferSpinLock; + LIST_ENTRY SplitTransfersList; // for parent transfers + LIST_ENTRY SplitLink; // for splitted transfers + ULONG Period; + PUSBPORT_ISO_BLOCK IsoBlockPtr; // pointer on IsoBlock // SgList should be LAST field - USBPORT_SCATTER_GATHER_LIST SgList; // Non IsoTransfer + USBPORT_SCATTER_GATHER_LIST SgList; // variable length + //USBPORT_ISO_BLOCK IsoBlock; // variable length } USBPORT_TRANSFER, *PUSBPORT_TRANSFER; typedef struct _USBPORT_IRP_TABLE { @@ -573,6 +585,11 @@ IN PDEVICE_OBJECT FdoDevice, IN ULONG Type); +VOID +NTAPI +USBPORT_DoneTransfer( + IN PUSBPORT_TRANSFER Transfer); + /* debug.c */ ULONG NTAPI @@ -1120,6 +1137,25 @@ USBPORT_RootHubPowerAndChirpAllCcPorts( IN PDEVICE_OBJECT FdoDevice); +/* trfsplit.c */ +VOID +NTAPI +USBPORT_SplitTransfer( + IN PDEVICE_OBJECT FdoDevice, + IN PUSBPORT_ENDPOINT Endpoint, + IN PUSBPORT_TRANSFER Transfer, + IN PLIST_ENTRY List); + +VOID +NTAPI +USBPORT_DoneSplitTransfer( + IN PUSBPORT_TRANSFER SplitTransfer); + +VOID +NTAPI +USBPORT_CancelSplitTransfer( + IN PUSBPORT_TRANSFER SplitTransfer); + /* urb.c */ NTSTATUS NTAPI Modified: trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/driver… ============================================================================== --- trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h [iso-8859-1] Fri Sep 8 07:17:34 2017 @@ -626,16 +626,16 @@ ULONG_PTR CurrentVa; PVOID MappedSystemVa; ULONG SgElementCount; - USBPORT_SCATTER_GATHER_ELEMENT SgElement[1]; + USBPORT_SCATTER_GATHER_ELEMENT SgElement[2]; } USBPORT_SCATTER_GATHER_LIST, *PUSBPORT_SCATTER_GATHER_LIST; -C_ASSERT(sizeof(USBPORT_SCATTER_GATHER_LIST) == 24 + 4 * sizeof(PVOID)); +C_ASSERT(sizeof(USBPORT_SCATTER_GATHER_LIST) == 48 + 4 * sizeof(PVOID)); typedef struct _USBPORT_TRANSFER_PARAMETERS { ULONG TransferFlags; ULONG TransferBufferLength; ULONG TransferCounter; - ULONG Reserved1; + BOOL IsTransferSplited; ULONG Reserved2; USB_DEFAULT_PIPE_SETUP_PACKET SetupPacket; } USBPORT_TRANSFER_PARAMETERS, *PUSBPORT_TRANSFER_PARAMETERS;

7 years

[pschweitzer] 75782: [NTOSKRNL] In IoReportDetectedDevice(), don't attempt to guess service name, use the one provided in DriverObject. This fixes BtrFS file system driver initialization. Patch by ...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Sep 7 21:23:19 2017 New Revision: 75782 URL: http://svn.reactos.org/svn/reactos?rev=75782&view=rev Log: [NTOSKRNL] In IoReportDetectedDevice(), don't attempt to guess service name, use the one provided in DriverObject. This fixes BtrFS file system driver initialization. Patch by Thomas Faber. CORE-13763 Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] Thu Sep 7 21:23:19 2017 @@ -181,12 +181,7 @@ DPRINT("IoReportDetectedDevice (DeviceObject %p, *DeviceObject %p)\n", DeviceObject, DeviceObject ? *DeviceObject : NULL); - /* Create the service name (eg. ACPI_HAL) */ - ServiceName.Buffer = DriverObject->DriverName.Buffer + - sizeof(DRIVER_ROOT_NAME) / sizeof(WCHAR) - 1; - ServiceName.Length = DriverObject->DriverName.Length - - sizeof(DRIVER_ROOT_NAME) + sizeof(WCHAR); - ServiceName.MaximumLength = ServiceName.Length; + ServiceName = DriverObject->DriverExtension->ServiceKeyName; /* If the interface type is unknown, treat it as internal */ if (LegacyBusType == InterfaceTypeUndefined)

7 years

[mjansen] 75781: [SDK] Allow version lie shims to be applied to msi.dll

by mjansen＠svn.reactos.org

Author: mjansen Date: Thu Sep 7 16:46:33 2017 New Revision: 75781 URL: http://svn.reactos.org/svn/reactos?rev=75781&view=rev Log: [SDK] Allow version lie shims to be applied to msi.dll Modified: trunk/reactos/media/sdb/sysmain.xml Modified: trunk/reactos/media/sdb/sysmain.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/sdb/sysmain.xml?rev=… ============================================================================== --- trunk/reactos/media/sdb/sysmain.xml [iso-8859-1] (original) +++ trunk/reactos/media/sdb/sysmain.xml [iso-8859-1] Thu Sep 7 16:46:33 2017 @@ -13,6 +13,7 @@ <SHIM NAME="Win95VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -21,6 +22,7 @@ </SHIM> <SHIM NAME="Win98VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -29,6 +31,7 @@ </SHIM> <SHIM NAME="WinNT4SP5VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -37,6 +40,7 @@ </SHIM> <SHIM NAME="Win2000VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -45,6 +49,7 @@ </SHIM> <SHIM NAME="Win2000SP1VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -53,6 +58,7 @@ </SHIM> <SHIM NAME="Win2000SP2VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -61,6 +67,7 @@ </SHIM> <SHIM NAME="Win2000SP3VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -69,6 +76,7 @@ </SHIM> <SHIM NAME="WinXPVersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -77,6 +85,7 @@ </SHIM> <SHIM NAME="WinXPSP1VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -85,6 +94,7 @@ </SHIM> <SHIM NAME="WinXPSP2VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -93,6 +103,7 @@ </SHIM> <SHIM NAME="WinXPSP3VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -101,6 +112,7 @@ </SHIM> <SHIM NAME="Win2k3RTMVersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -109,6 +121,7 @@ </SHIM> <SHIM NAME="Win2k3SP1VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -117,6 +130,7 @@ </SHIM> <SHIM NAME="Win2k3SP2VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -125,6 +139,7 @@ </SHIM> <SHIM NAME="VistaRTMVersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -133,6 +148,7 @@ </SHIM> <SHIM NAME="VistaSP1VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -141,6 +157,7 @@ </SHIM> <SHIM NAME="VistaSP2VersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" /> @@ -149,6 +166,7 @@ </SHIM> <SHIM NAME="Win7RTMVersionLie"> <INCLUDE MODULE="shell32.dll" /> + <INCLUDE MODULE="msi.dll" /> <EXCLUDE MODULE="kernel32.dll" /> <EXCLUDE MODULE="msvcrt.dll" /> <EXCLUDE MODULE="ole32.dll" />

7 years

← Newer
1
...
20
21
22
23
24
25
26
...
29
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 September 2017