Ros-diffs August 2012

ros-diffs@reactos.org

14 participants
198 discussions

[tkreuzer] 57058: [VGA] Fix possible NULL pointer dereference. Patch by numitus (domovoi94 at gmail dot com)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Aug 11 22:40:50 2012 New Revision: 57058 URL: http://svn.reactos.org/svn/reactos?rev=57058&view=rev Log: [VGA] Fix possible NULL pointer dereference. Patch by numitus (domovoi94 at gmail dot com) Modified: trunk/reactos/win32ss/drivers/displays/vga/objects/bitblt.c Modified: trunk/reactos/win32ss/drivers/displays/vga/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/v… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/vga/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/vga/objects/bitblt.c [iso-8859-1] Sat Aug 11 22:40:50 2012 @@ -426,6 +426,18 @@ UINT i; POINTL Pt; ULONG Direction; + POINTL FinalSourcePoint; + + if (Source && SourcePoint) + { + FinalSourcePoint.x = SourcePoint->x; + FinalSourcePoint.y = SourcePoint->y; + } + else + { + FinalSourcePoint.x = 0; + FinalSourcePoint.y = 0; + } switch (rop4) { @@ -462,8 +474,8 @@ case DC_RECT: /* Clip the blt to the clip rectangle */ VGADDI_IntersectRect(&CombinedRect, DestRect, &(Clip->rclBounds)); - Pt.x = SourcePoint->x + CombinedRect.left - DestRect->left; - Pt.y = SourcePoint->y + CombinedRect.top - DestRect->top; + Pt.x = FinalSourcePoint.x + CombinedRect.left - DestRect->left; + Pt.y = FinalSourcePoint.y + CombinedRect.top - DestRect->top; Ret = (*BltRectFunc)(Dest, Source, Mask, ColorTranslation, &CombinedRect, &Pt, MaskPoint, Brush, BrushPoint, rop4); @@ -472,10 +484,10 @@ Ret = TRUE; if (Dest == Source) { - if (DestRect->top <= SourcePoint->y) - Direction = DestRect->left < SourcePoint->x ? CD_RIGHTDOWN : CD_LEFTDOWN; + if (DestRect->top <= FinalSourcePoint.y) + Direction = DestRect->left < FinalSourcePoint.y ? CD_RIGHTDOWN : CD_LEFTDOWN; else - Direction = DestRect->left < SourcePoint->x ? CD_RIGHTUP : CD_LEFTUP; + Direction = DestRect->left < FinalSourcePoint.x ? CD_RIGHTUP : CD_LEFTUP; } else { @@ -489,8 +501,8 @@ for (i = 0; i < RectEnum.c; i++) { VGADDI_IntersectRect(&CombinedRect, DestRect, RectEnum.arcl + i); - Pt.x = SourcePoint->x + CombinedRect.left - DestRect->left; - Pt.y = SourcePoint->y + CombinedRect.top - DestRect->top; + Pt.x = FinalSourcePoint.x + CombinedRect.left - DestRect->left; + Pt.y = FinalSourcePoint.y + CombinedRect.top - DestRect->top; Ret = (*BltRectFunc)(Dest, Source, Mask, ColorTranslation, &CombinedRect, &Pt, MaskPoint, Brush, BrushPoint, rop4) && Ret;

12 years, 4 months

[ekohl] 57057: [SAMLIB/SAMSRV] - Implement SamLookupIdsInDomain and SamrLookupIdsInDomain.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Aug 11 19:41:17 2012 New Revision: 57057 URL: http://svn.reactos.org/svn/reactos?rev=57057&view=rev Log: [SAMLIB/SAMSRV] - Implement SamLookupIdsInDomain and SamrLookupIdsInDomain. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/include/ddk/ntsam.h Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Sat Aug 11 19:41:17 2012 @@ -648,6 +648,116 @@ NTSTATUS NTAPI +SamLookupIdsInDomain(IN SAM_HANDLE DomainHandle, + IN ULONG Count, + IN PULONG RelativeIds, + OUT PUNICODE_STRING *Names, + OUT PSID_NAME_USE *Use) +{ + SAMPR_RETURNED_USTRING_ARRAY NamesBuffer = {0, NULL}; + SAMPR_ULONG_ARRAY UseBuffer = {0, NULL}; + ULONG i; + NTSTATUS Status; + + TRACE("SamLookupIdsInDomain(%p %lu %p %p %p)\n", + DomainHandle, Count, RelativeIds, Names, Use); + + *Names = NULL; + *Use = NULL; + + RpcTryExcept + { + Status = SamrLookupIdsInDomain((SAMPR_HANDLE)DomainHandle, + Count, + RelativeIds, + &NamesBuffer, + &UseBuffer); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + if (NT_SUCCESS(Status)) + { + *Names = midl_user_allocate(Count * sizeof(RPC_UNICODE_STRING)); + if (*Names == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + for (i = 0; i < Count; i++) + { + (*Names)[i].Buffer = midl_user_allocate(NamesBuffer.Element[i].MaximumLength); + if ((*Names)[i].Buffer == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + } + + *Use = midl_user_allocate(Count * sizeof(SID_NAME_USE)); + if (*Use == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + for (i = 0; i < Count; i++) + { + (*Names)[i].Length = NamesBuffer.Element[i].Length; + (*Names)[i].MaximumLength = NamesBuffer.Element[i].MaximumLength; + + RtlCopyMemory((*Names)[i].Buffer, + NamesBuffer.Element[i].Buffer, + NamesBuffer.Element[i].Length); + } + + RtlCopyMemory(*Use, + UseBuffer.Element, + Count * sizeof(SID_NAME_USE)); + } + +done: + if (!NT_SUCCESS(Status)) + { + if (*Names != NULL) + { + for (i = 0; i < Count; i++) + { + if ((*Names)[i].Buffer != NULL) + midl_user_free((*Names)[i].Buffer); + } + + midl_user_free(*Names); + } + + if (*Use != NULL) + midl_user_free(*Use); + } + + if (NamesBuffer.Element != NULL) + { + for (i = 0; i < NamesBuffer.Count; i++) + { + if (NamesBuffer.Element[i].Buffer != NULL) + midl_user_free(NamesBuffer.Element[i].Buffer); + } + + midl_user_free(NamesBuffer.Element); + } + + if (UseBuffer.Element != NULL) + midl_user_free(UseBuffer.Element); + + return 0; +} + + +NTSTATUS +NTAPI SamLookupNamesInDomain(IN SAM_HANDLE DomainHandle, IN ULONG Count, IN PUNICODE_STRING Names, @@ -664,9 +774,6 @@ *RelativeIds = NULL; *Use = NULL; - RidBuffer.Element = NULL; - UseBuffer.Element = NULL; - RpcTryExcept { Status = SamrLookupNamesInDomain((SAMPR_HANDLE)DomainHandle, Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Sat Aug 11 19:41:17 2012 @@ -26,7 +26,7 @@ @ stdcall SamGetMembersInAlias(ptr ptr ptr) @ stub SamGetMembersInGroup @ stdcall SamLookupDomainInSamServer(ptr ptr ptr) -@ stub SamLookupIdsInDomain +@ stdcall SamLookupIdsInDomain(ptr long ptr ptr ptr) @ stdcall SamLookupNamesInDomain(ptr long ptr ptr ptr) @ stdcall SamOpenAlias(ptr long long ptr) @ stdcall SamOpenDomain(ptr long ptr ptr) Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat Aug 11 19:41:17 2012 @@ -2925,6 +2925,9 @@ SampRegCloseKey(AccountsKeyHandle); } + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) + break; + /* Return alias account */ if (NT_SUCCESS(Status) && RelativeId != 0) { @@ -2961,6 +2964,9 @@ SampRegCloseKey(AccountsKeyHandle); } + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) + break; + /* Return group account */ if (NT_SUCCESS(Status) && RelativeId != 0) { @@ -2997,6 +3003,9 @@ SampRegCloseKey(AccountsKeyHandle); } + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) + break; + /* Return user account */ if (NT_SUCCESS(Status) && RelativeId != 0) { @@ -3050,13 +3059,276 @@ NTSTATUS NTAPI SamrLookupIdsInDomain(IN SAMPR_HANDLE DomainHandle, - IN unsigned long Count, - IN unsigned long *RelativeIds, + IN ULONG Count, + IN ULONG *RelativeIds, OUT PSAMPR_RETURNED_USTRING_ARRAY Names, OUT PSAMPR_ULONG_ARRAY Use) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT DomainObject; + WCHAR RidString[9]; + HANDLE AccountsKeyHandle; + HANDLE AccountKeyHandle; + ULONG MappedCount = 0; + ULONG DataLength; + ULONG i; + NTSTATUS Status; + + TRACE("SamrLookupIdsInDomain(%p %lu %p %p %p)\n", + DomainHandle, Count, RelativeIds, Names, Use); + + /* Validate the domain handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_LOOKUP, + &DomainObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + Names->Count = 0; + Use->Count = 0; + + if (Count == 0) + return STATUS_SUCCESS; + + /* Allocate the names array */ + Names->Element = midl_user_allocate(Count * sizeof(ULONG)); + if (Names->Element == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + /* Allocate the use array */ + Use->Element = midl_user_allocate(Count * sizeof(ULONG)); + if (Use->Element == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + Names->Count = Count; + Use->Count = Count; + + for (i = 0; i < Count; i++) + { + TRACE("RID: %lu\n", RelativeIds[i]); + + swprintf(RidString, L"%08lx", RelativeIds[i]); + + /* Lookup aliases */ + Status = SampRegOpenKey(DomainObject->KeyHandle, + L"Aliases", + KEY_READ, + &AccountsKeyHandle); + if (NT_SUCCESS(Status)) + { + Status = SampRegOpenKey(AccountsKeyHandle, + RidString, + KEY_READ, + &AccountKeyHandle); + if (NT_SUCCESS(Status)) + { + DataLength = 0; + Status = SampRegQueryValue(AccountKeyHandle, + L"Name", + NULL, + NULL, + &DataLength); + if (NT_SUCCESS(Status)) + { + Names->Element[i].Buffer = midl_user_allocate(DataLength); + if (Names->Element[i].Buffer == NULL) + Status = STATUS_INSUFFICIENT_RESOURCES; + + if (NT_SUCCESS(Status)) + { + Names->Element[i].MaximumLength = DataLength; + Names->Element[i].Length = DataLength - sizeof(WCHAR); + + Status = SampRegQueryValue(AccountKeyHandle, + L"Name", + NULL, + Names->Element[i].Buffer, + &DataLength); + } + } + + SampRegCloseKey(AccountKeyHandle); + } + + SampRegCloseKey(AccountsKeyHandle); + } + + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) + break; + + /* Return alias account */ + if (NT_SUCCESS(Status) && Names->Element[i].Buffer != NULL) + { + TRACE("Name: %S\n", Names->Element[i].Buffer); + Use->Element[i] = SidTypeAlias; + MappedCount++; + continue; + } + + /* Lookup groups */ + Status = SampRegOpenKey(DomainObject->KeyHandle, + L"Groups", + KEY_READ, + &AccountsKeyHandle); + if (NT_SUCCESS(Status)) + { + Status = SampRegOpenKey(AccountsKeyHandle, + RidString, + KEY_READ, + &AccountKeyHandle); + if (NT_SUCCESS(Status)) + { + DataLength = 0; + Status = SampRegQueryValue(AccountKeyHandle, + L"Name", + NULL, + NULL, + &DataLength); + if (NT_SUCCESS(Status)) + { + Names->Element[i].Buffer = midl_user_allocate(DataLength); + if (Names->Element[i].Buffer == NULL) + Status = STATUS_INSUFFICIENT_RESOURCES; + + if (NT_SUCCESS(Status)) + { + Names->Element[i].MaximumLength = DataLength; + Names->Element[i].Length = DataLength - sizeof(WCHAR); + + Status = SampRegQueryValue(AccountKeyHandle, + L"Name", + NULL, + Names->Element[i].Buffer, + &DataLength); + } + } + + SampRegCloseKey(AccountKeyHandle); + } + + SampRegCloseKey(AccountsKeyHandle); + } + + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) + break; + + /* Return group account */ + if (NT_SUCCESS(Status) && Names->Element[i].Buffer != NULL) + { + TRACE("Name: %S\n", Names->Element[i].Buffer); + Use->Element[i] = SidTypeGroup; + MappedCount++; + continue; + } + + /* Lookup users */ + Status = SampRegOpenKey(DomainObject->KeyHandle, + L"Users", + KEY_READ, + &AccountsKeyHandle); + if (NT_SUCCESS(Status)) + { + Status = SampRegOpenKey(AccountsKeyHandle, + RidString, + KEY_READ, + &AccountKeyHandle); + if (NT_SUCCESS(Status)) + { + DataLength = 0; + Status = SampRegQueryValue(AccountKeyHandle, + L"Name", + NULL, + NULL, + &DataLength); + if (NT_SUCCESS(Status)) + { + TRACE("DataLength: %lu\n", DataLength); + + Names->Element[i].Buffer = midl_user_allocate(DataLength); + if (Names->Element[i].Buffer == NULL) + Status = STATUS_INSUFFICIENT_RESOURCES; + + if (NT_SUCCESS(Status)) + { + Names->Element[i].MaximumLength = DataLength; + Names->Element[i].Length = DataLength - sizeof(WCHAR); + + Status = SampRegQueryValue(AccountKeyHandle, + L"Name", + NULL, + Names->Element[i].Buffer, + &DataLength); + } + } + + SampRegCloseKey(AccountKeyHandle); + } + + SampRegCloseKey(AccountsKeyHandle); + } + + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) + break; + + /* Return user account */ + if (NT_SUCCESS(Status) && Names->Element[i].Buffer != NULL) + { + TRACE("Name: %S\n", Names->Element[i].Buffer); + Use->Element[i] = SidTypeUser; + MappedCount++; + continue; + } + + /* Return unknown account */ + Use->Element[i] = SidTypeUnknown; + } + +done: + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + Status = STATUS_SUCCESS; + + if (NT_SUCCESS(Status)) + { + if (MappedCount == 0) + Status = STATUS_NONE_MAPPED; + else if (MappedCount < Count) + Status = STATUS_SOME_NOT_MAPPED; + } + else + { + if (Names->Element != NULL) + { + for (i = 0; i < Count; i++) + { + if (Names->Element[i].Buffer != NULL) + midl_user_free(Names->Element[i].Buffer); + } + + midl_user_free(Names->Element); + Names->Element = NULL; + } + + Names->Count = 0; + + if (Use->Element != NULL) + { + midl_user_free(Use->Element); + Use->Element = NULL; + } + + Use->Count = 0; + } + + return Status; } Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=57… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Sat Aug 11 19:41:17 2012 @@ -426,6 +426,14 @@ NTSTATUS NTAPI +SamLookupIdsInDomain(IN SAM_HANDLE DomainHandle, + IN ULONG Count, + IN PULONG RelativeIds, + OUT PUNICODE_STRING *Names, + OUT PSID_NAME_USE *Use); + +NTSTATUS +NTAPI SamLookupNamesInDomain(IN SAM_HANDLE DomainHandle, IN ULONG Count, IN PUNICODE_STRING Names,

