Ros-diffs November 2012

ros-diffs@reactos.org

11 participants
124 discussions

[hbelusca] 57785: Synchronize up to trunk's revision r57784.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Nov 30 21:32:42 2012 New Revision: 57785 URL: http://svn.reactos.org/svn/reactos?rev=57785&view=rev Log: Synchronize up to trunk's revision r57784. Added: branches/ros-csrss/dll/win32/lsasrv/registry.c - copied unchanged from r57784, trunk/reactos/dll/win32/lsasrv/registry.c Removed: branches/ros-csrss/drivers/base/kddll/kdcom.h Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/base/applications/regedit/lang/bg-BG.rc branches/ros-csrss/base/applications/regedit/lang/cs-CZ.rc branches/ros-csrss/base/applications/regedit/lang/de-DE.rc branches/ros-csrss/base/applications/regedit/lang/el-GR.rc branches/ros-csrss/base/applications/regedit/lang/en-US.rc branches/ros-csrss/base/applications/regedit/lang/es-ES.rc branches/ros-csrss/base/applications/regedit/lang/fr-FR.rc branches/ros-csrss/base/applications/regedit/lang/hu-HU.rc branches/ros-csrss/base/applications/regedit/lang/id-ID.rc branches/ros-csrss/base/applications/regedit/lang/it-IT.rc branches/ros-csrss/base/applications/regedit/lang/ja-JP.rc branches/ros-csrss/base/applications/regedit/lang/ko-KR.rc branches/ros-csrss/base/applications/regedit/lang/nl-NL.rc branches/ros-csrss/base/applications/regedit/lang/no-NO.rc branches/ros-csrss/base/applications/regedit/lang/pl-PL.rc branches/ros-csrss/base/applications/regedit/lang/pt-BR.rc branches/ros-csrss/base/applications/regedit/lang/pt-PT.rc branches/ros-csrss/base/applications/regedit/lang/ro-RO.rc branches/ros-csrss/base/applications/regedit/lang/ru-RU.rc branches/ros-csrss/base/applications/regedit/lang/sk-SK.rc branches/ros-csrss/base/applications/regedit/lang/sl-SI.rc branches/ros-csrss/base/applications/regedit/lang/sv-SE.rc branches/ros-csrss/base/applications/regedit/lang/th-TH.rc branches/ros-csrss/base/applications/regedit/lang/uk-UA.rc branches/ros-csrss/base/applications/regedit/lang/zh-CN.rc branches/ros-csrss/base/applications/regedit/lang/zh-TW.rc branches/ros-csrss/base/applications/regedit/main.c branches/ros-csrss/base/applications/regedit/regedit.c branches/ros-csrss/boot/bootdata/CMakeLists.txt branches/ros-csrss/boot/freeldr/freeldr/arch/i386/hardware.c branches/ros-csrss/boot/freeldr/freeldr/comm/rs232.c branches/ros-csrss/boot/freeldr/freeldr/include/comm.h branches/ros-csrss/boot/freeldr/freeldr/windows/headless.c branches/ros-csrss/dll/win32/lsasrv/CMakeLists.txt branches/ros-csrss/dll/win32/lsasrv/database.c branches/ros-csrss/dll/win32/lsasrv/lsarpc.c branches/ros-csrss/dll/win32/lsasrv/lsasrv.h branches/ros-csrss/dll/win32/lsasrv/privileges.c branches/ros-csrss/drivers/base/kdcom/CMakeLists.txt branches/ros-csrss/drivers/base/kdcom/i386/kdbg.c branches/ros-csrss/drivers/base/kddll/CMakeLists.txt branches/ros-csrss/drivers/base/kddll/kdcom.c branches/ros-csrss/drivers/base/kddll/kddll.h branches/ros-csrss/drivers/serial/serial/serial.h branches/ros-csrss/include/reactos/drivers/serial/ns16550.h branches/ros-csrss/include/reactos/libs/cportlib/cportlib.h branches/ros-csrss/lib/cportlib/cport.c branches/ros-csrss/ntoskrnl/inbv/inbvport.c branches/ros-csrss/ntoskrnl/kd/wrappers/gdbstub_powerpc.c branches/ros-csrss/ntoskrnl/kd64/kdinit.c branches/ros-csrss/win32ss/user/ntuser/painting.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/base/applications/regedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/reg… Modified: branches/ros-csrss/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/bootdata/CMakeLi… Modified: branches/ros-csrss/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/comm/rs232.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/include/comm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/boot/freeldr/freeldr/windows/headless.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/boot/freeldr/freeldr/… Modified: branches/ros-csrss/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/CMak… Modified: branches/ros-csrss/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/data… Modified: branches/ros-csrss/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/lsar… Modified: branches/ros-csrss/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/lsas… Modified: branches/ros-csrss/dll/win32/lsasrv/privileges.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/lsasrv/priv… Modified: branches/ros-csrss/drivers/base/kdcom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/base/kdcom/CM… Modified: branches/ros-csrss/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/base/kdcom/i3… Modified: branches/ros-csrss/drivers/base/kddll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/base/kddll/CM… Modified: branches/ros-csrss/drivers/base/kddll/kdcom.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/base/kddll/kd… Removed: branches/ros-csrss/drivers/base/kddll/kdcom.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/base/kddll/kd… Modified: branches/ros-csrss/drivers/base/kddll/kddll.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/base/kddll/kd… Modified: branches/ros-csrss/drivers/serial/serial/serial.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/drivers/serial/serial… Modified: branches/ros-csrss/include/reactos/drivers/serial/ns16550.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/drive… Modified: branches/ros-csrss/include/reactos/libs/cportlib/cportlib.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/libs/… Modified: branches/ros-csrss/lib/cportlib/cport.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/lib/cportlib/cport.c?… Modified: branches/ros-csrss/ntoskrnl/inbv/inbvport.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/inbv/inbvpor… Modified: branches/ros-csrss/ntoskrnl/kd/wrappers/gdbstub_powerpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/kd/wrappers/… Modified: branches/ros-csrss/ntoskrnl/kd64/kdinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/ntoskrnl/kd64/kdinit.… Modified: branches/ros-csrss/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/p…

11 years, 9 months

[ekohl] 57784: [LSASRV] - Fix object deletion. - Add a registry wrapper function that enables us to delete registry keys which have already been opened. - Make LsarDelete call LsarDeleteObject beca...

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Nov 29 22:02:22 2012 New Revision: 57784 URL: http://svn.reactos.org/svn/reactos?rev=57784&view=rev Log: [LSASRV] - Fix object deletion. - Add a registry wrapper function that enables us to delete registry keys which have already been opened. - Make LsarDelete call LsarDeleteObject because otherwise object deletion would not be possible. Modified: trunk/reactos/dll/win32/lsasrv/database.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/registry.c Modified: trunk/reactos/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/database.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] Thu Nov 29 22:02:22 2012 @@ -796,7 +796,6 @@ NewObject = RtlAllocateHeap(RtlGetProcessHeap(), 0, -// sizeof(LSA_DB_OBJECT) + wcslen(ObjectName) + sizeof(WCHAR)); sizeof(LSA_DB_OBJECT)); if (NewObject == NULL) { @@ -810,7 +809,6 @@ NewObject->Access = DesiredAccess; NewObject->KeyHandle = ObjectKeyHandle; NewObject->ParentObject = ParentObject; -// wcscpy(NewObject->Name, ObjectName); if (ParentObject != NULL) ParentObject->RefCount++; @@ -901,10 +899,8 @@ LsapDeleteDbObject(IN PLSA_DB_OBJECT DbObject) { PLSA_DB_OBJECT ParentObject = NULL; -#if 0 WCHAR KeyName[64]; - ULONG EnumIndex; -#endif + ULONG Index; NTSTATUS Status = STATUS_SUCCESS; DbObject->RefCount--; @@ -914,40 +910,36 @@ if (DbObject->KeyHandle != NULL) { -#if 0 - EnumIndex = 0; + Index = 0; while (TRUE) { Status = LsapRegEnumerateSubKey(DbObject->KeyHandle, - EnumIndex, + Index, 64 * sizeof(WCHAR), KeyName); if (!NT_SUCCESS(Status)) break; - TRACE("EnumIndex: %lu\n", EnumIndex); + TRACE("Index: %lu\n", Index); TRACE("Key name: %S\n", KeyName); - Status = LsapRegDeleteKey(DbObject->KeyHandle, - KeyName); + Status = LsapRegDeleteSubKey(DbObject->KeyHandle, + KeyName); if (!NT_SUCCESS(Status)) break; - -// EnumIndex++; - } -#endif + } + + if (Status == STATUS_NO_MORE_ENTRIES) + Status = STATUS_SUCCESS; + + LsapRegDeleteKey(DbObject->KeyHandle); + NtClose(DbObject->KeyHandle); } if (DbObject->ParentObject != NULL) - { ParentObject = DbObject->ParentObject; -#if 0 - LsapRegDeleteKey(ParentObject->KeyHandle, - DbObject->Name); -#endif - } RtlFreeHeap(RtlGetProcessHeap(), 0, DbObject); Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Thu Nov 29 22:02:22 2012 @@ -97,8 +97,7 @@ NTSTATUS WINAPI LsarDelete( LSAPR_HANDLE ObjectHandle) { - /* Deprecated */ - return STATUS_NOT_SUPPORTED; + return LsarDeleteObject(&ObjectHandle); } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Thu Nov 29 22:02:22 2012 @@ -48,7 +48,6 @@ ACCESS_MASK Access; HANDLE KeyHandle; struct _LSA_DB_OBJECT *ParentObject; - WCHAR Name[0]; } LSA_DB_OBJECT, *PLSA_DB_OBJECT; #define LSAP_DB_SIGNATURE 0x12345678 @@ -282,8 +281,11 @@ OUT HANDLE KeyHandle); NTSTATUS -LsapRegDeleteKey(IN HANDLE ParentKeyHandle, - IN LPCWSTR KeyName); +LsapRegDeleteSubKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName); + +NTSTATUS +LsapRegDeleteKey(IN HANDLE KeyHandle); NTSTATUS LsapRegEnumerateSubKey(IN HANDLE KeyHandle, Modified: trunk/reactos/dll/win32/lsasrv/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/registry.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/registry.c [iso-8859-1] Thu Nov 29 22:02:22 2012 @@ -60,8 +60,8 @@ NTSTATUS -LsapRegDeleteKey(IN HANDLE ParentKeyHandle, - IN LPCWSTR KeyName) +LsapRegDeleteSubKey(IN HANDLE ParentKeyHandle, + IN LPCWSTR KeyName) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING SubKeyName; @@ -86,6 +86,13 @@ NtClose(TargetKey); return Status; +} + + +NTSTATUS +LsapRegDeleteKey(IN HANDLE KeyHandle) +{ + return NtDeleteKey(KeyHandle); }

