Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 45203: Fix more makefile paths, rbuild now builds
by gedmurphy＠svn.reactos.org 22 Jan '10

22 Jan '10

Author: gedmurphy Date: Fri Jan 22 17:32:15 2010 New Revision: 45203 URL: http://svn.reactos.org/svn/reactos?rev=45203&view=rev Log: Fix more makefile paths, rbuild now builds Modified: branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak branches/Tree-restructure-test/sdk/libs/lib.mak branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak Modified: branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/libs/… ============================================================================== --- branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak [iso-8859-1] Fri Jan 22 17:32:15 2010 @@ -32,7 +32,7 @@ INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \ -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST \ - -Iinclude/reactos -Iinclude $(HOST_CFLAGS) + -Isdk/include/reactos -Isdk/include $(HOST_CFLAGS) $(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT) $(ECHO_HOSTAR) Modified: branches/Tree-restructure-test/sdk/libs/lib.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/libs/… ============================================================================== --- branches/Tree-restructure-test/sdk/libs/lib.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/libs/lib.mak [iso-8859-1] Fri Jan 22 17:32:15 2010 @@ -1,4 +1,4 @@ -LIB_BASE = lib +LIB_BASE = sdk\libs LIB_BASE_ = $(LIB_BASE)$(SEP) include sdk/libs/inflib/inflib.mak Modified: branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak [iso-8859-1] Fri Jan 22 17:32:15 2010 @@ -321,7 +321,7 @@ $(RBUILD_COMMON_OBJECTS) \ $(RBUILD_TEST_SPECIAL_OBJECTS) -RBUILD_HOST_CXXFLAGS = -I$(RBUILD_BASE) -I$(TOOLS_BASE) -I$(INFLIB_BASE) $(TOOLS_CPPFLAGS) -Iinclude -Iinclude/reactos +RBUILD_HOST_CXXFLAGS = -I$(RBUILD_BASE) -I$(TOOLS_BASE) -I$(INFLIB_BASE) $(TOOLS_CPPFLAGS) -Iinclude -Isdk/include/reactos RBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS)

1 0

[gedmurphy] 45202: Add base include files
by gedmurphy＠svn.reactos.org 22 Jan '10

22 Jan '10

Author: gedmurphy Date: Fri Jan 22 17:28:08 2010 New Revision: 45202 URL: http://svn.reactos.org/svn/reactos?rev=45202&view=rev Log: Add base include files Added: branches/Tree-restructure-test/sdk/include/host/ - copied from r44923, trunk/reactos/include/host/ branches/Tree-restructure-test/sdk/include/reactos/ - copied from r44923, trunk/reactos/include/reactos/

1 0

[gedmurphy] 45201: Fix mak file paths, rbuild now starts to build
by gedmurphy＠svn.reactos.org 22 Jan '10

22 Jan '10

Author: gedmurphy Date: Fri Jan 22 16:55:53 2010 New Revision: 45201 URL: http://svn.reactos.org/svn/reactos?rev=45201&view=rev Log: Fix mak file paths, rbuild now starts to build Modified: branches/Tree-restructure-test/Makefile branches/Tree-restructure-test/sdk/tools/tools.mak Modified: branches/Tree-restructure-test/Makefile URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/Makefile?… ============================================================================== --- branches/Tree-restructure-test/Makefile [iso-8859-1] (original) +++ branches/Tree-restructure-test/Makefile [iso-8859-1] Fri Jan 22 16:55:53 2010 @@ -425,8 +425,8 @@ BUILDNO_H = $(INTERMEDIATE_)include$(SEP)reactos$(SEP)buildno.h -include lib/lib.mak -include tools/tools.mak +include sdk/libs/lib.mak +include sdk/tools/tools.mak -include $(ROS_AUTOMAKE) PREAUTO := \ Modified: branches/Tree-restructure-test/sdk/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/tools.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/tools.mak [iso-8859-1] Fri Jan 22 16:55:53 2010 @@ -1,4 +1,4 @@ -TOOLS_BASE = tools +TOOLS_BASE = sdk\tools TOOLS_BASE_ = $(TOOLS_BASE)$(SEP) TOOLS_INT = $(INTERMEDIATE_)$(TOOLS_BASE) TOOLS_INT_ = $(TOOLS_INT)$(SEP) @@ -40,15 +40,15 @@ $(ECHO_HOSTCC) ${host_gpp} $(TOOLS_CPPFLAGS) -c $< -o $@ -include tools/bin2c.mak -include tools/buildno/buildno.mak -include tools/gendib/gendib.mak -include tools/rsym/log2lines.mak -include tools/nci/nci.mak +include sdk/tools/bin2c.mak +include sdk/tools/buildno/buildno.mak +include sdk/tools/gendib/gendib.mak +include sdk/tools/rsym/log2lines.mak +include sdk/tools/nci/nci.mak ifeq ($(ARCH),powerpc) -include tools/ofw_interface/ofw_interface.mak +include sdk/tools/ofw_interface/ofw_interface.mak endif -include tools/pefixup.mak -include tools/rsym/raddr2line.mak -include tools/rbuild/rbuild.mak -include tools/rsym/rsym.mak +include sdk/tools/pefixup.mak +include sdk/tools/rsym/raddr2line.mak +include sdk/tools/rbuild/rbuild.mak +include sdk/tools/rsym/rsym.mak

1 0

[gedmurphy] 45200: Add base libs
by gedmurphy＠svn.reactos.org 22 Jan '10

22 Jan '10

