Some __stdcall declarations in ntoskrnl/hal.

A new include/ddk/kdfuncs.h header.

svn path=/trunk/; revision=1013

diff --git a/reactos/include/ddk/kdfuncs.h b/reactos/include/ddk/kdfuncs.h
new file mode 100644 (file)
index 0000000..9813c8b
--- /dev/null
+++ b/reactos/include/ddk/kdfuncs.h
@@ -0,0 +1,51 @@
+#ifndef __INCLUDE_DDK_KDFUNCS_H
+#define __INCLUDE_DDK_KDFUNCS_H
+/* $Id: kdfuncs.h,v 1.1 2000/02/26 22:41:34 ea Exp $ */
+
+/* --- NTOSKRNL.EXE --- */
+extern BOOLEAN KdDebuggerEnabled;
+extern BOOLEAN KdDebuggerNotPresent;
+
+BYTE
+STDCALL
+KdPollBreakIn (
+       VOID
+       );
+
+/* --- HAL.DLL --- */
+extern ULONG KdComPortInUse;
+
+BOOLEAN
+STDCALL
+KdPortInitialize (
+       PKD_PORT_INFORMATION    PortInformation,
+       DWORD   Unknown1,
+       DWORD   Unknown2
+       );
+BYTE
+STDCALL
+KdPortGetByte (
+       VOID
+       );
+BYTE
+STDCALL
+KdPortPollByte (
+       VOID
+       );
+VOID
+STDCALL
+KdPortPutByte (
+       UCHAR ByteToSend
+       );
+VOID
+STDCALL
+KdPortRestore (
+       VOID
+       );
+VOID
+STDCALL
+KdPortSave (
+       VOID
+       );
+
+#endif /* __INCLUDE_DDK_KDFUNCS_H */

diff --git a/reactos/include/ddk/ntddk.h b/reactos/include/ddk/ntddk.h
index aa91761..996bfdd 100644 (file)
--- a/reactos/include/ddk/ntddk.h
+++ b/reactos/include/ddk/ntddk.h
@@ -49,6 +49,7 @@ extern "C"
 #include <ddk/cmfuncs.h>
 #include <ddk/exfuncs.h>
 #include <ddk/mmfuncs.h>
+#include <ddk/kdfuncs.h>
 #include <ddk/kefuncs.h>
 #include <ddk/iofuncs.h> 
 #include <ddk/psfuncs.h>

diff --git a/reactos/include/ddk/ntifs.h b/reactos/include/ddk/ntifs.h
index 9e25e71..77ed553 100644 (file)
--- a/reactos/include/ddk/ntifs.h
+++ b/reactos/include/ddk/ntifs.h
@@ -34,19 +34,39 @@ typedef struct _CACHE_SEGMENT
    PBCB Bcb;
 } CACHE_SEGMENT, *PCACHE_SEGMENT;
 
-NTSTATUS CcFlushCachePage(PCACHE_SEGMENT CacheSeg);
-NTSTATUS CcReleaseCachePage(PBCB Bcb,
-                           PCACHE_SEGMENT CacheSeg,
-                           BOOLEAN Valid);
-NTSTATUS CcRequestCachePage(PBCB Bcb,
-                           ULONG FileOffset,
-                           PVOID* BaseAddress,
-                           PBOOLEAN UptoDate,
-                           PCACHE_SEGMENT* CacheSeg);
-NTSTATUS CcInitializeFileCache(PFILE_OBJECT FileObject,
-                              PBCB* Bcb);
-NTSTATUS CcReleaseFileCache(PFILE_OBJECT FileObject,
-                           PBCB Bcb);
+NTSTATUS
+STDCALL
+CcFlushCachePage (
+       PCACHE_SEGMENT  CacheSeg
+       );
+NTSTATUS
+STDCALL
+CcReleaseCachePage (
+       PBCB            Bcb,
+       PCACHE_SEGMENT  CacheSeg,
+       BOOLEAN         Valid
+       );
+NTSTATUS
+STDCALL
+CcRequestCachePage (
+       PBCB            Bcb,
+       ULONG           FileOffset,
+       PVOID           * BaseAddress,
+       PBOOLEAN        UptoDate,
+       PCACHE_SEGMENT  * CacheSeg
+       );
+NTSTATUS
+STDCALL
+CcInitializeFileCache (
+       PFILE_OBJECT    FileObject,
+       PBCB            * Bcb
+       );
+NTSTATUS
+STDCALL
+CcReleaseFileCache (
+       PFILE_OBJECT    FileObject,
+       PBCB            Bcb
+       );
 
 #include <ddk/cctypes.h>
 

