Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[ion] 17479: use correct wait mode when checking alertability in KeDelayExecuteThread. thanks to gunnar for noticing the bug

by ion＠svn.reactos.com

use correct wait mode when checking alertability in KeDelayExecuteThread. thanks to gunnar for noticing the bug Modified: trunk/reactos/ntoskrnl/ke/wait.c _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-08-22 21:35:41 UTC (rev 17478) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-08-22 23:33:51 UTC (rev 17479) @@ -111,7 +111,7 @@ do { /* We are going to wait no matter what (that's the point), so test Alertability */ - if (KiCheckAlertability(Alertable, CurrentThread, KernelMode, &Status)) + if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status)) break; /* Set Timer */

19 years, 4 months

[navaraf] 17478: Actually break out of the wait loops if we got alerted.

by navaraf＠svn.reactos.com

Actually break out of the wait loops if we got alerted. Modified: trunk/reactos/ntoskrnl/ke/wait.c _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-08-22 15:20:49 UTC (rev 17477) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-08-22 21:35:41 UTC (rev 17478) @@ -27,7 +27,7 @@ /* FUNCTIONS *****************************************************************/ -VOID +BOOLEAN inline FASTCALL KiCheckAlertability(BOOLEAN Alertable, @@ -44,6 +44,7 @@ CurrentThread->Alerted[(int)WaitMode] = FALSE; DPRINT("Thread was Alerted\n"); *Status = STATUS_ALERTED; + return TRUE; /* If there are User APCs Pending, then we can't really be alertable */ } else if ((!IsListEmpty(&CurrentThread->ApcState.ApcListHead[UserMode])) && @@ -52,13 +53,17 @@ DPRINT("APCs are Pending\n"); CurrentThread->ApcState.UserApcPending = TRUE; *Status = STATUS_USER_APC; + return TRUE; } /* If there are User APCs Pending and we are waiting in usermode, then we must notify the caller */ } else if ((CurrentThread->ApcState.UserApcPending) && (WaitMode != KernelMode)) { DPRINT("APCs are Pending\n"); *Status = STATUS_USER_APC; + return TRUE; } + + return FALSE; } /* @@ -106,7 +111,8 @@ do { /* We are going to wait no matter what (that's the point), so test Alertability */ - KiCheckAlertability(Alertable, CurrentThread, KernelMode, &Status); + if (KiCheckAlertability(Alertable, CurrentThread, KernelMode, &Status)) + break; /* Set Timer */ ThreadTimer = &CurrentThread->Timer; @@ -256,7 +262,8 @@ WaitBlock->NextWaitBlock = WaitBlock; /* Make sure we can satisfy the Alertable request */ - KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status); + if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status)) + break; /* Set the Wait Status */ CurrentThread->WaitStatus = Status; @@ -485,7 +492,8 @@ } /* Make sure we can satisfy the Alertable request */ - KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status); + if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status)) + break; /* Set the Wait Status */ CurrentThread->WaitStatus = Status;

19 years, 4 months

[weiden] 17477: rename IsKernelPointer to IsPointerOffset

by weiden＠svn.reactos.com

rename IsKernelPointer to IsPointerOffset Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/ob/wait.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-08-22 14:39:10 UTC (rev 17476) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-08-22 15:20:49 UTC (rev 17477) @@ -148,22 +148,22 @@ #define ProbeForReadUlargeInteger(Ptr) ((ULARGE_INTEGER)ProbeForReadGenericType(&(Ptr)->QuadPart, ULONGLONG, 0)) /* - * Use IsKernelPointer to test whether a pointer points to the kernel address - * space + * Use IsPointerOffset to test whether a pointer should be interpreted as an offset + * or as a pointer */ #if defined(_X86_) || defined(_M_AMD64) /* for x86 and x86-64 the MSB is 1 so we can simply test on that */ -#define IsKernelPointer(Ptr) ((LONG_PTR)(Ptr) < 0) +#define IsPointerOffset(Ptr) ((LONG_PTR)(Ptr) >= 0) #elif defined(_IA64_) /* on Itanium if the 24 most significant bits are set, we're not dealing with - user mode pointers. */ -#define IsKernelPointer(Ptr) (((ULONG_PTR)(Ptr) & 0xFFFFFF0000000000ULL) != 0) + offsets anymore. */ +#define IsPointerOffset(Ptr) (((ULONG_PTR)(Ptr) & 0xFFFFFF0000000000ULL) == 0) #else -#error IsKernelPointer() needs to be defined for this architecture +#error IsPointerOffset() needs to be defined for this architecture #endif #endif _____ Modified: trunk/reactos/ntoskrnl/ob/wait.c --- trunk/reactos/ntoskrnl/ob/wait.c 2005-08-22 14:39:10 UTC (rev 17476) +++ trunk/reactos/ntoskrnl/ob/wait.c 2005-08-22 15:20:49 UTC (rev 17477) @@ -149,7 +149,7 @@ DefaultObject = ObjectHeader->Type->DefaultObject; /* Check if it's the internal offset */ - if (!IsKernelPointer(DefaultObject)) + if (IsPointerOffset(DefaultObject)) { /* Increase reference count */ InterlockedIncrement(&ObjectHeader->PointerCount); @@ -295,7 +295,7 @@ WaitableObject = BODY_TO_HEADER(Object)->Type->DefaultObject; /* Is it an offset for internal objects? */ - if (!IsKernelPointer(WaitableObject)) + if (IsPointerOffset(WaitableObject)) { /* Turn it into a pointer */ WaitableObject = (PVOID)((ULONG_PTR)Object + @@ -389,7 +389,7 @@ WaitableObject = BODY_TO_HEADER(WaitObj)->Type->DefaultObject; /* Handle internal offset */ - if (!IsKernelPointer(WaitableObject)) + if (IsPointerOffset(WaitableObject)) { /* Get real pointer */ WaitableObject = (PVOID)((ULONG_PTR)WaitObj +

19 years, 4 months

[gdalsnes] 17476: move old cruft

by gdalsnes＠svn.reactos.com