Author: gedmurphy Date: Fri Jan 22 16:52:35 2010 New Revision: 45200 URL: http://svn.reactos.org/svn/reactos?rev=45200&view=rev Log: Add base libs Added: branches/Tree-restructure-test/sdk/libs/atl/ - copied from r44923, trunk/reactos/lib/atl/ branches/Tree-restructure-test/sdk/libs/cmlib/ - copied from r44923, trunk/reactos/lib/cmlib/ branches/Tree-restructure-test/sdk/libs/inflib/ - copied from r44923, trunk/reactos/lib/inflib/ branches/Tree-restructure-test/sdk/libs/lib.mak - copied, changed from r44923, trunk/reactos/lib/lib.mak branches/Tree-restructure-test/sdk/libs/libxml2/ - copied from r44923, trunk/reactos/lib/3rdparty/libxml2/ branches/Tree-restructure-test/sdk/libs/pseh/ - copied from r44923, trunk/reactos/lib/pseh/ branches/Tree-restructure-test/sdk/libs/rossym/ - copied from r44923, trunk/reactos/lib/rossym/ Copied: branches/Tree-restructure-test/sdk/libs/lib.mak (from r44923, trunk/reactos/lib/lib.mak) URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/libs/… ============================================================================== --- trunk/reactos/lib/lib.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/libs/lib.mak [iso-8859-1] Fri Jan 22 16:52:35 2010 @@ -1,7 +1,7 @@ LIB_BASE = lib LIB_BASE_ = $(LIB_BASE)$(SEP) -include lib/inflib/inflib.mak -ifeq ($(ARCH),powerpc) -include lib/ppcmmu/ppcmmu.mak -endif +include sdk/libs/inflib/inflib.mak +#ifeq ($(ARCH),powerpc) +#include lib/ppcmmu/ppcmmu.mak +#endif

1 0

[fireball] 45199: - Best way to fix CRT problem: Add more underscores! (and hacks) - winex11.drv builds again. - Mark usleep as unimplemented.
by fireball＠svn.reactos.org 22 Jan '10

22 Jan '10

Author: fireball Date: Fri Jan 22 11:49:40 2010 New Revision: 45199 URL: http://svn.reactos.org/svn/reactos?rev=45199&view=rev Log: - Best way to fix CRT problem: Add more underscores! (and hacks) - winex11.drv builds again. - Mark usleep as unimplemented. Modified: branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c branches/arwinss/reactos/dll/win32/winex11.drv/window.c branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c Modified: branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c [iso-8859-1] Fri Jan 22 11:49:40 2010 @@ -4,6 +4,9 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <fcntl.h> +#include <share.h> +#include <io.h> #include "windef.h" #include "winbase.h" @@ -17,12 +20,9 @@ int usleep (unsigned int useconds) { //return _usleep(useconds); + UNIMPLEMENTED; return 0; } - -//void xinerama_init( unsigned int width, unsigned int height ) -//{ -//} WCHAR *wine_get_dos_file_name(char *path) { @@ -74,9 +74,55 @@ { } + +/* CRT compatibility HACKS */ + struct _stat; int CDECL fstat(int fd, struct _stat* buf) { int CDECL _fstat(int fd, struct _stat* buf); return _fstat(fd, buf); } + +char *__cdecl strdup(const char *_Src) +{ + return _strdup(_Src); +} + +int __cdecl open(const char *path,int flags,...) +{ + va_list ap; + + if (flags & O_CREAT) + { + int pmode; + va_start(ap, flags); + pmode = va_arg(ap, int); + va_end(ap); + return _sopen( path, flags, _SH_DENYNO, pmode ); + } + else + return _sopen( path, flags, _SH_DENYNO); +} + +int __cdecl close(int _FileHandle) +{ + return _close(_FileHandle); +} + +int __cdecl read(int _FileHandle,void *_DstBuf,unsigned int _MaxCharCount) +{ + return _read(_FileHandle, _DstBuf, _MaxCharCount); +} + +int __cdecl unlink(const char *_Filename) +{ + return _unlink(_Filename); +} + +int __cdecl access(const char *_Filename,int _AccessMode) +{ + return _access(_Filename, _AccessMode); +} + + Modified: branches/arwinss/reactos/dll/win32/winex11.drv/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/window.c [iso-8859-1] Fri Jan 22 11:49:40 2010 @@ -946,7 +946,7 @@ /* set the WM_CLIENT_MACHINE and WM_LOCALE_NAME properties */ XSetWMProperties(display, data->whole_window, NULL, NULL, NULL, 0, NULL, NULL, NULL); /* set the pid. together, these properties are needed so the window manager can kill us if we freeze */ - i = getpid(); + i = _getpid(); XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_PID), XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&i, 1); Modified: branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c [iso-8859-1] Fri Jan 22 11:49:40 2010 @@ -47,6 +47,16 @@ #include "wine/library.h" #include "wine/unicode.h" #include "wine/debug.h" + +#ifdef __REACTOS__ +// CRT compat HACKS +#define open _open +#define close _close +#define read _read +#define write _write +#define lseek _lseek +#define hypot _hypot +#endif WINE_DEFAULT_DEBUG_CHANNEL(font);

1 0

[jimtabor] 45198: [Win32k] - Remove CriticalRegion calls.
by jimtabor＠svn.reactos.org 22 Jan '10

22 Jan '10