12 years, 4 months

[akhaldi] 57056: [SHELL32_WINETEST] * Skip tests that rely on DDE. See bug #7233 for more details.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Aug 11 16:24:36 2012 New Revision: 57056 URL: http://svn.reactos.org/svn/reactos?rev=57056&view=rev Log: [SHELL32_WINETEST] * Skip tests that rely on DDE. See bug #7233 for more details. Modified: trunk/rostests/winetests/shell32/CMakeLists.txt trunk/rostests/winetests/shell32/shlexec.c trunk/rostests/winetests/shell32/testlist.c Modified: trunk/rostests/winetests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/CMakeLists.txt [iso-8859-1] Sat Aug 11 16:24:36 2012 @@ -12,7 +12,7 @@ brsfolder.c ebrowser.c generated.c - progman_dde.c + #progman_dde.c FIXME: bug 7233 recyclebin.c shelldispatch.c shelllink.c Modified: trunk/rostests/winetests/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlexec… ============================================================================== --- trunk/rostests/winetests/shell32/shlexec.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlexec.c [iso-8859-1] Sat Aug 11 16:24:36 2012 @@ -57,7 +57,7 @@ static char child_file[MAX_PATH]; static DLLVERSIONINFO dllver; static BOOL skip_noassoc_tests = FALSE; -static HANDLE dde_ready_event; +//static HANDLE dde_ready_event; FIXME: bug 7233 /*** @@ -1624,6 +1624,7 @@ int todo; } dde_tests_t; +#if BUG_7233_IS_FIXED static dde_tests_t dde_tests[] = { /* Test passing and not passing command-line @@ -1820,6 +1821,7 @@ CloseHandle(map); hook_WaitForInputIdle((void *) WaitForInputIdle); } +#endif #define DDE_DEFAULT_APP_VARIANTS 2 typedef struct @@ -1830,6 +1832,7 @@ int rc[DDE_DEFAULT_APP_VARIANTS]; } dde_default_app_tests_t; +#if BUG_7233_IS_FIXED static dde_default_app_tests_t dde_default_app_tests[] = { /* Windows XP and 98 handle default DDE app names in different ways. @@ -1988,6 +1991,7 @@ assert(DdeFreeStringHandle(ddeInst, hszApplication)); assert(DdeUninitialize(ddeInst)); } +#endif static void init_test(void) { @@ -2278,8 +2282,12 @@ test_lnks(); test_exes(); test_exes_long(); +#if BUG_7233_IS_FIXED test_dde(); test_dde_default_app(); +#endif + win_skip("Skipping test_dde() until we have a sane DDE implementation. Bug 7233.\n"); + win_skip("Skipping test_dde_default_app() until we have a sane DDE implementation. Bug 7233.\n"); test_commandline(); test_directory(); Modified: trunk/rostests/winetests/shell32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/testlis… ============================================================================== --- trunk/rostests/winetests/shell32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/testlist.c [iso-8859-1] Sat Aug 11 16:24:36 2012 @@ -12,7 +12,7 @@ extern void func_brsfolder(void); extern void func_ebrowser(void); extern void func_generated(void); -extern void func_progman_dde(void); +//extern void func_progman_dde(void); FIXME: bug 7233 extern void func_recyclebin(void); extern void func_shelldispatch(void); extern void func_shelllink(void); @@ -34,7 +34,7 @@ { "brsfolder", func_brsfolder }, { "ebrowser", func_ebrowser }, { "generated", func_generated }, - { "progman_dde", func_progman_dde }, +// { "progman_dde", func_progman_dde }, FIXME: bug 7233 { "recyclebin", func_recyclebin }, { "shelldispatch", func_shelldispatch }, { "shelllink", func_shelllink },

12 years, 4 months

[fireball] 57055: [NTOS/MM] - Hack away UsedPageTable referencing in MiProtectVirtualMemory for now to help testman.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Aug 9 20:19:52 2012 New Revision: 57055 URL: http://svn.reactos.org/svn/reactos?rev=57055&view=rev Log: [NTOS/MM] - Hack away UsedPageTable referencing in MiProtectVirtualMemory for now to help testman. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Thu Aug 9 20:19:52 2012 @@ -1763,7 +1763,7 @@ ULONG_PTR StartingAddress, EndingAddress; PMMPTE PointerPde, PointerPte, LastPte; MMPTE PteContents; - PUSHORT UsedPageTableEntries; + //PUSHORT UsedPageTableEntries; PMMPFN Pfn1; ULONG ProtectionMask; NTSTATUS Status = STATUS_SUCCESS; @@ -1894,9 +1894,10 @@ { /* This used to be a zero PTE and it no longer is, so we must add a reference to the pagetable. */ - UsedPageTableEntries = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(MiPteToAddress(PointerPte))]; - (*UsedPageTableEntries)++; - ASSERT((*UsedPageTableEntries) <= PTE_COUNT); + //UsedPageTableEntries = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(MiPteToAddress(PointerPte))]; + //(*UsedPageTableEntries)++; + //ASSERT((*UsedPageTableEntries) <= PTE_COUNT); + DPRINT1("HACK: Not increasing UsedPageTableEntries count!\n"); } else if (PteContents.u.Hard.Valid == 1) { @@ -1913,14 +1914,16 @@ /* TODO */ UNIMPLEMENTED; } - - /* Write the protection mask and write it with a TLB flush */ - Pfn1->OriginalPte.u.Soft.Protection = ProtectionMask; - MiFlushTbAndCapture(Vad, - PointerPte, - ProtectionMask, - Pfn1, - TRUE); + else + { + /* Write the protection mask and write it with a TLB flush */ + Pfn1->OriginalPte.u.Soft.Protection = ProtectionMask; + MiFlushTbAndCapture(Vad, + PointerPte, + ProtectionMask, + Pfn1, + TRUE); + } } else {

12 years, 4 months