11 years, 9 months

[fireball] 57783: [WINENT] - Don't skip rendering clipboard data. ARWINSS-84 #comment This issue is resolved by r57783.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Nov 29 13:08:29 2012 New Revision: 57783 URL: http://svn.reactos.org/svn/reactos?rev=57783&view=rev Log: [WINENT] - Don't skip rendering clipboard data. ARWINSS-84 #comment This issue is resolved by r57783. Modified: branches/arwinss/arwinss/client/winent.drv/clipboard.c Modified: branches/arwinss/arwinss/client/winent.drv/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/winent.d… ============================================================================== --- branches/arwinss/arwinss/client/winent.drv/clipboard.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/winent.drv/clipboard.c [iso-8859-1] Thu Nov 29 13:08:29 2012 @@ -107,7 +107,9 @@ static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA lpData); static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop, unsigned char** data, unsigned long* datasize); -static BOOL X11DRV_CLIPBOARD_RenderFormat(Display *display, LPWINE_CLIPDATA lpData); +#endif +static BOOL NTDRV_CLIPBOARD_RenderFormat(LPWINE_CLIPDATA lpData); +#if 0 static HANDLE X11DRV_CLIPBOARD_SerializeMetafile(INT wformat, HANDLE hdata, LPDWORD lpcbytes, BOOL out); #endif static BOOL NTDRV_CLIPBOARD_SynthesizeData(UINT wFormatID); @@ -659,11 +661,10 @@ return bret; } -#if 0 /************************************************************************** * X11DRV_CLIPBOARD_RenderFormat */ -static BOOL X11DRV_CLIPBOARD_RenderFormat(Display *display, LPWINE_CLIPDATA lpData) +static BOOL NTDRV_CLIPBOARD_RenderFormat(LPWINE_CLIPDATA lpData) { BOOL bret = TRUE; @@ -671,9 +672,9 @@ if (lpData->hData) return bret; /* Already rendered */ - if (lpData->wFlags & CF_FLAG_SYNTHESIZED) + /*if (lpData->wFlags & CF_FLAG_SYNTHESIZED) bret = X11DRV_CLIPBOARD_RenderSynthesizedFormat(display, lpData); - else if (!X11DRV_CLIPBOARD_IsSelectionOwner()) + else if (!NTDRV_CLIPBOARD_IsSelectionOwner()) { if (!X11DRV_CLIPBOARD_ReadSelectionData(display, lpData)) { @@ -682,11 +683,11 @@ bret = FALSE; } } - else + else*/ { CLIPBOARDINFO cbInfo; - if (X11DRV_CLIPBOARD_GetClipboardInfo(&cbInfo) && cbInfo.hWndOwner) + if (NTDRV_CLIPBOARD_GetClipboardInfo(&cbInfo) && cbInfo.hWndOwner) { /* Send a WM_RENDERFORMAT message to notify the owner to render the * data requested into the clipboard. @@ -706,7 +707,7 @@ return bret; } - +#if 0 /************************************************************************** * CLIPBOARD_ConvertText * Returns number of required/converted characters - not bytes! @@ -2739,8 +2740,8 @@ if ((lpRender = NTDRV_CLIPBOARD_LookupData(wFormat))) { - //if ( !lpRender->hData ) - // NTDRV_CLIPBOARD_RenderFormat(thread_init_display(), lpRender); + if ( !lpRender->hData ) + NTDRV_CLIPBOARD_RenderFormat(lpRender); TRACE(" returning %p (type %04x)\n", lpRender->hData, lpRender->wFormatID); return lpRender->hData;

11 years, 9 months