Author: jimtabor Date: Fri Jan 22 02:29:21 2010 New Revision: 45198 URL: http://svn.reactos.org/svn/reactos?rev=45198&view=rev Log: [Win32k] - Remove CriticalRegion calls. Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Fri Jan 22 02:29:21 2010 @@ -182,34 +182,28 @@ */ if (pDC->rosdc.hClipRgn) { // FIXME! HAX!!! - KeEnterCriticalRegion(); Index = GDI_HANDLE_GET_INDEX(pDC->rosdc.hClipRgn); Entry = &GdiHandleTable->Entries[Index]; if (Entry->UserData) FreeObjectAttr(Entry->UserData); Entry->UserData = NULL; - KeLeaveCriticalRegion(); // if (!GDIOBJ_SetOwnership(pDC->rosdc.hClipRgn, Owner)) return FALSE; } if (pDC->rosdc.hVisRgn) { // FIXME! HAX!!! - KeEnterCriticalRegion(); Index = GDI_HANDLE_GET_INDEX(pDC->rosdc.hVisRgn); Entry = &GdiHandleTable->Entries[Index]; if (Entry->UserData) FreeObjectAttr(Entry->UserData); Entry->UserData = NULL; - KeLeaveCriticalRegion(); // if (!GDIOBJ_SetOwnership(pDC->rosdc.hVisRgn, Owner)) return FALSE; } if (pDC->rosdc.hGCClipRgn) { // FIXME! HAX!!! - KeEnterCriticalRegion(); Index = GDI_HANDLE_GET_INDEX(pDC->rosdc.hGCClipRgn); Entry = &GdiHandleTable->Entries[Index]; if (Entry->UserData) FreeObjectAttr(Entry->UserData); Entry->UserData = NULL; - KeLeaveCriticalRegion(); // if (!GDIOBJ_SetOwnership(pDC->rosdc.hGCClipRgn, Owner)) return FALSE; }

1 0

[jimtabor] 45197: [Win32k] - Remove CriticalRegion calls.
by jimtabor＠svn.reactos.org 22 Jan '10

22 Jan '10

Author: jimtabor Date: Fri Jan 22 02:12:06 2010 New Revision: 45197 URL: http://svn.reactos.org/svn/reactos?rev=45197&view=rev Log: [Win32k] - Remove CriticalRegion calls. Modified: trunk/reactos/subsystems/win32/win32k/objects/dcattr.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dcattr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcattr.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcattr.c [iso-8859-1] Fri Jan 22 02:12:06 2010 @@ -159,7 +159,6 @@ PVOID NewMem = NULL; PDC pDC; - KeEnterCriticalRegion(); { INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)hDC); PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; @@ -179,7 +178,6 @@ DPRINT1("DC_ATTR not allocated!\n"); } } - KeLeaveCriticalRegion(); pDC = DC_LockDc(hDC); ASSERT(pDC->pdcattr == &pDC->dcattr); if (NewMem) @@ -198,7 +196,6 @@ pDC->pdcattr = &pDC->dcattr; DC_UnlockDc(pDC); - KeEnterCriticalRegion(); { INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)DCToFree); PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; @@ -208,7 +205,6 @@ Entry->UserData = NULL; } } - KeLeaveCriticalRegion(); } Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Fri Jan 22 02:12:06 2010 @@ -755,10 +755,8 @@ } if (pAttr) { - KeEnterCriticalRegion(); FreeObjectAttr(pAttr); Entry->UserData = NULL; - KeLeaveCriticalRegion(); } break; @@ -1575,12 +1573,10 @@ level functions. */ // FIXME! HAX!!! Remove this once we get everything right! - KeEnterCriticalRegion(); Index = GDI_HANDLE_GET_INDEX(hRgn); Entry = &GdiHandleTable->Entries[Index]; if (Entry->UserData) FreeObjectAttr(Entry->UserData); Entry->UserData = NULL; - KeLeaveCriticalRegion(); // if ((OwnerMask == GDI_OBJ_HMGR_PUBLIC) || OwnerMask == GDI_OBJ_HMGR_NONE) { Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Fri Jan 22 02:12:06 2010 @@ -2063,11 +2063,9 @@ } } - KeEnterCriticalRegion(); Index = GDI_HANDLE_GET_INDEX(hReg); Entry = &GdiHandleTable->Entries[Index]; Entry->UserData = AllocateObjectAttr(); - KeLeaveCriticalRegion(); EMPTY_REGION(pReg); pReg->rdh.dwSize = sizeof(RGNDATAHEADER); @@ -2091,12 +2089,10 @@ if (pRgn) { - KeEnterCriticalRegion(); Index = GDI_HANDLE_GET_INDEX(hRgn); Entry = &GdiHandleTable->Entries[Index]; pRgn_Attr = Entry->UserData; pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); - KeLeaveCriticalRegion(); if ( pid == NtCurrentTeb()->ClientId.UniqueProcess && pRgn_Attr ) @@ -2151,12 +2147,10 @@ if (pRgn) { - KeEnterCriticalRegion(); Index = GDI_HANDLE_GET_INDEX(pRgn->BaseObject.hHmgr); Entry = &GdiHandleTable->Entries[Index]; pRgn_Attr = Entry->UserData; pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); - KeLeaveCriticalRegion(); if ( pid == NtCurrentTeb()->ClientId.UniqueProcess && pRgn_Attr )

1 0

[tkreuzer] 45196: Merge from amd64-branch: 44886 KxAcquireSpinLock: check for already owned lock only on debug builds, fix check in inner loop, don't call Kii386SpinOnSpinLock inside the inner loop, but instead of it, simplify the code. Stubplement Kii386SpinOnSpinLock in C 44893 Move spinlock inline functions into their own header, so they can be shared with hal.
by tkreuzer＠svn.reactos.org 21 Jan '10

21 Jan '10