[ekohl] 57054: [SAMLIB/SAMSRV] Implement SamCreateUser2InDomain / SamrCreateUser2InDomain (untested) and SamLookupNamesInDomain / SamrLookupNamesInDomain.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Aug 8 21:17:17 2012 New Revision: 57054 URL: http://svn.reactos.org/svn/reactos?rev=57054&view=rev Log: [SAMLIB/SAMSRV] Implement SamCreateUser2InDomain / SamrCreateUser2InDomain (untested) and SamLookupNamesInDomain / SamrLookupNamesInDomain. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/include/ddk/ntsam.h Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Wed Aug 8 21:17:17 2012 @@ -191,6 +191,9 @@ TRACE("SamCreateAliasInDomain(%p %p 0x%08x %p %p)\n", DomainHandle, AccountName, DesiredAccess, AliasHandle, RelativeId); + *AliasHandle = NULL; + *RelativeId = 0; + RpcTryExcept { Status = SamrCreateAliasInDomain((SAMPR_HANDLE)DomainHandle, @@ -222,6 +225,9 @@ TRACE("SamCreateGroupInDomain(%p %p 0x%08x %p %p)\n", DomainHandle, AccountName, DesiredAccess, GroupHandle, RelativeId); + *GroupHandle = NULL; + *RelativeId = 0; + RpcTryExcept { Status = SamrCreateGroupInDomain((SAMPR_HANDLE)DomainHandle, @@ -242,6 +248,46 @@ NTSTATUS NTAPI +SamCreateUser2InDomain(IN SAM_HANDLE DomainHandle, + IN PUNICODE_STRING AccountName, + IN ULONG AccountType, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_HANDLE UserHandle, + OUT PULONG GrantedAccess, + OUT PULONG RelativeId) +{ + NTSTATUS Status; + + TRACE("SamCreateUser2InDomain(%p %p %lu 0x%08x %p %p %p)\n", + DomainHandle, AccountName, AccountType, DesiredAccess, + UserHandle, GrantedAccess, RelativeId); + + *UserHandle = NULL; + *RelativeId = 0; + + RpcTryExcept + { + Status = SamrCreateUser2InDomain((SAMPR_HANDLE)DomainHandle, + (PRPC_UNICODE_STRING)AccountName, + AccountType, + DesiredAccess, + (SAMPR_HANDLE *)UserHandle, + GrantedAccess, + RelativeId); + + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +NTSTATUS +NTAPI SamCreateUserInDomain(IN SAM_HANDLE DomainHandle, IN PUNICODE_STRING AccountName, IN ACCESS_MASK DesiredAccess, @@ -252,6 +298,9 @@ TRACE("SamCreateUserInDomain(%p %p 0x%08x %p %p)\n", DomainHandle, AccountName, DesiredAccess, UserHandle, RelativeId); + + *UserHandle = NULL; + *RelativeId = 0; RpcTryExcept { @@ -605,8 +654,75 @@ OUT PULONG *RelativeIds, OUT PSID_NAME_USE *Use) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + SAMPR_ULONG_ARRAY RidBuffer = {0, NULL}; + SAMPR_ULONG_ARRAY UseBuffer = {0, NULL}; + NTSTATUS Status; + + TRACE("SamLookupNamesInDomain(%p %lu %p %p %p)\n", + DomainHandle, Count, Names, RelativeIds, Use); + + *RelativeIds = NULL; + *Use = NULL; + + RidBuffer.Element = NULL; + UseBuffer.Element = NULL; + + RpcTryExcept + { + Status = SamrLookupNamesInDomain((SAMPR_HANDLE)DomainHandle, + Count, + (PRPC_UNICODE_STRING)Names, + &RidBuffer, + &UseBuffer); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + if (NT_SUCCESS(Status)) + { + *RelativeIds = midl_user_allocate(Count * sizeof(ULONG)); + if (*RelativeIds == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + *Use = midl_user_allocate(Count * sizeof(SID_NAME_USE)); + if (*Use == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + RtlCopyMemory(*RelativeIds, + RidBuffer.Element, + Count * sizeof(ULONG)); + + RtlCopyMemory(*Use, + UseBuffer.Element, + Count * sizeof(SID_NAME_USE)); + } + +done: + if (!NT_SUCCESS(Status)) + { + if (*RelativeIds != NULL) + midl_user_free(*RelativeIds); + + if (*Use != NULL) + midl_user_free(*Use); + } + + if (RidBuffer.Element != NULL) + midl_user_free(RidBuffer.Element); + + if (UseBuffer.Element != NULL) + midl_user_free(UseBuffer.Element); + + return Status; } Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Wed Aug 8 21:17:17 2012 @@ -9,7 +9,7 @@ @ stub SamConnectWithCreds @ stdcall SamCreateAliasInDomain(ptr ptr long ptr ptr) @ stdcall SamCreateGroupInDomain(ptr ptr long ptr ptr) -@ stub SamCreateUser2InDomain +@ stdcall SamCreateUser2InDomain(ptr ptr long long ptr ptr ptr) @ stdcall SamCreateUserInDomain(ptr ptr long ptr ptr) @ stub SamDeleteAlias @ stub SamDeleteGroup Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Wed Aug 8 21:17:17 2012 @@ -2840,14 +2840,211 @@ NTSTATUS NTAPI SamrLookupNamesInDomain(IN SAMPR_HANDLE DomainHandle, - IN unsigned long Count, + IN ULONG Count, IN RPC_UNICODE_STRING Names[], OUT PSAMPR_ULONG_ARRAY RelativeIds, OUT PSAMPR_ULONG_ARRAY Use) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + PSAM_DB_OBJECT DomainObject; + HANDLE AccountsKeyHandle; + HANDLE NamesKeyHandle; + ULONG MappedCount = 0; + ULONG DataLength; + ULONG i; + ULONG RelativeId; + NTSTATUS Status; + + TRACE("SamrLookupNamesInDomain(%p %lu %p %p %p)\n", + DomainHandle, Count, Names, RelativeIds, Use); + + /* Validate the domain handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_LOOKUP, + &DomainObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + RelativeIds->Count = 0; + Use->Count = 0; + + if (Count == 0) + return STATUS_SUCCESS; + + /* Allocate the relative IDs array */ + RelativeIds->Element = midl_user_allocate(Count * sizeof(ULONG)); + if (RelativeIds->Element == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + /* Allocate the use array */ + Use->Element = midl_user_allocate(Count * sizeof(ULONG)); + if (Use->Element == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + RelativeIds->Count = Count; + Use->Count = Count; + + for (i = 0; i < Count; i++) + { + TRACE("Name: %S\n", Names[i].Buffer); + + RelativeId = 0; + + /* Lookup aliases */ + Status = SampRegOpenKey(DomainObject->KeyHandle, + L"Aliases", + KEY_READ, + &AccountsKeyHandle); + if (NT_SUCCESS(Status)) + { + Status = SampRegOpenKey(AccountsKeyHandle, + L"Names", + KEY_READ, + &NamesKeyHandle); + if (NT_SUCCESS(Status)) + { + DataLength = sizeof(ULONG); + Status = SampRegQueryValue(NamesKeyHandle, + Names[i].Buffer, + NULL, + &RelativeId, + &DataLength); + + SampRegCloseKey(NamesKeyHandle); + } + + SampRegCloseKey(AccountsKeyHandle); + } + + /* Return alias account */ + if (NT_SUCCESS(Status) && RelativeId != 0) + { + TRACE("Rid: %lu\n", RelativeId); + RelativeIds->Element[i] = RelativeId; + Use->Element[i] = SidTypeAlias; + MappedCount++; + continue; + } + + /* Lookup groups */ + Status = SampRegOpenKey(DomainObject->KeyHandle, + L"Groups", + KEY_READ, + &AccountsKeyHandle); + if (NT_SUCCESS(Status)) + { + Status = SampRegOpenKey(AccountsKeyHandle, + L"Names", + KEY_READ, + &NamesKeyHandle); + if (NT_SUCCESS(Status)) + { + DataLength = sizeof(ULONG); + Status = SampRegQueryValue(NamesKeyHandle, + Names[i].Buffer, + NULL, + &RelativeId, + &DataLength); + + SampRegCloseKey(NamesKeyHandle); + } + + SampRegCloseKey(AccountsKeyHandle); + } + + /* Return group account */ + if (NT_SUCCESS(Status) && RelativeId != 0) + { + TRACE("Rid: %lu\n", RelativeId); + RelativeIds->Element[i] = RelativeId; + Use->Element[i] = SidTypeGroup; + MappedCount++; + continue; + } + + /* Lookup users */ + Status = SampRegOpenKey(DomainObject->KeyHandle, + L"Users", + KEY_READ, + &AccountsKeyHandle); + if (NT_SUCCESS(Status)) + { + Status = SampRegOpenKey(AccountsKeyHandle, + L"Names", + KEY_READ, + &NamesKeyHandle); + if (NT_SUCCESS(Status)) + { + DataLength = sizeof(ULONG); + Status = SampRegQueryValue(NamesKeyHandle, + Names[i].Buffer, + NULL, + &RelativeId, + &DataLength); + + SampRegCloseKey(NamesKeyHandle); + } + + SampRegCloseKey(AccountsKeyHandle); + } + + /* Return user account */ + if (NT_SUCCESS(Status) && RelativeId != 0) + { + TRACE("Rid: %lu\n", RelativeId); + RelativeIds->Element[i] = RelativeId; + Use->Element[i] = SidTypeUser; + MappedCount++; + continue; + } + + /* Return unknown account */ + RelativeIds->Element[i] = 0; + Use->Element[i] = SidTypeUnknown; + } + +done: + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + Status = STATUS_SUCCESS; + + if (NT_SUCCESS(Status)) + { + if (MappedCount == 0) + Status = STATUS_NONE_MAPPED; + else if (MappedCount < Count) + Status = STATUS_SOME_NOT_MAPPED; + } + else + { + if (RelativeIds->Element != NULL) + { + midl_user_free(RelativeIds->Element); + RelativeIds->Element = NULL; + } + + RelativeIds->Count = 0; + + if (Use->Element != NULL) + { + midl_user_free(Use->Element); + Use->Element = NULL; + } + + Use->Count = 0; + } + + return Status; +} + /* Function 18 */ NTSTATUS @@ -5546,6 +5743,7 @@ return STATUS_NOT_IMPLEMENTED; } + /* Function 50 */ NTSTATUS NTAPI @@ -5557,8 +5755,260 @@ OUT unsigned long *GrantedAccess, OUT unsigned long *RelativeId) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNICODE_STRING EmptyString = RTL_CONSTANT_STRING(L""); + SAM_DOMAIN_FIXED_DATA FixedDomainData; + SAM_USER_FIXED_DATA FixedUserData; + PSAM_DB_OBJECT DomainObject; + PSAM_DB_OBJECT UserObject; + ULONG ulSize; + ULONG ulRid; + WCHAR szRid[9]; + NTSTATUS Status; + + TRACE("SamrCreateUserInDomain(%p %p %lx %p %p)\n", + DomainHandle, Name, DesiredAccess, UserHandle, RelativeId); + + if (Name == NULL || + Name->Length == 0 || + Name->Buffer == NULL || + UserHandle == NULL || + RelativeId == NULL) + return STATUS_INVALID_PARAMETER; + + /* Check for valid account type */ + if (AccountType != USER_NORMAL_ACCOUNT && + AccountType != USER_WORKSTATION_TRUST_ACCOUNT && + AccountType != USER_INTERDOMAIN_TRUST_ACCOUNT && + AccountType != USER_SERVER_TRUST_ACCOUNT && + AccountType != USER_TEMP_DUPLICATE_ACCOUNT) + return STATUS_INVALID_PARAMETER; + + /* Validate the domain handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DOMAIN_CREATE_USER, + &DomainObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Check if the user name already exists in the domain */ + Status = SampCheckAccountNameInDomain(DomainObject, + Name->Buffer); + if (!NT_SUCCESS(Status)) + { + TRACE("User name \'%S\' already exists in domain (Status 0x%08lx)\n", + Name->Buffer, Status); + return Status; + } + + /* Get the fixed domain attributes */ + ulSize = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(DomainObject, + L"F", + NULL, + (PVOID)&FixedDomainData, + &ulSize); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Increment the NextRid attribute */ + ulRid = FixedDomainData.NextRid; + FixedDomainData.NextRid++; + + /* Store the fixed domain attributes */ + Status = SampSetObjectAttribute(DomainObject, + L"F", + REG_BINARY, + &FixedDomainData, + ulSize); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + TRACE("RID: %lx\n", ulRid); + + /* Convert the RID into a string (hex) */ + swprintf(szRid, L"%08lX", ulRid); + + /* Create the user object */ + Status = SampCreateDbObject(DomainObject, + L"Users", + szRid, + SamDbUserObject, + DesiredAccess, + &UserObject); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Add the account name for the user object */ + Status = SampSetAccountNameInDomain(DomainObject, + L"Users", + Name->Buffer, + ulRid); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Initialize fixed user data */ + memset(&FixedUserData, 0, sizeof(SAM_USER_FIXED_DATA)); + FixedUserData.Version = 1; + FixedUserData.LastLogon.QuadPart = 0; + FixedUserData.LastLogoff.QuadPart = 0; + FixedUserData.PasswordLastSet.QuadPart = 0; + FixedUserData.AccountExpires.LowPart = MAXULONG; + FixedUserData.AccountExpires.HighPart = MAXLONG; + FixedUserData.LastBadPasswordTime.QuadPart = 0; + FixedUserData.UserId = ulRid; + FixedUserData.PrimaryGroupId = DOMAIN_GROUP_RID_USERS; + FixedUserData.UserAccountControl = USER_ACCOUNT_DISABLED | + USER_PASSWORD_NOT_REQUIRED | + AccountType; + + /* Set fixed user data attribute */ + Status = SampSetObjectAttribute(UserObject, + L"F", + REG_BINARY, + (LPVOID)&FixedUserData, + sizeof(SAM_USER_FIXED_DATA)); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the Name attribute */ + Status = SampSetObjectAttribute(UserObject, + L"Name", + REG_SZ, + (LPVOID)Name->Buffer, + Name->MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the FullName attribute */ + Status = SampSetObjectAttribute(UserObject, + L"FullName", + REG_SZ, + EmptyString.Buffer, + EmptyString.MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the HomeDirectory attribute */ + Status = SampSetObjectAttribute(UserObject, + L"HomeDirectory", + REG_SZ, + EmptyString.Buffer, + EmptyString.MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the HomeDirectoryDrive attribute */ + Status = SampSetObjectAttribute(UserObject, + L"HomeDirectoryDrive", + REG_SZ, + EmptyString.Buffer, + EmptyString.MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the ScriptPath attribute */ + Status = SampSetObjectAttribute(UserObject, + L"ScriptPath", + REG_SZ, + EmptyString.Buffer, + EmptyString.MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the ProfilePath attribute */ + Status = SampSetObjectAttribute(UserObject, + L"ProfilePath", + REG_SZ, + EmptyString.Buffer, + EmptyString.MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the AdminComment attribute */ + Status = SampSetObjectAttribute(UserObject, + L"AdminComment", + REG_SZ, + EmptyString.Buffer, + EmptyString.MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the UserComment attribute */ + Status = SampSetObjectAttribute(UserObject, + L"UserComment", + REG_SZ, + EmptyString.Buffer, + EmptyString.MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* Set the WorkStations attribute */ + Status = SampSetObjectAttribute(UserObject, + L"WorkStations", + REG_SZ, + EmptyString.Buffer, + EmptyString.MaximumLength); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + + /* FIXME: Set default user attributes */ + + if (NT_SUCCESS(Status)) + { + *UserHandle = (SAMPR_HANDLE)UserObject; + *RelativeId = ulRid; + *GrantedAccess = UserObject->Access; + } + + TRACE("returns with status 0x%08lx\n", Status); + + return Status; } /* Function 51 */ Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=57… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Wed Aug 8 21:17:17 2012 @@ -351,6 +351,16 @@ NTSTATUS NTAPI +SamCreateUser2InDomain(IN SAM_HANDLE DomainHandle, + IN PUNICODE_STRING AccountName, + IN ULONG AccountType, + IN ACCESS_MASK DesiredAccess, + OUT PSAM_HANDLE UserHandle, + OUT PULONG GrantedAccess, + OUT PULONG RelativeId); + +NTSTATUS +NTAPI SamCreateUserInDomain(IN SAM_HANDLE DomainHandle, IN PUNICODE_STRING AccountName, IN ACCESS_MASK DesiredAccess,

12 years, 4 months

[akhaldi] 57053: [UNIATA] * Sync with v0.42i2.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Aug 8 01:17:53 2012 New Revision: 57053 URL: http://svn.reactos.org/svn/reactos?rev=57053&view=rev Log: [UNIATA] * Sync with v0.42i2. Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/inc/misc.h trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] Wed Aug 8 01:17:53 2012 @@ -192,6 +192,7 @@ #define AHCI_CAP_PMD 0x00008000 #define AHCI_CAP_SPM 0x00020000 #define AHCI_CAP_SAM 0x00040000 +#define AHCI_CAP_ISS_MASK 0x00f00000 #define AHCI_CAP_SCLO 0x01000000 #define AHCI_CAP_SNTF 0x20000000 #define AHCI_CAP_NCQ 0x40000000 Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Wed Aug 8 01:17:53 2012 @@ -508,10 +508,11 @@ ULONG i; UCHAR Status; + GetStatus(chan, Status); for (i=0; i<g_opt_WaitBusyCount; i++) { - GetStatus(chan, Status); if (Status & IDE_STATUS_BUSY) { AtapiStallExecution(g_opt_WaitBusyDelay); + GetStatus(chan, Status); continue; } else { break; @@ -2069,7 +2070,7 @@ KdPrint2((PRINT_PREFIX "AtapiResetController: Reset channel %d\n", j)); chan = &(deviceExtension->chan[j]); MaxLuns = chan->NumberLuns; - KdPrint2((PRINT_PREFIX " CompleteType %#x, Luns %d, chan %#x\n", CompleteType, MaxLuns, chan)); + KdPrint2((PRINT_PREFIX " CompleteType %#x, Luns %d, chan %#x, sptr %#x\n", CompleteType, MaxLuns, chan, &chan)); //MaxLuns = (chan->ChannelCtrlFlags & CTRFLAGS_NO_SLAVE) ? 1 : 2; if(CompleteType != RESET_COMPLETE_NONE) { #ifndef UNIATA_CORE @@ -2077,11 +2078,12 @@ PATA_REQ AtaReq = (PATA_REQ)(CurSrb->SrbExtension); - KdPrint2((PRINT_PREFIX "AtapiResetController: pending SRB %#x\n", CurSrb)); + KdPrint2((PRINT_PREFIX "AtapiResetController: pending SRB %#x, chan %#x\n", CurSrb, chan)); // Check and see if we are processing an internal srb if (AtaReq->OriginalSrb) { KdPrint2((PRINT_PREFIX " restore original SRB %#x\n", AtaReq->OriginalSrb)); AtaReq->Srb = AtaReq->OriginalSrb; + CurSrb->SrbExtension = NULL; AtaReq->OriginalSrb = NULL; // NOTE: internal SRB doesn't get to SRB queue !!! CurSrb = AtaReq->Srb; @@ -2104,6 +2106,7 @@ if (CurSrb->SenseInfoBuffer) { PSENSE_DATA senseBuffer = (PSENSE_DATA)CurSrb->SenseInfoBuffer; + KdPrint2((PRINT_PREFIX " senseBuffer %#x, chan %#x\n", senseBuffer, chan)); senseBuffer->ErrorCode = 0x70; senseBuffer->Valid = 1; @@ -2125,6 +2128,7 @@ AtaReq->WordsLeft = 0; AtaReq->DataBuffer = NULL; AtaReq->TransferLength = 0; + KdPrint2((PRINT_PREFIX "chan %#x\n", chan)); ScsiPortNotification(RequestComplete, deviceExtension, @@ -2161,7 +2165,7 @@ AtapiDisableInterrupts(deviceExtension, j); UniataAhciReset(HwDeviceExtension, j); } else { - KdPrint2((PRINT_PREFIX " ATA path\n")); + KdPrint2((PRINT_PREFIX " ATA path, chan %#x\n", chan)); KdPrint2((PRINT_PREFIX " disable intr (0)\n")); AtapiDisableInterrupts(deviceExtension, j); KdPrint2((PRINT_PREFIX " done\n")); @@ -2170,8 +2174,9 @@ ULONG mask; ULONG pshift; ULONG timeout; - if(!(ChipFlags & UNIATA_SATA)) + if(!(ChipFlags & UNIATA_SATA)) { goto default_reset; + } if(!UniataIsSATARangeAvailable(deviceExtension, j)) { goto default_reset; } @@ -3917,7 +3922,7 @@ UCHAR dma_status = 0; UCHAR reg8 = 0; ULONG reg32 = 0; - UCHAR statusByte; + UCHAR statusByte = 0; ULONG slotNumber = deviceExtension->slotNumber; ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; @@ -5017,16 +5022,21 @@ KdPrint2((PRINT_PREFIX "AtapiInterrupt: i-reason=%d, status=%#x\n", interruptReason, statusByte)); if(deviceExtension->HwFlags & UNIATA_AHCI) { KdPrint2((PRINT_PREFIX " AHCI path, WordsTransfered %x, WordsLeft %x\n", AtaReq->WordsTransfered, AtaReq->WordsLeft)); - if(chan->AhciLastIS & ATA_AHCI_P_IX_OF) { - status = SRB_STATUS_DATA_OVERRUN; +/* if(chan->AhciLastIS & ATA_AHCI_P_IX_OF) { + //status = SRB_STATUS_DATA_OVERRUN; DataOverrun = TRUE; } else { status = SRB_STATUS_SUCCESS; - } + }*/ if(AtaReq->WordsTransfered >= AtaReq->WordsLeft) { AtaReq->WordsLeft = 0; } else { AtaReq->WordsLeft -= AtaReq->WordsTransfered; + } + if(AtaReq->WordsLeft) { + status = SRB_STATUS_DATA_OVERRUN; + } else { + status = SRB_STATUS_SUCCESS; } chan->ChannelCtrlFlags &= ~CTRFLAGS_DMA_OPERATION; goto CompleteRequest; @@ -6781,6 +6791,7 @@ // DEBUG !!!! for TEST ONLY KdPrint2((PRINT_PREFIX "AtapiSendCommand: force use dma (ahci)\n")); use_dma = TRUE; + goto setup_dma; } else if(Srb->Cdb[0] == SCSIOP_REQUEST_SENSE) { KdPrint2((PRINT_PREFIX "AtapiSendCommand: SCSIOP_REQUEST_SENSE, no DMA setup\n")); @@ -6839,6 +6850,7 @@ break; } // try setup DMA +setup_dma: if(use_dma) { if(deviceExtension->HwFlags & UNIATA_AHCI) { KdPrint2((PRINT_PREFIX "AtapiSendCommand: use dma (ahci)\n")); @@ -7625,11 +7637,6 @@ LunExt->IdentifyData.NumberOfCylinders; } lba--; - - //((PREAD_CAPACITY_DATA)Srb->DataBuffer)->LogicalBlockAddress = - // (((PUCHAR)&i)[0] << 24) | (((PUCHAR)&i)[1] << 16) | - // (((PUCHAR)&i)[2] << 8) | ((PUCHAR)&i)[3]; - MOV_QD_SWP( ((PREAD_CAPACITY16_DATA)Srb->DataBuffer)->LogicalBlockAddress, lba ); KdPrint2((PRINT_PREFIX @@ -9815,6 +9822,8 @@ cdb->MECH_STATUS.OperationCode = SCSIOP_MECHANISM_STATUS; cdb->MECH_STATUS.AllocationLength[1] = sizeof(MECHANICAL_STATUS_INFORMATION_HEADER); + KdPrint2((PRINT_PREFIX " MechanismStatusSrb %#x\n", srb)); + return srb; } // end BuildMechanismStatusSrb() @@ -9856,6 +9865,8 @@ cdb = (PCDB)srb->Cdb; cdb->CDB6INQUIRY.OperationCode = SCSIOP_REQUEST_SENSE; cdb->CDB6INQUIRY.AllocationLength = sizeof(SENSE_DATA); + + KdPrint2((PRINT_PREFIX " RequestSenseSrb %#x\n", srb)); return srb; } // end BuildRequestSenseSrb() Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Wed Aug 8 01:17:53 2012 @@ -996,7 +996,9 @@ /****************/ KdPrint2((PRINT_PREFIX "SATA Generic\n")); - if(udmamode > 5) { + if((udmamode >= 5) || (ChipFlags & UNIATA_AHCI) || chan->MaxTransferMode >= ATA_SA150) { + /* some drives report UDMA6, some UDMA5 */ + /* ATAPI may not have SataCapabilities set in IDENTIFY DATA */ if(LunExt->IdentifyData.SataCapabilities != 0x0000 && LunExt->IdentifyData.SataCapabilities != 0xffff) { //udmamode = min(udmamode, 6); Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] Wed Aug 8 01:17:53 2012 @@ -2162,10 +2162,10 @@ KdPrint2((PRINT_PREFIX "Multichannel native mode, go...\n")); #ifndef UNIATA_USE_XXableInterrupts // If we raise IRQL to TIMER value, other interrupt cannot occure on the same CPU - if(KeNumberProcessors < 2) { +/* if(KeNumberProcessors < 2) { KdPrint2((PRINT_PREFIX "Unnecessary (?), UP machine\n")); //return STATUS_SUCCESS; - } + }*/ #endif //UNIATA_USE_XXableInterrupts } else { KdPrint2((PRINT_PREFIX "Unnecessary\n")); Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] Wed Aug 8 01:17:53 2012 @@ -70,6 +70,15 @@ SStatus.SPD == SStatus_SPD_Gen3) { chan->lun[0]->TransferMode = ATA_SA150 + (UCHAR)(SStatus.SPD - 1); KdPrint2((PRINT_PREFIX "SATA TransferMode %#x\n", chan->lun[0]->TransferMode)); + if(chan->MaxTransferMode < chan->lun[0]->TransferMode) { + KdPrint2((PRINT_PREFIX "SATA upd chan TransferMode\n")); + chan->MaxTransferMode = chan->lun[0]->TransferMode; + } + if(deviceExtension->MaxTransferMode < chan->lun[0]->TransferMode) { + KdPrint2((PRINT_PREFIX "SATA upd controller TransferMode\n")); + deviceExtension->MaxTransferMode = chan->lun[0]->TransferMode; + } + break; } AtapiStallExecution(10000); @@ -664,6 +673,9 @@ BaseMemAddress = deviceExtension->BaseIoAHCI_0.Addr; MemIo = deviceExtension->BaseIoAHCI_0.MemIo; + deviceExtension->MaxTransferMode = ATA_SA150+(((CAP & AHCI_CAP_ISS_MASK) >> 20)-1); + KdPrint2((PRINT_PREFIX " SATA Gen %d\n", ((CAP & AHCI_CAP_ISS_MASK) >> 20) )); + for(c=0; c<deviceExtension->NumberChannels; c++) { chan = &deviceExtension->chan[c]; offs = sizeof(IDE_AHCI_REGISTERS) + c*sizeof(IDE_AHCI_PORT_REGISTERS); @@ -825,6 +837,7 @@ KdPrint2((PRINT_PREFIX " AHCI version %#x.%02x controller with %d ports (mask %#x) detected\n", v_Mj, v_Mn, NumberChannels, PI)); + KdPrint((" AHCI SATA Gen %d\n", (((CAP & AHCI_CAP_ISS_MASK) >> 20)) )); if(CAP & AHCI_CAP_SPM) { KdPrint2((PRINT_PREFIX " PM supported\n")); @@ -865,7 +878,7 @@ deviceExtension->DmaSegmentAlignmentMask = -1; // no restrictions deviceExtension->BusMaster = DMA_MODE_AHCI; - deviceExtension->MaxTransferMode = max(deviceExtension->MaxTransferMode, ATA_SA150); + deviceExtension->MaxTransferMode = max(deviceExtension->MaxTransferMode, ATA_SA150+(((CAP & AHCI_CAP_ISS_MASK) >> 20)-1) ); return TRUE; } // end UniataAhciDetect() @@ -1190,11 +1203,11 @@ UCHAR statusByte; PATA_REQ AtaReq; ULONG fis_size; - ULONG tag=0; + //ULONG tag=0; //PIDE_AHCI_CMD AHCI_CMD = &(chan->AhciCtlBlock->cmd); PIDE_AHCI_CMD AHCI_CMD = NULL; - PIDE_AHCI_CMD_LIST AHCI_CL = &(chan->AhciCtlBlock->cmd_list[tag]); + //PIDE_AHCI_CMD_LIST AHCI_CL = &(chan->AhciCtlBlock->cmd_list[tag]); KdPrint2((PRINT_PREFIX "UniataAhciSendPIOCommand: cntrlr %#x:%#x dev %#x, cmd %#x, lba %#I64x bcount %#x feature %#x, buff %#x, len %#x, WF %#x \n", deviceExtension->DevIndex, lChannel, DeviceNumber, command, lba, bcount, feature, data, length, wait_flags )); Modified: trunk/reactos/drivers/storage/ide/uniata/inc/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/inc/misc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/inc/misc.h [iso-8859-1] Wed Aug 8 01:17:53 2012 @@ -6,7 +6,7 @@ /* The definitions look so crappy, because the code doesn't care whether the source is an array or an integer */ #define MOV_DD_SWP(a,b) ((a) = RtlUlongByteSwap(*(PULONG)&(b))) -#define MOV_DW_SWP(a,b) ((a) = RtlUshortByteSwap(*(PUSHORT)&(b))) +#define MOV_DW_SWP(a,b) ( ((PUSHORT)&(a))[0] = RtlUshortByteSwap(*(PUSHORT)&(b))) #define MOV_SWP_DW2DD(a,b) ((a) = RtlUshortByteSwap(*(PUSHORT)&(b))) #define MOV_QD_SWP(a,b) { ((PULONG)&(a))[0] = RtlUlongByteSwap( ((PULONG)&(b))[1]); ((PULONG)&(a))[1] = RtlUlongByteSwap( ((PULONG)&(b))[0]); } Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] Wed Aug 8 01:17:53 2012 @@ -1,10 +1,10 @@ -#define UNIATA_VER_STR "42h" -#define UNIATA_VER_DOT 0.42.8.0 +#define UNIATA_VER_STR "42i2" +#define UNIATA_VER_DOT 0.42.9.2 #define UNIATA_VER_MJ 0 #define UNIATA_VER_MN 42 -#define UNIATA_VER_SUB_MJ 8 -#define UNIATA_VER_SUB_MN 0 -#define UNIATA_VER_DOT_COMMA 0,42,8,0 -#define UNIATA_VER_DOT_STR "0.42.8.0" +#define UNIATA_VER_SUB_MJ 9 +#define UNIATA_VER_SUB_MN 2 +#define UNIATA_VER_DOT_COMMA 0,42,9,2 +#define UNIATA_VER_DOT_STR "0.42.9.2" #define UNIATA_VER_YEAR 2012 #define UNIATA_VER_YEAR_STR "2012"

12 years, 4 months

[akhaldi] 57052: [CMAKE] * Tackle the VS solutions case when handling importlibs.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Aug 6 20:29:38 2012 New Revision: 57052 URL: http://svn.reactos.org/svn/reactos?rev=57052&view=rev Log: [CMAKE] * Tackle the VS solutions case when handling importlibs. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=57052… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Mon Aug 6 20:29:38 2012 @@ -129,26 +129,41 @@ endmacro() function(generate_import_lib _libname _dllname _spec_file) + + set(_def_file ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_exp.def) + set(_asm_stubs_file ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_stubs.asm) + # Generate the asm stub file and the def file for import library add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_stubs.asm ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_exp.def - COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} --implib -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_libname}_exp.def -l=${CMAKE_CURRENT_BINARY_DIR}/${_libname}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + OUTPUT ${_asm_stubs_file} ${_def_file} + COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} --implib -n=${_dllname} -d=${_def_file} -l=${_asm_stubs_file} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) - - # be clear about the "language" - # Thanks MS for creating a stupid linker - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_libname}_stubs.asm PROPERTIES LANGUAGE "STUB_ASM") + + if(MSVC_IDE) + # Compile the generated asm stub file + add_custom_command( + OUTPUT ${_asm_stubs_file}.obj + COMMAND ml /Cp /Fo${_asm_stubs_file}.obj /c /Ta ${_asm_stubs_file} + DEPENDS ${_asm_stubs_file}) + else() + # be clear about the "language" + # Thanks MS for creating a stupid linker + set_source_files_properties(${_asm_stubs_file} PROPERTIES LANGUAGE "STUB_ASM") + endif() # add our library - # NOTE: as stub file and def file are generated in one pass, depending on one is like depending on the other - add_library(${_libname} STATIC EXCLUDE_FROM_ALL - ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_stubs.asm) - - add_dependencies(${_libname} ${CMAKE_CURRENT_BINARY_DIR}\\${_libname}_exp.def) - - # set correct "link rule" - set_target_properties(${_libname} PROPERTIES LINKER_LANGUAGE "IMPLIB" - STATIC_LIBRARY_FLAGS "/DEF:${CMAKE_CURRENT_BINARY_DIR}\\${_libname}_exp.def") + if(MSVC_IDE) + add_library(${_libname} STATIC EXCLUDE_FROM_ALL ${_asm_stubs_file}.obj) + set_source_files_properties(${_asm_stubs_file}.obj PROPERTIES EXTERNAL_OBJECT 1) + set_target_properties(${_libname} PROPERTIES LINKER_LANGUAGE "C") + else() + # NOTE: as stub file and def file are generated in one pass, depending on one is like depending on the other + add_library(${_libname} STATIC EXCLUDE_FROM_ALL ${_asm_stubs_file}) + add_dependencies(${_libname} ${_def_file}) + # set correct "link rule" + set_target_properties(${_libname} PROPERTIES LINKER_LANGUAGE "IMPLIB") + endif() + set_target_properties(${_libname} PROPERTIES STATIC_LIBRARY_FLAGS "/DEF:${_def_file}") endfunction() if(${ARCH} MATCHES amd64)

12 years, 4 months

[akhaldi] 57051: [UNIATA] * Fix a typo. Already sent upstream.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Aug 6 14:35:59 2012 New Revision: 57051 URL: http://svn.reactos.org/svn/reactos?rev=57051&view=rev Log: [UNIATA] * Fix a typo. Already sent upstream. Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Mon Aug 6 14:35:59 2012 @@ -7624,13 +7624,13 @@ LunExt->IdentifyData.NumberOfHeads * LunExt->IdentifyData.NumberOfCylinders; } - i--; + lba--; //((PREAD_CAPACITY_DATA)Srb->DataBuffer)->LogicalBlockAddress = // (((PUCHAR)&i)[0] << 24) | (((PUCHAR)&i)[1] << 16) | // (((PUCHAR)&i)[2] << 8) | ((PUCHAR)&i)[3]; - MOV_QD_SWP( ((PREAD_CAPACITY16_DATA)Srb->DataBuffer)->LogicalBlockAddress, i ); + MOV_QD_SWP( ((PREAD_CAPACITY16_DATA)Srb->DataBuffer)->LogicalBlockAddress, lba ); KdPrint2((PRINT_PREFIX "** IDE disk %#x - #sectors %#x, #heads %#x, #cylinders %#x (16)\n",

12 years, 4 months

[akhaldi] 57050: [UNIATA] * Sync with v0.42h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Aug 6 13:26:40 2012 New Revision: 57050 URL: http://svn.reactos.org/svn/reactos?rev=57050&view=rev Log: [UNIATA] * Sync with v0.42h. Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.h trunk/reactos/drivers/storage/ide/uniata/inc/misc.h trunk/reactos/drivers/storage/ide/uniata/scsi.h trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] Mon Aug 6 13:26:40 2012 @@ -502,6 +502,7 @@ #define ATA_F_DMA 0x01 /* enable DMA */ #define ATA_F_OVL 0x02 /* enable overlap */ +#define ATA_F_DMAREAD 0x04 /* DMA Packet (ATAPI) read */ #define ATA_C_F_SETXFER 0x03 /* set transfer mode */ @@ -628,8 +629,19 @@ ULONG UserAddressableSectors; // 60-61 - USHORT SingleWordDMASupport : 8; // 62 \- obsolete - USHORT SingleWordDMAActive : 8; // /- + union { + struct { + USHORT SingleWordDMASupport : 8; // 62 ATA, obsolete + USHORT SingleWordDMAActive : 8; // + }; + struct { + USHORT UDMASupport : 7; // 62 ATAPI + USHORT MultiWordDMASupport : 3; + USHORT DMASupport : 1; + USHORT Reaseved62_11_14 : 4; + USHORT DMADirRequired : 1; + } AtapiDMA; + }; USHORT MultiWordDMASupport : 8; // 63 USHORT MultiWordDMAActive : 8; Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bsmaster.h [iso-8859-1] Mon Aug 6 13:26:40 2012 @@ -187,11 +187,14 @@ } CAP; #define AHCI_CAP_NOP_MASK 0x0000001f +#define AHCI_CAP_CCC 0x00000080 #define AHCI_CAP_NCS_MASK 0x00001f00 #define AHCI_CAP_PMD 0x00008000 #define AHCI_CAP_SPM 0x00020000 #define AHCI_CAP_SAM 0x00040000 #define AHCI_CAP_SCLO 0x01000000 +#define AHCI_CAP_SNTF 0x20000000 +#define AHCI_CAP_NCQ 0x40000000 #define AHCI_CAP_S64A 0x80000000 // Global HBA Control @@ -619,6 +622,7 @@ #define IDX_AHCI_P_TFD (FIELD_OFFSET(IDE_AHCI_PORT_REGISTERS, TFD)) #define IDX_AHCI_P_SIG (FIELD_OFFSET(IDE_AHCI_PORT_REGISTERS, SIG)) #define IDX_AHCI_P_CMD (FIELD_OFFSET(IDE_AHCI_PORT_REGISTERS, CMD)) +#define IDX_AHCI_P_ACT (FIELD_OFFSET(IDE_AHCI_PORT_REGISTERS, SACT)) #define IDX_AHCI_P_SNTF (FIELD_OFFSET(IDE_AHCI_PORT_REGISTERS, SNTF)) @@ -1160,8 +1164,8 @@ HW_LU_EXTENSION lun[IDE_MAX_LUN]; HW_CHANNEL chan[AHCI_MAX_PORT/*IDE_MAX_CHAN*/]; #else - PHW_LU_EXTENSION lun; - PHW_CHANNEL chan; + PHW_LU_EXTENSION lun; // lun array + PHW_CHANNEL chan; // channel array #endif UCHAR LastInterruptedChannel; // Indicates the number of blocks transferred per int. according to the Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Mon Aug 6 13:26:40 2012 @@ -773,7 +773,7 @@ IN ULONG wait_flags ) { - PHW_CHANNEL chan = &deviceExtension->chan[lChannel]; + PHW_CHANNEL chan = &(deviceExtension->chan[lChannel]); UCHAR statusByte; ULONG i; PUCHAR plba; @@ -1089,7 +1089,7 @@ KdPrint2((PRINT_PREFIX "AtapiTimerDpc: no items\n")); return; } - chan = &deviceExtension->chan[lChannel]; + chan = &(deviceExtension->chan[lChannel]); while(TRUE) { @@ -1178,13 +1178,13 @@ chan = prev_chan = NULL; while(i != CHAN_NOT_SPECIFIED) { prev_chan = chan; - chan = &deviceExtension->chan[i]; + chan = &(deviceExtension->chan[i]); if(chan->DpcTime > time.QuadPart) { break; } i = chan->NextDpcChan; } - chan = &deviceExtension->chan[lChannel]; + chan = &(deviceExtension->chan[lChannel]); if(!prev_chan) { deviceExtension->FirstDpcChan = lChannel; } else { @@ -1271,7 +1271,7 @@ ) { PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; - PHW_CHANNEL chan = &deviceExtension->chan[lChannel]; + PHW_CHANNEL chan = &(deviceExtension->chan[lChannel]); ULONG waitCount = 50000; ULONG j; UCHAR statusByte; @@ -1424,6 +1424,7 @@ // Send IDENTIFY command. // Load CylinderHigh and CylinderLow with number bytes to transfer for old devices, use 0 for newer. + statusByte = AtaCommand(deviceExtension, DeviceNumber, lChannel, Command, (j < 4) ? DEV_BSIZE : 0 /* cyl */, 0, 0, 0, 0, ATA_WAIT_INTR); // Clear interrupt @@ -2066,10 +2067,10 @@ for (; j < numberChannels; j++) { KdPrint2((PRINT_PREFIX "AtapiResetController: Reset channel %d\n", j)); - chan = &deviceExtension->chan[j]; - KdPrint2((PRINT_PREFIX " CompleteType %#x\n", CompleteType)); + chan = &(deviceExtension->chan[j]); + MaxLuns = chan->NumberLuns; + KdPrint2((PRINT_PREFIX " CompleteType %#x, Luns %d, chan %#x\n", CompleteType, MaxLuns, chan)); //MaxLuns = (chan->ChannelCtrlFlags & CTRFLAGS_NO_SLAVE) ? 1 : 2; - MaxLuns = chan->NumberLuns; if(CompleteType != RESET_COMPLETE_NONE) { #ifndef UNIATA_CORE while((CurSrb = UniataGetCurRequest(chan))) { @@ -2283,11 +2284,14 @@ // all these shall be performed inside AtapiHwInitialize__() ? #if 1 - KdPrint2((PRINT_PREFIX " process connected devices\n")); + KdPrint2((PRINT_PREFIX " process connected devices 0 - %d\n", MaxLuns-1)); // Do special processing for ATAPI and IDE disk devices. for (i = 0; i < MaxLuns; i++) { // Check if device present. + KdPrint2((PRINT_PREFIX " Chan %#x\n", chan)); + KdPrint2((PRINT_PREFIX " Lun %#x\n", i)); + KdPrint2((PRINT_PREFIX " Lun ptr %#x\n", chan->lun[i])); if (!(chan->lun[i]->DeviceFlags & DFLAGS_DEVICE_PRESENT)) { if(ChipFlags & UNIATA_AHCI) { // everything is done in UniataAhciReset() @@ -2429,7 +2433,7 @@ ULONG lChannel = GET_CHANNEL(Srb); PHW_CHANNEL chan = &(deviceExtension->chan[lChannel]); // ULONG i; - UCHAR errorByte; + UCHAR errorByte = 0; UCHAR srbStatus = SRB_STATUS_SUCCESS; UCHAR scsiStatus; ULONG DeviceNumber = GET_CDEV(Srb); @@ -2437,7 +2441,15 @@ // Read the error register. - errorByte = AtapiReadPort1(chan, IDX_IO1_i_Error); + if(deviceExtension->HwFlags & UNIATA_AHCI) { + PATA_REQ AtaReq = (PATA_REQ)(Srb->SrbExtension); + if(AtaReq) { + errorByte = AtaReq->ahci.in_error; + } else { + } + } else { + errorByte = AtapiReadPort1(chan, IDX_IO1_i_Error); + } KdPrint2((PRINT_PREFIX "MapError: Error register is %#x\n", errorByte)); @@ -3803,7 +3815,7 @@ if(deviceExtension->HwFlags & UNIATA_AHCI) { UniataAhciWriteChannelPort4(chan, IDX_AHCI_P_IE, (ATA_AHCI_P_IX_CPD | ATA_AHCI_P_IX_TFE | ATA_AHCI_P_IX_HBF | - ATA_AHCI_P_IX_HBD | ATA_AHCI_P_IX_IF | ATA_AHCI_P_IX_OF | + ATA_AHCI_P_IX_HBD | ATA_AHCI_P_IX_INF | ATA_AHCI_P_IX_IF | ATA_AHCI_P_IX_OF | ((/*ch->pm_level == */0) ? ATA_AHCI_P_IX_PRC | ATA_AHCI_P_IX_PC : 0) | ATA_AHCI_P_IX_PRC | ATA_AHCI_P_IX_PC | /* DEBUG */ ATA_AHCI_P_IX_DI | @@ -4576,6 +4588,29 @@ if(deviceExtension->HwFlags & UNIATA_AHCI) { UniataAhciEndTransaction(HwDeviceExtension, lChannel, DeviceNumber, srb); statusByte = (UCHAR)(AtaReq->ahci.in_status & IDE_STATUS_MASK); + + if(chan->AhciLastIS & ~(ATA_AHCI_P_IX_DHR | ATA_AHCI_P_IX_PS | ATA_AHCI_P_IX_DS | ATA_AHCI_P_IX_SDB)) { + KdPrint3((PRINT_PREFIX "Err intr (%#x)\n", chan->AhciLastIS & ~(ATA_AHCI_P_IX_DHR | ATA_AHCI_P_IX_PS | ATA_AHCI_P_IX_DS | ATA_AHCI_P_IX_SDB))); + if(chan->AhciLastIS & ~ATA_AHCI_P_IX_OF) { + //KdPrint3((PRINT_PREFIX "Err mask (%#x)\n", chan->AhciLastIS & ~ATA_AHCI_P_IX_OF)); + // We have some other error except Overflow + // Just signal ERROR, operation will be aborted in ERROR branch. + statusByte |= IDE_STATUS_ERROR; + } else { + // We have only Overflow. Abort operation and continue +#if DBG + UniataDumpAhciPortRegs(chan); +#endif + if(!UniataAhciAbortOperation(chan)) { + KdPrint2((PRINT_PREFIX "need UniataAhciReset\n")); + } +#if DBG + UniataDumpAhciPortRegs(chan); +#endif + UniataAhciWaitCommandReady(chan, 10); + } + } + } else { GetBaseStatus(chan, statusByte); } @@ -4738,16 +4773,16 @@ (dma_status & BM_STATUS_ERR)) { if(deviceExtension->HwFlags & UNIATA_AHCI) { - error = (UCHAR)((AtaReq->ahci.in_status >> 8) & 0xff); + error = AtaReq->ahci.in_error; // wait ready #if DBG UniataDumpAhciPortRegs(chan); #endif - UniataAhciStop(chan); - UniataAhciStart(chan); - + if(!UniataAhciAbortOperation(chan)) { + KdPrint2((PRINT_PREFIX "need UniataAhciReset\n")); + } + // clear interrupts again UniataAhciWaitCommandReady(chan, 10); - // clear interrupts again #if DBG UniataDumpAhciPortRegs(chan); #endif @@ -5199,6 +5234,17 @@ if(DataOverrun) { KdPrint2((PRINT_PREFIX " DataOverrun\n")); AtapiSuckPort2(chan); + GetBaseStatus(chan, statusByte); + } + + if(statusByte & IDE_STATUS_BUSY) { + for (i = 0; i < 2; i++) { + AtapiStallExecution(10); + GetBaseStatus(chan, statusByte); + if (!(statusByte & IDE_STATUS_BUSY)) { + break; + } + } } } else { @@ -5361,7 +5407,7 @@ CompleteRequest: - KdPrint2((PRINT_PREFIX "AtapiInterrupt: CompleteRequest\n")); + KdPrint2((PRINT_PREFIX "AtapiInterrupt: CompleteRequest, srbstatus %x\n", status)); // Check and see if we are processing our secret (mechanism status/request sense) srb if (AtaReq->OriginalSrb) { @@ -5790,6 +5836,13 @@ interruptReason, statusByte)); + if(OldReqState == REQ_STATE_DPC_WAIT_BUSY0 && + AtaReq->WordsLeft == 0) { + KdPrint2((PRINT_PREFIX "AtapiInterrupt: pending WAIT_BUSY0. Complete.\n")); + status = SRB_STATUS_SUCCESS; + chan->ChannelCtrlFlags &= ~CTRFLAGS_DMA_OPERATION; + goto CompleteRequest; + } } ReturnEnableIntr: @@ -5980,7 +6033,7 @@ NTAPI UniAtaCalculateLBARegs( PHW_LU_EXTENSION LunExt, - ULONG startingSector, + ULONGLONG startingSector, PULONG max_bcount ) { @@ -6077,7 +6130,7 @@ PATA_REQ AtaReq = (PATA_REQ)(Srb->SrbExtension); //ULONG ldev = GET_LDEV(Srb); UCHAR DeviceNumber = GET_CDEV(Srb);; - ULONG startingSector; + ULONGLONG startingSector=0; ULONG max_bcount; ULONG wordCount = 0; UCHAR statusByte,statusByte2; @@ -6108,9 +6161,9 @@ if(AtaReq->WordsTransfered) { AtaReq->DataBuffer = ((PUSHORT)(Srb->DataBuffer)) + AtaReq->WordsTransfered; - startingSector = (ULONG)(UniAtaCalculateLBARegsBack(LunExt, AtaReq->lba)) /* latest lba */ + AtaReq->bcount /* previous bcount */; + startingSector = (UniAtaCalculateLBARegsBack(LunExt, AtaReq->lba)) /* latest lba */ + AtaReq->bcount /* previous bcount */; AtaReq->bcount = (AtaReq->TransferLength - AtaReq->WordsTransfered*2 + DEV_BSIZE-1) / DEV_BSIZE; - KdPrint2((PRINT_PREFIX "IdeReadWrite (Chained REQ): Starting sector %#x, OrigWordsRequested %#x, WordsTransfered %#x, DevSize %#x\n", + KdPrint2((PRINT_PREFIX "IdeReadWrite (Chained REQ): Starting sector %I64x, OrigWordsRequested %#x, WordsTransfered %#x, DevSize %#x\n", startingSector, AtaReq->TransferLength/2, AtaReq->WordsTransfered, @@ -6119,9 +6172,24 @@ AtaReq->DataBuffer = (PUSHORT)(Srb->DataBuffer); AtaReq->TransferLength = Srb->DataTransferLength; // Set up 1st block. - MOV_DD_SWP(startingSector, ((PCDB)Srb->Cdb)->CDB10.LBA); - MOV_SWP_DW2DD(AtaReq->bcount, ((PCDB)Srb->Cdb)->CDB10.TransferBlocks); - KdPrint2((PRINT_PREFIX "IdeReadWrite (Orig REQ): Starting sector %#x, OrigWordsRequested %#x, DevSize %#x\n", + switch(Srb->Cdb[0]) { + case SCSIOP_READ: + case SCSIOP_WRITE: + MOV_DD_SWP(startingSector, ((PCDB)Srb->Cdb)->CDB10.LBA); + MOV_SWP_DW2DD(AtaReq->bcount, ((PCDB)Srb->Cdb)->CDB10.TransferBlocks); + break; + case SCSIOP_READ12: + case SCSIOP_WRITE12: + MOV_DD_SWP(startingSector, ((PCDB)Srb->Cdb)->CDB12READWRITE.LBA); + MOV_DD_SWP(AtaReq->bcount, ((PCDB)Srb->Cdb)->CDB12READWRITE.NumOfBlocks); + break; + case SCSIOP_READ16: + case SCSIOP_WRITE16: + MOV_QD_SWP(startingSector, ((PCDB)Srb->Cdb)->CDB16READWRITE.LBA); + MOV_DD_SWP(AtaReq->bcount, ((PCDB)Srb->Cdb)->CDB16READWRITE.NumOfBlocks); + break; + } + KdPrint2((PRINT_PREFIX "IdeReadWrite (Orig REQ): Starting sector %I64x, OrigWordsRequested %#x, DevSize %#x\n", startingSector, AtaReq->TransferLength/2, AtaReq->bcount)); @@ -6134,7 +6202,7 @@ AtaReq->WordsLeft = min(AtaReq->TransferLength - AtaReq->WordsTransfered*2, AtaReq->bcount * DEV_BSIZE) / 2; - KdPrint2((PRINT_PREFIX "IdeReadWrite (REQ): Starting sector is %#x, Number of WORDS %#x, DevSize %#x\n", + KdPrint2((PRINT_PREFIX "IdeReadWrite (REQ): Starting sector is %I64x, Number of WORDS %#x, DevSize %#x\n", startingSector, AtaReq->WordsLeft, AtaReq->bcount)); @@ -6380,11 +6448,11 @@ //ULONG ldev = GET_LDEV(Srb); ULONG DeviceNumber = GET_CDEV(Srb); UCHAR statusByte; - ULONG startingSector; + ULONGLONG startingSector=0; ULONG max_bcount; - ULONG sectors; - ULONG endSector; - USHORT sectorCount; + ULONGLONG sectors; + ULONGLONG endSector; + ULONG sectorCount=0; ULONGLONG lba; LunExt = chan->lun[DeviceNumber]; @@ -6400,18 +6468,30 @@ sectors)); // Get starting sector number from CDB. - MOV_DD_SWP(startingSector, ((PCDB)Srb->Cdb)->CDB10.LBA); - MOV_DW_SWP(sectorCount, ((PCDB)Srb->Cdb)->CDB10.TransferBlocks); + switch(Srb->Cdb[0]) { + case SCSIOP_VERIFY: + MOV_DD_SWP(startingSector, ((PCDB)Srb->Cdb)->CDB10.LBA); + MOV_SWP_DW2DD(sectorCount, ((PCDB)Srb->Cdb)->CDB10.TransferBlocks); + break; + case SCSIOP_VERIFY12: + MOV_DD_SWP(startingSector, ((PCDB)Srb->Cdb)->CDB12READWRITE.LBA); + MOV_DD_SWP(sectorCount, ((PCDB)Srb->Cdb)->CDB12READWRITE.NumOfBlocks); + break; + case SCSIOP_VERIFY16: + MOV_QD_SWP(startingSector, ((PCDB)Srb->Cdb)->CDB16READWRITE.LBA); + MOV_DD_SWP(sectorCount, ((PCDB)Srb->Cdb)->CDB16READWRITE.NumOfBlocks); + break; + } KdPrint2((PRINT_PREFIX - "IdeVerify: Starting sector %#x. Number of blocks %#x\n", + "IdeVerify: Starting sector %#I64x. Number of blocks %#x\n", startingSector, sectorCount)); endSector = startingSector + sectorCount; KdPrint2((PRINT_PREFIX - "IdeVerify: Ending sector %#x\n", + "IdeVerify: Ending sector %#I64x\n", endSector)); if (endSector > sectors) { @@ -6421,7 +6501,7 @@ "IdeVerify: Truncating request to %#x blocks\n", sectors - startingSector - 1)); - sectorCount = (USHORT)(sectors - startingSector - 1); + sectorCount = (ULONG)(sectors - startingSector - 1); } else { @@ -6443,7 +6523,7 @@ statusByte = AtaCommand48(deviceExtension, LunExt->Lun, GET_CHANNEL(Srb), IDE_COMMAND_VERIFY, lba, - sectorCount, + (USHORT)sectorCount, 0, ATA_IMMEDIATE); if(!(statusByte & IDE_STATUS_ERROR)) { @@ -6490,6 +6570,7 @@ BOOLEAN dma_reinited = FALSE; BOOLEAN retried = FALSE; ULONG fis_size; + UCHAR FeatureReg=0; LunExt = chan->lun[DeviceNumber]; @@ -6538,6 +6619,18 @@ Cdb->CDB12READWRITE.LBA[1], Cdb->CDB12READWRITE.LBA[2], Cdb->CDB12READWRITE.LBA[3] + )); + } else + if(ScsiCommand == SCSIOP_WRITE16) { + KdPrint(("Write16, LBA %2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x\n", + Cdb->CDB16READWRITE.LBA[0], + Cdb->CDB16READWRITE.LBA[1], + Cdb->CDB16READWRITE.LBA[2], + Cdb->CDB16READWRITE.LBA[3], + Cdb->CDB16READWRITE.LBA[4], + Cdb->CDB16READWRITE.LBA[5], + Cdb->CDB16READWRITE.LBA[6], + Cdb->CDB16READWRITE.LBA[7] )); } else if(ScsiCommand == SCSIOP_MODE_SELECT) { @@ -6571,6 +6664,8 @@ case SCSIOP_WRITE: case SCSIOP_READ12: case SCSIOP_WRITE12: + case SCSIOP_READ16: + case SCSIOP_WRITE16: // all right break; default: @@ -6638,6 +6733,13 @@ // check if reorderable switch(Srb->Cdb[0]) { + case SCSIOP_READ16: + case SCSIOP_WRITE16: + + MOV_DD_SWP(AtaReq->bcount, ((PCDB)Srb->Cdb)->CDB16READWRITE.NumOfBlocks); + MOV_QD_SWP(AtaReq->lba, ((PCDB)Srb->Cdb)->CDB16READWRITE.LBA); + goto GetLba2; + case SCSIOP_READ12: case SCSIOP_WRITE12: @@ -6650,15 +6752,36 @@ MOV_SWP_DW2DD(AtaReq->bcount, ((PCDB)Srb->Cdb)->CDB10.TransferBlocks); GetLba: MOV_DD_SWP(AtaReq->lba, ((PCDB)Srb->Cdb)->CDB10.LBA); - +GetLba2: AtaReq->Flags |= REQ_FLAG_REORDERABLE_CMD; AtaReq->Flags &= ~REQ_FLAG_RW_MASK; - AtaReq->Flags |= (Srb->Cdb[0] == SCSIOP_WRITE || Srb->Cdb[0] == SCSIOP_WRITE12) ? + AtaReq->Flags |= (Srb->Cdb[0] == SCSIOP_WRITE || + Srb->Cdb[0] == SCSIOP_WRITE12 || + Srb->Cdb[0] == SCSIOP_WRITE16) ? REQ_FLAG_WRITE : REQ_FLAG_READ; break; + default: + AtaReq->Flags &= ~REQ_FLAG_RW_MASK; + if(!AtaReq->TransferLength) { + KdPrint((" assume 0-transfer\n")); + } else + if(Srb->SrbFlags & SRB_FLAGS_DATA_OUT) { + KdPrint((" assume OUT\n")); + AtaReq->Flags |= REQ_FLAG_WRITE; + } else + if(Srb->SrbFlags & SRB_FLAGS_DATA_IN) { + KdPrint((" assume IN\n")); + AtaReq->Flags |= REQ_FLAG_READ; + } + break; } // check if DMA read/write + if(deviceExtension->HwFlags & UNIATA_SATA) { + // DEBUG !!!! for TEST ONLY + KdPrint2((PRINT_PREFIX "AtapiSendCommand: force use dma (ahci)\n")); + use_dma = TRUE; + } else if(Srb->Cdb[0] == SCSIOP_REQUEST_SENSE) { KdPrint2((PRINT_PREFIX "AtapiSendCommand: SCSIOP_REQUEST_SENSE, no DMA setup\n")); } else @@ -6667,6 +6790,7 @@ switch(Srb->Cdb[0]) { case SCSIOP_WRITE: case SCSIOP_WRITE12: + case SCSIOP_WRITE16: case SCSIOP_SEND: if(chan->ChannelCtrlFlags & CTRFLAGS_DMA_RO) break; @@ -6674,6 +6798,7 @@ case SCSIOP_RECEIVE: case SCSIOP_READ: case SCSIOP_READ12: + case SCSIOP_READ16: if(deviceExtension->opt_AtapiDmaReadWrite) { call_dma_setup: @@ -6734,8 +6859,13 @@ if(deviceExtension->HwFlags & UNIATA_AHCI) { + UniataAhciSetupCmdPtr(AtaReq); + if(!Srb->DataTransferLength) { + KdPrint2((PRINT_PREFIX "zero-transfer\n")); + use_dma = FALSE; + } else if(!AtapiDmaSetup(HwDeviceExtension, DeviceNumber, lChannel, Srb, (PUCHAR)(AtaReq->DataBuffer), Srb->DataTransferLength)) { @@ -6744,18 +6874,25 @@ } if(!use_dma) { AtaReq->Flags &= ~REQ_FLAG_DMA_OPERATION; + } else { + FeatureReg |= ATA_F_DMA; + if(LunExt->IdentifyData.AtapiDMA.DMADirRequired && + (Srb->SrbFlags & SRB_FLAGS_DATA_IN)) { + FeatureReg |= ATA_F_DMAREAD; + } } KdPrint2((PRINT_PREFIX "AtapiSendCommand: setup AHCI FIS\n")); - RtlZeroMemory(&(AtaReq->ahci.ahci_cmd_ptr->cfis), sizeof(AtaReq->ahci_cmd0.cfis)); - RtlCopyMemory(&(AtaReq->ahci.ahci_cmd_ptr->acmd), Srb->Cdb, 16); + // this is done in UniataAhciSetupFIS_H2D() + //RtlZeroMemory(&(AtaReq->ahci.ahci_cmd_ptr->cfis), sizeof(AtaReq->ahci_cmd0.cfis)); + RtlCopyMemory(&(AtaReq->ahci.ahci_cmd_ptr->acmd), Srb->Cdb, Srb->CdbLength); fis_size = UniataAhciSetupFIS_H2D(deviceExtension, DeviceNumber, lChannel, &(AtaReq->ahci.ahci_cmd_ptr->cfis[0]), IDE_COMMAND_ATAPI_PACKET /* command */, 0 /* lba */, (Srb->DataTransferLength >= 0x10000) ? (USHORT)(0xffff) : (USHORT)(Srb->DataTransferLength), - use_dma ? ATA_F_DMA : 0/* feature */ + FeatureReg/* feature */ ); if(!fis_size) { @@ -6764,16 +6901,10 @@ } AtaReq->ahci.io_cmd_flags = UniAtaAhciAdjustIoFlags(0, - ((AtaReq->Flags & REQ_FLAG_READ) ? 0 : ATA_AHCI_CMD_WRITE) | + ((Srb->DataTransferLength && (Srb->SrbFlags & SRB_FLAGS_DATA_OUT)) ? ATA_AHCI_CMD_WRITE : 0) | (ATA_AHCI_CMD_ATAPI | ATA_AHCI_CMD_PREFETCH), fis_size, DeviceNumber); -#if 0 - AtaReq->ahci.io_cmd_flags = (USHORT)(((AtaReq->Flags & REQ_FLAG_READ) ? 0 : ATA_AHCI_CMD_WRITE) | - /*((LunExt->DeviceFlags & DFLAGS_ATAPI_DEVICE) ? (ATA_AHCI_CMD_ATAPI | ATA_AHCI_CMD_PREFETCH) : 0) |*/ - (ATA_AHCI_CMD_ATAPI | ATA_AHCI_CMD_PREFETCH) | - (fis_size / sizeof(ULONG)) | - (DeviceNumber << 12)); -#endif + KdPrint2((PRINT_PREFIX "AtapiSendCommand ahci io flags %x: \n", AtaReq->ahci.io_cmd_flags)); } @@ -6805,7 +6936,7 @@ KdPrint2((PRINT_PREFIX " REQ_FLAG_DMA_OPERATION\n")); } - if((Srb->Cdb[0] == SCSIOP_REQUEST_SENSE) /*&& !(deviceExtension->HwFlags & UNIATA_AHCI)*/) { + if((Srb->Cdb[0] == SCSIOP_REQUEST_SENSE) && !(deviceExtension->HwFlags & UNIATA_SATA)) { KdPrint2((PRINT_PREFIX "AtapiSendCommand: SCSIOP_REQUEST_SENSE -> no dma setup (2)\n")); use_dma = FALSE; AtaReq->Flags &= ~REQ_FLAG_DMA_OPERATION; @@ -6826,7 +6957,7 @@ KdPrint2((PRINT_PREFIX "AtapiSendCommand: zero transfer\n")); use_dma = FALSE; AtaReq->Flags &= ~REQ_FLAG_DMA_OPERATION; - if(!deviceExtension->opt_AtapiDmaZeroTransfer) { + if(!deviceExtension->opt_AtapiDmaZeroTransfer && !(deviceExtension->HwFlags & UNIATA_SATA)) { KdPrint2((PRINT_PREFIX "AtapiSendCommand: AtapiDmaReinit() to PIO\n")); AtapiDmaReinit(deviceExtension, LunExt, AtaReq); } @@ -7003,8 +7134,15 @@ KdPrint3((PRINT_PREFIX "AtapiSendCommand: Entry Status (%#x)\n", statusByte)); - AtapiWritePort1(chan, IDX_IO1_o_Feature, - use_dma ? ATA_F_DMA : 0); + if(use_dma) { + FeatureReg |= ATA_F_DMA; + if(LunExt->IdentifyData.AtapiDMA.DMADirRequired && + (Srb->SrbFlags & SRB_FLAGS_DATA_IN)) { + FeatureReg |= ATA_F_DMAREAD; + } + } + + AtapiWritePort1(chan, IDX_IO1_o_Feature, FeatureReg); // Write transfer byte count to registers. byteCountLow = (UCHAR)(Srb->DataTransferLength & 0xFF); @@ -7153,6 +7291,7 @@ UCHAR statusByte,errorByte; ULONG status; ULONG i; + ULONGLONG lba; PMODE_PARAMETER_HEADER modeData; //ULONG ldev; ULONG DeviceNumber; @@ -7196,27 +7335,39 @@ if(AtaReq->ReqState < REQ_STATE_PREPARE_TO_TRANSFER) AtaReq->ReqState = REQ_STATE_PREPARE_TO_TRANSFER; + cdb = (PCDB)(Srb->Cdb); + if(CmdAction == CMD_ACTION_PREPARE) { switch (Srb->Cdb[0]) { + case SCSIOP_SERVICE_ACTION16: + if( cdb->SERVICE_ACTION16.ServiceAction==SCSIOP_SA_READ_CAPACITY16 ) { + // ok + } else { + goto default_no_prep; + } #ifdef NAVO_TEST case SCSIOP_INQUIRY: // now it requires device access #endif //NAVO_TEST case SCSIOP_READ_CAPACITY: case SCSIOP_READ: case SCSIOP_WRITE: + case SCSIOP_READ12: + case SCSIOP_WRITE12: + case SCSIOP_READ16: + case SCSIOP_WRITE16: case SCSIOP_REQUEST_SENSE: // all right KdPrint2((PRINT_PREFIX "** Ide: Command continue prep\n")); SetCheckPoint(50); break; default: +default_no_prep: SetCheckPoint(0); KdPrint2((PRINT_PREFIX "** Ide: Command break prep\n")); return SRB_STATUS_BUSY; } } - cdb = (PCDB)(Srb->Cdb); SetCheckPoint(0x100 | Srb->Cdb[0]); switch (Srb->Cdb[0]) { case SCSIOP_INQUIRY: @@ -7427,6 +7578,7 @@ // Claim 512 byte blocks (big-endian). //((PREAD_CAPACITY_DATA)Srb->DataBuffer)->BytesPerBlock = 0x20000; i = DEV_BSIZE; + RtlZeroMemory(Srb->DataBuffer, sizeof(READ_CAPACITY_DATA)); MOV_DD_SWP( ((PREAD_CAPACITY_DATA)Srb->DataBuffer)->BytesPerBlock, i ); // Calculate last sector. @@ -7454,7 +7606,48 @@ status = SRB_STATUS_SUCCESS; break; + case SCSIOP_SERVICE_ACTION16: + + if( cdb->SERVICE_ACTION16.ServiceAction==SCSIOP_SA_READ_CAPACITY16 ) { + KdPrint2((PRINT_PREFIX + "** IdeSendCommand: SCSIOP_READ_CAPACITY PATH:LUN:TID = %#x:%#x:%#x\n", + Srb->PathId, Srb->Lun, Srb->TargetId)); + // Claim 512 byte blocks (big-endian). + //((PREAD_CAPACITY_DATA)Srb->DataBuffer)->BytesPerBlock = 0x20000; + i = DEV_BSIZE; + RtlZeroMemory(Srb->DataBuffer, sizeof(READ_CAPACITY16_DATA)); + MOV_DD_SWP( ((PREAD_CAPACITY16_DATA)Srb->DataBuffer)->BytesPerBlock, i ); + + // Calculate last sector. + if(!(lba = LunExt->NumOfSectors)) { + lba = LunExt->IdentifyData.SectorsPerTrack * + LunExt->IdentifyData.NumberOfHeads * + LunExt->IdentifyData.NumberOfCylinders; + } + i--; + + //((PREAD_CAPACITY_DATA)Srb->DataBuffer)->LogicalBlockAddress = + // (((PUCHAR)&i)[0] << 24) | (((PUCHAR)&i)[1] << 16) | + // (((PUCHAR)&i)[2] << 8) | ((PUCHAR)&i)[3]; + + MOV_QD_SWP( ((PREAD_CAPACITY16_DATA)Srb->DataBuffer)->LogicalBlockAddress, i ); + + KdPrint2((PRINT_PREFIX + "** IDE disk %#x - #sectors %#x, #heads %#x, #cylinders %#x (16)\n", + Srb->TargetId, + LunExt->IdentifyData.SectorsPerTrack, + LunExt->IdentifyData.NumberOfHeads, + LunExt->IdentifyData.NumberOfCylinders)); + + status = SRB_STATUS_SUCCESS; + } else { + goto default_abort; + } + break; + case SCSIOP_VERIFY: + case SCSIOP_VERIFY12: + case SCSIOP_VERIFY16: KdPrint2((PRINT_PREFIX "IdeSendCommand: SCSIOP_VERIFY PATH:LUN:TID = %#x:%#x:%#x\n", @@ -7465,13 +7658,19 @@ case SCSIOP_READ: case SCSIOP_WRITE: + case SCSIOP_READ12: + case SCSIOP_WRITE12: + case SCSIOP_READ16: + case SCSIOP_WRITE16: KdPrint2((PRINT_PREFIX "IdeSendCommand: SCSIOP_%s PATH:LUN:TID = %#x:%#x:%#x\n", (Srb->Cdb[0] == SCSIOP_WRITE) ? "WRITE" : "READ", Srb->PathId, Srb->Lun, Srb->TargetId)); AtaReq->Flags &= ~REQ_FLAG_RW_MASK; - AtaReq->Flags |= (Srb->Cdb[0] == SCSIOP_WRITE) ? REQ_FLAG_WRITE : REQ_FLAG_READ; + AtaReq->Flags |= (Srb->Cdb[0] == SCSIOP_WRITE || + Srb->Cdb[0] == SCSIOP_WRITE12 || + Srb->Cdb[0] == SCSIOP_WRITE16) ? REQ_FLAG_WRITE : REQ_FLAG_READ; status = IdeReadWrite(HwDeviceExtension, Srb, CmdAction); break; @@ -7717,7 +7916,7 @@ } default: - +default_abort: KdPrint2((PRINT_PREFIX "IdeSendCommand: Unsupported command %#x\n", Srb->Cdb[0])); @@ -8128,6 +8327,9 @@ break; //} } + } else { + KdPrint2((PRINT_PREFIX + " SRB %#x, CDB %#x, AtaReq %#x, SCmd %#x\n", Srb, &(Srb->Cdb), Srb->SrbExtension, Srb->Cdb[0])); } /* __try { @@ -8177,7 +8379,7 @@ } else { // Send command to device. - KdPrint2((PRINT_PREFIX "Send to device\n")); + KdPrint2((PRINT_PREFIX "Send to device %x\n", Srb->Cdb[0])); if(TopLevel) { KdPrint2((PRINT_PREFIX "TopLevel (2), srb %#x\n", Srb)); AtaReq = (PATA_REQ)(Srb->SrbExtension); @@ -8216,7 +8418,7 @@ if(atapiDev && (Srb->Cdb[0] != SCSIOP_ATA_PASSTHROUGH)) { - KdPrint3((PRINT_PREFIX "Try ATAPI send\n")); + KdPrint3((PRINT_PREFIX "Try ATAPI send %x\n", Srb->Cdb[0])); status = AtapiSendCommand(HwDeviceExtension, Srb, CMD_ACTION_ALL); } else { KdPrint2((PRINT_PREFIX "Try IDE send\n")); @@ -9526,7 +9728,8 @@ hwInitializationData.comm.DeviceIdLength = 0; if(!BMListLen) { - hwInitializationData.comm.SrbExtensionSize = FIELD_OFFSET(ATA_REQ, ata); + hwInitializationData.comm.SrbExtensionSize = //FIELD_OFFSET(ATA_REQ, ata); + sizeof(ATA_REQ); KdPrint2((PRINT_PREFIX "using AtaReq sz %x\n", hwInitializationData.comm.SrbExtensionSize)); } @@ -9904,7 +10107,9 @@ status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE /*| RTL_REGISTRY_OPTIONAL*/, paramPath.Buffer, parameters, NULL, NULL); - KdPrint(( "AtapiCheckRegValue: %ws -> %ws is %#x\n", PathSuffix, Name, doRun)); + if(NT_SUCCESS(status)) { + KdPrint(( "AtapiCheckRegValue: %ws -> %ws is %#x\n", PathSuffix, Name, doRun)); + } ExFreePool(paramPath.Buffer); Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Mon Aug 6 13:26:40 2012 @@ -803,7 +803,8 @@ IN PHW_LU_EXTENSION LunExt ) { - if(LunExt->IdentifyData.SupportDma) { + if(LunExt->IdentifyData.SupportDma || + (LunExt->IdentifyData.AtapiDMA.DMASupport && (LunExt->DeviceFlags & DFLAGS_ATAPI_DEVICE))) { KdPrint2((PRINT_PREFIX "AtapiDmaInit__: Set (U)DMA on Device %d\n", LunExt->Lun)); /* for(i=AtaUmode(&(LunExt->IdentifyData)); i>=0; i--) { Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Mon Aug 6 13:26:40 2012 @@ -2368,11 +2368,14 @@ KdPrint2((PRINT_PREFIX "Achtung !deviceExtension->NumberLuns \n")); deviceExtension->NumberLuns = IDE_MAX_LUN_PER_CHAN; } + KdPrint2((PRINT_PREFIX " Chan %#x\n", chan)); chan->DeviceExtension = deviceExtension; chan->lChannel = c; chan->NumberLuns = deviceExtension->NumberLuns; for(i=0; i<deviceExtension->NumberLuns; i++) { chan->lun[i] = &(deviceExtension->lun[c*deviceExtension->NumberLuns+i]); + KdPrint2((PRINT_PREFIX " Lun %#x\n", i)); + KdPrint2((PRINT_PREFIX " Lun ptr %#x\n", chan->lun[i])); } chan->AltRegMap = deviceExtension->AltRegMap; chan->NextDpcChan = -1; @@ -2403,7 +2406,7 @@ PHW_LU_EXTENSION old_luns = NULL; PHW_CHANNEL old_chans = NULL; - KdPrint2((PRINT_PREFIX "allocate %d Luns for %d channels\n", deviceExtension->lun, deviceExtension->NumberChannels)); + KdPrint2((PRINT_PREFIX "allocate %d Luns for %d channels\n", deviceExtension->NumberLuns, deviceExtension->NumberChannels)); old_luns = deviceExtension->lun; old_chans = deviceExtension->chan; Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] Mon Aug 6 13:26:40 2012 @@ -1385,11 +1385,11 @@ KdPrint2((PRINT_PREFIX "update ConfigInfo->nt4\n")); _ConfigInfo->nt4.DeviceExtensionSize = sizeof(HW_DEVICE_EXTENSION); _ConfigInfo->nt4.SpecificLuExtensionSize = sizeof(HW_LU_EXTENSION); - if(deviceExtension->HwFlags & UNIATA_AHCI) { + //if(deviceExtension->HwFlags & UNIATA_AHCI) { _ConfigInfo->nt4.SrbExtensionSize = sizeof(ATA_REQ); - } else { - _ConfigInfo->nt4.SrbExtensionSize = FIELD_OFFSET(ATA_REQ, dma_tab) + sizeof(BM_DMA_ENTRY)*ATA_DMA_ENTRIES; - } + //} else { + // _ConfigInfo->nt4.SrbExtensionSize = FIELD_OFFSET(ATA_REQ, dma_tab) + sizeof(BM_DMA_ENTRY)*ATA_DMA_ENTRIES; + //} KdPrint2((PRINT_PREFIX "using AtaReq sz %x\n", _ConfigInfo->nt4.SrbExtensionSize)); } if((WinVer_Id() > WinVer_2k) || Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] Mon Aug 6 13:26:40 2012 @@ -772,13 +772,23 @@ CAP2 = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_CAP2); KdPrint2((PRINT_PREFIX " AHCI CAP %#x, CAP2 %#x\n", CAP, CAP2)); if(CAP & AHCI_CAP_S64A) { - KdPrint2((PRINT_PREFIX " AHCI 64bit\n")); + KdPrint2((PRINT_PREFIX " 64bit")); //deviceExtension->Host64 = TRUE; } if(CAP2 & AHCI_CAP2_BOH) { BOHC = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_BOHC); - KdPrint2((PRINT_PREFIX " AHCI BOHC %#x\n", BOHC)); - } + KdPrint2((PRINT_PREFIX " BOHC %#x", BOHC)); + } + if(CAP & AHCI_CAP_NCQ) { + KdPrint2((PRINT_PREFIX " NCQ")); + } + if(CAP & AHCI_CAP_SNTF) { + KdPrint2((PRINT_PREFIX " SNTF")); + } + if(CAP & AHCI_CAP_CCC) { + KdPrint2((PRINT_PREFIX " CCC")); + } + KdPrint2((PRINT_PREFIX "\n")); /* get the number of HW channels */ PI = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_PI); @@ -787,6 +797,7 @@ NumberChannels = max((CAP & AHCI_CAP_NOP_MASK)+1, n); + KdPrint2((PRINT_PREFIX " CommandSlots %d\n", (CAP & AHCI_CAP_NCS_MASK)>>8 )); KdPrint2((PRINT_PREFIX " Channels %d\n", n)); switch(deviceExtension->DevID) { @@ -871,7 +882,7 @@ PHW_CHANNEL chan = &deviceExtension->chan[lChannel]; ULONG Channel = deviceExtension->Channel + lChannel; ULONG hIS; - ULONG CI; + ULONG CI, ACT; AHCI_IS_REG IS; SATA_SSTATUS_REG SStatus; SATA_SERROR_REG SError; @@ -888,6 +899,7 @@ } IS.Reg = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_IS); CI = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_CI); + ACT = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_ACT); SStatus.Reg = AtapiReadPort4(chan, IDX_SATA_SStatus); SError.Reg = AtapiReadPort4(chan, IDX_SATA_SError); @@ -896,8 +908,8 @@ UniataAhciWriteChannelPort4(chan, IDX_AHCI_P_IS, IS.Reg); AtapiWritePort4(chan, IDX_SATA_SError, SError.Reg); - KdPrint((" AHCI: istatus=%08x sstatus=%08x serror=%08x CI=%08x\n", - IS.Reg, SStatus.Reg, SError.Reg, CI)); + KdPrint((" AHCI: is=%08x ss=%08x serror=%08x CI=%08x, ACT=%08x\n", + IS.Reg, SStatus.Reg, SError.Reg, CI, ACT)); /* do we have cold connect surprise */ if(IS.CPDS) { @@ -1059,6 +1071,7 @@ ) { AHCI_IS_REG IS; + //ULONG ACT; ULONG CI=0; ULONG i; ULONG SError; @@ -1068,7 +1081,8 @@ for (i=0; i<timeout; i++) { CI = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_CI); - if (!((CI >> tag) & 0x01)) { + //ACT = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_ACT); + if (!(( CI >> tag) & 0x01)) { break; } IS.Reg = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_IS); @@ -1146,6 +1160,7 @@ KdPrint2((PRINT_PREFIX " AHCI CMD address is not aligned (mask %#x)\n", (ULONG)AHCI_CMD_ALIGNEMENT_MASK)); } + //UniataAhciWriteChannelPort4(chan, IDX_AHCI_P_ACT, 0x01 << tag); UniataAhciWriteChannelPort4(chan, IDX_AHCI_P_CI, 1 << tag); return UniataAhciWaitCommandReady(chan, timeout); @@ -1269,6 +1284,28 @@ } // end UniataAhciSendPIOCommand() +BOOLEAN +NTAPI +UniataAhciAbortOperation( + IN PHW_CHANNEL chan + ) +{ + /* kick controller into sane state */ + if(!UniataAhciStop(chan)) { + return FALSE; + } + if(!UniataAhciStopFR(chan)) { + return FALSE; + } + if(!UniataAhciCLO(chan)) { + return FALSE; + } + UniataAhciStartFR(chan); + UniataAhciStart(chan); + + return TRUE; +} // end UniataAhciAbortOperation() + ULONG NTAPI UniataAhciSoftReset( @@ -1290,18 +1327,11 @@ PIDE_AHCI_CMD AHCI_CMD = &(chan->AhciCtlBlock->cmd); PUCHAR RCV_FIS = &(chan->AhciCtlBlock->rcv_fis.rfis[0]); -#ifdef DBG -// UniataDumpAhciPortRegs(chan); -#endif // DBG - /* kick controller into sane state */ - UniataAhciStop(chan); - UniataAhciCLO(chan); - UniataAhciStart(chan); - -#ifdef DBG -// UniataDumpAhciPortRegs(chan); -#endif // DBG + if(!UniataAhciAbortOperation(chan)) { + KdPrint2((" abort failed\n")); + return (ULONG)(-1); + } /* pull reset active */ RtlZeroMemory(AHCI_CMD->cfis, sizeof(AHCI_CMD->cfis)); @@ -1523,7 +1553,7 @@ return; } // end UniataAhciStartFR() -VOID +BOOLEAN NTAPI UniataAhciStopFR( IN PHW_CHANNEL chan @@ -1542,14 +1572,14 @@ CMD = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_CMD); if(!(CMD & ATA_AHCI_P_CMD_FR)) { KdPrint2((" final CMD %#x\n", CMD)); - return; + return TRUE; } AtapiStallExecution(1000); } KdPrint2((" CMD %#x\n", CMD)); KdPrint((" SError %#x\n", AtapiReadPort4(chan, IDX_SATA_SError))); KdPrint2(("UniataAhciStopFR: timeout\n")); - return; + return FALSE; } // end UniataAhciStopFR() VOID @@ -1582,7 +1612,7 @@ return; } // end UniataAhciStart() -VOID +BOOLEAN NTAPI UniataAhciCLO( IN PHW_CHANNEL chan @@ -1600,7 +1630,7 @@ //CAP = UniataAhciReadHostPort4(deviceExtension, IDX_AHCI_CAP); CAP = chan->DeviceExtension->AHCI_CAP; if(!(CAP & AHCI_CAP_SCLO)) { - return; + return TRUE; } KdPrint2((" send CLO\n")); CMD = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_CMD); @@ -1611,16 +1641,16 @@ CMD = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_CMD); if(!(CMD & ATA_AHCI_P_CMD_CLO)) { KdPrint2((" final CMD %#x\n", CMD)); - return; + return TRUE; } AtapiStallExecution(1000); } KdPrint2((" CMD %#x\n", CMD)); KdPrint2(("UniataAhciCLO: timeout\n")); - return; + return FALSE; } // end UniataAhciCLO() -VOID +BOOLEAN NTAPI UniataAhciStop( IN PHW_CHANNEL chan @@ -1641,14 +1671,14 @@ CMD = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_CMD); if(!(CMD & ATA_AHCI_P_CMD_CR)) { KdPrint2((" final CMD %#x\n", CMD)); - return; + return TRUE; } AtapiStallExecution(1000); } KdPrint2((" CMD %#x\n", CMD)); KdPrint((" SError %#x\n", AtapiReadPort4(chan, IDX_SATA_SError))); KdPrint2(("UniataAhciStop: timeout\n")); - return; + return FALSE; } // end UniataAhciStop() UCHAR @@ -1664,7 +1694,7 @@ PHW_CHANNEL chan = &deviceExtension->chan[lChannel]; //ULONG Channel = deviceExtension->Channel + lChannel; //ULONG hIS; - ULONG CMD; + ULONG CMD, CMD0; //AHCI_IS_REG IS; PATA_REQ AtaReq = (PATA_REQ)(Srb->SrbExtension); //SATA_SSTATUS_REG SStatus; @@ -1712,20 +1742,24 @@ AHCI_CL->cmd_table_phys)); #endif // DBG - CMD = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_CMD); + CMD0 = CMD = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_CMD); KdPrint2((" CMD %#x\n", CMD)); // switch controller to ATAPI mode for ATA_PACKET commands only if(ATAPI_DEVICE(chan, DeviceNumber) && AtaReq->ahci.ahci_cmd_ptr->cfis[2] == IDE_COMMAND_ATAPI_PACKET) { KdPrint2((" ATAPI\n")); CMD |= ATA_AHCI_P_CMD_ATAPI; + KdDump(&(AtaReq->ahci.ahci_cmd_ptr->acmd), 16); } else { CMD &= ~ATA_AHCI_P_CMD_ATAPI; } - KdPrint2((" send CMD %#x, entries %#x\n", CMD, AHCI_CL->prd_length)); - UniataAhciWriteChannelPort4(chan, IDX_AHCI_P_CMD, CMD); + if(CMD0 != CMD) { + KdPrint2((" send CMD %#x, entries %#x\n", CMD, AHCI_CL->prd_length)); + UniataAhciWriteChannelPort4(chan, IDX_AHCI_P_CMD, CMD); + } /* issue command to controller */ + //UniataAhciWriteChannelPort4(chan, IDX_AHCI_P_ACT, 0x01 << tag); UniataAhciWriteChannelPort4(chan, IDX_AHCI_P_CI, 0x01 << tag); chan->AhciPrevCI |= 0x01 << tag; @@ -1770,7 +1804,7 @@ PHW_CHANNEL chan = &deviceExtension->chan[lChannel]; //ULONG Channel = deviceExtension->Channel + lChannel; //ULONG hIS; - ULONG CI; + ULONG CI, ACT; PATA_REQ AtaReq = (PATA_REQ)(Srb->SrbExtension); ULONG TFD; PUCHAR RCV_FIS = &(chan->AhciCtlBlock->rcv_fis.rfis[0]); @@ -1809,7 +1843,7 @@ ((ULONGLONG)(RCV_FIS[7] & 0x0f) << 24); } AtaReq->WordsTransfered = AHCI_CL->bytecount/2; - +/* if(LunExt->DeviceFlags & DFLAGS_ATAPI_DEVICE) { KdPrint2(("RCV:\n")); KdDump(RCV_FIS, 24); @@ -1821,18 +1855,20 @@ AtaReq->WordsTransfered = ((ULONG)RCV_FIS[5] | ((ULONG)RCV_FIS[6] << 8)) / 2; } } - +*/ + ACT = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_ACT); CI = UniataAhciReadChannelPort4(chan, IDX_AHCI_P_CI); if(CI & (1 << tag)) { // clear CI - KdPrint2((" Incomplete command, CI %#x\n", CI)); + KdPrint2((" Incomplete command, CI %#x, ACT %#x\n", CI, ACT)); KdPrint2((" FIS status %#x, error %#x\n", RCV_FIS[2], RCV_FIS[3])); #if DBG UniataDumpAhciPortRegs(chan); #endif - UniataAhciStop(chan); - UniataAhciStart(chan); + if(!UniataAhciAbortOperation(chan)) { + KdPrint2((" Abort failed, need RESET\n")); + } #if DBG UniataDumpAhciPortRegs(chan); #endif Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.h [iso-8859-1] Mon Aug 6 13:26:40 2012 @@ -195,6 +195,12 @@ IN ULONG timeout ); +BOOLEAN +NTAPI +UniataAhciAbortOperation( + IN PHW_CHANNEL chan + ); + ULONG NTAPI UniataAhciSoftReset( @@ -231,7 +237,7 @@ IN PHW_CHANNEL chan ); -VOID +BOOLEAN NTAPI UniataAhciStopFR( IN PHW_CHANNEL chan @@ -243,13 +249,13 @@ IN PHW_CHANNEL chan ); -VOID +BOOLEAN NTAPI UniataAhciCLO( IN PHW_CHANNEL chan ); -VOID +BOOLEAN NTAPI UniataAhciStop( IN PHW_CHANNEL chan Modified: trunk/reactos/drivers/storage/ide/uniata/inc/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/inc/misc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/inc/misc.h [iso-8859-1] Mon Aug 6 13:26:40 2012 @@ -8,6 +8,7 @@ #define MOV_DD_SWP(a,b) ((a) = RtlUlongByteSwap(*(PULONG)&(b))) #define MOV_DW_SWP(a,b) ((a) = RtlUshortByteSwap(*(PUSHORT)&(b))) #define MOV_SWP_DW2DD(a,b) ((a) = RtlUshortByteSwap(*(PUSHORT)&(b))) +#define MOV_QD_SWP(a,b) { ((PULONG)&(a))[0] = RtlUlongByteSwap( ((PULONG)&(b))[1]); ((PULONG)&(a))[1] = RtlUlongByteSwap( ((PULONG)&(b))[0]); } #else @@ -34,6 +35,32 @@ void* b // EDX ); #define MOV_DD_SWP(a,b) _MOV_DD_SWP(&(a),&(b)) + +/********************/ + +typedef void +(__fastcall *ptrMOV_QD_SWP)( + void* a, // ECX + void* b // EDX + ); +extern "C" ptrMOV_QD_SWP _MOV_QD_SWP; + +extern "C" +void +__fastcall +_MOV_QD_SWP_i486( + void* a, // ECX + void* b // EDX + ); + +extern "C" +void +__fastcall +_MOV_QD_SWP_i386( + void* a, // ECX + void* b // EDX + ); +#define MOV_QD_SWP(a,b) _MOV_QD_SWP(&(a),&(b)) /********************/ Modified: trunk/reactos/drivers/storage/ide/uniata/scsi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/scsi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/scsi.h [iso-8859-1] Mon Aug 6 13:26:40 2012 @@ -144,6 +144,14 @@ UCHAR TransferBlocks[2]; UCHAR Control; } CDB10, *PCDB10; + + // Service Action 16-byte CDB + struct _SERVICE_ACTION16 { + UCHAR OperationCode; // 0x9E + UCHAR ServiceAction : 5; + UCHAR Reserved1 : 3; + UCHAR Data[14]; + } SERVICE_ACTION16, *PSERVICE_ACTION16; // CD Rom Audio CDBs @@ -722,6 +730,26 @@ UCHAR NumOfBlocks [4]; UCHAR Reserved1[2]; } CDB12READWRITE, *PCDB12READWRITE; + + struct _CDB16READWRITE { + UCHAR OperationCode; + union { + UCHAR Flags; + struct { + UCHAR RELADR : 1; + UCHAR Reserved0 : 2; + UCHAR FUA : 1; + UCHAR DPO : 1; + UCHAR Reserved1 : 3; + } Fields; + } Byte1; + UCHAR LBA [8]; + UCHAR NumOfBlocks [4]; + UCHAR GroupNumber:5; + UCHAR Reserved14_5_6:2; + UCHAR Restricted:1; // MMC-4 + UCHAR Reserved1[1]; + } CDB16READWRITE, *PCDB16READWRITE; // Plextor Read CD-DA struct _PLXTR_READ_CDDA { @@ -866,6 +894,13 @@ #define SCSIOP_CLOSE_TRACK_SESSION 0x5B #define SCSIOP_READ_BUFFER_CAPACITY 0x5C #define SCSIOP_SEND_CUE_SHEET 0x5D +#define SCSIOP_READ16 0x88 +#define SCSIOP_WRITE16 0x8A +#define SCSIOP_VERIFY16 0x8F +#define SCSIOP_SERVICE_ACTION16 0x9E + + #define SCSIOP_SA_READ_CAPACITY16 0x10 + #define SCSIOP_BLANK 0xA1 #define SCSIOP_SEND_KEY 0xA3 #define SCSIOP_REPORT_KEY 0xA4 @@ -874,6 +909,7 @@ #define SCSIOP_SET_READ_AHEAD 0xA7 #define SCSIOP_READ12 0xA8 #define SCSIOP_WRITE12 0xAA +#define SCSIOP_VERIFY12 0xAF #define SCSIOP_SEEK12 0xAB #define SCSIOP_GET_PERFORMANCE 0xAC #define SCSIOP_READ_DVD_STRUCTURE 0xAD @@ -1365,6 +1401,15 @@ ULONG BytesPerBlock; } READ_CAPACITY_DATA, *PREAD_CAPACITY_DATA; +typedef struct _READ_CAPACITY16_DATA { + ULONGLONG LogicalBlockAddress; + ULONG BytesPerBlock; + UCHAR Prot_EN:1; + UCHAR RTO_EN:1; + UCHAR Reserved:6; + UCHAR Reserved1[20]; +} READ_CAPACITY16_DATA, *PREAD_CAPACITY16_DATA; + // CD ROM Read Table Of Contents (TOC) structures // Format 0 - Get table of contents Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [iso-8859-1] Mon Aug 6 13:26:40 2012 @@ -1,10 +1,10 @@ -#define UNIATA_VER_STR "42e2" -#define UNIATA_VER_DOT 0.42.5.2 +#define UNIATA_VER_STR "42h" +#define UNIATA_VER_DOT 0.42.8.0 #define UNIATA_VER_MJ 0 #define UNIATA_VER_MN 42 -#define UNIATA_VER_SUB_MJ 5 -#define UNIATA_VER_SUB_MN 2 -#define UNIATA_VER_DOT_COMMA 0,42,5,2 -#define UNIATA_VER_DOT_STR "0.42.5.2" +#define UNIATA_VER_SUB_MJ 8 +#define UNIATA_VER_SUB_MN 0 +#define UNIATA_VER_DOT_COMMA 0,42,8,0 +#define UNIATA_VER_DOT_STR "0.42.8.0" #define UNIATA_VER_YEAR 2012 #define UNIATA_VER_YEAR_STR "2012"

12 years, 4 months

[jimtabor] 57049: [NtUser] - Fix note again.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Aug 6 06:20:06 2012 New Revision: 57049 URL: http://svn.reactos.org/svn/reactos?rev=57049&view=rev Log: [NtUser] - Fix note again. Modified: trunk/reactos/win32ss/user/ntuser/input.c Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Mon Aug 6 06:20:06 2012 @@ -430,7 +430,7 @@ return FALSE; /* MSDN Note: - Keyboard and mouse events received by both threads are processed by the thread specifieby the idAttachTo. + Keyboard and mouse events received by both threads are processed by the thread specified by the idAttachTo. */ /* If Attach set, allocate and link. */

12 years, 4 months

← Newer
1
...
13
14
15
16
17
18
19
20
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 August 2012