[hbelusca] 57782: [KDCOM] Fixes COM port debugging output with Virtual PC 2007. See r57781 for more details. CORE-4247 #comment Fixed also in r57782.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Nov 29 10:26:00 2012 New Revision: 57782 URL: http://svn.reactos.org/svn/reactos?rev=57782&view=rev Log: [KDCOM] Fixes COM port debugging output with Virtual PC 2007. See r57781 for more details. CORE-4247 #comment Fixed also in r57782. Modified: trunk/reactos/drivers/base/kdcom/CMakeLists.txt trunk/reactos/drivers/base/kdcom/i386/kdbg.c Modified: trunk/reactos/drivers/base/kdcom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/CMakeLi… ============================================================================== --- trunk/reactos/drivers/base/kdcom/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/CMakeLists.txt [iso-8859-1] Thu Nov 29 10:26:00 2012 @@ -2,11 +2,11 @@ spec2def(kdcom.dll kdcom.spec ADD_IMPORTLIB) if(ARCH STREQUAL "i386") -list(APPEND SOURCE i386/kdbg.c) + list(APPEND SOURCE i386/kdbg.c) elseif(ARCH STREQUAL "amd64") -list(APPEND SOURCE i386/kdbg.c) + list(APPEND SOURCE i386/kdbg.c) elseif(ARCH STREQUAL "arm") -list(APPEND SOURCE arm/kdbg.c) + list(APPEND SOURCE arm/kdbg.c) endif(ARCH STREQUAL "i386") list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) @@ -17,7 +17,7 @@ set_image_base(kdcom 0x00010000) add_importlibs(kdcom ntoskrnl hal) +target_link_libraries(kdcom cportlib) +add_dependencies(kdcom psdk bugcodes) -add_dependencies(kdcom psdk bugcodes) add_cd_file(TARGET kdcom DESTINATION reactos/system32 NO_CAB FOR all) - Modified: trunk/reactos/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/i386/kd… ============================================================================== --- trunk/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] Thu Nov 29 10:26:00 2012 @@ -11,14 +11,17 @@ #define NOEXTAPI #include <ntifs.h> -#define NDEBUG #include <halfuncs.h> #include <stdio.h> -#include <debug.h> #include "arc/arc.h" #include "windbgkd.h" #include <kddll.h> #include <ioaccess.h> /* port intrinsics */ +#include <cportlib/cportlib.h> + +#define NDEBUG +#include <debug.h> + typedef struct _KD_PORT_INFORMATION { @@ -54,14 +57,14 @@ #define DEFAULT_BAUD_RATE 19200 -#ifdef _M_IX86 -const ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; +#if defined(_M_IX86) || defined(_M_AMD64) +const ULONG BaseArray[] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; #elif defined(_M_PPC) -const ULONG BaseArray[2] = {0, 0x800003f8}; +const ULONG BaseArray[] = {0, 0x800003F8}; #elif defined(_M_MIPS) -const ULONG BaseArray[3] = {0, 0x80006000, 0x80007000}; +const ULONG BaseArray[] = {0, 0x80006000, 0x80007000}; #elif defined(_M_ARM) -const ULONG BaseArray[2] = {0, 0xF1012000}; +const ULONG BaseArray[] = {0, 0xF1012000}; #else #error Unknown architecture #endif @@ -122,68 +125,6 @@ static BOOLEAN PortInitialized = FALSE; -/* STATIC FUNCTIONS *********************************************************/ - -static BOOLEAN -KdpDoesComPortExist( - IN ULONG BaseAddress) -{ - BOOLEAN found; - UCHAR mcr; - UCHAR msr; - - found = FALSE; - - /* save Modem Control Register (MCR) */ - mcr = READ_PORT_UCHAR(SER_MCR(BaseAddress)); - - /* enable loop mode (set Bit 4 of the MCR) */ - WRITE_PORT_UCHAR(SER_MCR(BaseAddress), SR_MCR_LOOP); - - /* clear all modem output bits */ - WRITE_PORT_UCHAR(SER_MCR(BaseAddress), SR_MCR_LOOP); - - /* read the Modem Status Register */ - msr = READ_PORT_UCHAR(SER_MSR(BaseAddress)); - - /* - * the upper nibble of the MSR (modem output bits) must be - * equal to the lower nibble of the MCR (modem input bits) - */ - if ((msr & 0xF0) == 0x00) - { - /* set all modem output bits */ - WRITE_PORT_UCHAR(SER_MCR(BaseAddress), SR_MCR_DTR | SR_MCR_RTS | SR_MCR_OUT1 | SR_MCR_OUT2 | SR_MCR_LOOP); - - /* read the Modem Status Register */ - msr = READ_PORT_UCHAR(SER_MSR(BaseAddress)); - - /* - * the upper nibble of the MSR (modem output bits) must be - * equal to the lower nibble of the MCR (modem input bits) - */ - if ((msr & 0xF0) == 0xF0) - { - /* - * setup a resonable state for the port: - * enable fifo and clear recieve/transmit buffers - */ - WRITE_PORT_UCHAR(SER_FCR(BaseAddress), - (SR_FCR_ENABLE_FIFO | SR_FCR_CLEAR_RCVR | SR_FCR_CLEAR_XMIT)); - WRITE_PORT_UCHAR(SER_FCR(BaseAddress), 0); - READ_PORT_UCHAR(SER_RBR(BaseAddress)); - WRITE_PORT_UCHAR(SER_IER(BaseAddress), 0); - found = TRUE; - } - } - - /* restore MCR */ - WRITE_PORT_UCHAR(SER_MCR(BaseAddress), mcr); - - return found; -} - - /* FUNCTIONS ****************************************************************/ /* HAL.KdPortInitialize */ @@ -203,14 +144,18 @@ if (PortInformation->ComPort == 0) { + /* + * Start enumerating COM ports from the last one to the first one, + * and break when we find a valid port. + * If we reach the first element of the list, the invalid COM port, + * then it means that no valid port was found. + */ for (i = sizeof(BaseArray) / sizeof(BaseArray[0]) - 1; i > 0; i--) { - if (KdpDoesComPortExist(BaseArray[i])) + if (CpDoesPortExist(UlongToPtr(BaseArray[i]))) { - DefaultPort.BaseAddress = BaseArray[i]; - DefaultPort.ComPort = i; - PortInformation->BaseAddress = DefaultPort.BaseAddress; - PortInformation->ComPort = DefaultPort.ComPort; + PortInformation->BaseAddress = DefaultPort.BaseAddress = BaseArray[i]; + PortInformation->ComPort = DefaultPort.ComPort = i; break; } } @@ -237,7 +182,7 @@ } -/* HAL.KdPortInitializeEx */ +/* HAL.KdPortInitializeEx ; ReactOS-specific */ BOOLEAN NTAPI KdPortInitializeEx( @@ -260,7 +205,7 @@ if (PortInformation->ComPort != 0) { - if (!KdpDoesComPortExist(BaseArray[PortInformation->ComPort])) + if (!CpDoesPortExist(UlongToPtr(BaseArray[PortInformation->ComPort]))) { sprintf(buffer, "\nKernel Debugger: Serial port not found!\n\n"); @@ -335,7 +280,7 @@ } -/* HAL.KdPortGetByteEx */ +/* HAL.KdPortGetByteEx ; ReactOS-specific */ BOOLEAN NTAPI KdPortGetByteEx( @@ -366,7 +311,7 @@ } -/* HAL.KdPortPollByteEx */ +/* HAL.KdPortPollByteEx ; ReactOS-specific */ BOOLEAN NTAPI KdPortPollByteEx( @@ -395,7 +340,7 @@ KdPortPutByteEx(&DefaultPort, ByteToSend); } -/* HAL.KdPortPutByteEx */ +/* HAL.KdPortPutByteEx ; ReactOS-specific */ VOID NTAPI KdPortPutByteEx(

11 years, 9 months