diff --git a/reactos/ntoskrnl/cc/view.c b/reactos/ntoskrnl/cc/view.c
index db78d51..659022f 100644 (file)
--- a/reactos/ntoskrnl/cc/view.c
+++ b/reactos/ntoskrnl/cc/view.c
@@ -1,4 +1,5 @@
-/*
+/* $Id: view.c,v 1.7 2000/02/26 22:41:34 ea Exp $
+ *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/cc/view.c
@@ -19,7 +20,7 @@
 
 /* FUNCTIONS *****************************************************************/
 
-NTSTATUS CcFlushCachePage(PCACHE_SEGMENT CacheSeg)
+NTSTATUS STDCALL CcFlushCachePage(PCACHE_SEGMENT CacheSeg)
 /*
  * FUNCTION: Asks the FSD to flush the contents of the page back to disk
  */
@@ -34,7 +35,7 @@ NTSTATUS CcFlushCachePage(PCACHE_SEGMENT CacheSeg)
    return(STATUS_NOT_IMPLEMENTED);
 }
 
-NTSTATUS CcReleaseCachePage(PBCB Bcb,
+NTSTATUS STDCALL CcReleaseCachePage(PBCB Bcb,
                            PCACHE_SEGMENT CacheSeg,
                            BOOLEAN Valid)
 {
@@ -50,7 +51,7 @@ NTSTATUS CcReleaseCachePage(PBCB Bcb,
    return(STATUS_SUCCESS);
 }
 
-NTSTATUS CcRequestCachePage(PBCB Bcb,
+NTSTATUS STDCALL CcRequestCachePage(PBCB Bcb,
                            ULONG FileOffset,
                            PVOID* BaseAddress,
                            PBOOLEAN UptoDate,
@@ -128,7 +129,7 @@ NTSTATUS CcRequestCachePage(PBCB Bcb,
    return(STATUS_SUCCESS);
 }
 
-NTSTATUS CcFreeCacheSegment(PFILE_OBJECT FileObject,
+NTSTATUS STDCALL CcFreeCacheSegment(PFILE_OBJECT FileObject,
                            PBCB Bcb,
                            PCACHE_SEGMENT CacheSeg)
 {
@@ -140,7 +141,7 @@ NTSTATUS CcFreeCacheSegment(PFILE_OBJECT FileObject,
    return(STATUS_SUCCESS);
 }
 
-NTSTATUS CcReleaseFileCache(PFILE_OBJECT FileObject,
+NTSTATUS STDCALL CcReleaseFileCache(PFILE_OBJECT FileObject,
                            PBCB Bcb)
 {
    PLIST_ENTRY current_entry;
@@ -166,7 +167,7 @@ NTSTATUS CcReleaseFileCache(PFILE_OBJECT FileObject,
    return(STATUS_SUCCESS);
 }
 
-NTSTATUS CcInitializeFileCache(PFILE_OBJECT FileObject,
+NTSTATUS STDCALL CcInitializeFileCache(PFILE_OBJECT FileObject,
                               PBCB* Bcb)
 {
    DPRINT("CcInitializeFileCache(FileObject %x)\n",FileObject);
@@ -187,4 +188,4 @@ NTSTATUS CcInitializeFileCache(PFILE_OBJECT FileObject,
 }
 
 
-
+/* EOF */

diff --git a/reactos/ntoskrnl/hal/x86/kdbg.c b/reactos/ntoskrnl/hal/x86/kdbg.c
index 4cd04a3..66a7484 100644 (file)
--- a/reactos/ntoskrnl/hal/x86/kdbg.c
+++ b/reactos/ntoskrnl/hal/x86/kdbg.c
@@ -1,4 +1,4 @@
-/* $Id: kdbg.c,v 1.4 2000/01/19 16:24:15 ekohl Exp $
+/* $Id: kdbg.c,v 1.5 2000/02/26 22:41:35 ea Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -56,7 +56,7 @@
 
 /* GLOBAL VARIABLES *********************************************************/
 
-ULONG KdComPortInUse = 0;
+ULONG KdComPortInUse = 0; /* EXPORTED */
 
 
 /* STATIC VARIABLES *********************************************************/

diff --git a/reactos/ntoskrnl/kd/kdebug.c b/reactos/ntoskrnl/kd/kdebug.c
index 0cad9b0..bc7420e 100644 (file)
--- a/reactos/ntoskrnl/kd/kdebug.c
+++ b/reactos/ntoskrnl/kd/kdebug.c
@@ -1,4 +1,4 @@
-/* $Id: kdebug.c,v 1.4 2000/01/19 16:23:56 ekohl Exp $
+/* $Id: kdebug.c,v 1.5 2000/02/26 22:41:35 ea Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -58,10 +58,6 @@ KdDebuggerEnabled = FALSE;
 BOOLEAN
 KdDebuggerNotPresent = TRUE;
 
-/* This is exported by hal.dll (Eric Kohl) */
-//ULONG
-//KdComPortInUse = 0;
-
 
 /* PRIVATE FUNCTIONS ********************************************************/
 
@@ -130,7 +126,7 @@ KdpPrintString (PANSI_STRING String)
 /* PUBLIC FUNCTIONS *********************************************************/
 
 /* NTOSKRNL.KdPollBreakIn */
-/*
+
 BYTE
 STDCALL
 KdPollBreakIn (
@@ -139,7 +135,6 @@ KdPollBreakIn (
 {
        return KdPortPollByte();
 }
-*/
 
 
 /* EOF */

diff --git a/reactos/ntoskrnl/ke/main.c b/reactos/ntoskrnl/ke/main.c
index 3ee3cd6..c57d9cc 100644 (file)
--- a/reactos/ntoskrnl/ke/main.c
+++ b/reactos/ntoskrnl/ke/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.35 2000/02/26 16:22:27 ea Exp $
+/* $Id: main.c,v 1.36 2000/02/26 22:41:35 ea Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -33,6 +33,8 @@
 
 USHORT NtBuildNumber = KERNEL_VERSION_BUILD;   /* EXPORTED */
 
+ULONG NtGlobalFlag = 0; /* FIXME: EXPORTED */
+
 /* FUNCTIONS ****************************************************************/
                                             
 void set_breakpoint(unsigned int i, unsigned int addr, unsigned int type,

diff --git a/reactos/ntoskrnl/ntoskrnl.def b/reactos/ntoskrnl/ntoskrnl.def
index c78dc84..13280be 100644 (file)
--- a/reactos/ntoskrnl/ntoskrnl.def
+++ b/reactos/ntoskrnl/ntoskrnl.def
@@ -1,4 +1,4 @@
-; $Id: ntoskrnl.def,v 1.45 2000/02/26 16:22:27 ea Exp $
+; $Id: ntoskrnl.def,v 1.46 2000/02/26 22:41:34 ea Exp $
 ;
 ; reactos/ntoskrnl/ntoskrnl.def
 ;
@@ -6,10 +6,10 @@
 ;
 EXPORTS
 InitializeListHead
-CcInitializeFileCache
-CcRequestCachePage
-CcReleaseCachePage
-CcReleaseFileCache
+CcInitializeFileCache@8
+CcRequestCachePage@20
+CcReleaseCachePage@12
+CcReleaseFileCache@8
 DbgPrint
 ExAcquireResourceExclusive
 ExAcquireResourceExclusiveLite
@@ -186,7 +186,6 @@ NtAllocateVirtualMemory@24
 NtBuildNumber DATA
 NtClose@4
 NtConnectPort@32
-;NtConnectPort@8
 NtCreateEvent@20
 NtCreateFile@44
 NtCreateSection@28
@@ -198,7 +197,7 @@ NtDuplicateToken@24
 NtFindAtom@8
 NtFreeVirtualMemory@16
 NtFsControlFile@40
-;NtGlobalFlag <--- variable?
+NtGlobalFlag DATA
 NtLockFile@40
 NtMapViewOfSection@40
 NtNotifyChangeDirectoryFile@36
@@ -216,10 +215,8 @@ NtQuerySecurityObject@20
 NtQuerySystemTime@4
 NtQueryVolumeInformationFile@20
 NtReadFile@36
-;NtRequestPort@8
 NtRequestPort@20
 NtRequestWaitReplyPort@12
-;NtRequestWaitReplyPort@0
 NtSetEvent@8
 NtSetInformationFile@20
 NtSetInformationProcess@16
@@ -541,13 +538,14 @@ HalSetRealTimeClock
 ;IoReadPartitionTable
 ;IoSetPartitionInformation
 ;IoWritePartitionTable
-;KdComPortInUse
-;KdPortGetByte
-KdPortInitialize
-;KdPortPollByte
-KdPortPutByte
-;KdPortRestore
-;KdPortSave
+KdComPortInUse DATA
+KdPollBreakIn@0
+KdPortGetByte@0
+KdPortInitialize@12
+KdPortPollByte@0
+KdPortPutByte@4
+KdPortRestore@0
+KdPortSave@0
 KeAcquireSpinLock
 ;KeAcquireSpinLockRaiseToSynch
 ;KeFlushWriteBuffer

diff --git a/reactos/ntoskrnl/ntoskrnl.edf b/reactos/ntoskrnl/ntoskrnl.edf
index ab42c47..aa57a92 100644 (file)
--- a/reactos/ntoskrnl/ntoskrnl.edf
+++ b/reactos/ntoskrnl/ntoskrnl.edf
@@ -1,4 +1,4 @@
-; $Id: ntoskrnl.edf,v 1.32 2000/02/26 16:22:27 ea Exp $
+; $Id: ntoskrnl.edf,v 1.33 2000/02/26 22:41:34 ea Exp $
 ;
 ; reactos/ntoskrnl/ntoskrnl.def
 ;
@@ -6,10 +6,10 @@
 ;
 EXPORTS
 InitializeListHead
-CcInitializeFileCache
-CcRequestCachePage
-CcReleaseCachePage
-CcReleaseFileCache
+CcInitializeFileCache=CcInitializeFileCache@8
+CcRequestCachePage=CcRequestCachePage@20
+CcReleaseCachePage=CcReleaseCachePage@12
+CcReleaseFileCache=CcReleaseFileCache@8
 DbgPrint
 ExAcquireResourceExclusive
 ExAcquireResourceExclusiveLite
@@ -186,7 +186,6 @@ NtAllocateVirtualMemory=NtAllocateVirtualMemory@24
 NtBuildNumber DATA
 NtClose=NtClose@4
 NtConnectPort=NtConnectPort@32
-;NtConnectPort=NtConnectPort@8
 NtCreateEvent=NtCreateEvent@20
 NtCreateFile=NtCreateFile@44
 NtCreateSection=NtCreateSection@28
@@ -198,7 +197,7 @@ NtDuplicateToken=NtDuplicateToken@24
 NtFindAtom=NtFindAtom@8
 NtFreeVirtualMemory=NtFreeVirtualMemory@16
 NtFsControlFile=NtFsControlFile@40
-;NtGlobalFlag <--- variable
+NtGlobalFlag DATA
 NtLockFile=NtLockFile@40
 NtMapViewOfSection=NtMapViewOfSection@40
 NtNotifyChangeDirectoryFile=NtNotifyChangeDirectoryFile@36
@@ -217,9 +216,7 @@ NtQuerySystemTime=NtQuerySystemTime@4
 NtQueryVolumeInformationFile=NtQueryVolumeInformationFile@20
 NtReadFile=NtReadFile@36
 NtRequestPort=NtRequestPort@8
-;NtRequestPort=NtRequestPort@20
 NtRequestWaitReplyPort@12
-;NtRequestWaitReplyPort=NtRequestWaitReplyPort@0
 NtSetEvent=NtSetEvent@8
 NtSetInformationFile=NtSetInformationFile@20
 NtSetInformationProcess=NtSetInformationProcess@16
@@ -539,13 +536,14 @@ HalSetRealTimeClock
 ;IoReadPartitionTable
 ;IoSetPartitionInformation
 ;IoWritePartitionTable
-KdComPortInUse
-;KdPortGetByte
+KdComPortInUse DATA
+KdPollBreakIn=KdPollBreakIn@0
+KdPortGetByte=KdPortGetByte@0
 KdPortInitialize=KdPortInitialize@12
-;KdPortPollByte
+KdPortPollByte=KdPortPollByte@0
 KdPortPutByte=KdPortPutByte@4
-;KdPortRestore
-;KdPortSave
+KdPortRestore=KdPortRestore@0
+KdPortSave=KdPortSave@0
 KeAcquireSpinLock
 ;KeAcquireSpinLockRaiseToSynch
 ;KeFlushWriteBuffer