Author: tkreuzer Date: Thu Jan 21 23:34:01 2010 New Revision: 45196 URL: http://svn.reactos.org/svn/reactos?rev=45196&view=rev Log: Merge from amd64-branch: 44886 KxAcquireSpinLock: check for already owned lock only on debug builds, fix check in inner loop, don't call Kii386SpinOnSpinLock inside the inner loop, but instead of it, simplify the code. Stubplement Kii386SpinOnSpinLock in C 44893 Move spinlock inline functions into their own header, so they can be shared with hal. Added: trunk/reactos/ntoskrnl/include/internal/spinlock.h - copied unchanged from r44893, branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/spinlock.h Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/ke/spinlock.c Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Thu Jan 21 23:34:01 2010 @@ -102,27 +102,6 @@ } #ifndef CONFIG_SMP -// -// Spinlock Acquire at IRQL >= DISPATCH_LEVEL -// -FORCEINLINE -VOID -KxAcquireSpinLock(IN PKSPIN_LOCK SpinLock) -{ - /* On UP builds, spinlocks don't exist at IRQL >= DISPATCH */ - UNREFERENCED_PARAMETER(SpinLock); -} - -// -// Spinlock Release at IRQL >= DISPATCH_LEVEL -// -FORCEINLINE -VOID -KxReleaseSpinLock(IN PKSPIN_LOCK SpinLock) -{ - /* On UP builds, spinlocks don't exist at IRQL >= DISPATCH */ - UNREFERENCED_PARAMETER(SpinLock); -} // // This routine protects against multiple CPU acquires, it's meaningless on UP. @@ -302,72 +281,6 @@ } #else - -// -// Spinlock Acquisition at IRQL >= DISPATCH_LEVEL -// -FORCEINLINE -VOID -KxAcquireSpinLock(IN PKSPIN_LOCK SpinLock) -{ - /* Make sure that we don't own the lock already */ - if (((KSPIN_LOCK)KeGetCurrentThread() | 1) == *SpinLock) - { - /* We do, bugcheck! */ - KeBugCheckEx(SPIN_LOCK_ALREADY_OWNED, (ULONG_PTR)SpinLock, 0, 0, 0); - } - - /* Start acquire loop */ - for (;;) - { - /* Try to acquire it */ - if (InterlockedBitTestAndSet((PLONG)SpinLock, 0)) - { - /* Value changed... wait until it's unlocked */ - while (*(volatile KSPIN_LOCK *)SpinLock == 1) - { -#if DBG - /* On debug builds, we use a much slower but useful routine */ - //Kii386SpinOnSpinLock(SpinLock, 5); - - /* FIXME: Do normal yield for now */ - YieldProcessor(); -#else - /* Otherwise, just yield and keep looping */ - YieldProcessor(); -#endif - } - } - else - { -#if DBG - /* On debug builds, we OR in the KTHREAD */ - *SpinLock = (KSPIN_LOCK)KeGetCurrentThread() | 1; -#endif - /* All is well, break out */ - break; - } - } -} - -// -// Spinlock Release at IRQL >= DISPATCH_LEVEL -// -FORCEINLINE -VOID -KxReleaseSpinLock(IN PKSPIN_LOCK SpinLock) -{ -#if DBG - /* Make sure that the threads match */ - if (((KSPIN_LOCK)KeGetCurrentThread() | 1) != *SpinLock) - { - /* They don't, bugcheck */ - KeBugCheckEx(SPIN_LOCK_NOT_OWNED, (ULONG_PTR)SpinLock, 0, 0, 0); - } -#endif - /* Clear the lock */ - InterlockedAnd((PLONG)SpinLock, 0); -} FORCEINLINE VOID Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Thu Jan 21 23:34:01 2010 @@ -83,6 +83,7 @@ #include "../kdbg/kdb.h" #endif #include "dbgk.h" +#include "spinlock.h" #include "tag.h" #include "test.h" #include "inbv.h" Modified: trunk/reactos/ntoskrnl/ke/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/spinlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] Thu Jan 21 23:34:01 2010 @@ -456,15 +456,20 @@ } #ifdef _M_IX86 -/* - * @unimplemented - */ -VOID -NTAPI -Kii386SpinOnSpinLock(IN PKSPIN_LOCK SpinLock, - IN ULONG Flags) -{ - UNIMPLEMENTED; - while (TRUE); -} -#endif +VOID +NTAPI +Kii386SpinOnSpinLock(PKSPIN_LOCK SpinLock, ULONG Flags) +{ + // FIXME: Handle flags + UNREFERENCED_PARAMETER(Flags); + + /* Spin until it's unlocked */ + while (*(volatile KSPIN_LOCK *)SpinLock & 1) + { + // FIXME: Check for timeout + + /* Yield and keep looping */ + YieldProcessor(); + } +} +#endif

1 0

[tkreuzer] 45195: [HAL] Cleanup part 1/x - Rename each architectures default hal to "hal" and delete the stubbed "hal" module. - Delete halamd64 (will later reuse the x86 hal) - Rename "halmp" to "halmps" as it's called on windows - Set HalInitSystem as entry point - Move pcibus.c into hal_generic.rbuild - Use a common .pspec file - Use a directory.rbuild for halx86 as it was done for the other architectures already - Move some code from hal_generic to hal_generic_up - No code change
by tkreuzer＠svn.reactos.org 21 Jan '10

21 Jan '10