[hbelusca] 57781: [KDDLL] - Use cportlib for COM port facilities. Fixes COM port debugging output with Virtual PC 2007. - Remove now unneeded header file. CORE-4247 #comment Fixed in r57776, r57777...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Nov 28 23:23:54 2012 New Revision: 57781 URL: http://svn.reactos.org/svn/reactos?rev=57781&view=rev Log: [KDDLL] - Use cportlib for COM port facilities. Fixes COM port debugging output with Virtual PC 2007. - Remove now unneeded header file. CORE-4247 #comment Fixed in r57776, r57777, r57780 and r57781. #resolve Removed: trunk/reactos/drivers/base/kddll/kdcom.h Modified: trunk/reactos/drivers/base/kddll/CMakeLists.txt trunk/reactos/drivers/base/kddll/kdcom.c trunk/reactos/drivers/base/kddll/kddll.h Modified: trunk/reactos/drivers/base/kddll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/CMakeLi… ============================================================================== --- trunk/reactos/drivers/base/kddll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/CMakeLists.txt [iso-8859-1] Wed Nov 28 23:23:54 2012 @@ -10,7 +10,9 @@ set_entrypoint(kdcom 0) set_subsystem(kdcom native) set_image_base(kdcom 0x00010000) + add_importlibs(kdcom ntoskrnl hal) +target_link_libraries(kdcom cportlib) add_dependencies(kdcom psdk bugcodes) add_cd_file(TARGET kdcom DESTINATION reactos/system32 NO_CAB FOR all) Modified: trunk/reactos/drivers/base/kddll/kdcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kdcom.c… ============================================================================== --- trunk/reactos/drivers/base/kddll/kdcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kdcom.c [iso-8859-1] Wed Nov 28 23:23:54 2012 @@ -7,9 +7,9 @@ */ #include "kddll.h" -#include "kdcom.h" - -/* serial debug connection */ +#include <cportlib/cportlib.h> + +/* Serial debug connection */ #define DEFAULT_DEBUG_PORT 2 /* COM2 */ #define DEFAULT_DEBUG_COM1_IRQ 4 /* COM1 IRQ */ #define DEFAULT_DEBUG_COM2_IRQ 3 /* COM2 IRQ */ @@ -19,91 +19,46 @@ #if defined(_M_IX86) || defined(_M_AMD64) -const ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; +const ULONG BaseArray[] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; #elif defined(_M_PPC) -const ULONG BaseArray[2] = {0, 0x800003f8}; +const ULONG BaseArray[] = {0, 0x800003F8}; #elif defined(_M_MIPS) -const ULONG BaseArray[3] = {0, 0x80006000, 0x80007000}; +const ULONG BaseArray[] = {0, 0x80006000, 0x80007000}; #elif defined(_M_ARM) -const ULONG BaseArray[2] = {0, 0xF1012000}; +const ULONG BaseArray[] = {0, 0xF1012000}; #else #error Unknown architecture #endif /* GLOBALS ********************************************************************/ -PUCHAR ComPortBase; -ULONG ComPortNumber = DEFAULT_DEBUG_PORT; -ULONG ComPortBaudRate = DEFAULT_DEBUG_BAUD_RATE; -ULONG ComPortIrq = 0; - - -NTSTATUS -NTAPI -KdpPortInitialize() -{ - ULONG Mode; +CPPORT KdDebugComPort; +ULONG KdDebugComPortIrq = 0; // Not used at the moment. + + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +KdpPortInitialize(IN ULONG ComPortNumber, + IN ULONG ComPortBaudRate) +{ + NTSTATUS Status; KDDBGPRINT("KdpPortInitialize, Port = COM%ld\n", ComPortNumber); - /* Enable loop mode (set Bit 4 of the MCR) */ - WRITE_PORT_UCHAR(ComPortBase + COM_MCR, MCR_LOOP); - - /* Clear all modem output bits */ - WRITE_PORT_UCHAR(ComPortBase + COM_MCR, MCR_LOOP); - - /* The upper nibble of the MSR (modem output bits) must be - * equal to the lower nibble of the MCR (modem input bits) */ - if ((READ_PORT_UCHAR(ComPortBase + COM_MSR) & 0xF0) != 0x00) + Status = CpInitialize(&KdDebugComPort, + UlongToPtr(BaseArray[ComPortNumber]), + ComPortBaudRate); + if (!NT_SUCCESS(Status)) { return STATUS_INVALID_PARAMETER; } - - /* Set all modem output bits */ - WRITE_PORT_UCHAR(ComPortBase + COM_MCR, MCR_ALL); - - /* The upper nibble of the MSR (modem output bits) must be - * equal to the lower nibble of the MCR (modem input bits) */ - if ((READ_PORT_UCHAR(ComPortBase + COM_MSR) & 0xF0) != 0xF0) - { - return STATUS_INVALID_PARAMETER; - } - - /* Enable FIFO */ - WRITE_PORT_UCHAR(ComPortBase + COM_FCR, - FCR_ENABLE_FIFO | FCR_CLEAR_RCVR | FCR_CLEAR_XMIT); - - /* Disable interrupts */ - WRITE_PORT_UCHAR(ComPortBase + COM_LCR, 0); - WRITE_PORT_UCHAR(ComPortBase + COM_IEN, 0); - - /* Enable on DTR and RTS */ - WRITE_PORT_UCHAR(ComPortBase + COM_MCR, MCR_DTR | MCR_RTS); - - /* Set DLAB */ - WRITE_PORT_UCHAR(ComPortBase + COM_LCR, LCR_DLAB); - - /* Set baud rate */ - Mode = 115200 / ComPortBaudRate; - WRITE_PORT_UCHAR(ComPortBase + COM_DLL, (UCHAR)(Mode & 0xff)); - WRITE_PORT_UCHAR(ComPortBase + COM_DLM, (UCHAR)((Mode >> 8) & 0xff)); - - /* Reset DLAB and set 8 data bits, 1 stop bit, no parity, no break */ - WRITE_PORT_UCHAR(ComPortBase + COM_LCR, LCR_CS8 | LCR_ST1 | LCR_PNO); - - /* Check for 16450/16550 scratch register */ - WRITE_PORT_UCHAR(ComPortBase + COM_SCR, 0xff); - if (READ_PORT_UCHAR(ComPortBase + COM_SCR) != 0xff) - { - return STATUS_INVALID_PARAMETER; - } - WRITE_PORT_UCHAR(ComPortBase + COM_SCR, 0x00); - if (READ_PORT_UCHAR(ComPortBase + COM_SCR) != 0x00) - { - return STATUS_INVALID_PARAMETER; - } - - return STATUS_SUCCESS; + else + { + KdComPortInUse = KdDebugComPort.Address; + return STATUS_SUCCESS; + } } /****************************************************************************** @@ -114,9 +69,11 @@ */ NTSTATUS NTAPI -KdDebuggerInitialize0( - IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) -{ +KdDebuggerInitialize0(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) +{ + ULONG ComPortNumber = DEFAULT_DEBUG_PORT; + ULONG ComPortBaudRate = DEFAULT_DEBUG_BAUD_RATE; + PCHAR CommandLine, PortString, BaudString, IrqString; ULONG Value; @@ -136,7 +93,7 @@ /* Get the port and baud rate */ PortString = strstr(CommandLine, "DEBUGPORT"); BaudString = strstr(CommandLine, "BAUDRATE"); - IrqString = strstr(CommandLine, "IRQ"); + IrqString = strstr(CommandLine, "IRQ"); /* Check if we got the /DEBUGPORT parameter */ if (PortString) @@ -154,10 +111,10 @@ return STATUS_INVALID_PARAMETER; } - /* Gheck for a valid Serial Port */ + /* Check for a valid Serial Port */ PortString += 3; Value = atol(PortString); - if (Value > 4) + if (Value >= sizeof(BaseArray) / sizeof(BaseArray[0])) { return STATUS_INVALID_PARAMETER; } @@ -198,47 +155,56 @@ { /* Read and set it */ Value = atol(IrqString + 1); - if (Value) ComPortIrq = Value; - } - } - } - - /* Get base address */ - ComPortBase = UlongToPtr(BaseArray[ComPortNumber]); - KdComPortInUse = ComPortBase; + if (Value) KdDebugComPortIrq = Value; + } + } + } /* Initialize the port */ - return KdpPortInitialize(); + return KdpPortInitialize(ComPortNumber, ComPortBaudRate); } VOID NTAPI KdpSendByte(IN BYTE Byte) { - /* Wait for the port to be ready */ - while ((READ_PORT_UCHAR(ComPortBase + COM_LSR) & LSR_TBE) == 0); - - /* This is needed due to subtle timing issues */ - READ_PORT_UCHAR(ComPortBase + COM_MSR); - while ((READ_PORT_UCHAR(ComPortBase + COM_LSR) & LSR_TBE) == 0); - READ_PORT_UCHAR(ComPortBase + COM_MSR); - /* Send the byte */ - WRITE_PORT_UCHAR(ComPortBase + COM_DAT, Byte); + CpPutByte(&KdDebugComPort, Byte); } KDP_STATUS NTAPI KdpPollByte(OUT PBYTE OutByte) { - READ_PORT_UCHAR(ComPortBase + COM_MSR); // Timing - - /* Check if data is available */ - if ((READ_PORT_UCHAR(ComPortBase + COM_LSR) & LSR_DR)) + /* Get the byte */ + if (CpGetByte(&KdDebugComPort, OutByte, FALSE) == CP_GET_SUCCESS) { /* Yes, return the byte */ - *OutByte = READ_PORT_UCHAR(ComPortBase + COM_DAT); return KDP_PACKET_RECEIVED; + } + else + { + /* Timed out */ + return KDP_PACKET_TIMEOUT; + } +} + +KDP_STATUS +NTAPI +KdpReceiveByte(OUT PBYTE OutByte) +{ + // TODO: Use CpGetByte(&KdDebugComPort, OutByte, TRUE); + + ULONG Repeats = KdpStallScaleFactor * 100; + + while (Repeats--) + { + /* Check if data is available */ + if (KdpPollByte(OutByte) == KDP_PACKET_RECEIVED) + { + /* We successfully got a byte */ + return KDP_PACKET_RECEIVED; + } } /* Timed out */ @@ -247,27 +213,7 @@ KDP_STATUS NTAPI -KdpReceiveByte(OUT PBYTE OutByte) -{ - ULONG Repeats = KdpStallScaleFactor * 100; - - while (Repeats--) - { - /* Check if data is available */ - if (KdpPollByte(OutByte) == KDP_PACKET_RECEIVED) - { - /* We successfully got a byte */ - return KDP_PACKET_RECEIVED; - } - } - - /* Timed out */ - return KDP_PACKET_TIMEOUT; -} - -KDP_STATUS -NTAPI -KdpPollBreakIn() +KdpPollBreakIn(VOID) { UCHAR Byte; if (KdpPollByte(&Byte) == KDP_PACKET_RECEIVED) @@ -282,8 +228,7 @@ NTSTATUS NTAPI -KdSave( - IN BOOLEAN SleepTransition) +KdSave(IN BOOLEAN SleepTransition) { /* Nothing to do on COM ports */ return STATUS_SUCCESS; @@ -291,10 +236,10 @@ NTSTATUS NTAPI -KdRestore( - IN BOOLEAN SleepTransition) +KdRestore(IN BOOLEAN SleepTransition) { /* Nothing to do on COM ports */ return STATUS_SUCCESS; } +/* EOF */ Removed: trunk/reactos/drivers/base/kddll/kdcom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kdcom.h… ============================================================================== --- trunk/reactos/drivers/base/kddll/kdcom.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kdcom.h (removed) @@ -1,54 +1,0 @@ -/* - * COPYRIGHT: GPL, see COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/base/kddll/kdcom.h - * PURPOSE: COM port definitions for the kernel debugger. - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)ewactos.org) - */ - -#pragma once - -#define COM_DAT 0x00 -#define COM_IEN 0x01 /* interrupt enable register */ -#define COM_FCR 0x02 /* FIFO Control Register */ -#define COM_LCR 0x03 /* line control registers */ -#define COM_MCR 0x04 /* modem control reg */ -#define COM_LSR 0x05 /* line status register */ -#define COM_MSR 0x06 /* modem status register */ -#define COM_SCR 0x07 /* scratch register */ -#define COM_DLL 0x00 /* divisor latch least sig */ -#define COM_DLM 0x01 /* divisor latch most sig */ - -#define IEN_ERDA 0x01 -#define IEN_ETHRE 0x02 -#define IEN_ERLSI 0x04 -#define IEN_EMS 0x08 -#define IEN_ALL 0x0F -#define FCR_ENABLE_FIFO 0x01 -#define FCR_CLEAR_RCVR 0x02 -#define FCR_CLEAR_XMIT 0x04 -#define LCR_CS5 0x00 -#define LCR_CS6 0x01 -#define LCR_CS7 0x02 -#define LCR_CS8 0x03 -#define LCR_ST1 0x00 -#define LCR_ST2 0x04 -#define LCR_PNO 0x00 -#define LCR_POD 0x08 -#define LCR_PEV 0x18 -#define LCR_PMK 0x28 -#define LCR_PSP 0x38 -#define LCR_BRK 0x40 -#define LCR_DLAB 0x80 -#define MCR_DTR 0x01 -#define MCR_RTS 0x02 -#define MCR_OUT1 0x04 /* general purpose output */ -#define MCR_OUT2 0x08 -#define MCR_LOOP 0x10 /* loopback testing mode */ -#define MCR_ALL (MCR_DTR | MCR_RTS | MCR_OUT1 | MCR_OUT2 | MCR_LOOP) -#define LSR_DR 0x01 -#define LSR_TBE 0x20 -#define MSR_CTS 0x10 /* (complemented) state of clear to send (CTS). */ -#define MSR_DSR 0x20 /* (complemented) state of data set ready (DSR). */ -#define MSR_RI 0x40 /* (complemented) state of ring indicator (RI). */ -#define MSR_DCD 0x80 /* (complemented) state of data carrier detect (DCD). */ Modified: trunk/reactos/drivers/base/kddll/kddll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kddll.h… ============================================================================== --- trunk/reactos/drivers/base/kddll/kddll.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kddll.h [iso-8859-1] Wed Nov 28 23:23:54 2012 @@ -12,14 +12,15 @@ #define NOEXTAPI #include <ntifs.h> -#define NDEBUG #include <halfuncs.h> -#include <debug.h> #include "arc/arc.h" #include "windbgkd.h" #include <wdbgexts.h> #include <ioaccess.h> /* port intrinsics */ + +#define NDEBUG +#include <debug.h> long atol(const char *str);