move old cruft Deleted: trunk/reactos/lib/crtdll/direct/ Deleted: trunk/reactos/lib/crtdll/dirent/ Deleted: trunk/reactos/lib/crtdll/float/ Deleted: trunk/reactos/lib/crtdll/io/ Deleted: trunk/reactos/lib/crtdll/math/ Deleted: trunk/reactos/lib/crtdll/mbstring/ Deleted: trunk/reactos/lib/crtdll/misc/ Added: trunk/reactos/lib/crtdll/old cruft/direct/ Added: trunk/reactos/lib/crtdll/old cruft/dirent/ Added: trunk/reactos/lib/crtdll/old cruft/float/ Added: trunk/reactos/lib/crtdll/old cruft/io/ Added: trunk/reactos/lib/crtdll/old cruft/math/ Added: trunk/reactos/lib/crtdll/old cruft/mbstring/ Added: trunk/reactos/lib/crtdll/old cruft/misc/ Added: trunk/reactos/lib/crtdll/old cruft/process/ Added: trunk/reactos/lib/crtdll/old cruft/setjmp/ Added: trunk/reactos/lib/crtdll/old cruft/stdio/ Added: trunk/reactos/lib/crtdll/old cruft/stdlib/ Added: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/ Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/alloca.c Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/atexit.c Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/calloc.c Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/errno.c Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/fullpath.c Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/itoa.c Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/itow.c Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/llabs.c Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/lldiv.c Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/makepath.c Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/malloc.c Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/mbstowcs.c Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/putenv.c Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/qsort.c Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/rand.c Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/splitp.c Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/strtoull.c Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/swab.c Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/wcstom.c Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/wcstomb.c Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/wcstombs.c Added: trunk/reactos/lib/crtdll/old cruft/sys_stat/ Added: trunk/reactos/lib/crtdll/old cruft/time/ Deleted: trunk/reactos/lib/crtdll/process/ Deleted: trunk/reactos/lib/crtdll/setjmp/ Deleted: trunk/reactos/lib/crtdll/stdio/ Deleted: trunk/reactos/lib/crtdll/stdlib/ Deleted: trunk/reactos/lib/crtdll/sys_stat/ Deleted: trunk/reactos/lib/crtdll/time/ _____ Copied: trunk/reactos/lib/crtdll/old cruft/direct (from rev 17475, trunk/reactos/lib/crtdll/direct) _____ Copied: trunk/reactos/lib/crtdll/old cruft/dirent (from rev 17475, trunk/reactos/lib/crtdll/dirent) _____ Copied: trunk/reactos/lib/crtdll/old cruft/float (from rev 17475, trunk/reactos/lib/crtdll/float) _____ Copied: trunk/reactos/lib/crtdll/old cruft/io (from rev 17475, trunk/reactos/lib/crtdll/io) _____ Copied: trunk/reactos/lib/crtdll/old cruft/math (from rev 17475, trunk/reactos/lib/crtdll/math) _____ Copied: trunk/reactos/lib/crtdll/old cruft/mbstring (from rev 17475, trunk/reactos/lib/crtdll/mbstring) _____ Copied: trunk/reactos/lib/crtdll/old cruft/misc (from rev 17475, trunk/reactos/lib/crtdll/misc) _____ Copied: trunk/reactos/lib/crtdll/old cruft/process (from rev 17475, trunk/reactos/lib/crtdll/process) _____ Copied: trunk/reactos/lib/crtdll/old cruft/setjmp (from rev 17475, trunk/reactos/lib/crtdll/setjmp) _____ Copied: trunk/reactos/lib/crtdll/old cruft/stdio (from rev 17475, trunk/reactos/lib/crtdll/stdio) _____ Copied: trunk/reactos/lib/crtdll/old cruft/stdlib (from rev 17475, trunk/reactos/lib/crtdll/stdlib) _____ Copied: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib (from rev 17475, trunk/reactos/lib/crtdll/stdlib) Property changes on: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib ___________________________________________________________________ Name: svn:ignore + *.d *.o *.sym _____ Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/alloca.c --- trunk/reactos/lib/crtdll/stdlib/alloca.c 2005-08-22 14:26:37 UTC (rev 17475) +++ trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/alloca.c 2005-08-22 14:39:10 UTC (rev 17476) @@ -1,64 +0,0 @@ -#include <precomp.h> -#include <msvcrt/stdlib.h> - - -#undef alloca -void *alloca(size_t s) -{ - register unsigned int as = s; - -// alloca(0) should not return the stack pointer - if ( s == 0 ) - return NULL; - - as = (as + 3) & (~3); - - __asm__ __volatile__( - "mov %0, %%edx \n" -// "popl %%ebp \n" - "leave \n" - "popl %%ecx \n" - "subl %%edx, %%esp \n" - "movl %%esp, %%eax \n" - "addl $20, %%eax \n"//4 bytes + 16 bytes = arguments - "push %%ecx \n" - "ret \n" - : - :"g" ( as) - ); - - - return NULL; -} - -void *_alloca(size_t s) -{ - register unsigned int as = s; - -// alloca(0) should not return the stack pointer - if ( s == 0 ) - return NULL; - - - if ( (s & 0xfffffffc) != 0 ) - as += 4; - - as &= 0xfffffffc; - - __asm__ __volatile__( - "mov %0, %%edx \n" -// "popl %%ebp \n" - "leave \n" - "popl %%ecx \n" - "subl %%edx, %%esp \n" - "movl %%esp, %%eax \n" - "addl $20, %%eax \n"//4 bytes + 16 bytes = arguments - "push %%ecx \n" - "ret \n" - : - :"g" ( as) - ); - - - return NULL; -} _____ Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/atexit.c --- trunk/reactos/lib/crtdll/stdlib/atexit.c 2005-08-22 14:26:37 UTC (rev 17475) +++ trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/atexit.c 2005-08-22 14:39:10 UTC (rev 17476) @@ -1,21 +0,0 @@ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include <msvcrt/stdlib.h> -#include <msvcrt/internal/atexit.h> - -/* - * @implemented - */ -int -atexit(void (*a)(void)) -{ - struct __atexit *ap; - if (a == 0) - return -1; - ap = (struct __atexit *)malloc(sizeof(struct __atexit)); - if (!ap) - return -1; - ap->__next = __atexit_ptr; - ap->__function = a; - __atexit_ptr = ap; - return 0; -} _____ Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/calloc.c --- trunk/reactos/lib/crtdll/stdlib/calloc.c 2005-08-22 14:26:37 UTC (rev 17475) +++ trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/calloc.c 2005-08-22 14:39:10 UTC (rev 17476) @@ -1,15 +0,0 @@ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include <msvcrt/stdlib.h> -#include <msvcrt/string.h> - -/* - * @implemented - */ -void * -calloc(size_t size, size_t nelem) -{ - void *rv = malloc(size*nelem); - if (rv) - memset(rv, 0, size*nelem); - return rv; -} _____ Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/errno.c --- trunk/reactos/lib/crtdll/stdlib/errno.c 2005-08-22 14:26:37 UTC (rev 17475) +++ trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/errno.c 2005-08-22 14:39:10 UTC (rev 17476) @@ -1,71 +0,0 @@ -#include <precomp.h> -#include <msvcrt/errno.h> -#include "../../msvcrt/stdlib/doserrmap.h" - -#undef errno -int errno; - -#undef _doserrno -int _doserrno; - -#undef _fpecode -int fpecode; - -/* - * @implemented - */ -int *_errno(void) -{ - return &errno; -} - -int __set_errno (int error) -{ - errno = error; - return error; -} - -/* - * @implemented - */ -int * __fpecode ( void ) -{ - return &fpecode; -} - -/* - * @implemented - */ -int* __doserrno(void) -{ - _doserrno = GetLastError(); - return &_doserrno; -} - -/* - * This function sets both doserrno to the passed in OS error code - * and also maps this to an appropriate errno code. The mapping - * has been deduced automagically by running this functions, which - * exists in MSVCRT but is undocumented, on all the error codes in - * winerror.h. - */ -void _dosmaperr(unsigned long oserror) -{ - int pos, base, lim; - - SetLastError(oserror); - - /* Use binary chop to find the corresponding errno code */ - for (base=0, lim=sizeof(doserrmap)/sizeof(doserrmap[0]); lim; lim >>= 1) { - pos = base+(lim >> 1); - if (doserrmap[pos].winerr == oserror) { - __set_errno(doserrmap[pos].en); - return; - } else if (doserrmap[pos].winerr > oserror) { - base = pos + 1; - --lim; - } - } - /* EINVAL appears to be the default */ - __set_errno(EINVAL); -} _____ Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/fullpath.c --- trunk/reactos/lib/crtdll/stdlib/fullpath.c 2005-08-22 14:26:37 UTC (rev 17475) +++ trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/fullpath.c 2005-08-22 14:39:10 UTC (rev 17476) @@ -1,31 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/crtdll/stdlib/fullpath.c - * PURPOSE: Gets the fullpathname - * PROGRAMER: Boudewijn Dekker - * UPDATE HISTORY: - * 28/12/98: Created - */ - -#include <precomp.h> -#include <msvcrt/stdlib.h> - -#undef fullpath -char *fullpath(char *absPath, const char *relPath, size_t maxLength) -{ - return _fullpath(absPath,relPath,maxLength ); -} - -/* - * @implemented - */ -char* _fullpath(char* absPath, const char* relPath, size_t maxLength) -{ - char* lpFilePart; - - if (GetFullPathNameA(relPath,maxLength,absPath,&lpFilePart) == 0) - return NULL; - - return absPath; -} _____ Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/itoa.c --- trunk/reactos/lib/crtdll/stdlib/itoa.c 2005-08-22 14:26:37 UTC (rev 17475) +++ trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/itoa.c 2005-08-22 14:39:10 UTC (rev 17476) @@ -1,155 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/crtdll/stdlib/itoa.c - * PURPOSE: converts a integer to ascii - * PROGRAMER: - * UPDATE HISTORY: - * 1995: Created - * 1998: Added ltoa Boudewijn Dekker - */ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ - -#include <msvcrt/errno.h> -#include <msvcrt/stdlib.h> -#include <msvcrt/internal/file.h> - - -/* - * @implemented - * - * this function is now forwarded to NTDLL._itoa to reduce code duplication - */ -#if 0 -char* _itoa(int value, char* string, int radix) -{ - char tmp[33]; - char *tp = tmp; - int i; - unsigned v; - int sign; - char *sp; - - if (radix > 36 || radix <= 1) - { - __set_errno(EDOM); - return 0; - } - - sign = (radix == 10 && value < 0); - if (sign) - v = -value; - else - v = (unsigned)value; - while (v || tp == tmp) - { - i = v % radix; - v = v / radix; - if (i < 10) - *tp++ = i+'0'; - else - *tp++ = i + 'a' - 10; - } - - if (string == 0) - string = (char *)malloc((tp-tmp)+sign+1); - sp = string; - - if (sign) - *sp++ = '-'; - while (tp > tmp) - *sp++ = *--tp; - *sp = 0; - return string; -} -#endif - -/* - * @implemented - * - * this function is now forwarded to NTDLL._ltoa to reduce code duplication - */ -#if 0 -char* _ltoa(long value, char* string, int radix) -{ - char tmp[33]; - char *tp = tmp; - long i; - unsigned long v; - int sign; - char *sp; - - if (radix > 36 || radix <= 1) - { - __set_errno(EDOM); - return 0; - } - - sign = (radix == 10 && value < 0); - if (sign) - v = -value; - else - v = (unsigned long)value; - while (v || tp == tmp) - { - i = v % radix; - v = v / radix; - if (i < 10) - *tp++ = i+'0'; - else - *tp++ = i + 'a' - 10; - } - - if (string == 0) - string = (char *)malloc((tp-tmp)+sign+1); - sp = string; - - if (sign) - *sp++ = '-'; - while (tp > tmp) - *sp++ = *--tp; - *sp = 0; - return string; -} -#endif - -/* - * @implemented - * - * this function is now forwarded to NTDLL._ultoa to reduce code duplication - */ -#if 0 -char* _ultoa(unsigned long value, char* string, int radix) -{ - char tmp[33]; - char *tp = tmp; - long i; - unsigned long v = value; - char *sp; - - if (radix > 36 || radix <= 1) - { - __set_errno(EDOM); - return 0; - } - - while (v || tp == tmp) - { - i = v % radix; - v = v / radix; - if (i < 10) - *tp++ = i+'0'; - else - *tp++ = i + 'a' - 10; - } - - if (string == 0) - string = (char *)malloc((tp-tmp)+1); - sp = string; - - while (tp > tmp) - *sp++ = *--tp; - *sp = 0; - return string; -} -#endif _____ Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/itow.c --- trunk/reactos/lib/crtdll/stdlib/itow.c 2005-08-22 14:26:37 UTC (rev 17475) +++ trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/itow.c 2005-08-22 14:39:10 UTC (rev 17476) @@ -1,168 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/crtdll/stdlib/itow.c - * PURPOSE: converts a integer to wchar_t - * PROGRAMER: - * UPDATE HISTORY: - * 1995: Created - * 1998: Added ltoa Boudewijn Dekker - * 2000: derived from ./itoa.c by ea - */ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ - -#include <msvcrt/errno.h> -#include <msvcrt/stdlib.h> -#include <msvcrt/internal/file.h> - - -/* - * @implemented - * - * this function is now forwarded to NTDLL._itow to reduce code duplication - */ -#if 0 -wchar_t* _itow(int value, wchar_t* string, int radix) -{ - wchar_t tmp [33]; - wchar_t * tp = tmp; - int i; - unsigned int v; - int sign; - wchar_t * sp; - - if (radix > 36 || radix <= 1) - { - __set_errno(EDOM); - return 0; - } - - sign = ((radix == 10) && (value < 0)); - if (sign) { - v = -value; - } else { - v = (unsigned) value; - } - while (v || tp == tmp) { - i = v % radix; - v = v / radix; - if (i < 10) { - *tp++ = i+ (wchar_t) '0'; - } else { - *tp++ = i + (wchar_t) 'a' - 10; - } - } - - if (string == 0) { - string = (wchar_t *) malloc((tp-tmp) + (sign + 1) * sizeof(wchar_t)); - } - sp = string; - - if (sign) { - *sp++ = (wchar_t) '-'; - } - while (tp > tmp) { - *sp++ = *--tp; - } - *sp = (wchar_t) 0; - return string; -} -#endif - -/* - * @implemented - * - * this function is now forwarded to NTDLL._ltow to reduce code duplication - */ -#if 0 -wchar_t* _ltow(long value, wchar_t* string, int radix) -{ - wchar_t tmp [33]; - wchar_t * tp = tmp; - long int i; - unsigned long int v; - int sign; - wchar_t * sp; - - if (radix > 36 || radix <= 1) { - __set_errno(EDOM); - return 0; - } - - sign = ((radix == 10) && (value < 0)); - if (sign) { - v = -value; - } else { - v = (unsigned long) value; - } - while (v || tp == tmp) { - i = v % radix; - v = v / radix; - if (i < 10) { - *tp++ = i + (wchar_t) '0'; - } else { - *tp++ = i + (wchar_t) 'a' - 10; - } - } - - if (string == 0) { - string = (wchar_t *) malloc((tp - tmp) + (sign + 1) * sizeof(wchar_t)); - } - sp = string; - - if (sign) { - *sp++ = (wchar_t) '-'; - } - while (tp > tmp) { - *sp++ = *--tp; - } - *sp = (wchar_t) 0; - return string; -} -#endif - -/* - * @implemented - * - * this function is now forwarded to NTDLL._ultow to reduce code duplication - */ -#if 0 -wchar_t* _ultow(unsigned long value, wchar_t* string, int radix) -{ - wchar_t tmp [33]; - wchar_t * tp = tmp; - long int i; - unsigned long int v = value; - wchar_t * sp; - - if (radix > 36 || radix <= 1) { - __set_errno(EDOM); - return 0; - } - while (v || tp == tmp) { - i = v % radix; - v = v / radix; - if (i < 10) { - *tp++ = i + (wchar_t) '0'; - } else { - *tp++ = i + (wchar_t) 'a' - 10; - } - } - - if (string == 0) { -#ifdef _MSVCRT_LIB_ // TODO: check on difference? - string = (wchar_t *)malloc(((tp-tmp)+1)*sizeof(wchar_t)); -#else // TODO: FIXME: review which is correct - string = (wchar_t *) malloc((tp - tmp) + sizeof(wchar_t)); -#endif /*_MSVCRT_LIB_*/ - } - sp = string; - - while (tp > tmp) { - *sp++ = *--tp; - } - *sp = (wchar_t) 0; - return string; -} -#endif _____ Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/llabs.c --- trunk/reactos/lib/crtdll/stdlib/llabs.c 2005-08-22 14:26:37 UTC (rev 17475) +++ trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/llabs.c 2005-08-22 14:39:10 UTC (rev 17476) @@ -1,9 +0,0 @@ -/* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include <msvcrt/stdlib.h> - -long long -llabs(long long j) -{ - return j<0 ? -j : j; -} _____ Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/lldiv.c --- trunk/reactos/lib/crtdll/stdlib/lldiv.c 2005-08-22 14:26:37 UTC (rev 17475) +++ trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/lldiv.c 2005-08-22 14:39:10 UTC (rev 17476) @@ -1,26 +0,0 @@ -/* Copyright (C) 1996 DJ Delorie, see COPYING.DJ for details */ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include <msvcrt/stdlib.h> - -lldiv_t -lldiv(long long num, long long denom) -{ - lldiv_t r; - - if (num > 0 && denom < 0) - { - num = -num; - denom = -denom; - } - r.quot = num / denom; - r.rem = num % denom; - if (num < 0 && denom > 0) - { - if (r.rem > 0) - { - r.quot++; - r.rem -= denom; - } - } - return r; -} _____ Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/makepath.c --- trunk/reactos/lib/crtdll/stdlib/makepath.c 2005-08-22 14:26:37 UTC (rev 17475) +++ trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/makepath.c 2005-08-22 14:39:10 UTC (rev 17476) @@ -1,35 +0,0 @@ -/* $Id$ - */ -#include <msvcrt/stdlib.h> -#include <msvcrt/string.h> - -/* - * @implemented - */ -void _makepath(char *path, const char *drive, const char *dir, const char *fname, const char *ext) -{ - int dir_len; - - if ((drive != NULL) && (*drive)) { - strcpy(path, drive); - strcat(path, ":"); - } else { - (*path)=0; - } - - if (dir != NULL) { - strcat(path, dir); - dir_len = strlen(dir); - if (dir_len && *(dir + dir_len - 1) != '\\') - strcat(path, "\\"); - } - - if (fname != NULL) { - strcat(path, fname); - if (ext != NULL && *ext != 0) { - if (*ext != '.') - strcat(path, "."); - strcat(path, ext); - } - } -} _____ Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/malloc.c --- trunk/reactos/lib/crtdll/stdlib/malloc.c 2005-08-22 14:26:37 UTC (rev 17475) +++ trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/malloc.c 2005-08-22 14:39:10 UTC (rev 17476) @@ -1,37 +0,0 @@ -#include <precomp.h> -#include <msvcrt/stdlib.h> - - -/* - * @implemented - */ -void* malloc(size_t _size) -{ - return(HeapAlloc(GetProcessHeap(),0,_size)); -} - -/* - * @implemented - */ -void free(void* _ptr) -{ - HeapFree(GetProcessHeap(),0,_ptr); -} - -/* - * @implemented - */ -void* calloc(size_t _nmemb, size_t _size) -{ - return(HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, _nmemb*_size)); -} - -/* - * @implemented - */ -void* realloc(void* _ptr, size_t _size) -{ - if (!_ptr) - return(HeapAlloc(GetProcessHeap(),0,_size)); - return(HeapReAlloc(GetProcessHeap(),0,_ptr,_size)); -} _____ Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/mbstowcs.c --- trunk/reactos/lib/crtdll/stdlib/mbstowcs.c 2005-08-22 14:26:37 UTC (rev 17475) +++ trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/mbstowcs.c 2005-08-22 14:39:10 UTC (rev 17476) @@ -1,17 +0,0 @@ -#include <stdlib.h> - -/* - * @unimplemented - */ -size_t mbstowcs( wchar_t *wcstr, const char *mbstr, size_t count ) -{ - return 0; -} - -/* - * @unimplemented - */ -int mbtowc( wchar_t *wchar, const char *mbchar, size_t count ) -{ - return 0; -} _____ Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/putenv.c --- trunk/reactos/lib/crtdll/stdlib/putenv.c 2005-08-22 14:26:37 UTC (rev 17475) +++ trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/putenv.c 2005-08-22 14:39:10 UTC (rev 17476) @@ -1,23 +0,0 @@ -#include <precomp.h> -#include <msvcrt/stdlib.h> -#include <msvcrt/string.h> - - - -int putenv(const char *val) -{ - - char buffer[1024]; - char *epos; - - strcpy(buffer,val); - - - epos = strchr(buffer, '='); - if ( epos == NULL ) - return -1; - - *epos = 0; - - return SetEnvironmentVariableA(buffer,epos+1); -} _____ Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/qsort.c --- trunk/reactos/lib/crtdll/stdlib/qsort.c 2005-08-22 14:26:37 UTC (rev 17475) +++ trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/qsort.c 2005-08-22 14:39:10 UTC (rev 17476) @@ -1,239 +0,0 @@ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ -#include <msvcrt/stdlib.h> - -/*- - * Copyright (c) 1980, 1983 The Regents of the University of California. - * All rights reserved. - * - * Redistribution and use in source and binary forms are permitted - * provided that: (1) source distributions retain this entire copyright - * notice and comment, and (2) distributions including binaries display - * the following acknowledgement: ``This product includes software - * developed by the University of California, Berkeley and its contributors'' - * in the documentation or other materials provided with the distribution - * and in all advertising materials mentioning features or use of this - * software. Neither the name of the University nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ - -/* - * qsort.c: - * Our own version of the system qsort routine which is faster by an average - * of 25%, with lows and highs of 10% and 50%. - * The THRESHold below is the insertion sort threshold, and has been adjusted - * for records of size 48 bytes. - * The MTHREShold is where we stop finding a better median. - */ - -#define THRESH 4 /* threshold for insertion */ -#define MTHRESH 6 /* threshold for median */ - -static int (*qcmp)(const void *, const void *); /* the comparison routine */ -static int qsz; /* size of each record */ -static int thresh; /* THRESHold in chars */ -static int mthresh; /* MTHRESHold in chars */ - -/* - * qst: - * Do a quicksort - * First, find the median element, and put that one in the first place as the - * discriminator. (This "median" is just the median of the first, last and - * middle elements). (Using this median instead of the first element is a big - * win). Then, the usual partitioning/swapping, followed by moving the - * discriminator into the right place. Then, figure out the sizes of the two - * partions, do the smaller one recursively and the larger one via a repeat of - * this code. Stopping when there are less than THRESH elements in a partition - * and cleaning up with an insertion sort (in our caller) is a huge win. - * All data swaps are done in-line, which is space-losing but time-saving. - * (And there are only three places where this is done). - */ - -static void -qst(char *base, char *max) -{ - char c, *i, *j, *jj; - int ii; - char *mid, *tmp; - int lo, hi; - - /* - * At the top here, lo is the number of characters of elements in the - * current partition. (Which should be max - base). - * Find the median of the first, last, and middle element and make - * that the middle element. Set j to largest of first and middle. - * If max is larger than that guy, then it's that guy, else compare - * max with loser of first and take larger. Things are set up to - * prefer the middle, then the first in case of ties. - */ - lo = max - base; /* number of elements as chars */ - do { - mid = i = base + qsz * ((lo / qsz) >> 1); - if (lo >= mthresh) - { - j = (qcmp((jj = base), i) > 0 ? jj : i); - if (qcmp(j, (tmp = max - qsz)) > 0) - { - /* switch to first loser */ - j = (j == jj ? i : jj); - if (qcmp(j, tmp) < 0) - j = tmp; - } - if (j != i) - { - ii = qsz; - do { - c = *i; - *i++ = *j; - *j++ = c; - } while (--ii); - } - } - /* - * Semi-standard quicksort partitioning/swapping - */ - for (i = base, j = max - qsz; ; ) - { - while (i < mid && qcmp(i, mid) <= 0) - i += qsz; - while (j > mid) - { - if (qcmp(mid, j) <= 0) - { - j -= qsz; - continue; - } - tmp = i + qsz; /* value of i after swap */ - if (i == mid) - { - /* j <-> mid, new mid is j */ - mid = jj = j; - } - else - { - /* i <-> j */ - jj = j; - j -= qsz; - } - goto swap; - } - if (i == mid) - { - break; - } - else - { - /* i <-> mid, new mid is i */ - jj = mid; - tmp = mid = i; /* value of i after swap */ - j -= qsz; - } - swap: - ii = qsz; - do { - c = *i; - *i++ = *jj; - *jj++ = c; - } while (--ii); - i = tmp; - } - /* - * Look at sizes of the two partitions, do the smaller - * one first by recursion, then do the larger one by - * making sure lo is its size, base and max are update - * correctly, and branching back. But only repeat - * (recursively or by branching) if the partition is - * of at least size THRESH. - */ - i = (j = mid) + qsz; - if ((lo = j - base) <= (hi = max - i)) - { - if (lo >= thresh) - qst(base, j); - base = i; - lo = hi; - } - else - { - if (hi >= thresh) - qst(i, max); - max = j; - } - } while (lo >= thresh); -} - -/* - * qsort: - * First, set up some global parameters for qst to share. Then, quicksort - * with qst(), and then a cleanup insertion sort ourselves. Sound simple? - * It's not... - * - * @implemented - */ -void -qsort(const void *base0, size_t n, size_t size, _pfunccmp_t compar) -{ - char *base = (char *)base0; - char c, *i, *j, *lo, *hi; - char *min, *max; - - if (n <= 1) - return; - qsz = size; - qcmp = compar; - thresh = qsz * THRESH; - mthresh = qsz * MTHRESH; - max = base + n * qsz; - if (n >= THRESH) - { - qst(base, max); - hi = base + thresh; - } - else - { - hi = max; - } - /* - * First put smallest element, which must be in the first THRESH, in - * the first position as a sentinel. This is done just by searching - * the first THRESH elements (or the first n if n < THRESH), finding - * the min, and swapping it into the first position. - */ - for (j = lo = base; (lo += qsz) < hi; ) - if (qcmp(j, lo) > 0) - j = lo; - if (j != base) - { - /* swap j into place */ - for (i = base, hi = base + qsz; i < hi; ) - { - c = *j; - *j++ = *i; - *i++ = c; - } - } - /* - * With our sentinel in place, we now run the following hyper-fast - * insertion sort. For each remaining element, min, from [1] to [n-1], - * set hi to the index of the element AFTER which this one goes. - * Then, do the standard insertion sort shift on a character at a time - * basis for each element in the frob. - */ - for (min = base; (hi = min += qsz) < max; ) - { - while (qcmp(hi -= qsz, min) > 0) - /* void */; - if ((hi += qsz) != min) { - for (lo = min + qsz; --lo >= min; ) - { - c = *lo; - for (i = j = lo; (j -= qsz) >= hi; i = j) - *i = *j; - *i = c; - } - } - } -} _____ Deleted: trunk/reactos/lib/crtdll/old cruft/stdlib/stdlib/rand.c [truncated at 1000 lines; 498 more skipped]

19 years, 4 months

[gdalsnes] 17475: prepare move old cruft

by gdalsnes＠svn.reactos.com

prepare move old cruft Added: trunk/reactos/lib/crtdll/old cruft/ Added: trunk/reactos/lib/crtdll/old cruft/readme.txt _____ Added: trunk/reactos/lib/crtdll/old cruft/readme.txt --- trunk/reactos/lib/crtdll/old cruft/readme.txt 2005-08-22 13:38:30 UTC (rev 17474) +++ trunk/reactos/lib/crtdll/old cruft/readme.txt 2005-08-22 14:26:37 UTC (rev 17475) @@ -0,0 +1,2 @@ +When merging msvcrt and crtdll into crt, mostly msvcrt stuff were used. All files in crtdll that was equal to files in msvcrt were deleted but those who were not are still here, possibly containing changes that we might want to merge into crt, thou its very likely that the changes are worthless. Someone should go thru it and either delete or merge sometime... +-Gunnar

19 years, 4 months

[weiden] 17474: added a macro IsKernelPointer() to test whether a pointer value points to the kernel address space. This is needed because on IA-64 the MSB is not necessarily set for pointers to the kernel address space.

by weiden＠svn.reactos.com

added a macro IsKernelPointer() to test whether a pointer value points to the kernel address space. This is needed because on IA-64 the MSB is not necessarily set for pointers to the kernel address space. Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/ob/wait.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-08-22 10:51:05 UTC (rev 17473) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2005-08-22 13:38:30 UTC (rev 17474) @@ -147,8 +147,26 @@ #define ProbeForReadLargeInteger(Ptr) ((LARGE_INTEGER)ProbeForReadGenericType(&(Ptr)->QuadPart, LONGLONG, 0)) #define ProbeForReadUlargeInteger(Ptr) ((ULARGE_INTEGER)ProbeForReadGenericType(&(Ptr)->QuadPart, ULONGLONG, 0)) +/* + * Use IsKernelPointer to test whether a pointer points to the kernel address + * space + */ +#if defined(_X86_) || defined(_M_AMD64) +/* for x86 and x86-64 the MSB is 1 so we can simply test on that */ +#define IsKernelPointer(Ptr) ((LONG_PTR)(Ptr) < 0) + +#elif defined(_IA64_) + +/* on Itanium if the 24 most significant bits are set, we're not dealing with + user mode pointers. */ +#define IsKernelPointer(Ptr) (((ULONG_PTR)(Ptr) & 0xFFFFFF0000000000ULL) != 0) + +#else +#error IsKernelPointer() needs to be defined for this architecture #endif + +#endif /* * */ _____ Modified: trunk/reactos/ntoskrnl/ob/wait.c --- trunk/reactos/ntoskrnl/ob/wait.c 2005-08-22 10:51:05 UTC (rev 17473) +++ trunk/reactos/ntoskrnl/ob/wait.c 2005-08-22 13:38:30 UTC (rev 17474) @@ -149,7 +149,7 @@ DefaultObject = ObjectHeader->Type->DefaultObject; /* Check if it's the internal offset */ - if ((LONG_PTR)DefaultObject >= 0) + if (!IsKernelPointer(DefaultObject)) { /* Increase reference count */ InterlockedIncrement(&ObjectHeader->PointerCount); @@ -295,7 +295,7 @@ WaitableObject = BODY_TO_HEADER(Object)->Type->DefaultObject; /* Is it an offset for internal objects? */ - if ((LONG_PTR)WaitableObject >= 0) + if (!IsKernelPointer(WaitableObject)) { /* Turn it into a pointer */ WaitableObject = (PVOID)((ULONG_PTR)Object + @@ -389,7 +389,7 @@ WaitableObject = BODY_TO_HEADER(WaitObj)->Type->DefaultObject; /* Handle internal offset */ - if ((LONG_PTR)WaitableObject >= 0) + if (!IsKernelPointer(WaitableObject)) { /* Get real pointer */ WaitableObject = (PVOID)((ULONG_PTR)WaitObj +

19 years, 4 months

[navaraf] 17473: Cleanup IoGetDmaAdapter and use HalGetDmaAdapter instead of HalGetAdapter.

by navaraf＠svn.reactos.com

Cleanup IoGetDmaAdapter and use HalGetDmaAdapter instead of HalGetAdapter. Modified: trunk/reactos/ntoskrnl/io/pnpdma.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpdma.c --- trunk/reactos/ntoskrnl/io/pnpdma.c 2005-08-22 10:47:29 UTC (rev 17472) +++ trunk/reactos/ntoskrnl/io/pnpdma.c 2005-08-22 10:51:05 UTC (rev 17473) @@ -15,224 +15,35 @@ #include <internal/debug.h> #include <ddk/wdmguid.h> -typedef struct _DMA_ADAPTER_INTERNAL { - USHORT Version; - USHORT Size; - PDMA_OPERATIONS DmaOperations; - PADAPTER_OBJECT HalAdapter; -} DMA_ADAPTER_INTERNAL, *PDMA_ADAPTER_INTERNAL; - /* FUNCTIONS *****************************************************************/ -VOID -STDCALL -IopPutDmaAdapter( - PDMA_ADAPTER DmaAdapter) -{ - DPRINT("IopPutDmaAdapter\n"); - ExFreePool(DmaAdapter); -} - - -PVOID -STDCALL -IopAllocateCommonBuffer( - IN PDMA_ADAPTER DmaAdapter, - IN ULONG Length, - OUT PPHYSICAL_ADDRESS LogicalAddress, - IN BOOLEAN CacheEnabled) -{ - DPRINT("IopAllocateCommonBuffer\n"); - return HalAllocateCommonBuffer( - ((PDMA_ADAPTER_INTERNAL)DmaAdapter)->HalAdapter, - Length, LogicalAddress, CacheEnabled); -} - - -VOID -STDCALL -IopFreeCommonBuffer( - IN PDMA_ADAPTER DmaAdapter, - IN ULONG Length, - IN PHYSICAL_ADDRESS LogicalAddress, - IN PVOID VirtualAddress, - IN BOOLEAN CacheEnabled) -{ - DPRINT("IopFreeCommonBuffer\n"); - HalFreeCommonBuffer( - ((PDMA_ADAPTER_INTERNAL)DmaAdapter)->HalAdapter, - Length, LogicalAddress, VirtualAddress, CacheEnabled); -} - - -NTSTATUS -STDCALL -IopAllocateAdapterChannel( - IN PDMA_ADAPTER DmaAdapter, - IN PDEVICE_OBJECT DeviceObject, - IN ULONG NumberOfMapRegisters, - IN PDRIVER_CONTROL ExecutionRoutine, - IN PVOID Context) -{ - DPRINT("IopAllocateAdapterChannel\n"); - return IoAllocateAdapterChannel( - ((PDMA_ADAPTER_INTERNAL)DmaAdapter)->HalAdapter, - DeviceObject, NumberOfMapRegisters, ExecutionRoutine, Context); -} - - -BOOLEAN -STDCALL -IopFlushAdapterBuffers( - IN PDMA_ADAPTER DmaAdapter, - IN PMDL Mdl, - IN PVOID MapRegisterBase, - IN PVOID CurrentVa, - IN ULONG Length, - IN BOOLEAN WriteToDevice) -{ - DPRINT("IopFlushAdapterBuffers\n"); - return IoFlushAdapterBuffers( - ((PDMA_ADAPTER_INTERNAL)DmaAdapter)->HalAdapter, - Mdl, MapRegisterBase, CurrentVa, Length, WriteToDevice); -} - - -VOID -STDCALL -IopFreeAdapterChannel( - IN PDMA_ADAPTER DmaAdapter) -{ - DPRINT("IopFreeAdapterChannel\n"); - IoFreeAdapterChannel(((PDMA_ADAPTER_INTERNAL)DmaAdapter)->HalAdapter); -} - - -VOID -STDCALL -IopFreeMapRegisters( - IN PDMA_ADAPTER DmaAdapter, - PVOID MapRegisterBase, - ULONG NumberOfMapRegisters) -{ - DPRINT("IopFreeMapRegisters\n"); - IoFreeMapRegisters( - ((PDMA_ADAPTER_INTERNAL)DmaAdapter)->HalAdapter, - MapRegisterBase, NumberOfMapRegisters); -} - - -PHYSICAL_ADDRESS -STDCALL -IopMapTransfer( - IN PDMA_ADAPTER DmaAdapter, - IN PMDL Mdl, - IN PVOID MapRegisterBase, - IN PVOID CurrentVa, - IN OUT PULONG Length, - IN BOOLEAN WriteToDevice) -{ - DPRINT("IopMapTransfer\n"); - return IoMapTransfer( - ((PDMA_ADAPTER_INTERNAL)DmaAdapter)->HalAdapter, - Mdl, MapRegisterBase, CurrentVa, Length, WriteToDevice); -} - - -ULONG -STDCALL -IopGetDmaAlignment( - IN PDMA_ADAPTER DmaAdapter) -{ - DPRINT("IopGetDmaAlignment\n"); - /* FIXME: This is actually true only on i386 and Amd64 */ - return 1L; -} - - -ULONG -STDCALL -IopReadDmaCounter( - IN PDMA_ADAPTER DmaAdapter) -{ - DPRINT("IopReadDmaCounter\n"); - return HalReadDmaCounter(((PDMA_ADAPTER_INTERNAL)DmaAdapter)->HalAdapter); -} - - -NTSTATUS -STDCALL -IopGetScatterGatherList( - IN PDMA_ADAPTER DmaAdapter, - IN PDEVICE_OBJECT DeviceObject, - IN PMDL Mdl, - IN PVOID CurrentVa, - IN ULONG Length, - IN PDRIVER_LIST_CONTROL ExecutionRoutine, - IN PVOID Context, - IN BOOLEAN WriteToDevice) -{ - DPRINT("IopGetScatterGatherList\n"); - /* FIXME */ - return STATUS_UNSUCCESSFUL; -} - - -VOID -STDCALL -IopPutScatterGatherList( - IN PDMA_ADAPTER DmaAdapter, - IN PSCATTER_GATHER_LIST ScatterGather, - IN BOOLEAN WriteToDevice) -{ - DPRINT("IopPutScatterGatherList\n"); - /* FIXME */ -} - /* * @implemented */ -PDMA_ADAPTER -STDCALL +PDMA_ADAPTER STDCALL IoGetDmaAdapter( IN PDEVICE_OBJECT PhysicalDeviceObject, IN PDEVICE_DESCRIPTION DeviceDescription, IN OUT PULONG NumberOfMapRegisters) { - static DMA_OPERATIONS HalDmaOperations = { - sizeof(DMA_OPERATIONS), - IopPutDmaAdapter, - IopAllocateCommonBuffer, - IopFreeCommonBuffer, - IopAllocateAdapterChannel, - IopFlushAdapterBuffers, - IopFreeAdapterChannel, - IopFreeMapRegisters, - IopMapTransfer, - IopGetDmaAlignment, - IopReadDmaCounter, - IopGetScatterGatherList, - IopPutScatterGatherList - }; NTSTATUS Status; ULONG ResultLength; BUS_INTERFACE_STANDARD BusInterface; IO_STATUS_BLOCK IoStatusBlock; IO_STACK_LOCATION Stack; DEVICE_DESCRIPTION PrivateDeviceDescription; - PDMA_ADAPTER Result = NULL; - PDMA_ADAPTER_INTERNAL ResultInternal = NULL; - PADAPTER_OBJECT HalAdapter; + PDMA_ADAPTER Adapter = NULL; DPRINT("IoGetDmaAdapter called\n"); /* - * Try to create DMA adapter through bus driver + * Try to create DMA adapter through bus driver. */ + if (PhysicalDeviceObject != NULL) { - if (DeviceDescription->InterfaceType == 0x0F /*PNPBus*/ || - DeviceDescription->InterfaceType == (INTERFACE_TYPE)0xFFFFFFFF) + if (DeviceDescription->InterfaceType == PNPBus || + DeviceDescription->InterfaceType == InterfaceTypeUndefined) { RtlCopyMemory(&PrivateDeviceDescription, DeviceDescription, sizeof(DEVICE_DESCRIPTION)); @@ -240,9 +51,7 @@ DevicePropertyLegacyBusType, sizeof(INTERFACE_TYPE), &PrivateDeviceDescription.InterfaceType, &ResultLength); if (!NT_SUCCESS(Status)) - { PrivateDeviceDescription.InterfaceType = Internal; - } DeviceDescription = &PrivateDeviceDescription; } @@ -255,32 +64,20 @@ IRP_MN_QUERY_INTERFACE, &Stack); if (NT_SUCCESS(Status)) { - Result = BusInterface.GetDmaAdapter(BusInterface.Context, + Adapter = BusInterface.GetDmaAdapter(BusInterface.Context, DeviceDescription, NumberOfMapRegisters); BusInterface.InterfaceDereference(BusInterface.Context); - if (Result != NULL) - return Result; + if (Adapter != NULL) + return Adapter; } } /* - * Fallback to HAL + * Fallback to HAL. */ - HalAdapter = HalGetAdapter(DeviceDescription, NumberOfMapRegisters); - if (HalAdapter == NULL) - return NULL; - - ResultInternal = ExAllocatePool(PagedPool, sizeof(DMA_ADAPTER_INTERNAL)); - if (ResultInternal == NULL) - return NULL; - - ResultInternal->Version = DEVICE_DESCRIPTION_VERSION; - ResultInternal->Size = sizeof(DMA_ADAPTER); - ResultInternal->DmaOperations = &HalDmaOperations; - ResultInternal->HalAdapter = HalAdapter; - - return (PDMA_ADAPTER)ResultInternal; + return HalGetDmaAdapter(PhysicalDeviceObject, DeviceDescription, + NumberOfMapRegisters); } /* EOF */

19 years, 4 months

[navaraf] 17472: Export the HalGetDmaAdapter callback and use some nice macros where appropriate.

by navaraf＠svn.reactos.com

Export the HalGetDmaAdapter callback and use some nice macros where appropriate. Modified: trunk/reactos/hal/halx86/generic/dma.c Modified: trunk/reactos/hal/halx86/include/haldma.h _____ Modified: trunk/reactos/hal/halx86/generic/dma.c --- trunk/reactos/hal/halx86/generic/dma.c 2005-08-22 10:29:51 UTC (rev 17471) +++ trunk/reactos/hal/halx86/generic/dma.c 2005-08-22 10:47:29 UTC (rev 17472) @@ -139,6 +139,13 @@ KeInitializeEvent(&HalpDmaLock, NotificationEvent, TRUE); HalpMasterAdapter = HalpDmaAllocateMasterAdapter(); + + /* + * Setup the HalDispatchTable callback for creating PnP DMA adapters. It's + * used by IoGetDmaAdapter in the kernel. + */ + + HalGetDmaAdapter = HalpGetDmaAdapter; } /** @@ -761,6 +768,24 @@ } /** + * @name HalpGetDmaAdapter + * + * Internal routine to allocate PnP DMA adapter object. It's exported through + * HalDispatchTable and used by IoGetDmaAdapter. + * + * @see HalGetAdapter + */ + +PDMA_ADAPTER STDCALL +HalpGetDmaAdapter( + IN PVOID Context, + IN PDEVICE_DESCRIPTION DeviceDescription, + OUT PULONG NumberOfMapRegisters) +{ + return &HalGetAdapter(DeviceDescription, NumberOfMapRegisters)->DmaHeader; +} + +/** * @name HalPutDmaAdapter * * Internal routine to free DMA adapter and resources for reuse. It's exported @@ -1431,7 +1456,7 @@ { ULONG CurrentLength; ULONG_PTR CurrentAddress; - ULONG PageOffset; + ULONG ByteOffset; PVOID VirtualAddress; VirtualAddress = MmGetSystemAddressForMdlSafe(Mdl, HighPagePriority); @@ -1446,20 +1471,20 @@ KEBUGCHECK(0); } - CurrentAddress = (ULONG_PTR)CurrentVa - (ULONG_PTR)Mdl->StartVa - - Mdl->ByteOffset; + CurrentAddress = (ULONG_PTR)CurrentVa - + (ULONG_PTR)MmGetMdlVirtualAddress(Mdl); while (Length > 0) { - PageOffset = CurrentAddress & (PAGE_SIZE - 1); - CurrentLength = PAGE_SIZE - PageOffset; + ByteOffset = BYTE_OFFSET(CurrentAddress); + CurrentLength = PAGE_SIZE - ByteOffset; if (CurrentLength > Length) CurrentLength = Length; if (WriteToDevice) { RtlCopyMemory( - (PVOID)((ULONG_PTR)MapRegisterBase->VirtualAddress + PageOffset), + (PVOID)((ULONG_PTR)MapRegisterBase->VirtualAddress + ByteOffset), (PVOID)CurrentAddress, CurrentLength); } @@ -1467,7 +1492,7 @@ { RtlCopyMemory( (PVOID)CurrentAddress, - (PVOID)((ULONG_PTR)MapRegisterBase->VirtualAddress + PageOffset), + (PVOID)((ULONG_PTR)MapRegisterBase->VirtualAddress + ByteOffset), CurrentLength); } @@ -1613,9 +1638,9 @@ IN OUT PULONG Length, IN BOOLEAN WriteToDevice) { - PPFN_TYPE MdlPagesPtr; - PFN_TYPE MdlPage1, MdlPage2; - ULONG PageOffset; + PPFN_NUMBER MdlPagesPtr; + PFN_NUMBER MdlPage1, MdlPage2; + ULONG ByteOffset; ULONG TransferOffset; ULONG TransferLength; BOOLEAN UseMapRegisters; @@ -1629,7 +1654,7 @@ /* * Precalculate some values that are used in all cases. * - * PageOffset is offset inside the page at which the transfer starts. + * ByteOffset is offset inside the page at which the transfer starts. * MdlPagesPtr is pointer inside the MDL page chain at the page where the * transfer start. * PhysicalAddress is physical address corresponding to the transfer @@ -1641,15 +1666,15 @@ * takes place below. These are just initial values. */ - PageOffset = (ULONG_PTR)CurrentVa & (PAGE_SIZE - 1); + ByteOffset = BYTE_OFFSET(CurrentVa); - MdlPagesPtr = (PPFN_TYPE)(Mdl + 1); + MdlPagesPtr = MmGetMdlPfnArray(Mdl); MdlPagesPtr += ((ULONG_PTR)CurrentVa - (ULONG_PTR)Mdl->StartVa) >> PAGE_SHIFT; PhysicalAddress.QuadPart = *MdlPagesPtr << PAGE_SHIFT; - PhysicalAddress.QuadPart += PageOffset; + PhysicalAddress.QuadPart += ByteOffset; - TransferLength = PAGE_SIZE - PageOffset; + TransferLength = PAGE_SIZE - ByteOffset; /* * Special case for bus master adapters with S/G support. We can directly @@ -1720,7 +1745,7 @@ { UseMapRegisters = TRUE; PhysicalAddress = RealMapRegisterBase->PhysicalAddress; - PhysicalAddress.QuadPart += PageOffset; + PhysicalAddress.QuadPart += ByteOffset; TransferLength = *Length; RealMapRegisterBase->Counter = ~0; Counter = 0; @@ -1735,8 +1760,7 @@ UseMapRegisters = FALSE; Counter = RealMapRegisterBase->Counter; - RealMapRegisterBase->Counter += - (PageOffset + TransferLength + (PAGE_SIZE - 1)) >> PAGE_SHIFT; + RealMapRegisterBase->Counter += BYTES_TO_PAGES(ByteOffset + TransferLength); /* * Check if the buffer doesn't exceed the highest phisical address @@ -1750,7 +1774,7 @@ { UseMapRegisters = TRUE; PhysicalAddress = RealMapRegisterBase->PhysicalAddress; - PhysicalAddress.QuadPart += PageOffset; + PhysicalAddress.QuadPart += ByteOffset; } } @@ -1791,7 +1815,7 @@ if (AdapterObject->IgnoreCount) { RtlZeroMemory((PUCHAR)RealMapRegisterBase[Counter].VirtualAddress + - PageOffset, TransferLength); + ByteOffset, TransferLength); } } _____ Modified: trunk/reactos/hal/halx86/include/haldma.h --- trunk/reactos/hal/halx86/include/haldma.h 2005-08-22 10:29:51 UTC (rev 17471) +++ trunk/reactos/hal/halx86/include/haldma.h 2005-08-22 10:47:29 UTC (rev 17472) @@ -1,389 +1,395 @@ -#ifndef HALDMA_H -#define HALDMA_H - -/* - * DMA Page Register Structure - * 080 DMA RESERVED - * 081 DMA Page Register (channel 2) - * 082 DMA Page Register (channel 3) - * 083 DMA Page Register (channel 1) - * 084 DMA RESERVED - * 085 DMA RESERVED - * 086 DMA RESERVED - * 087 DMA Page Register (channel 0) - * 088 DMA RESERVED - * 089 PS/2-DMA Page Register (channel 6) - * 08A PS/2-DMA Page Register (channel 7) - * 08B PS/2-DMA Page Register (channel 5) - * 08C PS/2-DMA RESERVED - * 08D PS/2-DMA RESERVED - * 08E PS/2-DMA RESERVED - * 08F PS/2-DMA Page Register (channel 4) - */ - -typedef struct _DMA_PAGE -{ - UCHAR Reserved1; - UCHAR Channel2; - UCHAR Channel3; - UCHAR Channel1; - UCHAR Reserved2[3]; - UCHAR Channel0; - UCHAR Reserved3; - UCHAR Channel6; - UCHAR Channel7; - UCHAR Channel5; - UCHAR Reserved4[3]; - UCHAR Channel4; -} DMA_PAGE, *PDMA_PAGE; - -/* - * DMA Channel Mask Register Structure - * - * MSB LSB - * x x x x x x x x - * ------------------- - ----- - * | | | 00 - Select channel 0 mask bit - * | | \---- 01 - Select channel 1 mask bit - * | | 10 - Select channel 2 mask bit - * | | 11 - Select channel 3 mask bit - * | | - * | \---------- 0 - Clear mask bit - * | 1 - Set mask bit - * | - * \----------------------- xx - Reserved - */ - -typedef struct _DMA_CHANNEL_MASK -{ - UCHAR Channel: 2; - UCHAR SetMask: 1; - UCHAR Reserved: 5; -} DMA_CHANNEL_MASK, *PDMA_CHANNEL_MASK; - -/* - * DMA Mask Register Structure - * - * MSB LSB - * x x x x x x x x - * \---/ - - ----- ----- - * | | | | | 00 - Channel 0 select - * | | | | \---- 01 - Channel 1 select - * | | | | 10 - Channel 2 select - * | | | | 11 - Channel 3 select - * | | | | - * | | | | 00 - Verify transfer - * | | | \------------ 01 - Write transfer - * | | | 10 - Read transfer - * | | | - * | | \-------------------- 0 - Autoinitialized - * | | 1 - Non-autoinitialized - * | | - * | \------------------------ 0 - Address increment select - * | - * | 00 - Demand mode - * \------------------------------ 01 - Single mode - * 10 - Block mode - * 11 - Cascade mode - */ - -typedef union _DMA_MODE -{ - struct - { - UCHAR Channel: 2; - UCHAR TransferType: 2; - UCHAR AutoInitialize: 1; - UCHAR AddressDecrement: 1; - UCHAR RequestMode: 2; - }; - UCHAR Byte; -} DMA_MODE, *PDMA_MODE; - -/* - * DMA Extended Mode Register Structure - * - * MSB LSB - * x x x x x x x x - * - - ----- ----- ----- - * | | | | | 00 - Channel 0 select - * | | | | \---- 01 - Channel 1 select - * | | | | 10 - Channel 2 select - * | | | | 11 - Channel 3 select - * | | | | - * | | | | 00 - 8-bit I/O, by bytes - * | | | \------------ 01 - 16-bit I/O, by words, address shifted - * | | | 10 - 32-bit I/O, by bytes - * | | | 11 - 16-bit I/O, by bytes - * | | | - * | | \---------------------- 00 - Compatible - * | | 01 - Type A - * | | 10 - Type B - * | | 11 - Burst - * | | - * | \---------------------------- 0 - Terminal Count is Output - * | - * \---------------------------------0 - Disable Stop Register - * 1 - Enable Stop Register - */ - -typedef union _DMA_EXTENDED_MODE -{ - struct - { - UCHAR ChannelNumber: 2; - UCHAR TransferSize: 2; - UCHAR TimingMode: 2; - UCHAR TerminalCountIsOutput: 1; - UCHAR EnableStopRegister: 1; - }; - UCHAR Byte; -} DMA_EXTENDED_MODE, *PDMA_EXTENDED_MODE; - -/* DMA Extended Mode Register Transfer Sizes */ -#define B_8BITS 0 -#define W_16BITS 1 -#define B_32BITS 2 -#define B_16BITS 3 - -/* DMA Extended Mode Register Timing */ -#define COMPATIBLE_TIMING 0 -#define TYPE_A_TIMING 1 -#define TYPE_B_TIMING 2 -#define BURST_TIMING 3 - -/* Channel Stop Registers for each Channel */ -typedef struct _DMA_CHANNEL_STOP -{ - UCHAR ChannelLow; - UCHAR ChannelMid; - UCHAR ChannelHigh; - UCHAR Reserved; -} DMA_CHANNEL_STOP, *PDMA_CHANNEL_STOP; - -/* Transfer Types */ -#define VERIFY_TRANSFER 0x00 -#define READ_TRANSFER 0x01 -#define WRITE_TRANSFER 0x02 - -/* Request Modes */ -#define DEMAND_REQUEST_MODE 0x00 -#define SINGLE_REQUEST_MODE 0x01 -#define BLOCK_REQUEST_MODE 0x02 -#define CASCADE_REQUEST_MODE 0x03 - -#define DMA_SETMASK 4 -#define DMA_CLEARMASK 0 -#define DMA_READ 4 -#define DMA_WRITE 8 -#define DMA_SINGLE_TRANSFER 0x40 -#define DMA_AUTO_INIT 0x10 - -typedef struct _DMA1_ADDRESS_COUNT -{ - UCHAR DmaBaseAddress; - UCHAR DmaBaseCount; -} DMA1_ADDRESS_COUNT, *PDMA1_ADDRESS_COUNT; - -typedef struct _DMA2_ADDRESS_COUNT -{ - UCHAR DmaBaseAddress; - UCHAR Reserved1; - UCHAR DmaBaseCount; - UCHAR Reserved2; -} DMA2_ADDRESS_COUNT, *PDMA2_ADDRESS_COUNT; - -typedef struct _DMA1_CONTROL -{ - DMA1_ADDRESS_COUNT DmaAddressCount[4]; - UCHAR DmaStatus; - UCHAR DmaRequest; - UCHAR SingleMask; - UCHAR Mode; - UCHAR ClearBytePointer; - UCHAR MasterClear; - UCHAR ClearMask; - UCHAR AllMask; -} DMA1_CONTROL, *PDMA1_CONTROL; - -typedef struct _DMA2_CONTROL -{ - DMA2_ADDRESS_COUNT DmaAddressCount[4]; - UCHAR DmaStatus; - UCHAR Reserved1; - UCHAR DmaRequest; - UCHAR Reserved2; - UCHAR SingleMask; - UCHAR Reserved3; - UCHAR Mode; - UCHAR Reserved4; - UCHAR ClearBytePointer; - UCHAR Reserved5; - UCHAR MasterClear; - UCHAR Reserved6; - UCHAR ClearMask; - UCHAR Reserved7; - UCHAR AllMask; - UCHAR Reserved8; -} DMA2_CONTROL, *PDMA2_CONTROL; - -/* This structure defines the I/O Map of the 82537 controller. */ -typedef struct _EISA_CONTROL -{ - /* DMA Controller 1 */ - DMA1_CONTROL DmaController1; /* 00h-0Fh */ - UCHAR Reserved1[16]; /* 0Fh-1Fh */ - - /* Interrupt Controller 1 (PIC) */ - UCHAR Pic1Operation; /* 20h */ - UCHAR Pic1Interrupt; /* 21h */ - UCHAR Reserved2[30]; /* 22h-3Fh */ - - /* Timer */ - UCHAR TimerCounter; /* 40h */ - UCHAR TimerMemoryRefresh; /* 41h */ - UCHAR Speaker; /* 42h */ - UCHAR TimerOperation; /* 43h */ - UCHAR TimerMisc; /* 44h */ - UCHAR Reserved3[2]; /* 45-46h */ - UCHAR TimerCounterControl; /* 47h */ - UCHAR TimerFailSafeCounter; /* 48h */ - UCHAR Reserved4; /* 49h */ - UCHAR TimerCounter2; /* 4Ah */ - UCHAR TimerOperation2; /* 4Bh */ - UCHAR Reserved5[20]; /* 4Ch-5Fh */ - - /* NMI / Keyboard / RTC */ - UCHAR Keyboard; /* 60h */ - UCHAR NmiStatus; /* 61h */ - UCHAR Reserved6[14]; /* 62h-6Fh */ - UCHAR NmiEnable; /* 70h */ - UCHAR Reserved7[15]; /* 71h-7Fh */ - - /* DMA Page Registers Controller 1 */ - DMA_PAGE DmaController1Pages; /* 80h-8Fh */ - UCHAR Reserved8[16]; /* 90h-9Fh */ - - /* Interrupt Controller 2 (PIC) */ - UCHAR Pic2Operation; /* 0A0h */ - UCHAR Pic2Interrupt; /* 0A1h */ - UCHAR Reserved9[30]; /* 0A2h-0BFh */ - - /* DMA Controller 2 */ - DMA1_CONTROL DmaController2; /* 0C0h-0CFh */ - - /* System Reserved Ports */ - UCHAR SystemReserved[816]; /* 0D0h-3FFh */ - - /* Extended DMA Registers, Controller 1 */ - UCHAR DmaHighByteCount1[8]; /* 400h-407h */ - UCHAR Reserved10[2]; /* 408h-409h */ - UCHAR DmaChainMode1; /* 40Ah */ - UCHAR DmaExtendedMode1; /* 40Bh */ - UCHAR DmaBufferControl; /* 40Ch */ - UCHAR Reserved11[84]; /* 40Dh-460h */ - UCHAR ExtendedNmiControl; /* 461h */ - UCHAR NmiCommand; /* 462h */ - UCHAR Reserved12; /* 463h */ - UCHAR BusMaster; /* 464h */ - UCHAR Reserved13[27]; /* 465h-47Fh */ - - /* DMA Page Registers Controller 2 */ - DMA_PAGE DmaController2Pages; /* 480h-48Fh */ - UCHAR Reserved14[48]; /* 490h-4BFh */ - - /* Extended DMA Registers, Controller 2 */ - UCHAR DmaHighByteCount2[16]; /* 4C0h-4CFh */ - - /* Edge/Level Control Registers */ - UCHAR Pic1EdgeLevel; /* 4D0h */ - UCHAR Pic2EdgeLevel; /* 4D1h */ - UCHAR Reserved15[2]; /* 4D2h-4D3h */ - - /* Extended DMA Registers, Controller 2 */ - UCHAR DmaChainMode2; /* 4D4h */ - UCHAR Reserved16; /* 4D5h */ - UCHAR DmaExtendedMode2; /* 4D6h */ - UCHAR Reserved17[9]; /* 4D7h-4DFh */ - - /* DMA Stop Registers */ - DMA_CHANNEL_STOP DmaChannelStop[8]; /* 4E0h-4FFh */ -} EISA_CONTROL, *PEISA_CONTROL; - -typedef struct _MAP_REGISTER_ENTRY -{ - PVOID VirtualAddress; - PHYSICAL_ADDRESS PhysicalAddress; - ULONG Counter; -} MAP_REGISTER_ENTRY, *PMAP_REGISTER_ENTRY; - -struct _ADAPTER_OBJECT { - /* - * New style DMA object definition. The fact that it is at the beginning - * of the ADAPTER_OBJECT structure allows us to easily implement the - * fallback implementation of IoGetDmaAdapter. - */ - DMA_ADAPTER DmaHeader; - - /* - * For normal adapter objects pointer to master adapter that takes care - * of channel allocation. For master adapter set to NULL. - */ - struct _ADAPTER_OBJECT *MasterAdapter; - - ULONG MapRegistersPerChannel; - PVOID AdapterBaseVa; - PMAP_REGISTER_ENTRY MapRegisterBase; - - ULONG NumberOfMapRegisters; - ULONG CommittedMapRegisters; - - PWAIT_CONTEXT_BLOCK CurrentWcb; - KDEVICE_QUEUE ChannelWaitQueue; - PKDEVICE_QUEUE RegisterWaitQueue; - LIST_ENTRY AdapterQueue; - KSPIN_LOCK SpinLock; - PRTL_BITMAP MapRegisters; - PUCHAR PagePort; - UCHAR ChannelNumber; - UCHAR AdapterNumber; - USHORT DmaPortAddress; - DMA_MODE AdapterMode; - BOOLEAN NeedsMapRegisters; - BOOLEAN MasterDevice; - BOOLEAN Width16Bits; - BOOLEAN ScatterGather; - BOOLEAN IgnoreCount; - BOOLEAN Dma32BitAddresses; - BOOLEAN Dma64BitAddresses; - LIST_ENTRY AdapterList; -} ADAPTER_OBJECT; - -typedef struct _GROW_WORK_ITEM { - WORK_QUEUE_ITEM WorkQueueItem; - PADAPTER_OBJECT AdapterObject; - ULONG NumberOfMapRegisters; -} GROW_WORK_ITEM, *PGROW_WORK_ITEM; - -#define MAP_BASE_SW_SG 1 - -PADAPTER_OBJECT STDCALL -HalpDmaAllocateMasterAdapter(VOID); - -VOID STDCALL -HalPutDmaAdapter( - PADAPTER_OBJECT AdapterObject); - -ULONG STDCALL -HalpDmaGetDmaAlignment( - PADAPTER_OBJECT AdapterObject); - -NTSTATUS STDCALL -IoAllocateAdapterChannel( - IN PADAPTER_OBJECT AdapterObject, - IN PDEVICE_OBJECT DeviceObject, - IN ULONG NumberOfMapRegisters, - IN PDRIVER_CONTROL ExecutionRoutine, - IN PVOID Context); - -#endif /* HALDMA_H */ +#ifndef HALDMA_H +#define HALDMA_H + +/* + * DMA Page Register Structure + * 080 DMA RESERVED + * 081 DMA Page Register (channel 2) + * 082 DMA Page Register (channel 3) + * 083 DMA Page Register (channel 1) + * 084 DMA RESERVED + * 085 DMA RESERVED + * 086 DMA RESERVED + * 087 DMA Page Register (channel 0) + * 088 DMA RESERVED + * 089 PS/2-DMA Page Register (channel 6) + * 08A PS/2-DMA Page Register (channel 7) + * 08B PS/2-DMA Page Register (channel 5) + * 08C PS/2-DMA RESERVED + * 08D PS/2-DMA RESERVED + * 08E PS/2-DMA RESERVED + * 08F PS/2-DMA Page Register (channel 4) + */ + +typedef struct _DMA_PAGE +{ + UCHAR Reserved1; + UCHAR Channel2; + UCHAR Channel3; + UCHAR Channel1; + UCHAR Reserved2[3]; + UCHAR Channel0; + UCHAR Reserved3; + UCHAR Channel6; + UCHAR Channel7; + UCHAR Channel5; + UCHAR Reserved4[3]; + UCHAR Channel4; +} DMA_PAGE, *PDMA_PAGE; + +/* + * DMA Channel Mask Register Structure + * + * MSB LSB + * x x x x x x x x + * ------------------- - ----- + * | | | 00 - Select channel 0 mask bit + * | | \---- 01 - Select channel 1 mask bit + * | | 10 - Select channel 2 mask bit + * | | 11 - Select channel 3 mask bit + * | | + * | \---------- 0 - Clear mask bit + * | 1 - Set mask bit + * | + * \----------------------- xx - Reserved + */ + +typedef struct _DMA_CHANNEL_MASK +{ + UCHAR Channel: 2; + UCHAR SetMask: 1; + UCHAR Reserved: 5; +} DMA_CHANNEL_MASK, *PDMA_CHANNEL_MASK; + +/* + * DMA Mask Register Structure + * + * MSB LSB + * x x x x x x x x + * \---/ - - ----- ----- + * | | | | | 00 - Channel 0 select + * | | | | \---- 01 - Channel 1 select + * | | | | 10 - Channel 2 select + * | | | | 11 - Channel 3 select + * | | | | + * | | | | 00 - Verify transfer + * | | | \------------ 01 - Write transfer + * | | | 10 - Read transfer + * | | | + * | | \-------------------- 0 - Autoinitialized + * | | 1 - Non-autoinitialized + * | | + * | \------------------------ 0 - Address increment select + * | + * | 00 - Demand mode + * \------------------------------ 01 - Single mode + * 10 - Block mode + * 11 - Cascade mode + */ + +typedef union _DMA_MODE +{ + struct + { + UCHAR Channel: 2; + UCHAR TransferType: 2; + UCHAR AutoInitialize: 1; + UCHAR AddressDecrement: 1; + UCHAR RequestMode: 2; + }; + UCHAR Byte; +} DMA_MODE, *PDMA_MODE; + +/* + * DMA Extended Mode Register Structure + * + * MSB LSB + * x x x x x x x x + * - - ----- ----- ----- + * | | | | | 00 - Channel 0 select + * | | | | \---- 01 - Channel 1 select + * | | | | 10 - Channel 2 select + * | | | | 11 - Channel 3 select + * | | | | + * | | | | 00 - 8-bit I/O, by bytes + * | | | \------------ 01 - 16-bit I/O, by words, address shifted + * | | | 10 - 32-bit I/O, by bytes + * | | | 11 - 16-bit I/O, by bytes + * | | | + * | | \---------------------- 00 - Compatible + * | | 01 - Type A + * | | 10 - Type B + * | | 11 - Burst + * | | + * | \---------------------------- 0 - Terminal Count is Output + * | + * \---------------------------------0 - Disable Stop Register + * 1 - Enable Stop Register + */ + +typedef union _DMA_EXTENDED_MODE +{ + struct + { + UCHAR ChannelNumber: 2; + UCHAR TransferSize: 2; + UCHAR TimingMode: 2; + UCHAR TerminalCountIsOutput: 1; + UCHAR EnableStopRegister: 1; + }; + UCHAR Byte; +} DMA_EXTENDED_MODE, *PDMA_EXTENDED_MODE; + +/* DMA Extended Mode Register Transfer Sizes */ +#define B_8BITS 0 +#define W_16BITS 1 +#define B_32BITS 2 +#define B_16BITS 3 + +/* DMA Extended Mode Register Timing */ +#define COMPATIBLE_TIMING 0 +#define TYPE_A_TIMING 1 +#define TYPE_B_TIMING 2 +#define BURST_TIMING 3 + +/* Channel Stop Registers for each Channel */ +typedef struct _DMA_CHANNEL_STOP +{ + UCHAR ChannelLow; + UCHAR ChannelMid; + UCHAR ChannelHigh; + UCHAR Reserved; +} DMA_CHANNEL_STOP, *PDMA_CHANNEL_STOP; + +/* Transfer Types */ +#define VERIFY_TRANSFER 0x00 +#define READ_TRANSFER 0x01 +#define WRITE_TRANSFER 0x02 + +/* Request Modes */ +#define DEMAND_REQUEST_MODE 0x00 +#define SINGLE_REQUEST_MODE 0x01 +#define BLOCK_REQUEST_MODE 0x02 +#define CASCADE_REQUEST_MODE 0x03 + +#define DMA_SETMASK 4 +#define DMA_CLEARMASK 0 +#define DMA_READ 4 +#define DMA_WRITE 8 +#define DMA_SINGLE_TRANSFER 0x40 +#define DMA_AUTO_INIT 0x10 + +typedef struct _DMA1_ADDRESS_COUNT +{ + UCHAR DmaBaseAddress; + UCHAR DmaBaseCount; +} DMA1_ADDRESS_COUNT, *PDMA1_ADDRESS_COUNT; + +typedef struct _DMA2_ADDRESS_COUNT +{ + UCHAR DmaBaseAddress; + UCHAR Reserved1; + UCHAR DmaBaseCount; + UCHAR Reserved2; +} DMA2_ADDRESS_COUNT, *PDMA2_ADDRESS_COUNT; + +typedef struct _DMA1_CONTROL +{ + DMA1_ADDRESS_COUNT DmaAddressCount[4]; + UCHAR DmaStatus; + UCHAR DmaRequest; + UCHAR SingleMask; + UCHAR Mode; + UCHAR ClearBytePointer; + UCHAR MasterClear; + UCHAR ClearMask; + UCHAR AllMask; +} DMA1_CONTROL, *PDMA1_CONTROL; + +typedef struct _DMA2_CONTROL +{ + DMA2_ADDRESS_COUNT DmaAddressCount[4]; + UCHAR DmaStatus; + UCHAR Reserved1; + UCHAR DmaRequest; + UCHAR Reserved2; + UCHAR SingleMask; + UCHAR Reserved3; + UCHAR Mode; + UCHAR Reserved4; + UCHAR ClearBytePointer; + UCHAR Reserved5; + UCHAR MasterClear; + UCHAR Reserved6; + UCHAR ClearMask; + UCHAR Reserved7; + UCHAR AllMask; + UCHAR Reserved8; +} DMA2_CONTROL, *PDMA2_CONTROL; + +/* This structure defines the I/O Map of the 82537 controller. */ +typedef struct _EISA_CONTROL +{ + /* DMA Controller 1 */ + DMA1_CONTROL DmaController1; /* 00h-0Fh */ + UCHAR Reserved1[16]; /* 0Fh-1Fh */ + + /* Interrupt Controller 1 (PIC) */ + UCHAR Pic1Operation; /* 20h */ + UCHAR Pic1Interrupt; /* 21h */ + UCHAR Reserved2[30]; /* 22h-3Fh */ + + /* Timer */ + UCHAR TimerCounter; /* 40h */ + UCHAR TimerMemoryRefresh; /* 41h */ + UCHAR Speaker; /* 42h */ + UCHAR TimerOperation; /* 43h */ + UCHAR TimerMisc; /* 44h */ + UCHAR Reserved3[2]; /* 45-46h */ + UCHAR TimerCounterControl; /* 47h */ + UCHAR TimerFailSafeCounter; /* 48h */ + UCHAR Reserved4; /* 49h */ + UCHAR TimerCounter2; /* 4Ah */ + UCHAR TimerOperation2; /* 4Bh */ + UCHAR Reserved5[20]; /* 4Ch-5Fh */ + + /* NMI / Keyboard / RTC */ + UCHAR Keyboard; /* 60h */ + UCHAR NmiStatus; /* 61h */ + UCHAR Reserved6[14]; /* 62h-6Fh */ + UCHAR NmiEnable; /* 70h */ + UCHAR Reserved7[15]; /* 71h-7Fh */ + + /* DMA Page Registers Controller 1 */ + DMA_PAGE DmaController1Pages; /* 80h-8Fh */ + UCHAR Reserved8[16]; /* 90h-9Fh */ + + /* Interrupt Controller 2 (PIC) */ + UCHAR Pic2Operation; /* 0A0h */ + UCHAR Pic2Interrupt; /* 0A1h */ + UCHAR Reserved9[30]; /* 0A2h-0BFh */ + + /* DMA Controller 2 */ + DMA1_CONTROL DmaController2; /* 0C0h-0CFh */ + + /* System Reserved Ports */ + UCHAR SystemReserved[816]; /* 0D0h-3FFh */ + + /* Extended DMA Registers, Controller 1 */ + UCHAR DmaHighByteCount1[8]; /* 400h-407h */ + UCHAR Reserved10[2]; /* 408h-409h */ + UCHAR DmaChainMode1; /* 40Ah */ + UCHAR DmaExtendedMode1; /* 40Bh */ + UCHAR DmaBufferControl; /* 40Ch */ + UCHAR Reserved11[84]; /* 40Dh-460h */ + UCHAR ExtendedNmiControl; /* 461h */ + UCHAR NmiCommand; /* 462h */ + UCHAR Reserved12; /* 463h */ + UCHAR BusMaster; /* 464h */ + UCHAR Reserved13[27]; /* 465h-47Fh */ + + /* DMA Page Registers Controller 2 */ + DMA_PAGE DmaController2Pages; /* 480h-48Fh */ + UCHAR Reserved14[48]; /* 490h-4BFh */ + + /* Extended DMA Registers, Controller 2 */ + UCHAR DmaHighByteCount2[16]; /* 4C0h-4CFh */ + + /* Edge/Level Control Registers */ + UCHAR Pic1EdgeLevel; /* 4D0h */ + UCHAR Pic2EdgeLevel; /* 4D1h */ + UCHAR Reserved15[2]; /* 4D2h-4D3h */ + + /* Extended DMA Registers, Controller 2 */ + UCHAR DmaChainMode2; /* 4D4h */ + UCHAR Reserved16; /* 4D5h */ + UCHAR DmaExtendedMode2; /* 4D6h */ + UCHAR Reserved17[9]; /* 4D7h-4DFh */ + + /* DMA Stop Registers */ + DMA_CHANNEL_STOP DmaChannelStop[8]; /* 4E0h-4FFh */ +} EISA_CONTROL, *PEISA_CONTROL; + +typedef struct _MAP_REGISTER_ENTRY +{ + PVOID VirtualAddress; + PHYSICAL_ADDRESS PhysicalAddress; + ULONG Counter; +} MAP_REGISTER_ENTRY, *PMAP_REGISTER_ENTRY; + +struct _ADAPTER_OBJECT { + /* + * New style DMA object definition. The fact that it is at the beginning + * of the ADAPTER_OBJECT structure allows us to easily implement the + * fallback implementation of IoGetDmaAdapter. + */ + DMA_ADAPTER DmaHeader; + + /* + * For normal adapter objects pointer to master adapter that takes care + * of channel allocation. For master adapter set to NULL. + */ + struct _ADAPTER_OBJECT *MasterAdapter; + + ULONG MapRegistersPerChannel; + PVOID AdapterBaseVa; + PMAP_REGISTER_ENTRY MapRegisterBase; + + ULONG NumberOfMapRegisters; + ULONG CommittedMapRegisters; + + PWAIT_CONTEXT_BLOCK CurrentWcb; + KDEVICE_QUEUE ChannelWaitQueue; + PKDEVICE_QUEUE RegisterWaitQueue; + LIST_ENTRY AdapterQueue; + KSPIN_LOCK SpinLock; + PRTL_BITMAP MapRegisters; + PUCHAR PagePort; + UCHAR ChannelNumber; + UCHAR AdapterNumber; + USHORT DmaPortAddress; + DMA_MODE AdapterMode; + BOOLEAN NeedsMapRegisters; + BOOLEAN MasterDevice; + BOOLEAN Width16Bits; + BOOLEAN ScatterGather; + BOOLEAN IgnoreCount; + BOOLEAN Dma32BitAddresses; + BOOLEAN Dma64BitAddresses; + LIST_ENTRY AdapterList; +} ADAPTER_OBJECT; + +typedef struct _GROW_WORK_ITEM { + WORK_QUEUE_ITEM WorkQueueItem; + PADAPTER_OBJECT AdapterObject; + ULONG NumberOfMapRegisters; +} GROW_WORK_ITEM, *PGROW_WORK_ITEM; + +#define MAP_BASE_SW_SG 1 + +PADAPTER_OBJECT STDCALL +HalpDmaAllocateMasterAdapter(VOID); + +PDMA_ADAPTER STDCALL +HalpGetDmaAdapter( + IN PVOID Context, + IN PDEVICE_DESCRIPTION DeviceDescription, + OUT PULONG NumberOfMapRegisters); + +VOID STDCALL +HalPutDmaAdapter( + PADAPTER_OBJECT AdapterObject); + +ULONG STDCALL +HalpDmaGetDmaAlignment( + PADAPTER_OBJECT AdapterObject); + +NTSTATUS STDCALL +IoAllocateAdapterChannel( + IN PADAPTER_OBJECT AdapterObject, + IN PDEVICE_OBJECT DeviceObject, + IN ULONG NumberOfMapRegisters, + IN PDRIVER_CONTROL ExecutionRoutine, + IN PVOID Context); + +#endif /* HALDMA_H */

19 years, 4 months

[navaraf] 17471: Add missing definitions for HalDispatchTable callbacks.

by navaraf＠svn.reactos.com

Add missing definitions for HalDispatchTable callbacks. Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-08-22 08:39:42 UTC (rev 17470) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-08-22 10:29:51 UTC (rev 17471) @@ -2470,6 +2470,15 @@ #define HalReferenceHandlerForBus HALDISPATCH->HalReferenceHandlerForBus #define HalReferenceBusHandler HALDISPATCH->HalReferenceBusHandler #define HalDereferenceBusHandler HALDISPATCH->HalDereferenceBusHandler +#define HalInitPnpDriver HALDISPATCH->HalInitPnpDriver +#define HalInitPowerManagement HALDISPATCH->HalInitPowerManagement +#define HalGetDmaAdapter HALDISPATCH->HalGetDmaAdapter +#define HalGetInterruptTranslator HALDISPATCH->HalGetInterruptTranslator +#define HalStartMirroring HALDISPATCH->HalStartMirroring +#define HalEndMirroring HALDISPATCH->HalEndMirroring +#define HalMirrorPhysicalMemory HALDISPATCH->HalMirrorPhysicalMemory +#define HalEndOfBoot HALDISPATCH->HalEndOfBoot +#define HalMirrorVerify HALDISPATCH->HalMirrorVerify typedef enum _FILE_INFORMATION_CLASS { FileDirectoryInformation = 1,