Author: tkreuzer Date: Thu Jan 21 22:05:45 2010 New Revision: 45195 URL: http://svn.reactos.org/svn/reactos?rev=45195&view=rev Log: [HAL] Cleanup part 1/x - Rename each architectures default hal to "hal" and delete the stubbed "hal" module. - Delete halamd64 (will later reuse the x86 hal) - Rename "halmp" to "halmps" as it's called on windows - Set HalInitSystem as entry point - Move pcibus.c into hal_generic.rbuild - Use a common .pspec file - Use a directory.rbuild for halx86 as it was done for the other architectures already - Move some code from hal_generic to hal_generic_up - No code change Added: trunk/reactos/hal/hal.pspec - copied, changed from r45183, trunk/reactos/hal/hal/hal.pspec trunk/reactos/hal/halx86/directory.rbuild (with props) trunk/reactos/hal/halx86/hal.rbuild - copied, changed from r45183, trunk/reactos/hal/halx86/halup.rbuild trunk/reactos/hal/halx86/hal_generic_mp.rbuild (with props) trunk/reactos/hal/halx86/halamd64.rbuild (with props) trunk/reactos/hal/halx86/halmps.rbuild - copied, changed from r45183, trunk/reactos/hal/halx86/halmp.rbuild Removed: trunk/reactos/hal/hal/ trunk/reactos/hal/halamd64/ trunk/reactos/hal/halx86/hal_generic_amd64.rbuild trunk/reactos/hal/halx86/hal_generic_pc.rbuild trunk/reactos/hal/halx86/halmp.rbuild trunk/reactos/hal/halx86/halup.rbuild Modified: trunk/reactos/hal/hal.rbuild trunk/reactos/hal/halarm/up/halup.rbuild trunk/reactos/hal/halppc/up/halup.rbuild trunk/reactos/hal/halx86/hal_generic.rbuild trunk/reactos/hal/halx86/halxbox.rbuild Copied: trunk/reactos/hal/hal.pspec (from r45183, trunk/reactos/hal/hal/hal.pspec) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal.pspec?p2=trunk/rea… ============================================================================== --- trunk/reactos/hal/hal/hal.pspec [iso-8859-1] (original) +++ trunk/reactos/hal/hal.pspec [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -1,30 +1,30 @@ #include "include/reactos/msvctarget.h" +#undef i386 #ifdef _M_ARM @ fastcall ExAcquireFastMutex(ptr) @ fastcall ExReleaseFastMutex(ptr) #else -@ fastcall ExAcquireFastMutex(ptr) ExiAcquireFastMutex -@ fastcall ExReleaseFastMutex(ptr) ExiReleaseFastMutex +@ fastcall -arch=i386 ExAcquireFastMutex(ptr) ExiAcquireFastMutex +@ fastcall -arch=i386 ExReleaseFastMutex(ptr) ExiReleaseFastMutex #endif -@ fastcall ExTryToAcquireFastMutex(ptr) ExiTryToAcquireFastMutex +@ fastcall -arch=i386,arm ExTryToAcquireFastMutex(ptr) ExiTryToAcquireFastMutex @ fastcall HalClearSoftwareInterrupt(long) @ fastcall HalRequestSoftwareInterrupt(long) @ fastcall HalSystemVectorDispatchEntry(long long long) -@ fastcall KeAcquireInStackQueuedSpinLock(ptr ptr) -@ fastcall KeAcquireInStackQueuedSpinLockRaiseToSynch(ptr ptr) -@ fastcall KeAcquireSpinLockRaiseToSynch(ptr) -@ fastcall KeAcquireQueuedSpinLock(ptr) -@ fastcall KeAcquireQueuedSpinLockRaiseToSynch(ptr) -@ fastcall KeReleaseInStackQueuedSpinLock(ptr) -@ fastcall KeReleaseQueuedSpinLock(ptr long) -@ fastcall KeTryToAcquireQueuedSpinLock(long ptr) -@ fastcall KeTryToAcquireQueuedSpinLockRaiseToSynch(long ptr) -@ fastcall KfAcquireSpinLock(ptr) -@ fastcall KfLowerIrql(long) -@ fastcall KfRaiseIrql(long) -@ fastcall KfReleaseSpinLock(ptr long) - +@ fastcall -arch=i386,arm KeAcquireInStackQueuedSpinLock(ptr ptr) +@ fastcall -arch=i386,arm KeAcquireInStackQueuedSpinLockRaiseToSynch(ptr ptr) +@ fastcall -arch=i386,arm KeAcquireSpinLockRaiseToSynch(ptr) +@ fastcall -arch=i386,arm KeAcquireQueuedSpinLock(ptr) +@ fastcall -arch=i386,arm KeAcquireQueuedSpinLockRaiseToSynch(ptr) +@ fastcall -arch=i386,arm KeReleaseInStackQueuedSpinLock(ptr) +@ fastcall -arch=i386,arm KeReleaseQueuedSpinLock(ptr long) +@ fastcall -arch=i386,arm KeTryToAcquireQueuedSpinLock(long ptr) +@ fastcall -arch=i386,arm KeTryToAcquireQueuedSpinLockRaiseToSynch(long ptr) +@ fastcall -arch=i386,arm KfAcquireSpinLock(ptr) +@ fastcall -arch=i386,arm KfLowerIrql(long) +@ fastcall -arch=i386,arm KfRaiseIrql(long) +@ fastcall -arch=i386,arm KfReleaseSpinLock(ptr long) @ stdcall HalAcquireDisplayOwnership(ptr) @ stdcall HalAdjustResourceList(ptr) @ stdcall HalAllProcessorsStarted() @@ -44,9 +44,7 @@ @ stdcall HalGetBusData(long long long ptr long) @ stdcall HalGetBusDataByOffset(long long long ptr long long) @ stdcall HalGetEnvironmentVariable(str long str) -#ifdef _M_ARM -@ fastcall HalGetInterruptSource() -#endif +@ fastcall -arch=arm HalGetInterruptSource() @ stdcall HalGetInterruptVector(long long long long ptr ptr) @ stdcall HalHandleNMI(ptr) @ stdcall HalInitSystem(long ptr) @@ -69,41 +67,38 @@ @ stdcall HalStartNextProcessor(ptr ptr) @ stdcall HalStartProfileInterrupt(long) @ stdcall HalStopProfileInterrupt(long) -#ifdef _M_ARM -@ fastcall HalSweepIcache() -@ fastcall HalSweepDcache() -#endif +@ fastcall -arch=arm HalSweepIcache() +@ fastcall -arch=arm HalSweepDcache() @ stdcall HalTranslateBusAddress(long long long long ptr ptr) @ stdcall IoFlushAdapterBuffers(ptr ptr ptr ptr long long) @ stdcall IoFreeAdapterChannel(ptr) @ stdcall IoFreeMapRegisters(ptr ptr long) @ stdcall IoMapTransfer(ptr ptr ptr ptr ptr long) -#ifndef _M_ARM -@ stdcall IoAssignDriveLetters(ptr str ptr ptr) HalpAssignDriveLetters -@ stdcall IoReadPartitionTable(ptr long long ptr) HalpReadPartitionTable -@ stdcall IoSetPartitionInformation(ptr long long long) HalpSetPartitionInformation -@ stdcall IoWritePartitionTable(ptr long long long ptr) HalpWritePartitionTable -#endif -@ stdcall KeAcquireSpinLock(ptr ptr) +@ stdcall -arch=i386,x86_64 IoAssignDriveLetters(ptr str ptr ptr) HalpAssignDriveLetters +@ stdcall -arch=i386,x86_64 IoReadPartitionTable(ptr long long ptr) HalpReadPartitionTable +@ stdcall -arch=i386,x86_64 IoSetPartitionInformation(ptr long long long) HalpSetPartitionInformation +@ stdcall -arch=i386,x86_64 IoWritePartitionTable(ptr long long long ptr) HalpWritePartitionTable +@ stdcall -arch=i386,arm KeAcquireSpinLock(ptr ptr) @ extern KdComPortInUse @ stdcall KeFlushWriteBuffer() -@ stdcall KeGetCurrentIrql() -@ stdcall KeLowerIrql(long) +@ stdcall -arch=i386,arm KeGetCurrentIrql() +@ stdcall -arch=i386,arm KeLowerIrql(long) @ stdcall KeQueryPerformanceCounter(ptr) -@ stdcall KeRaiseIrql(long ptr) -@ stdcall KeRaiseIrqlToDpcLevel() -@ stdcall KeRaiseIrqlToSynchLevel() -@ stdcall KeReleaseSpinLock(ptr long) +@ stdcall -arch=i386,arm KeRaiseIrql(long ptr) +@ stdcall -arch=i386,arm KeRaiseIrqlToDpcLevel() +@ stdcall -arch=i386,arm KeRaiseIrqlToSynchLevel() +@ stdcall -arch=i386,arm KeReleaseSpinLock(ptr long) @ stdcall KeStallExecutionProcessor(long) -@ stdcall READ_PORT_BUFFER_UCHAR(ptr ptr long) -@ stdcall READ_PORT_BUFFER_ULONG(ptr ptr long) -@ stdcall READ_PORT_BUFFER_USHORT(ptr ptr long) -@ stdcall READ_PORT_UCHAR(ptr) -@ stdcall READ_PORT_ULONG(ptr) -@ stdcall READ_PORT_USHORT(ptr) -@ stdcall WRITE_PORT_BUFFER_UCHAR(ptr ptr long) -@ stdcall WRITE_PORT_BUFFER_ULONG(ptr ptr long) -@ stdcall WRITE_PORT_BUFFER_USHORT(ptr ptr long) -@ stdcall WRITE_PORT_UCHAR(ptr long) -@ stdcall WRITE_PORT_ULONG(ptr long) -@ stdcall WRITE_PORT_USHORT(ptr long) +@ stdcall -arch=i386,arm READ_PORT_BUFFER_UCHAR(ptr ptr long) +@ stdcall -arch=i386,arm READ_PORT_BUFFER_ULONG(ptr ptr long) +@ stdcall -arch=i386,arm READ_PORT_BUFFER_USHORT(ptr ptr long) +@ stdcall -arch=i386,arm READ_PORT_UCHAR(ptr) +@ stdcall -arch=i386,arm READ_PORT_ULONG(ptr) +@ stdcall -arch=i386,arm READ_PORT_USHORT(ptr) +@ stdcall -arch=i386,arm WRITE_PORT_BUFFER_UCHAR(ptr ptr long) +@ stdcall -arch=i386,arm WRITE_PORT_BUFFER_ULONG(ptr ptr long) +@ stdcall -arch=i386,arm WRITE_PORT_BUFFER_USHORT(ptr ptr long) +@ stdcall -arch=i386,arm WRITE_PORT_UCHAR(ptr long) +@ stdcall -arch=i386,arm WRITE_PORT_ULONG(ptr long) +@ stdcall -arch=i386,arm WRITE_PORT_USHORT(ptr long) +@ stdcall -arch=x86_64 HalInitializeBios(long ptr) Modified: trunk/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal.rbuild?rev=45195&r… ============================================================================== --- trunk/reactos/hal/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/hal.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -1,21 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="hal"> - <xi:include href="hal/hal.rbuild" /> + <directory name="halx86"> + <xi:include href="halx86/directory.rbuild" /> </directory> - <if property="ARCH" value="i386"> - <directory name="halx86"> - <xi:include href="halx86/hal_generic.rbuild" /> - <xi:include href="halx86/hal_generic_up.rbuild" /> - <xi:include href="halx86/hal_generic_pc.rbuild" /> - <xi:include href="halx86/halup.rbuild" /> - <if property="BUILD_MP" value="1"> - <xi:include href="halx86/halmp.rbuild" /> - </if> - <xi:include href="halx86/halxbox.rbuild" /> - </directory> - </if> + <if property="ARCH" value="powerpc"> <directory name="halppc"> <xi:include href="halppc/directory.rbuild" /> @@ -26,12 +15,4 @@ <xi:include href="halarm/directory.rbuild" /> </directory> </if> - <if property="ARCH" value="amd64"> - <directory name="halx86"> - <xi:include href="halx86/hal_generic_amd64.rbuild" /> - </directory> - <directory name="halamd64"> - <xi:include href="halamd64/directory.rbuild" /> - </directory> - </if> </group> Modified: trunk/reactos/hal/halarm/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halarm/up/halup.rbuild… ============================================================================== --- trunk/reactos/hal/halarm/up/halup.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halarm/up/halup.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="halarm_up" type="kernelmodedll" installbase="system32" installname="hal.dll"> - <importlibrary base="hal" definition="hal.pspec" /> +<module name="hal" type="kernelmodedll" entrypoint="HalInitSystem" installbase="system32" installname="hal.dll"> + <importlibrary base="hal" definition="../../hal.pspec" /> <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> <include base="halarm_generic">../include</include> <include base="ntoskrnl">include</include> Modified: trunk/reactos/hal/halppc/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/up/halup.rbuild… ============================================================================== --- trunk/reactos/hal/halppc/up/halup.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/up/halup.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="halppc_up" type="kernelmodedll"> - <importlibrary definition="../../hal/hal.def" /> +<module name="hal" type="kernelmodedll" entrypoint="HalInitSystem"> + <importlibrary definition="../../hal/hal.pspec" /> <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> <include base="halppc_generic">../include</include> <include base="ntoskrnl">include</include> Added: trunk/reactos/hal/halx86/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/directory.rbuil… ============================================================================== --- trunk/reactos/hal/halx86/directory.rbuild (added) +++ trunk/reactos/hal/halx86/directory.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -1,0 +1,21 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + + <xi:include href="hal_generic.rbuild" /> + <xi:include href="hal_generic_up.rbuild" /> + <xi:include href="hal_generic_mp.rbuild" /> + + <if property="ARCH" value="i386"> + <xi:include href="hal.rbuild" /> + <xi:include href="halxbox.rbuild" /> + <if property="BUILD_MP" value="1"> + <xi:include href="halmps.rbuild" /> + </if> + </if> + + <if property="ARCH" value="amd64"> + <xi:include href="halamd64.rbuild" /> + </if> + +</group> Propchange: trunk/reactos/hal/halx86/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Copied: trunk/reactos/hal/halx86/hal.rbuild (from r45183, trunk/reactos/hal/halx86/halup.rbuild) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal.rbuild?p2=t… ============================================================================== --- trunk/reactos/hal/halx86/halup.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -1,15 +1,14 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="halup" type="kernelmodedll" entrypoint="0" installname="hal.dll"> - <importlibrary base="hal" definition="hal.pspec" /> + <module name="hal" type="kernelmodedll" entrypoint="HalInitSystem@8" installbase="system32" installname="hal.dll"> + <importlibrary base="hal" definition="../hal.pspec" /> <bootstrap installbase="$(CDOUTPUT)" /> <include>include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> <library>hal_generic</library> <library>hal_generic_up</library> - <library>hal_generic_pc</library> <library>ntoskrnl</library> <directory name="up"> <file>halinit_up.c</file> Modified: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -10,6 +10,7 @@ <file>bushndlr.c</file> <file>isabus.c</file> <file>halbus.c</file> + <file>pcibus.c</file> <file>pcidata.c</file> <file>sysbus.c</file> </directory> Removed: trunk/reactos/hal/halx86/hal_generic_amd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_amd… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic_amd64.rbuild (removed) @@ -1,34 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> -<group> - <module name="hal_generic_amd64" type="objectlibrary"> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_NTHAL_" /> - <directory name="generic"> - <directory name="bus"> - <file>bushndlr.c</file> - <file>isabus.c</file> - <file>halbus.c</file> - <file>pcibus.c</file> - <file>pcidata.c</file> - <file>sysbus.c</file> - </directory> - <file>beep.c</file> - <file>cmos.c</file> - <file>dma.c</file> - <file>drive.c</file> - <file>display.c</file> - <file>profil.c</file> - <file>reboot.c</file> - <file>sysinfo.c</file> - <file>timer.c</file> - </directory> - <directory name="mp"> - <file>apic.c</file> - </directory> - <directory name="include"> - <pch>hal.h</pch> - </directory> - </module> -</group> Added: trunk/reactos/hal/halx86/hal_generic_mp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_mp.… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_mp.rbuild (added) +++ trunk/reactos/hal/halx86/hal_generic_mp.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -1,0 +1,20 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group> + <module name="hal_generic_mp" type="objectlibrary"> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_NTHAL_" /> + <define name="CONFIG_SMP" /> + <directory name="mp"> + <file>apic.c</file> + <file>halinit_mp.c</file> + <file>ioapic.c</file> + <file>ipi_mp.c</file> + <file>mpconfig.c</file> + <file>processor_mp.c</file> + <file>spinlock.c</file> + <file>halmp.rc</file> + </directory> + </module> +</group> Propchange: trunk/reactos/hal/halx86/hal_generic_mp.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/hal/halx86/hal_generic_pc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_pc.… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_pc.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic_pc.rbuild (removed) @@ -1,14 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> -<group> - <module name="hal_generic_pc" type="objectlibrary"> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_NTHAL_" /> - <directory name="generic"> - <directory name="bus"> - <file>pcibus.c</file> - </directory> - </directory> - </module> -</group> Added: trunk/reactos/hal/halx86/halamd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halamd64.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/halamd64.rbuild (added) +++ trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -1,0 +1,1 @@ + Propchange: trunk/reactos/hal/halx86/halamd64.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/hal/halx86/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmp.rbuild?re… ============================================================================== --- trunk/reactos/hal/halx86/halmp.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halmp.rbuild (removed) @@ -1,28 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> -<group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="halmp" type="kernelmodedll" entrypoint="0"> - <importlibrary base="hal" definition="hal.pspec" /> - <bootstrap installbase="$(CDOUTPUT)" /> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="CONFIG_SMP" /> - <define name="_NTHAL_" /> - <library>hal_generic</library> - <library>hal_generic_pc</library> - <library>ntoskrnl</library> - <directory name="mp"> - <file>apic.c</file> - <file>halinit_mp.c</file> - <file>ioapic.c</file> - <file>ipi_mp.c</file> - <file>mpconfig.c</file> - <file>mps.S</file> - <file>mpsboot.asm</file> - <file>mpsirql.c</file> - <file>processor_mp.c</file> - <file>spinlock.c</file> - <file>halmp.rc</file> - </directory> - </module> -</group> Copied: trunk/reactos/hal/halx86/halmps.rbuild (from r45183, trunk/reactos/hal/halx86/halmp.rbuild) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmps.rbuild?p… ============================================================================== --- trunk/reactos/hal/halx86/halmp.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halmps.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -1,28 +1,21 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="halmp" type="kernelmodedll" entrypoint="0"> - <importlibrary base="hal" definition="hal.pspec" /> + <module name="halmps" type="kernelmodedll" entrypoint="HalInitSystem@8"> + <importlibrary base="hal" definition="../hal.pspec" /> <bootstrap installbase="$(CDOUTPUT)" /> <include>include</include> <include base="ntoskrnl">include</include> <define name="CONFIG_SMP" /> <define name="_NTHAL_" /> <library>hal_generic</library> - <library>hal_generic_pc</library> + <library>hal_generic_mp</library> <library>ntoskrnl</library> <directory name="mp"> - <file>apic.c</file> - <file>halinit_mp.c</file> - <file>ioapic.c</file> - <file>ipi_mp.c</file> - <file>mpconfig.c</file> <file>mps.S</file> <file>mpsboot.asm</file> <file>mpsirql.c</file> - <file>processor_mp.c</file> - <file>spinlock.c</file> - <file>halmp.rc</file> + </directory> </module> </group> Removed: trunk/reactos/hal/halx86/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halup.rbuild?re… ============================================================================== --- trunk/reactos/hal/halx86/halup.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halup.rbuild (removed) @@ -1,19 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> -<group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="halup" type="kernelmodedll" entrypoint="0" installname="hal.dll"> - <importlibrary base="hal" definition="hal.pspec" /> - <bootstrap installbase="$(CDOUTPUT)" /> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_NTHAL_" /> - <library>hal_generic</library> - <library>hal_generic_up</library> - <library>hal_generic_pc</library> - <library>ntoskrnl</library> - <directory name="up"> - <file>halinit_up.c</file> - <file>halup.rc</file> - </directory> - </module> -</group> Modified: trunk/reactos/hal/halx86/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halxbox.rbuild?… ============================================================================== --- trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] Thu Jan 21 22:05:45 2010 @@ -1,8 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="halxbox" type="kernelmodedll" entrypoint="0"> - <importlibrary base="hal" definition="hal.pspec" /> + <module name="halxbox" type="kernelmodedll" entrypoint="HalInitSystem@8"> + <importlibrary base="hal" definition="../hal.pspec" /> <include>include</include> <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> @@ -10,11 +10,6 @@ <library>hal_generic</library> <library>hal_generic_up</library> <library>ntoskrnl</library> - <directory name="generic"> - <directory name="bus"> - <file>pcibus.c</file> - </directory> - </directory> <directory name="xbox"> <file>halinit_xbox.c</file> <file>part_xbox.c</file>