11 years, 9 months

[hbelusca] 57780: [CPORTLIB/FREELDR] GetByte --> Wait for data (with timeout) and get it if available. PollByte --> Check for data, get it if available, and return immediately.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Nov 28 23:16:01 2012 New Revision: 57780 URL: http://svn.reactos.org/svn/reactos?rev=57780&view=rev Log: [CPORTLIB/FREELDR] GetByte --> Wait for data (with timeout) and get it if available. PollByte --> Check for data, get it if available, and return immediately. Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c trunk/reactos/boot/freeldr/freeldr/windows/headless.c trunk/reactos/include/reactos/libs/cportlib/cportlib.h trunk/reactos/lib/cportlib/cport.c Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/comm/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] Wed Nov 28 23:16:01 2012 @@ -100,7 +100,7 @@ if (PortInitialized == FALSE) return FALSE; - return (CpGetByte(&Rs232ComPort, ByteReceived, FALSE, FALSE) == CP_GET_SUCCESS); + return (CpGetByte(&Rs232ComPort, ByteReceived, TRUE) == CP_GET_SUCCESS); } /* @@ -109,12 +109,7 @@ if (PortInitialized == FALSE) return FALSE; - while ((READ_PORT_UCHAR (SER_LSR(Rs232PortBase)) & SR_LSR_DR) == 0) - ; - - *ByteReceived = READ_PORT_UCHAR (SER_RBR(Rs232PortBase)); - - return TRUE; + return (CpGetByte(&Rs232ComPort, ByteReceived, FALSE) == CP_GET_SUCCESS); } */ Modified: trunk/reactos/boot/freeldr/freeldr/windows/headless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/headless.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/headless.c [iso-8859-1] Wed Nov 28 23:16:01 2012 @@ -143,7 +143,7 @@ WinLdrPortGetByte(IN ULONG PortId, OUT PUCHAR Data) { - return CpGetByte(&Port[PortId], Data, TRUE, FALSE) == CP_GET_SUCCESS; + return CpGetByte(&Port[PortId], Data, TRUE) == CP_GET_SUCCESS; } BOOLEAN @@ -151,7 +151,7 @@ { UCHAR Dummy; - return CpGetByte(&Port[PortId], &Dummy, FALSE, TRUE) == CP_GET_SUCCESS; + return CpGetByte(&Port[PortId], &Dummy, FALSE) == CP_GET_SUCCESS; } VOID Modified: trunk/reactos/include/reactos/libs/cportlib/cportlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/cport… ============================================================================== --- trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] Wed Nov 28 23:16:01 2012 @@ -69,8 +69,7 @@ CpGetByte( IN PCPPORT Port, OUT PUCHAR Byte, - IN BOOLEAN Wait, - IN BOOLEAN Poll + IN BOOLEAN Wait ); VOID Modified: trunk/reactos/lib/cportlib/cport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cportlib/cport.c?rev=5… ============================================================================== --- trunk/reactos/lib/cportlib/cport.c [iso-8859-1] (original) +++ trunk/reactos/lib/cportlib/cport.c [iso-8859-1] Wed Nov 28 23:16:01 2012 @@ -255,8 +255,7 @@ NTAPI CpGetByte(IN PCPPORT Port, OUT PUCHAR Byte, - IN BOOLEAN Wait, - IN BOOLEAN Poll) + IN BOOLEAN Wait) { UCHAR Lsr; ULONG LimitCount = Wait ? TIMEOUT_COUNT : 1; @@ -278,9 +277,6 @@ return CP_GET_ERROR; } - /* If only polling was requested by caller, return now */ - if (Poll) return CP_GET_SUCCESS; - /* Otherwise read the byte and return it */ *Byte = READ_PORT_UCHAR(Port->Address + RECEIVE_BUFFER_REGISTER);

11 years, 9 months

[jimtabor] 57779: [Win32k] - Fix crash when the exception is thrown.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Nov 28 23:05:57 2012 New Revision: 57779 URL: http://svn.reactos.org/svn/reactos?rev=57779&view=rev Log: [Win32k] - Fix crash when the exception is thrown. Modified: trunk/reactos/win32ss/user/ntuser/painting.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Wed Nov 28 23:05:57 2012 @@ -1088,6 +1088,8 @@ RETURN(FALSE); } + UserRefObjectCo(Window, &Ref); // Here for the exception. + _SEH2_TRY { ProbeForRead(pUnsafePs, sizeof(*pUnsafePs), 1); @@ -1102,8 +1104,6 @@ { RETURN(FALSE); } - - UserRefObjectCo(Window, &Ref); RETURN(IntEndPaint(Window, &Ps));

11 years, 9 months

[hbelusca] 57778: [FREELDR] Remove unuseful defines, now.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Nov 28 22:25:07 2012 New Revision: 57778 URL: http://svn.reactos.org/svn/reactos?rev=57778&view=rev Log: [FREELDR] Remove unuseful defines, now. Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/comm/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] Wed Nov 28 22:25:07 2012 @@ -28,38 +28,8 @@ #if DBG -#define DEFAULT_BAUD_RATE 19200 +#define DEFAULT_BAUD_RATE 19200 -#define SER_RBR(x) ((x)+0) -#define SER_THR(x) ((x)+0) -#define SER_DLL(x) ((x)+0) -#define SER_IER(x) ((x)+1) -#define SER_DLM(x) ((x)+1) -#define SER_IIR(x) ((x)+2) -#define SER_LCR(x) ((x)+3) -#define SR_LCR_CS5 0x00 -#define SR_LCR_CS6 0x01 -#define SR_LCR_CS7 0x02 -#define SR_LCR_CS8 0x03 -#define SR_LCR_ST1 0x00 -#define SR_LCR_ST2 0x04 -#define SR_LCR_PNO 0x00 -#define SR_LCR_POD 0x08 -#define SR_LCR_PEV 0x18 -#define SR_LCR_PMK 0x28 -#define SR_LCR_PSP 0x38 -#define SR_LCR_BRK 0x40 -#define SR_LCR_DLAB 0x80 -#define SER_MCR(x) ((x)+4) -#define SR_MCR_DTR 0x01 -#define SR_MCR_RTS 0x02 -#define SER_LSR(x) ((x)+5) -#define SR_LSR_DR 0x01 -#define SR_LSR_TBE 0x20 -#define SER_MSR(x) ((x)+6) -#define SR_MSR_CTS 0x10 -#define SR_MSR_DSR 0x20 -#define SER_SCR(x) ((x)+7) /* STATIC VARIABLES *********************************************************/

11 years, 9 months

[hbelusca] 57777: [FREELDR] - Make use of the previously committed cportlib code. This works great on VPC 2007 :) - Comment the unused Rs232PortPollByte function. - In hardware.c, add useful commen...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Nov 28 22:16:15 2012 New Revision: 57777 URL: http://svn.reactos.org/svn/reactos?rev=57777&view=rev Log: [FREELDR] - Make use of the previously committed cportlib code. This works great on VPC 2007 :) - Comment the unused Rs232PortPollByte function. - In hardware.c, add useful comments and two macros holding the maximum number of COM and LPT ports. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/comm/rs232.c trunk/reactos/boot/freeldr/freeldr/include/comm.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Wed Nov 28 22:16:15 2012 @@ -20,6 +20,7 @@ */ #include <freeldr.h> +#include <cportlib/cportlib.h> #define NDEBUG #include <debug.h> @@ -31,6 +32,10 @@ #define CLOCK_TICK_RATE (1193182) #define LATCH (CLOCK_TICK_RATE / HZ) + +/* Maximum number of COM and LPT ports */ +#define MAX_COM_PORTS 4 +#define MAX_LPT_PORTS 3 /* No Mouse */ #define MOUSE_TYPE_NONE 0 @@ -1042,7 +1047,7 @@ PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCM_SERIAL_DEVICE_DATA SerialDeviceData; - ULONG Irq[4] = {4, 3, 4, 3}; + ULONG Irq[MAX_COM_PORTS] = {4, 3, 4, 3}; ULONG Base; CHAR Buffer[80]; PUSHORT BasePtr; @@ -1053,12 +1058,17 @@ TRACE("DetectSerialPorts()\n"); - ControllerNumber = 0; + /* + * The BIOS data area 0x400 holds the address of the first valid COM port. + * Each COM port address is stored in a 2-byte field. + * Infos at: http://www.bioscentral.com/misc/bda.htm + */ BasePtr = (PUSHORT)0x400; - for (i = 0; i < 2; i++, BasePtr++) + + for (i = 0; i < MAX_COM_PORTS; i++, BasePtr++) { Base = (ULONG)*BasePtr; - if (Base == 0) + if (Base == 0 || !CpDoesPortExist((PUCHAR)Base)) continue; TRACE("Found COM%u port at 0x%x\n", i + 1, Base); @@ -1126,7 +1136,7 @@ MmHeapFree(PartialResourceList); - if (!Rs232PortInUse(Base)) + if (!Rs232PortInUse(UlongToPtr(Base))) { /* Detect serial mouse */ DetectSerialPointerPeripheral(ControllerKey, UlongToPtr(Base)); @@ -1142,20 +1152,25 @@ { PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; - ULONG Irq[3] = {7, 5, (ULONG)-1}; + ULONG Irq[MAX_LPT_PORTS] = {7, 5, (ULONG)-1}; CHAR Buffer[80]; PCONFIGURATION_COMPONENT_DATA ControllerKey; PUSHORT BasePtr; ULONG Base; - ULONG ControllerNumber; + ULONG ControllerNumber = 0; ULONG i; ULONG Size; TRACE("DetectParallelPorts() called\n"); - ControllerNumber = 0; + /* + * The BIOS data area 0x408 holds the address of the first valid LPT port. + * Each LPT port address is stored in a 2-byte field. + * Infos at: http://www.bioscentral.com/misc/bda.htm + */ BasePtr = (PUSHORT)0x408; - for (i = 0; i < 3; i++, BasePtr++) + + for (i = 0; i < MAX_LPT_PORTS; i++, BasePtr++) { Base = (ULONG)*BasePtr; if (Base == 0) Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/comm/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] Wed Nov 28 22:16:15 2012 @@ -22,6 +22,7 @@ #ifndef _M_ARM #include <freeldr.h> +#include <cportlib/cportlib.h> /* MACROS *******************************************************************/ @@ -62,227 +63,105 @@ /* STATIC VARIABLES *********************************************************/ -static ULONG Rs232ComPort = 0; -static ULONG Rs232BaudRate = 0; -static PUCHAR Rs232PortBase = (PUCHAR)0; +static ULONG BaseArray[] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; -/* The com port must only be initialized once! */ +/* The COM port must only be initialized once! */ +static CPPORT Rs232ComPort; static BOOLEAN PortInitialized = FALSE; -/* STATIC FUNCTIONS *********************************************************/ - -static BOOLEAN Rs232DoesComPortExist(PUCHAR BaseAddress) -{ - BOOLEAN found; - UCHAR mcr; - UCHAR msr; - - found = FALSE; - - /* save Modem Control Register (MCR) */ - mcr = READ_PORT_UCHAR (SER_MCR(BaseAddress)); - - /* enable loop mode (set Bit 4 of the MCR) */ - WRITE_PORT_UCHAR (SER_MCR(BaseAddress), 0x10); - - /* clear all modem output bits */ - WRITE_PORT_UCHAR (SER_MCR(BaseAddress), 0x10); - - /* read the Modem Status Register */ - msr = READ_PORT_UCHAR (SER_MSR(BaseAddress)); - - /* - * the upper nibble of the MSR (modem output bits) must be - * equal to the lower nibble of the MCR (modem input bits) - */ - if ((msr & 0xF0) == 0x00) - { - /* set all modem output bits */ - WRITE_PORT_UCHAR (SER_MCR(BaseAddress), 0x1F); - - /* read the Modem Status Register */ - msr = READ_PORT_UCHAR (SER_MSR(BaseAddress)); - - /* - * the upper nibble of the MSR (modem output bits) must be - * equal to the lower nibble of the MCR (modem input bits) - */ - if ((msr & 0xF0) == 0xF0) - found = TRUE; - } - - /* restore MCR */ - WRITE_PORT_UCHAR (SER_MCR(BaseAddress), mcr); - - return (found); -} /* FUNCTIONS *********************************************************/ -BOOLEAN Rs232PortInitialize(ULONG ComPort, ULONG BaudRate) +BOOLEAN Rs232PortInitialize(IN ULONG ComPort, + IN ULONG BaudRate) { - ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; - //char buffer[80]; - ULONG divisor; - UCHAR lcr; + NTSTATUS Status; + PUCHAR Address; - if (PortInitialized == FALSE) + if (PortInitialized == FALSE) + { + if (BaudRate == 0) { - if (BaudRate != 0) - { - Rs232BaudRate = BaudRate; - } - else - { - Rs232BaudRate = DEFAULT_BAUD_RATE; - } - - if (ComPort == 0) - { - if (Rs232DoesComPortExist ((PUCHAR)(ULONG_PTR)BaseArray[2])) - { - Rs232PortBase = (PUCHAR)(ULONG_PTR)BaseArray[2]; - Rs232ComPort = 2; -/*#ifndef NDEBUG - sprintf (buffer, - "\nSerial port COM%ld found at 0x%lx\n", - ComPort, - (ULONG)PortBase); - HalDisplayString (buffer); -#endif*/ /* NDEBUG */ - } - else if (Rs232DoesComPortExist ((PUCHAR)(ULONG_PTR)BaseArray[1])) - { - Rs232PortBase = (PUCHAR)(ULONG_PTR)BaseArray[1]; - Rs232ComPort = 1; -/*#ifndef NDEBUG - sprintf (buffer, - "\nSerial port COM%ld found at 0x%lx\n", - ComPort, - (ULONG)PortBase); - HalDisplayString (buffer); -#endif*/ /* NDEBUG */ - } - else - { - /*sprintf (buffer, - "\nKernel Debugger: No COM port found!!!\n\n"); - HalDisplayString (buffer);*/ - return FALSE; - } - } - else - { - if (Rs232DoesComPortExist ((PUCHAR)(ULONG_PTR)BaseArray[ComPort])) - { - Rs232PortBase = (PUCHAR)(ULONG_PTR)BaseArray[ComPort]; - Rs232ComPort = ComPort; -/*#ifndef NDEBUG - sprintf (buffer, - "\nSerial port COM%ld found at 0x%lx\n", - ComPort, - (ULONG)PortBase); - HalDisplayString (buffer); -#endif*/ /* NDEBUG */ - } - else - { - /*sprintf (buffer, - "\nKernel Debugger: No serial port found!!!\n\n"); - HalDisplayString (buffer);*/ - return FALSE; - } - } - - PortInitialized = TRUE; + BaudRate = DEFAULT_BAUD_RATE; } - /* - * set baud rate and data format (8N1) - */ + if (ComPort == 0) + { + if (CpDoesPortExist(UlongToPtr(BaseArray[2]))) + { + Address = UlongToPtr(BaseArray[2]); + } + else if (CpDoesPortExist(UlongToPtr(BaseArray[1]))) + { + Address = UlongToPtr(BaseArray[1]); + } + else + { + return FALSE; + } + } + else if (ComPort <= 4) // 4 == MAX_COM_PORTS + { + if (CpDoesPortExist(UlongToPtr(BaseArray[ComPort]))) + { + Address = UlongToPtr(BaseArray[ComPort]); + } + else + { + return FALSE; + } + } + else + { + return FALSE; + } - /* turn on DTR and RTS */ - WRITE_PORT_UCHAR (SER_MCR(Rs232PortBase), SR_MCR_DTR | SR_MCR_RTS); + Status = CpInitialize(&Rs232ComPort, Address, BaudRate); + if (!NT_SUCCESS(Status)) return FALSE; - /* set DLAB */ - lcr = READ_PORT_UCHAR (SER_LCR(Rs232PortBase)) | SR_LCR_DLAB; - WRITE_PORT_UCHAR (SER_LCR(Rs232PortBase), lcr); + PortInitialized = TRUE; + } - /* set baud rate */ - divisor = 115200 / BaudRate; - WRITE_PORT_UCHAR (SER_DLL(Rs232PortBase), divisor & 0xff); - WRITE_PORT_UCHAR (SER_DLM(Rs232PortBase), (divisor >> 8) & 0xff); - - /* reset DLAB and set 8N1 format */ - WRITE_PORT_UCHAR (SER_LCR(Rs232PortBase), - SR_LCR_CS8 | SR_LCR_ST1 | SR_LCR_PNO); - - /* read junk out of the RBR */ - lcr = READ_PORT_UCHAR (SER_RBR(Rs232PortBase)); - - /* - * set global info - */ - //KdComPortInUse = (ULONG)PortBase; - - /* - * print message to blue screen - */ - /*sprintf (buffer, - "\nKernel Debugger: COM%ld (Port 0x%lx) BaudRate %ld\n\n", - ComPort, - (ULONG)PortBase, - BaudRate); - - HalDisplayString (buffer);*/ - - return TRUE; + return TRUE; } -BOOLEAN Rs232PortGetByte(PUCHAR ByteRecieved) +BOOLEAN Rs232PortGetByte(PUCHAR ByteReceived) { - if (PortInitialized == FALSE) - return FALSE; + if (PortInitialized == FALSE) + return FALSE; - if ((READ_PORT_UCHAR (SER_LSR(Rs232PortBase)) & SR_LSR_DR)) - { - *ByteRecieved = READ_PORT_UCHAR (SER_RBR(Rs232PortBase)); - return TRUE; - } - - return FALSE; + return (CpGetByte(&Rs232ComPort, ByteReceived, FALSE, FALSE) == CP_GET_SUCCESS); } -BOOLEAN Rs232PortPollByte(PUCHAR ByteRecieved) +/* +BOOLEAN Rs232PortPollByte(PUCHAR ByteReceived) { - if (PortInitialized == FALSE) - return FALSE; + if (PortInitialized == FALSE) + return FALSE; - while ((READ_PORT_UCHAR (SER_LSR(Rs232PortBase)) & SR_LSR_DR) == 0) - ; + while ((READ_PORT_UCHAR (SER_LSR(Rs232PortBase)) & SR_LSR_DR) == 0) + ; - *ByteRecieved = READ_PORT_UCHAR (SER_RBR(Rs232PortBase)); + *ByteReceived = READ_PORT_UCHAR (SER_RBR(Rs232PortBase)); - return TRUE; + return TRUE; } +*/ VOID Rs232PortPutByte(UCHAR ByteToSend) { - if (PortInitialized == FALSE) - return; + if (PortInitialized == FALSE) + return; - while ((READ_PORT_UCHAR (SER_LSR(Rs232PortBase)) & SR_LSR_TBE) == 0) - ; - - WRITE_PORT_UCHAR (SER_THR(Rs232PortBase), ByteToSend); + CpPutByte(&Rs232ComPort, ByteToSend); } #endif /* DBG */ -BOOLEAN Rs232PortInUse(ULONG Base) +BOOLEAN Rs232PortInUse(PUCHAR Base) { #if DBG - return PortInitialized && Rs232PortBase == (PUCHAR)(ULONG_PTR)Base ? TRUE : FALSE; + return ( (PortInitialized && (Rs232ComPort.Address == Base)) ? TRUE : FALSE ); #else return FALSE; #endif Modified: trunk/reactos/boot/freeldr/freeldr/include/comm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/comm.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/comm.h [iso-8859-1] Wed Nov 28 22:16:15 2012 @@ -23,6 +23,6 @@ BOOLEAN Rs232PortInitialize(ULONG ComPort, ULONG BaudRate); BOOLEAN Rs232PortGetByte(PUCHAR ByteRecieved); -BOOLEAN Rs232PortPollByte(PUCHAR ByteRecieved); +// BOOLEAN Rs232PortPollByte(PUCHAR ByteRecieved); VOID Rs232PortPutByte(UCHAR ByteToSend); -BOOLEAN Rs232PortInUse(ULONG Base); +BOOLEAN Rs232PortInUse(PUCHAR Base);

11 years, 9 months

[hbelusca] 57776: [CPORTLIB] - Do a synthesis of all the code I've found concerning initializing COM ports (in kdcom / kddll / kdbg in the kernel and in freeldr). The "// Windows" comments concern ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Nov 28 22:12:29 2012 New Revision: 57776 URL: http://svn.reactos.org/svn/reactos?rev=57776&view=rev Log: [CPORTLIB] - Do a synthesis of all the code I've found concerning initializing COM ports (in kdcom / kddll / kdbg in the kernel and in freeldr). The "// Windows" comments concern the original code for testing the existence of COM ports, inside cportlib, whereas "// ReactOS" comments concern the equivalent existing in our kdcom/kddll/kdbg etc... - CORRECT THE VIRTUAL PC COM PORT INITIALIZATION !! The problem was, that the current COM port existence test fails on VPC whereas it works well in all other virtual machines. Therefore : * I keep the existing testing code in a function called ComPortTest1, this works everywhere but on VPC ; * I add a very basic COM port existence test function called ComPortTest2, which basically looks for the scratch register, this works everywhere including on VPC. * The COM port existence test consists in the two tests above. Modified: trunk/reactos/include/reactos/libs/cportlib/cportlib.h trunk/reactos/lib/cportlib/cport.c Modified: trunk/reactos/include/reactos/libs/cportlib/cportlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/cport… ============================================================================== --- trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/cportlib/cportlib.h [iso-8859-1] Wed Nov 28 22:12:29 2012 @@ -10,31 +10,45 @@ #include <ntdef.h> +// +// Return error codes. +// #define CP_GET_SUCCESS 0 #define CP_GET_NODATA 1 #define CP_GET_ERROR 2 +// +// COM port flags. +// #define CPPORT_FLAG_MODEM_CONTROL 0x02 + typedef struct _CPPORT { PUCHAR Address; - ULONG Baud; + ULONG BaudRate; USHORT Flags; } CPPORT, *PCPPORT; - -VOID -NTAPI -CpInitialize( - IN PCPPORT Port, - IN PUCHAR Address, - IN ULONG Rate -); VOID NTAPI CpEnableFifo( IN PUCHAR Address, IN BOOLEAN Enable +); + +VOID +NTAPI +CpSetBaud( + IN PCPPORT Port, + IN ULONG BaudRate +); + +NTSTATUS +NTAPI +CpInitialize( + IN PCPPORT Port, + IN PUCHAR Address, + IN ULONG BaudRate ); BOOLEAN @@ -50,20 +64,13 @@ IN UCHAR ExpectedValue ); -VOID -NTAPI -CpSetBaud( - IN PCPPORT Port, - IN ULONG Rate -); - USHORT NTAPI CpGetByte( - IN PCPPORT Port, - IN PUCHAR Byte, - IN BOOLEAN Wait, - IN BOOLEAN Poll + IN PCPPORT Port, + OUT PUCHAR Byte, + IN BOOLEAN Wait, + IN BOOLEAN Poll ); VOID Modified: trunk/reactos/lib/cportlib/cport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cportlib/cport.c?rev=5… ============================================================================== --- trunk/reactos/lib/cportlib/cport.c [iso-8859-1] (original) +++ trunk/reactos/lib/cportlib/cport.c [iso-8859-1] Wed Nov 28 22:12:29 2012 @@ -11,6 +11,10 @@ * documented their serial algorithms, we use the same ones to stay "compliant". * Do not change this code to "improve" it. It's done this way on purpose, at least on x86. * -- sir_richard + * + * REPLY: I reworked the COM-port testing code because the original one + * (i.e. the Microsoft's documented one) doesn't work on Virtual PC 2007. + * -- hbelusca */ /* NOTE: This code is used by Headless Support (Ntoskrnl.exe and Osloader.exe) and @@ -30,47 +34,100 @@ #include <drivers/serial/ns16550.h> #include <intrin.h> #include <ioaccess.h> +#include <ntstatus.h> + +#define NDEBUG #include <debug.h> /* GLOBALS ********************************************************************/ +// Wait timeout value +#define TIMEOUT_COUNT 1024 * 200 + UCHAR RingIndicator; + /* FUNCTIONS ******************************************************************/ VOID +NTAPI +CpEnableFifo(IN PUCHAR Address, + IN BOOLEAN Enable) +{ + /* Set FIFO and clear the receive/transmit buffers */ + WRITE_PORT_UCHAR(Address + FIFO_CONTROL_REGISTER, + Enable ? SERIAL_FCR_ENABLE | SERIAL_FCR_RCVR_RESET | SERIAL_FCR_TXMT_RESET + : SERIAL_FCR_DISABLE); +} + +VOID +NTAPI +CpSetBaud(IN PCPPORT Port, + IN ULONG BaudRate) +{ + UCHAR Lcr; + ULONG Mode = CLOCK_RATE / BaudRate; + + /* Set the DLAB on */ + Lcr = READ_PORT_UCHAR(Port->Address + LINE_CONTROL_REGISTER); + WRITE_PORT_UCHAR(Port->Address + LINE_CONTROL_REGISTER, Lcr | SERIAL_LCR_DLAB); + + /* Set the baud rate */ + WRITE_PORT_UCHAR(Port->Address + DIVISOR_LATCH_LSB, (UCHAR)(Mode & 0xFF)); + WRITE_PORT_UCHAR(Port->Address + DIVISOR_LATCH_MSB, (UCHAR)((Mode >> 8) & 0xFF)); + + /* Reset DLAB */ + WRITE_PORT_UCHAR(Port->Address + LINE_CONTROL_REGISTER, Lcr); + + /* Save baud rate in port */ + Port->BaudRate = BaudRate; +} + +NTSTATUS NTAPI CpInitialize(IN PCPPORT Port, IN PUCHAR Address, - IN ULONG Rate) -{ - /* Reset port data */ - Port->Address = Address; - Port->Baud = 0; + IN ULONG BaudRate) +{ + /* Validity checks */ + if (Port == NULL || Address == NULL || BaudRate == 0) + return STATUS_INVALID_PARAMETER; + + if (!CpDoesPortExist(Address)) + return STATUS_NOT_FOUND; + + /* Initialize port data */ + Port->Address = Address; + Port->BaudRate = 0; + Port->Flags = 0; + + /* Disable the interrupts */ + WRITE_PORT_UCHAR(Address + LINE_CONTROL_REGISTER, 0); + WRITE_PORT_UCHAR(Address + INTERRUPT_ENABLE_REGISTER, 0); + + /* Turn on DTR, RTS and OUT2 */ + WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, + SERIAL_MCR_DTR | SERIAL_MCR_RTS | SERIAL_MCR_OUT2); /* Set the baud rate */ - CpSetBaud(Port, Rate); - - /* Enable on DTR and RTS */ - WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, - SERIAL_MCR_DTR | SERIAL_MCR_RTS); - - /* Disable interrupts */ - WRITE_PORT_UCHAR(Address + INTERRUPT_ENABLE_REGISTER, 0); -} - -VOID -NTAPI -CpEnableFifo(IN PUCHAR Address, - IN BOOLEAN Enable) -{ - /* Set FIFO */ - WRITE_PORT_UCHAR(Address + FIFO_CONTROL_REGISTER, Enable ? SERIAL_FCR_ENABLE : 0); -} - -BOOLEAN -NTAPI -CpDoesPortExist(IN PUCHAR Address) + CpSetBaud(Port, BaudRate); + + /* Set 8 data bits, 1 stop bit, no parity, no break */ + WRITE_PORT_UCHAR(Port->Address + LINE_CONTROL_REGISTER, + SERIAL_8_DATA | SERIAL_1_STOP | SERIAL_NONE_PARITY); + + /* Turn on FIFO */ + // TODO: Check whether FIFO exists and turn it on in that case. + CpEnableFifo(Address, TRUE); // for 16550 + + /* Read junk out of the RBR */ + (VOID)READ_PORT_UCHAR(Address + RECEIVE_BUFFER_REGISTER); + + return STATUS_SUCCESS; +} + +static BOOLEAN +ComPortTest1(IN PUCHAR Address) { /* * See "Building Hardware and Firmware to Complement Microsoft Windows Headless Operation" @@ -89,28 +146,87 @@ * 5. The modem status register is read and the ring indicator is checked. * This means SERIAL_MSR_RI should be set. * 6. Restore original modem status register. + * + * REMARK: Strangely enough, the Virtual PC 2007 virtual machine + * doesn't pass this test. */ - UCHAR Old = READ_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER); - + BOOLEAN RetVal = FALSE; + UCHAR Mcr, Msr; + + /* Save the Modem Control Register */ + Mcr = READ_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER); + + /* Enable loop (diagnostic) mode (set Bit 4 of the MCR) */ WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, SERIAL_MCR_LOOP); + + /* Clear all modem output bits */ WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, SERIAL_MCR_LOOP); - if (!(READ_PORT_UCHAR(Address + MODEM_STATUS_REGISTER) & - (SERIAL_MSR_CTS | SERIAL_MSR_DSR | SERIAL_MSR_RI | SERIAL_MSR_DCD))) - { + /* Read the Modem Status Register */ + Msr = READ_PORT_UCHAR(Address + MODEM_STATUS_REGISTER); + + /* + * The upper nibble of the MSR (modem output bits) must be + * equal to the lower nibble of the MCR (modem input bits). + */ + if ((Msr & (SERIAL_MSR_CTS | SERIAL_MSR_DSR | SERIAL_MSR_RI | SERIAL_MSR_DCD)) == 0x00) + { + /* Set all modem output bits */ WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, - (SERIAL_MCR_OUT1 | SERIAL_MCR_LOOP)); - if (READ_PORT_UCHAR(Address + MODEM_STATUS_REGISTER) & SERIAL_MSR_RI) + SERIAL_MCR_OUT1 | SERIAL_MCR_LOOP); // Windows +/* ReactOS + WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, + SERIAL_MCR_DTR | SERIAL_MCR_RTS | SERIAL_MCR_OUT1 | SERIAL_MCR_OUT2 | SERIAL_MCR_LOOP); +*/ + + /* Read the Modem Status Register */ + Msr = READ_PORT_UCHAR(Address + MODEM_STATUS_REGISTER); + + /* + * The upper nibble of the MSR (modem output bits) must be + * equal to the lower nibble of the MCR (modem input bits). + */ + if (Msr & SERIAL_MSR_RI) // Windows + // if (Msr & (SERIAL_MSR_CTS | SERIAL_MSR_DSR | SERIAL_MSR_RI | SERIAL_MSR_DCD) == 0xF0) // ReactOS { - WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, Old); - return TRUE; + RetVal = TRUE; } } - WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, Old); - - return FALSE; + /* Restore the MCR */ + WRITE_PORT_UCHAR(Address + MODEM_CONTROL_REGISTER, Mcr); + + return RetVal; +} + +static BOOLEAN +ComPortTest2(IN PUCHAR Address) +{ + /* + * This test checks whether the 16450/16550 scratch register is available. + * If not, the serial port is considered as unexisting. + */ + + UCHAR Byte = 0; + + do + { + WRITE_PORT_UCHAR(Address + SCRATCH_REGISTER, Byte); + + if (READ_PORT_UCHAR(Address + SCRATCH_REGISTER) != Byte) + return FALSE; + + } while (++Byte != 0); + + return TRUE; +} + +BOOLEAN +NTAPI +CpDoesPortExist(IN PUCHAR Address) +{ + return ( ComPortTest1(Address) || ComPortTest2(Address) ); } UCHAR @@ -135,54 +251,28 @@ return Lsr; } -VOID -NTAPI -CpSetBaud(IN PCPPORT Port, - IN ULONG Rate) -{ - UCHAR Lcr; - USHORT Mode; - - /* Add DLAB */ - Lcr = READ_PORT_UCHAR(Port->Address + LINE_CONTROL_REGISTER); - WRITE_PORT_UCHAR(Port->Address + LINE_CONTROL_REGISTER, Lcr | SERIAL_LCR_DLAB); - - /* Set baud rate */ - Mode = (USHORT)(115200 / Rate); - WRITE_PORT_UCHAR(Port->Address + DIVISOR_LATCH_MSB, (UCHAR)((Mode >> 8) & 0xff)); - WRITE_PORT_UCHAR(Port->Address + DIVISOR_LATCH_LSB, (UCHAR)(Mode & 0xff)); - - /* Reset DLAB and set 8 data bits, 1 stop bit, no parity, no break */ - WRITE_PORT_UCHAR(Port->Address + LINE_CONTROL_REGISTER, - SERIAL_8_DATA | SERIAL_1_STOP | SERIAL_NONE_PARITY); - - /* Save baud rate in port */ - Port->Baud = Rate; -} - USHORT NTAPI -CpGetByte(IN PCPPORT Port, - IN PUCHAR Byte, - IN BOOLEAN Wait, - IN BOOLEAN Poll) +CpGetByte(IN PCPPORT Port, + OUT PUCHAR Byte, + IN BOOLEAN Wait, + IN BOOLEAN Poll) { UCHAR Lsr; - ULONG i; + ULONG LimitCount = Wait ? TIMEOUT_COUNT : 1; /* Handle early read-before-init */ if (!Port->Address) return CP_GET_NODATA; /* If "wait" mode enabled, spin many times, otherwise attempt just once */ - i = Wait ? 204800 : 1; - while (i--) + while (LimitCount--) { /* Read LSR for data ready */ Lsr = CpReadLsr(Port, SERIAL_LSR_DR); if ((Lsr & SERIAL_LSR_DR) == SERIAL_LSR_DR) { /* If an error happened, clear the byte and fail */ - if (Lsr & (SERIAL_LSR_FE | SERIAL_LSR_PE)) + if (Lsr & (SERIAL_LSR_FE | SERIAL_LSR_PE | SERIAL_LSR_OE)) { *Byte = 0; return CP_GET_ERROR; @@ -217,17 +307,18 @@ IN UCHAR Byte) { /* Check if port is in modem control to handle CD */ - while (Port->Flags & CPPORT_FLAG_MODEM_CONTROL) + // while (Port->Flags & CPPORT_FLAG_MODEM_CONTROL) // Commented for the moment. + if (Port->Flags & CPPORT_FLAG_MODEM_CONTROL) // To be removed when this becomes implemented. { /* Not implemented yet */ DPRINT1("CP: CPPORT_FLAG_MODEM_CONTROL unexpected\n"); } /* Wait for LSR to say we can go ahead */ - while (!(CpReadLsr(Port, SERIAL_LSR_THRE) & SERIAL_LSR_THRE)); + while ((CpReadLsr(Port, SERIAL_LSR_THRE) & SERIAL_LSR_THRE) == 0x00); /* Send the byte */ - WRITE_PORT_UCHAR(Port->Address + RECEIVE_BUFFER_REGISTER, Byte); + WRITE_PORT_UCHAR(Port->Address + TRANSMIT_HOLDING_REGISTER, Byte); } /* EOF */

11 years, 9 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2012