19 years, 4 months

[navaraf] 17470: Complete reimplementation of HAL DMA routines.

by navaraf＠svn.reactos.com

Complete reimplementation of HAL DMA routines. The key changes are * Proper support for bus-master device adapters. * Real implementation of map registers. * Basic support for emulating scatter/gather DMA on devices that don't support it in hardware. * Support for transfers that aren't page aligned. * Proper detection and support of EISA DMA controllers. * Fixed prototype for HalFlushCommonBuffer. Modified: trunk/reactos/hal/hal/hal.c Modified: trunk/reactos/hal/hal/hal.def Deleted: trunk/reactos/hal/halx86/generic/adapter.c Modified: trunk/reactos/hal/halx86/generic/dma.c Modified: trunk/reactos/hal/halx86/generic/generic.xml Modified: trunk/reactos/hal/halx86/include/hal.h Added: trunk/reactos/hal/halx86/include/haldma.h Modified: trunk/reactos/hal/halx86/include/halp.h _____ Modified: trunk/reactos/hal/hal/hal.c --- trunk/reactos/hal/hal/hal.c 2005-08-21 20:44:47 UTC (rev 17469) +++ trunk/reactos/hal/hal/hal.c 2005-08-22 08:39:42 UTC (rev 17470) @@ -211,10 +211,7 @@ ULONG Unknown2, ULONG Unknown3, ULONG Unknown4, - ULONG Unknown5, - ULONG Unknown6, - ULONG Unknown7, - ULONG Unknown8) + ULONG Unknown5) { UNIMPLEMENTED; _____ Modified: trunk/reactos/hal/hal/hal.def --- trunk/reactos/hal/hal/hal.def 2005-08-21 20:44:47 UTC (rev 17469) +++ trunk/reactos/hal/hal/hal.def 2005-08-22 08:39:42 UTC (rev 17470) @@ -20,7 +20,7 @@ HalDisplayString@4 HalEnableSystemInterrupt@12 HalEndSystemInterrupt@8 -HalFlushCommonBuffer@32 +HalFlushCommonBuffer@20 HalFreeCommonBuffer@24 HalGetAdapter@8 HalGetBusData@20 _____ Deleted: trunk/reactos/hal/halx86/generic/adapter.c --- trunk/reactos/hal/halx86/generic/adapter.c 2005-08-21 20:44:47 UTC (rev 17469) +++ trunk/reactos/hal/halx86/generic/adapter.c 2005-08-22 08:39:42 UTC (rev 17470) @@ -1,717 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/x86/adapter.c (from ntoskrnl/io/adapter.c) - * PURPOSE: DMA handling - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - * Vizzini (vizzini(a)plasmic.com) - * UPDATE HISTORY: - * Created 22/05/98 - * 18-Oct-2003 Vizzini DMA support modifications - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS *****************************************************************/ - -/* NOTE: IoAllocateAdapterChannel in NTOSKRNL.EXE */ - - -NTSTATUS STDCALL -HalAllocateAdapterChannel( - PADAPTER_OBJECT AdapterObject, - PWAIT_CONTEXT_BLOCK WaitContextBlock, - ULONG NumberOfMapRegisters, - PDRIVER_CONTROL ExecutionRoutine) -/* - * FUNCTION: Sets up an ADAPTER_OBJECT with map registers - * ARGUMENTS: - * - AdapterObject: pointer to an ADAPTER_OBJECT to set up - * - WaitContextBlock: Context block to be used with ExecutionRoutine - * - NumberOfMapRegisters: number of map registers requested - * - ExecutionRoutine: callback to call when map registers are allocated - * RETURNS: - * STATUS_INSUFFICIENT_RESOURCES if map registers cannot be allocated - * STATUS_SUCCESS in all other cases, including if the callbacak had - * to be queued for later delivery - * NOTES: - * - the ADAPTER_OBJECT struct is undocumented; please make copious - * notes in hal.h if anything is changed or improved since there is - * no other documentation for this data structure - * BUGS: - * - it's possible that some of this code is in the wrong place - * - there are many unhandled cases - */ -{ - LARGE_INTEGER MinAddress; - LARGE_INTEGER MaxAddress; - LARGE_INTEGER BoundryAddressMultiple; - IO_ALLOCATION_ACTION Retval; - - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); - - /* - FIXME: return STATUS_INSUFFICIENT_RESOURCES if the NumberOfMapRegisters - requested is larger than the value returned by IoGetDmaAdapter. - */ - - /* set up the wait context block in case we can't run right away */ - WaitContextBlock->DeviceRoutine = ExecutionRoutine; - WaitContextBlock->NumberOfMapRegisters = NumberOfMapRegisters; - - /* returns true if queued, else returns false and sets the queue to busy */ - if(KeInsertDeviceQueue(&AdapterObject->ChannelWaitQueue, &WaitContextBlock->WaitQueueEntry)) - return STATUS_SUCCESS; - - /* why 64K alignment? */ - /* - * X86 lacks map registers, so for now, we allocate a contiguous - * block of physical memory <16MB and copy all DMA buffers into - * that. This can be optimized. - * - * FIXME: We propably shouldn't allocate the memory here for common - * buffer transfers. See a comment in IoMapTransfer about common buffer - * support. - */ - - MinAddress.QuadPart = 0; - BoundryAddressMultiple.QuadPart = 0; - if ((AdapterObject->Dma64BitAddresses) && (AdapterObject->MasterDevice)) - { - MaxAddress.QuadPart = 0xFFFFFFFFFFFFFFFFLL; /* 64Bit: >4GB address range */ - } - else if ((AdapterObject->Dma32BitAddresses) && (AdapterObject->MasterDevice)) - { - MaxAddress.QuadPart = 0xFFFFFFFF; /* 32Bit: 4GB address range */ - } - else - { - MaxAddress.QuadPart = 0x00FFFFFF; /* 24Bit: 16MB address range */ - if (AdapterObject->Width16Bits) - { - BoundryAddressMultiple.QuadPart = 0x20000; /* 128k boundary */ - } - else - { - BoundryAddressMultiple.QuadPart = 0x10000; /* 64k boundary */ - } - } - AdapterObject->MapRegisterBase = MmAllocateContiguousMemorySpecifyCache( - NumberOfMapRegisters * PAGE_SIZE, - MinAddress, - MaxAddress, - BoundryAddressMultiple, - MmCached); - - if(!AdapterObject->MapRegisterBase) - return STATUS_INSUFFICIENT_RESOURCES; - - AdapterObject->CommittedMapRegisters = NumberOfMapRegisters; - - /* call the client's AdapterControl callback with its map registers and context */ - Retval = ExecutionRoutine(WaitContextBlock->DeviceObject, WaitContextBlock->CurrentIrp, - AdapterObject->MapRegisterBase, WaitContextBlock->DeviceContext); - - /* - * KeepObject: don't free any resources; the ADAPTER_OBJECT is still in use - * and the caller will call IoFreeAdapterChannel later - * - * DeallocateObject: Deallocate the map registers and release the ADAPTER_OBJECT - * so someone else can use it - * - * DeallocateObjectKeepRegisters: release the ADAPTER_OBJECT but hang on to - * the map registers. The client will later call IoFreeMapRegisters. - * - * NOTE - IoFreeAdapterChannel runs the queue, so it must be called - * unless the adapter object is not to be freed. - */ - if( Retval == DeallocateObject ) - IoFreeAdapterChannel(AdapterObject); - else if(Retval == DeallocateObjectKeepRegisters) - { - /* don't free the allocated map registers - this is what IoFreeAdapterChannel checks */ - AdapterObject->CommittedMapRegisters = 0; - IoFreeAdapterChannel(AdapterObject); - } - - /* - * if we don't call IoFreeAdapterChannel, the next device won't get de-queued, - * which is what we want. - */ - - return STATUS_SUCCESS; -} - - -BOOLEAN -HalpGrowMapBuffers( - IN PADAPTER_OBJECT AdapterObject, - IN ULONG SizeOfMapBuffers) -/* - * FUNCTION: Allocate initial, or additional, map buffers for IO adapters. - * ARGUMENTS: - * AdapterObject: DMA adapter to allocate buffers for. - * SizeOfMapBuffers: Size of the map buffers to allocate - * NOTES: - * - Needs to be tested... - */ -{ - //ULONG PagesToAllocate = BYTES_TO_PAGES(SizeOfMapBuffers); - - /* TODO: Allocation */ - - return TRUE; -} - -PADAPTER_OBJECT STDCALL -HalpAllocateAdapterEx( - ULONG NumberOfMapRegisters, - BOOLEAN IsMaster, - BOOLEAN Dma32BitAddresses) -/* - * FUNCTION: Allocates an ADAPTER_OBJECT, optionally creates the Master Adapter. - * ARGUMENTS: - * - NumberOfMapRegisters: Number of map registers to allocate - * - IsMaster: Wether this is a Master Device or not - * - Dma32BitAddresses: Wether 32-bit Addresses are supported - * RETURNS: - * - Pointer to Adapter Object, or NULL if failure. - * BUGS: - * - Some stuff is unhandled/incomplete - */ -{ - OBJECT_ATTRIBUTES ObjectAttributes; - ULONG ObjectSize; - ULONG BitmapSize; - NTSTATUS Status; - ULONG AllowedMapRegisters = 64; - PADAPTER_OBJECT AdapterObject; - HANDLE Handle; - - /* Allocate the Master Adapter if we haven't already - but make sure we're not asked to do it now, and also check if we need it */ - if ((MasterAdapter == NULL) && (!IsMaster) && (NumberOfMapRegisters)) { - - /* Allocate and Save */ - DPRINT("Allocating the Master Adapter Object\n"); - MasterAdapter = HalpAllocateAdapterEx(NumberOfMapRegisters, - TRUE, - Dma32BitAddresses); - - /* Cancel on Failure */ - DPRINT("Checking if Master Adapter was allocated properly\n"); - if (!MasterAdapter) return NULL; - } - - /* Initialize the Object Attributes for the Adapter Object */ - InitializeObjectAttributes(&ObjectAttributes, - NULL, - OBJ_PERMANENT, - NULL, - NULL); - - /* Check if this is the Master Adapter, in which case we need to allocate the bitmap */ - if (IsMaster) { - /* Size due to the Bitmap + Bytes in the Bitmap Buffer (8 bytes, 64 bits)*/ - BitmapSize = sizeof(RTL_BITMAP) + (AllowedMapRegisters + 7) / 8; - - /* We will put the Bitmap Buffer after the Adapter Object for simplicity */ - ObjectSize = sizeof(ADAPTER_OBJECT) + BitmapSize; - } else { - ObjectSize = sizeof(ADAPTER_OBJECT); - } - - /* Create and Allocate the Object */ - DPRINT("Creating the Object\n"); - Status = ObCreateObject(KernelMode, - IoAdapterObjectType, - &ObjectAttributes, - KernelMode, - NULL, - ObjectSize, - 0, - 0, - (PVOID)&AdapterObject); - - if (!NT_SUCCESS(Status)) return NULL; - - /* Add a Reference */ - DPRINT("Referencing the Object\n"); - Status = ObReferenceObjectByPointer(AdapterObject, - FILE_READ_DATA | FILE_WRITE_DATA, - IoAdapterObjectType, - KernelMode); - - if (!NT_SUCCESS(Status)) return NULL; - - /* It's a Valid Object, so now we can play with the memory */ - RtlZeroMemory(AdapterObject, sizeof(ADAPTER_OBJECT)); - - /* Insert it into the Object Table */ - DPRINT("Inserting the Object\n"); - Status = ObInsertObject(AdapterObject, - NULL, - FILE_READ_DATA | FILE_WRITE_DATA, - 0, - NULL, - &Handle); - - if (!NT_SUCCESS(Status)) return NULL; - - /* We don't want the handle */ - NtClose(Handle); - - /* Set up the Adapter Object fields */ - AdapterObject->MapRegistersPerChannel = 1; - - /* Set the Master if needed (master only needed if we use Map Registers) */ - if (NumberOfMapRegisters) AdapterObject->MasterAdapter = MasterAdapter; - - /* Initalize the Channel Wait queue, which every adapter has */ - DPRINT("Initializing the Device Queue of the Object\n"); - KeInitializeDeviceQueue(&AdapterObject->ChannelWaitQueue); - - /* Initialize the SpinLock, Queue and Bitmap, which are kept in the Master Adapter only */ - if (IsMaster) { - - DPRINT("Initializing the Master Adapter Stuff\n"); - KeInitializeSpinLock(&AdapterObject->SpinLock); - InitializeListHead(&AdapterObject->AdapterQueue); - - /* As said previously, we put them here for simplicity */ - AdapterObject->MapRegisters = (PVOID)(AdapterObject + 1); - - /* Set up Bitmap */ - RtlInitializeBitMap(AdapterObject->MapRegisters, - (PULONG)(AdapterObject->MapRegisters + 1), - AllowedMapRegisters); - - /* Reset the Bitmap */ - RtlSetAllBits(AdapterObject->MapRegisters); - AdapterObject->NumberOfMapRegisters = 0; - AdapterObject->CommittedMapRegisters = 0; - - /* Allocate Memory for the Map Registers */ - AdapterObject->MapRegisterBase = ExAllocatePool(NonPagedPool, - AllowedMapRegisters * sizeof(DWORD)); - - /* Clear them */ - RtlZeroMemory(AdapterObject->MapRegisterBase, AllowedMapRegisters * sizeof(DWORD)); - - /* Allocate the contigous memory */ - DPRINT("Allocating Buffers\n"); - HalpGrowMapBuffers(AdapterObject, 0x1000000); - } - - DPRINT("Adapter Object allocated\n"); - return AdapterObject; -} - - -BOOLEAN STDCALL -IoFlushAdapterBuffers ( - PADAPTER_OBJECT AdapterObject, - PMDL Mdl, - PVOID MapRegisterBase, - PVOID CurrentVa, - ULONG Length, - BOOLEAN WriteToDevice) -/* - * FUNCTION: flush any data remaining in the dma controller's memory into the host memory - * ARGUMENTS: - * AdapterObject: the adapter object to flush - * Mdl: original MDL to flush data into - * MapRegisterBase: map register base that was just used by IoMapTransfer, etc - * CurrentVa: offset into Mdl to be flushed into, same as was passed to IoMapTransfer - * Length: length of the buffer to be flushed into - * WriteToDevice: True if it's a write, False if it's a read - * RETURNS: - * TRUE in all cases - * NOTES: - * - This copies data from the map register-backed buffer to the user's target buffer. - * Data is not in the user buffer until this is called. - * - This is only meaningful on a read operation. Return immediately for a write. - */ -{ - ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); - - /* this can happen if the card supports scatter/gather */ - if(!MapRegisterBase) - return TRUE; - - /* mask out (disable) the dma channel */ - if (AdapterObject->AdapterNumber == 1) { - - /* Set this for Ease */ - PDMA1_CONTROL DmaControl1 = AdapterObject->AdapterBaseVa; - - /* Set Channel */ - WRITE_PORT_UCHAR(&DmaControl1->SingleMask, AdapterObject->ChannelNumber | DMA_SETMASK); - } else { - /* Set this for Ease */ - PDMA2_CONTROL DmaControl2 = AdapterObject->AdapterBaseVa; - - /* Set Channel */ - WRITE_PORT_UCHAR(&DmaControl2->SingleMask, (AdapterObject->ChannelNumber - 4) | DMA_SETMASK); - } - - if(WriteToDevice) - return TRUE; - - memcpy( - (PVOID)((DWORD)MmGetSystemAddressForMdl( Mdl ) + (DWORD)CurrentVa - (DWORD)MmGetMdlVirtualAddress( Mdl )), - MapRegisterBase, Length ); - - return TRUE; -} - - -VOID STDCALL -IoFreeAdapterChannel (PADAPTER_OBJECT AdapterObject) -/* - * FUNCTION: frees DMA resources allocated by IoAllocateAdapterChannel - * ARGUMENTS: - * AdapterObject: Adapter object with resources to free - * NOTES: - * - This function releases the DMA adapter and optionally the map registers - * - After releasing the adapter, it checks the adapter's queue and runs - * each queued device object in series until the queue is empty - * - This is the only way the device queue is emptied. - */ -{ - LARGE_INTEGER MaxAddress; - LARGE_INTEGER MinAddress; - LARGE_INTEGER BoundryAddressMultiple; - PWAIT_CONTEXT_BLOCK WaitContextBlock; - IO_ALLOCATION_ACTION Retval; - - while(1) - { - /* To keep map registers, call here with the following set to 0 */ - if(AdapterObject->CommittedMapRegisters) - IoFreeMapRegisters(AdapterObject, AdapterObject->MapRegisterBase, AdapterObject->CommittedMapRegisters); - - if(!(WaitContextBlock = (PWAIT_CONTEXT_BLOCK)KeRemoveDeviceQueue(&AdapterObject->ChannelWaitQueu e))) - break; - - /* - * the following should really be done elsewhere since this - * function really can't return an error code. FIXME. - */ - - MinAddress.QuadPart = 0; - BoundryAddressMultiple.QuadPart = 0; - if ((AdapterObject->Dma64BitAddresses) && (AdapterObject->MasterDevice)) - { - MaxAddress.QuadPart = 0xFFFFFFFFFFFFFFFFLL; /* 64Bit: >4GB address range */ - } - else if ((AdapterObject->Dma32BitAddresses) && (AdapterObject->MasterDevice)) - { - MaxAddress.QuadPart = 0xFFFFFFFF; /* 32Bit: 4GB address range */ - } - else - { - MaxAddress.QuadPart = 0x00FFFFFF; /* 24Bit: 16MB address range */ - if (AdapterObject->Width16Bits) - { - BoundryAddressMultiple.QuadPart = 0x20000; /* 128k boundary */ - } - else - { - BoundryAddressMultiple.QuadPart = 0x10000; /* 64k boundary */ - } - } - - AdapterObject->MapRegisterBase = MmAllocateContiguousMemorySpecifyCache( - WaitContextBlock->NumberOfMapRegisters * PAGE_SIZE, - MinAddress, - MaxAddress, - BoundryAddressMultiple, - MmCached); - - if(!AdapterObject->MapRegisterBase) - return; - - /* call the adapter control routine */ - Retval = ((PDRIVER_CONTROL)WaitContextBlock->DeviceRoutine)(WaitContextBlock->Dev iceObject, WaitContextBlock->CurrentIrp, - AdapterObject->MapRegisterBase, WaitContextBlock->DeviceContext); - - if(Retval == KeepObject) - { - /* we're done until the caller manually calls IoFreeAdapterChannel */ - break; - } - else if(Retval == DeallocateObjectKeepRegisters) - { - /* hide the map registers so they aren't deallocated next time around */ - AdapterObject->CommittedMapRegisters = 0; - } - } -} - - -VOID STDCALL -IoFreeMapRegisters ( - IN PADAPTER_OBJECT AdapterObject, - IN PVOID MapRegisterBase, - IN ULONG NumberOfMapRegisters) -/* - * FUNCTION: free map registers reserved by the system for a DMA - * ARGUMENTS: - * AdapterObject: dma adapter to free map registers on - * MapRegisterBase: hadle to map registers to free - * NumberOfRegisters: number of map registers to be freed - * NOTES: - * - XXX real windows has a funky interdependence between IoFreeMapRegisters - * and IoFreeAdapterChannel - * BUGS: - * - needs to be improved to use a real map register implementation - */ -{ - if( AdapterObject->CommittedMapRegisters ) - { - MmFreeContiguousMemory(AdapterObject->MapRegisterBase); - AdapterObject->MapRegisterBase = 0; - } -} - - -PHYSICAL_ADDRESS STDCALL -IoMapTransfer ( - IN PADAPTER_OBJECT AdapterObject, - IN PMDL Mdl, - IN PVOID MapRegisterBase, - IN PVOID CurrentVa, - IN OUT PULONG Length, - IN BOOLEAN WriteToDevice) -/* - * FUNCTION: map a dma for transfer and do the dma if it's a slave - * ARGUMENTS: - * AdapterObject: adapter object to do the dma on. busmaster may pass NULL. - * Mdl: locked-down user buffer to DMA in to or out of - * MapRegisterBase: handle to map registers to use for this dma. allways NULL - * when doing s/g. - * CurrentVa: index into Mdl to transfer into/out of - * Length: length of transfer in/out. Only modified on out when doing s/g. - * WriteToDevice: TRUE if it's an output dma, FALSE otherwise - * RETURNS: - * If a busmaster: A logical address that can be used to program a dma controller - * Otherwise: nothing meaningful - * NOTES: - * - This function does a copyover to contiguous memory <16MB - * - If it's a slave transfer, this function actually performs it. - * BUGS: - * - If the controller supports scatter/gather, the copyover should not happen - */ -{ - PHYSICAL_ADDRESS Address; - KIRQL OldIrql; - ULONG LengthShift = 0; - - Address.QuadPart = 0; - - /* Isa System (slave) DMA? */ - if (MapRegisterBase && !AdapterObject->MasterDevice) - { - KeAcquireSpinLock(&AdapterObject->SpinLock, &OldIrql); - - /* - * FIXME: Handle case when doing common-buffer System DMA. In this case, - * the buffer described by MDL is already phys. contiguous and below - * 16 mega. Driver makes a one-shot call to IoMapTransfer during init. - * to program controller with the common-buffer. - * - * UPDATE: Common buffer support is in place, but it's not done in a - * clean way. We use the buffer passed by the MDL in case that the - * adapter object is marked as auto initialize. I'm not sure if this - * is correct and if not, how to do it properly. Note that it's also - * possible to allocate the common buffer with different adapter object - * and IoMapTransfer must still work in this case. Eventually this should - * be cleaned up somehow or at least this comment modified to reflect - * the reality. - * -- Filip Navara, 19/07/2004 - */ - - /* if it is a write to the device, copy the caller buffer to the low buffer */ - if (WriteToDevice && !AdapterObject->AdapterMode.AutoInitialize) - { - memcpy(MapRegisterBase, - (char*)MmGetSystemAddressForMdl(Mdl) + ((ULONG)CurrentVa - (ULONG)MmGetMdlVirtualAddress(Mdl)), - *Length ); - } - - /* Writer Adapter Mode, transfer type */ - AdapterObject->AdapterMode.TransferType = (WriteToDevice ? WRITE_TRANSFER : READ_TRANSFER); - - /* program up the dma controller, and return */ - if (!AdapterObject->AdapterMode.AutoInitialize) { - Address = MmGetPhysicalAddress( MapRegisterBase ); - } else { - Address = MmGetPhysicalAddress( CurrentVa ); - } - - /* 16-bit DMA has a shifted length */ - if (AdapterObject->Width16Bits) { - LengthShift = 1; - } - - /* Make the Transfer */ - if (AdapterObject->AdapterNumber == 1) { - - PDMA1_CONTROL DmaControl1 = AdapterObject->AdapterBaseVa; /* For Writing Less Code */ - - /* Mask the Channel */ - WRITE_PORT_UCHAR(&DmaControl1->SingleMask, AdapterObject->ChannelNumber | DMA_SETMASK); - - /* Reset Register */ - WRITE_PORT_UCHAR(&DmaControl1->ClearBytePointer, 0); - - /* Set the Mode */ - WRITE_PORT_UCHAR(&DmaControl1->Mode, AdapterObject->AdapterModeByte); - - /* Set the Page Register */ - WRITE_PORT_UCHAR(AdapterObject->PagePort, (UCHAR)(Address.u.LowPart >> 16)); - - /* Set the Offset Register (apparently always 0 for us if I trust the previous comment) */ - WRITE_PORT_UCHAR(&DmaControl1->DmaAddressCount[AdapterObject->ChannelNum ber].DmaBaseAddress, 0); - WRITE_PORT_UCHAR(&DmaControl1->DmaAddressCount[AdapterObject->ChannelNum ber].DmaBaseAddress, 0); - - /* Set the Length */ - WRITE_PORT_UCHAR(&DmaControl1->DmaAddressCount[AdapterObject->ChannelNum ber].DmaBaseCount, - (UCHAR)((*Length >> LengthShift) - 1)); - WRITE_PORT_UCHAR(&DmaControl1->DmaAddressCount[AdapterObject->ChannelNum ber].DmaBaseCount, - (UCHAR)(((*Length >> LengthShift) - 1) >> 8)); - - /* Unmask the Channel */ - WRITE_PORT_UCHAR(&DmaControl1->SingleMask, AdapterObject->ChannelNumber | DMA_CLEARMASK); - } else { - PDMA2_CONTROL DmaControl2 = AdapterObject->AdapterBaseVa; /* For Writing Less Code */ - - /* Mask the Channel */ - WRITE_PORT_UCHAR(&DmaControl2->SingleMask, AdapterObject->ChannelNumber | DMA_SETMASK); - - /* Reset Register */ - WRITE_PORT_UCHAR(&DmaControl2->ClearBytePointer, 0); - - /* Set the Mode */ - WRITE_PORT_UCHAR(&DmaControl2->Mode, AdapterObject->AdapterModeByte); - - /* Set the Page Register */ - WRITE_PORT_UCHAR(AdapterObject->PagePort, (UCHAR)(Address.u.LowPart >> 16)); - - /* Set the Offset Register (apparently always 0 for us if I trust the previous comment) */ - WRITE_PORT_UCHAR(&DmaControl2->DmaAddressCount[AdapterObject->ChannelNum ber].DmaBaseAddress, 0); - WRITE_PORT_UCHAR(&DmaControl2->DmaAddressCount[AdapterObject->ChannelNum ber].DmaBaseAddress, 0); - - /* Set the Length */ - WRITE_PORT_UCHAR(&DmaControl2->DmaAddressCount[AdapterObject->ChannelNum ber].DmaBaseCount, - (UCHAR)((*Length >> LengthShift) - 1)); - WRITE_PORT_UCHAR(&DmaControl2->DmaAddressCount[AdapterObject->ChannelNum ber].DmaBaseCount, - (UCHAR)(((*Length >> LengthShift) - 1) >> 8)); - - /* Unmask the Channel */ - WRITE_PORT_UCHAR(&DmaControl2->SingleMask, AdapterObject->ChannelNumber | DMA_CLEARMASK); - } - - /* Release Spinlock */ - KeReleaseSpinLock(&AdapterObject->SpinLock, OldIrql); - - /* - NOTE: Return value should be ignored when doing System DMA. - Maybe return some more obvious invalid address here (thou returning - MapRegisterBase is also wrong;-)to catch invalid use? - */ - Address.QuadPart = (ULONG)MapRegisterBase; - return Address; - } - - - /* - Busmaster with s/g support? - NOTE: old docs allowed busmasters to pass a NULL Adapter. In this case, MapRegisterBase - being NULL is used to detect a s/g busmaster. - */ - if ((!AdapterObject && !MapRegisterBase) || - (AdapterObject && AdapterObject->MasterDevice && AdapterObject->ScatterGather)) - { - /* - Just return the passed VA's corresponding phys. address. - Update length to the number of phys. contiguous bytes found. - */ - - PULONG MdlPages; - ULONG MdlPageIndex, PhysContiguousLen; - ULONG PhysAddress; - - MdlPages = (PULONG)(Mdl + 1); - - /* Get VA's corresponding mdl phys. page index */ - MdlPageIndex = ((ULONG)CurrentVa - (ULONG)Mdl->StartVa) / PAGE_SIZE; - - /* Get phys. page containing the VA */ - PhysAddress = MdlPages[MdlPageIndex]; - - PhysContiguousLen = PAGE_SIZE - BYTE_OFFSET(CurrentVa); - - /* VA to map may span several contiguous phys. pages (unlikely) */ - while (PhysContiguousLen < *Length && - MdlPages[MdlPageIndex++] + PAGE_SIZE == MdlPages[MdlPageIndex]) - { - /* - Note that allways adding PAGE_SIZE may make PhysContiguousLen greater - than Length if buffer doesn't end on page boundary. Take this - into consideration below. - */ - PhysContiguousLen += PAGE_SIZE; - } - - if (PhysContiguousLen < *Length) - { - *Length = PhysContiguousLen; - } - - //add offset to phys. page address - Address.QuadPart = PhysAddress + BYTE_OFFSET(CurrentVa); - return Address; - } - - - /* - Busmaster without s/g support? - NOTE: old docs allowed busmasters to pass a NULL Adapter. In this case, MapRegisterBase - not being NULL is used to detect a non s/g busmaster. - */ - if ((!AdapterObject && MapRegisterBase) || - (AdapterObject && AdapterObject->MasterDevice && !AdapterObject->ScatterGather)) - { - /* - NOTE: Busmasters doing common-buffer DMA shouldn't call IoMapTransfer, but I don't - know if it's illegal... Maybe figure out what to do in this case... - */ - - if( WriteToDevice ) - { - memcpy(MapRegisterBase, - (char*)MmGetSystemAddressForMdl(Mdl) + ((ULONG)CurrentVa - (ULONG)MmGetMdlVirtualAddress(Mdl)), - *Length ); - } - - return MmGetPhysicalAddress(MapRegisterBase); - } - - DPRINT("IoMapTransfer: Unsupported operation\n"); - KEBUGCHECK(0); - return Address; -} - - -/* EOF */ - - - - _____ Modified: trunk/reactos/hal/halx86/generic/dma.c --- trunk/reactos/hal/halx86/generic/dma.c 2005-08-21 20:44:47 UTC (rev 17469) +++ trunk/reactos/hal/halx86/generic/dma.c 2005-08-22 08:39:42 UTC (rev 17470) @@ -5,459 +5,1898 @@ * FILE: ntoskrnl/hal/x86/dma.c * PURPOSE: DMA functions * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * Filip Navara (navaraf(a)reactos.com) * UPDATE HISTORY: * Created 22/05/98 */ +/** + * @page DMA Implementation Notes + * + * Concepts: + * + * - Map register + * + * Abstract encapsulation of physically contiguous buffer that resides + * in memory accessible by both the DMA device / controller and the system. + * The map registers are allocated and distributed on demand and are + * scarce resource. + * + * The actual use of map registers is to allow transfers from/to buffer + * located in physical memory at address inaccessible by the DMA device / + * controller directly. For such transfers the map register buffers + * are used as intermediate data storage. + * + * - Master adapter + * + * A container for map registers (typically corresponding to one physical + * bus connection type). There can be master adapters for 24-bit address + * ranges, 32-bit address ranges, etc. Every time a new DMA adapter is + * created it's associated with a corresponding master adapter that + * is used for any map register allocation requests. + * + * - Bus-master / Slave DMA + * + * Slave DMA is term used for DMA transfers done by the system (E)ISA + * controller as opposed to transfers mastered by the device itself + * (hence the name). + * + * For slave DMA special care is taken to actually access the system + * controller and handle the transfers. The relevant code is in + * HalpDmaInitializeEisaAdapter, HalReadDmaCounter, IoFlushAdapterBuffers + * and IoMapTransfer. + * + * Implementation: + * + * - Allocation of map registers + * + * Initial set of map registers is allocated on the system start to + * ensure that low memory won't get filled up later. Additional map + * registers are allocated as needed by HalpGrowMapBuffers. This + * routine is called on two places: + * + * - HalGetAdapter, since we're at PASSIVE_LEVEL and it's known that + * more map registers will probably be needed. + * - IoAllocateAdapterChannel (indirectly using HalpGrowMapBufferWorker + * since we're at DISPATCH_LEVEL and call HalpGrowMapBuffers directly) + * when no more map registers are free. + * + * Note that even if no more map registers can be allocated it's not + * the end of the world. The adapters waiting for free map registers + * are queued in the master adapter's queue and once one driver hands + * back it's map registers (using IoFreeMapRegisters or indirectly using + * the execution routine callback in IoAllocateAdapterChannel) the + * queue gets processed and the map registers are reassigned. + */ + /* INCLUDES *****************************************************************/ #include <hal.h> #define NDEBUG #include <debug.h> -/* Adapters for each channel */ -PADAPTER_OBJECT HalpEisaAdapter[8]; +static KEVENT HalpDmaLock; +static LIST_ENTRY HalpDmaAdapterList; +static PADAPTER_OBJECT HalpEisaAdapter[8]; +static BOOLEAN HalpEisaDma; +static PADAPTER_OBJECT HalpMasterAdapter; +static const ULONG_PTR HalpEisaPortPage[8] = { + FIELD_OFFSET(DMA_PAGE, Channel0), + FIELD_OFFSET(DMA_PAGE, Channel1), + FIELD_OFFSET(DMA_PAGE, Channel2), + FIELD_OFFSET(DMA_PAGE, Channel3), + 0, + FIELD_OFFSET(DMA_PAGE, Channel5), + FIELD_OFFSET(DMA_PAGE, Channel6), + FIELD_OFFSET(DMA_PAGE, Channel7) +}; + +static DMA_OPERATIONS HalpDmaOperations = { + sizeof(DMA_OPERATIONS), + (PPUT_DMA_ADAPTER)HalPutDmaAdapter, + (PALLOCATE_COMMON_BUFFER)HalAllocateCommonBuffer, + (PFREE_COMMON_BUFFER)HalFreeCommonBuffer, + (PALLOCATE_ADAPTER_CHANNEL)IoAllocateAdapterChannel, + (PFLUSH_ADAPTER_BUFFERS)IoFlushAdapterBuffers, + (PFREE_ADAPTER_CHANNEL)IoFreeAdapterChannel, + (PFREE_MAP_REGISTERS)IoFreeMapRegisters, + (PMAP_TRANSFER)IoMapTransfer, + (PGET_DMA_ALIGNMENT)HalpDmaGetDmaAlignment, + (PREAD_DMA_COUNTER)HalReadDmaCounter, + /* FIXME: Implement the S/G funtions. */ + NULL /*(PGET_SCATTER_GATHER_LIST)HalGetScatterGatherList*/, + NULL /*(PPUT_SCATTER_GATHER_LIST)HalPutScatterGatherList*/, + NULL /*(PCALCULATE_SCATTER_GATHER_LIST_SIZE)HalCalculateScatterGatherListSize */, + NULL /*(PBUILD_SCATTER_GATHER_LIST)HalBuildScatterGatherList*/, + NULL /*(PBUILD_MDL_FROM_SCATTER_GATHER_LIST)HalBuildMdlFromScatterGatherList* / +}; + +#define MAX_MAP_REGISTERS 64 + +#define TAG_DMA TAG('D','M','A',' ') + /* FUNCTIONS *****************************************************************/ VOID -HalpInitDma (VOID) +HalpInitDma(VOID) { - /* TODO: Initialize the first Map Buffer */ + /* + * Check if Extended DMA is available. We're just going to do a random + * read and write. + */ + + WRITE_PORT_UCHAR((PUCHAR)FIELD_OFFSET(EISA_CONTROL, DmaController2Pages.Channel2), 0x2A); + if (READ_PORT_UCHAR((PUCHAR)FIELD_OFFSET(EISA_CONTROL, DmaController2Pages.Channel2)) == 0x2A) + HalpEisaDma = TRUE; + + /* + * Intialize all the global variables and allocate master adapter with + * first map buffers. + */ + + InitializeListHead(&HalpDmaAdapterList); + KeInitializeEvent(&HalpDmaLock, NotificationEvent, TRUE); + + HalpMasterAdapter = HalpDmaAllocateMasterAdapter(); } -PVOID STDCALL -HalAllocateCommonBuffer (PADAPTER_OBJECT AdapterObject, - ULONG Length, - PPHYSICAL_ADDRESS LogicalAddress, - BOOLEAN CacheEnabled) -/* - * FUNCTION: Allocates memory that is visible to both the processor(s) and - * a dma device - * ARGUMENTS: - * AdapterObject = Adapter object representing the bus master or - * system dma controller - * Length = Number of bytes to allocate - * LogicalAddress = Logical address the driver can use to access the - * buffer - * CacheEnabled = Specifies if the memory can be cached - * RETURNS: The base virtual address of the memory allocated - * NULL on failure - * NOTES: - * CacheEnabled is ignored - it's all cache-disabled (like in NT) - * UPDATE: It's not ignored now. If that's wrong just modify the - * CacheEnabled comparsion below. +/** + * @name HalpGetAdapterMaximumPhysicalAddress + * + * Get the maximum physical address acceptable by the device represented + * by the passed DMA adapter. */ + +PHYSICAL_ADDRESS STDCALL +HalpGetAdapterMaximumPhysicalAddress( + IN PADAPTER_OBJECT AdapterObject) { - PHYSICAL_ADDRESS LowestAddress, HighestAddress, BoundryAddressMultiple; - PVOID BaseAddress; + PHYSICAL_ADDRESS HighestAddress; - LowestAddress.QuadPart = 0; - BoundryAddressMultiple.QuadPart = 0; - if ((AdapterObject->Dma64BitAddresses) && (AdapterObject->MasterDevice)) { - HighestAddress.QuadPart = 0xFFFFFFFFFFFFFFFFLL; /* 64Bit: >4GB address range */ - - } else if ((AdapterObject->Dma32BitAddresses) && (AdapterObject->MasterDevice)) { - HighestAddress.QuadPart = 0xFFFFFFFF; /* 32Bit: 4GB address range */ - } else { - HighestAddress.QuadPart = 0x00FFFFFF; /* 24Bit: 16MB address range */ - if (AdapterObject->Width16Bits) + if (AdapterObject->MasterDevice) + { + if (AdapterObject->Dma64BitAddresses) { - BoundryAddressMultiple.QuadPart = 0x20000; /* 128k boundary */ + HighestAddress.QuadPart = 0xFFFFFFFFFFFFFFFFULL; + return HighestAddress; } - else + else if (AdapterObject->Dma32BitAddresses) { - BoundryAddressMultiple.QuadPart = 0x10000; /* 64k boundary */ + HighestAddress.QuadPart = 0xFFFFFFFF; + return HighestAddress; } - } + } - BaseAddress = MmAllocateContiguousMemorySpecifyCache( - Length, - LowestAddress, - HighestAddress, - BoundryAddressMultiple, - CacheEnabled ? MmCached : MmNonCached); - if (!BaseAddress) - return 0; + HighestAddress.QuadPart = 0xFFFFFF; + return HighestAddress; +} - *LogicalAddress = MmGetPhysicalAddress(BaseAddress); +/** + * @name HalpGrowMapBuffers + * + * Allocate initial, or additional, map buffers for DMA master adapter. + * + * @param MasterAdapter + * DMA master adapter to allocate buffers for. + * @param SizeOfMapBuffers + * Size of the map buffers to allocate (not including the size + * already allocated). + */ - return BaseAddress; +BOOLEAN STDCALL +HalpGrowMapBuffers( + IN PADAPTER_OBJECT AdapterObject, + IN ULONG SizeOfMapBuffers) +{ + PVOID VirtualAddress; + PHYSICAL_ADDRESS PhysicalAddress; + PHYSICAL_ADDRESS HighestAcceptableAddress; + PHYSICAL_ADDRESS LowestAcceptableAddress; + PHYSICAL_ADDRESS BoundryAddressMultiple; + KIRQL OldIrql; [truncated at 1000 lines; 2839 more skipped]

19 years, 4 months

← Newer
1
...
10
11
12
13
14
15
16
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2005