1 0

[sserapion] 45194: Minor fix
by sserapion＠svn.reactos.org 21 Jan '10

21 Jan '10

Author: sserapion Date: Thu Jan 21 20:59:46 2010 New Revision: 45194 URL: http://svn.reactos.org/svn/reactos?rev=45194&view=rev Log: Minor fix Modified: trunk/tools/Qemu GUI/QEmu.cs Modified: trunk/tools/Qemu GUI/QEmu.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Qemu%20GUI/QEmu.cs?rev=45194… ============================================================================== --- trunk/tools/Qemu GUI/QEmu.cs [iso-8859-1] (original) +++ trunk/tools/Qemu GUI/QEmu.cs [iso-8859-1] Thu Jan 21 20:59:46 2010 @@ -144,17 +144,13 @@ switch (Platform) { case Platforms.x86: + case Platforms.x86_ISA: p.StartInfo.FileName = this.Paths.QEmu + "\\qemu.exe"; break; - case Platforms.x86_ISA: - p.StartInfo.FileName = this.Paths.QEmu + "\\qemu-system-x86_64.exe"; - break; case Platforms.x64: - p.StartInfo.FileName = this.Paths.QEmu + "\\qemu.exe"; - break; case Platforms.x64_ISA: p.StartInfo.FileName = this.Paths.QEmu + "\\qemu-system-x86_64.exe"; - break; + break; case Platforms.ARM_integratorcp926: case Platforms.ARM_integratorcp1026: case Platforms.ARM_versatilepb:

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs