Changeset 8188 for trunk/src

Timestamp:

Apr 1, 2002, 3:51:17 PM (23 years ago)

Author:

bird

Message:

Moved exported stuff from options.h.

Location:

trunk/src/win32k/kKrnlLib

Files:

• include/kKLkernel.h (modified) (2 diffs)
• include/kKrnlLib.h (modified) (5 diffs)
• include/options.h (modified) (5 diffs)
• src/OS2KTCB.c (modified) (2 diffs)
• src/d16ProbeKrnl.c (modified) (2 diffs)

trunk/src/win32k/kKrnlLib/include/kKLkernel.h

@@ -1 @@
-/* $Id: kKLkernel.h,v 1.1 2002-04-01 13:43:45 bird Exp $
+/* $Id: kKLkernel.h,v 1.2 2002-04-01 13:51:16 bird Exp $
  *
  *
@@ -53 +53 @@
 
 
+#define isSMPKernel()               (fKernel & KF_SMP)
+#define isUNIKernel()               (!(fKernel & KF_SMP))
+
+#define isHighMemorySupported()     (ulKernelBuild >= 14000 || isSMPKernel())
+
+
 /*******************************************************************************
 *   Global Variables                                                           *
 *******************************************************************************/
-extern ULONG    fKernel;
-extern ULONG    ulKernelBuild;
-#if defined(KKRNLLIB) && defined(RING0) && defined(INCL_32)
+#ifndef DATA16_GLOBAL
+    extern unsigned long                fKernel;
+    extern unsigned long                ulKernelBuild;
+#else
+    extern unsigned long DATA16_GLOBAL  fKernel;
+    extern unsigned long DATA16_GLOBAL  ulKernelBuild;
+#endif
+
+#if defined(KKRNLLIB) && defined(RING0)
     #if defined(__IBMC__) || defined(__IBMCPP__)
         #pragma map(fKernel,        "_fKernel")

trunk/src/win32k/kKrnlLib/include/kKrnlLib.h

@@ -1 @@
-/* $Id: kKrnlLib.h,v 1.6 2002-03-31 19:01:04 bird Exp $
+/* $Id: kKrnlLib.h,v 1.7 2002-04-01 13:51:16 bird Exp $
  *
  * Top level header file for kKrnlLib exports.
  *
- * Copyright (c) 2001 knut st. osmundsen (kosmunds@csc.com)
+ * NOTE: This there is no need to include any kLib stuff.
+ *       Everything goes thru this header file.
  *
- * Project Odin Software License can be found in LICENSE.TXT
+ * Copyright (c) 2002 knut st. osmundsen (bird@anduin.net)
+ *
+ * GPL
  *
  */
@@ -21 +24 @@
     #define INCL_KKL_AVL
     #define INCL_KKL_FUNC
+    #define INCL_KKL_MISC
 #endif
 
@@ -31 +35 @@
  */
 #include <kLib/kTypes.h>
+
+
+/*
+ * Basic kernel info.
+ */
+#ifndef NO_KKL_KERNEL
+    #include <kKLkernel.h>
+#endif
+
+
+/*
+ * Standard arg stuff.
+ */
+#ifndef NO_KKL_STDARG
+    #include "kKLstdarg.h"
+#endif
 
 
@@ -68 +88 @@
  * Logging.
  */
-#ifdef INCL_KKL_LOG
-    #include "kKLstdarg.h"
+#ifndef NO_KKL_LOG
     #include <kLib/kLog.h>
 #endif
@@ -90 +109 @@
 
 
-/*******************************************************************************
-*   Global Variables                                                           *
-*******************************************************************************/
-
-
-
-/*******************************************************************************
-*   Exported Functions                                                         *
-*******************************************************************************/
-
-
 
 #endif

trunk/src/win32k/kKrnlLib/include/options.h

@@ -1 @@
-/* $Id: options.h,v 1.2 2002-04-01 12:45:14 bird Exp $
+/* $Id: options.h,v 1.3 2002-04-01 13:51:16 bird Exp $
  *
  * Options.
@@ -17 +17 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-/* fKernel */
-#define KF_UNI              0x0000
-#define KF_SMP              0x0001
-#define KF_W4               0x0002
-#define KF_REV_MASK         0x0FF0
-#define KF_REV_SHIFT        4
-#define KF_REV_0            0x0000
-#define KF_REV_A            0x0010
-#define KF_REV_B            0x0020
-#define KF_REV_C            0x0030
-#define KF_REV_D            0x0040
-#define KF_REV_E            0x0050
-#define KF_REV_F            0x0060
-#define KF_REV_G            0x0070
-#define KF_REV_H            0x0080
-#define KF_REV_I            0x0090
-#define KF_REV_J            0x00a0
-#define KF_REV_K            0x00b0
-#define KF_REV_L            0x00c0
-#define KF_REV_M            0x00d0
-#define KF_REV_N            0x00e0
-#define KF_REV_O            0x00f0
-#define KF_REV_P            0x0100
-#define KF_REV_Q            0x0110
-#define KF_REV_R            0x0120
-#define KF_REV_S            0x0130
-#define KF_REV_T            0x0140
-#define KF_REV_U            0x0150
-#define KF_REV_V            0x0160
-#define KF_REV_W            0x0170
-#define KF_REV_X            0x0180
-#define KF_REV_Y            0x0190
-#define KF_REV_Z            0x01a0
-#define KF_REV_ECS          0x0900
-#define KF_DEBUG            0x1000
-#define KF_HAS_DEBUGTYPE    0x2000
-#define KF_ALLSTRICT        0x3000
-#define KF_HALFSTRICT       0x7000
-
-
 /* default heapsizes */
 #define CB_SWP_INIT         ((unsigned long)1024*512)      /* 512KB */
@@ -81 +41 @@
             CB_RES_INIT,            /* cbResHeapInit */     \
             CB_RES_MAX}             /* cbResHeapMax  */
-
-#define isSMPKernel()               (fKernel & KF_SMP)
-#define isUNIKernel()               (!(fKernel & KF_SMP))
-
-#define isHighMemorySupported()     (ulKernelBuild >= 14000 || isSMPKernel())
 
 /* INC */
@@ -116 +71 @@
 /* NOINC */
 extern struct kKLOptions DATA16_GLOBAL options;  /* defined in d16Globl.c */
-extern ULONG  DATA16_GLOBAL fKernel;
-extern ULONG  DATA16_GLOBAL ulKernelBuild;
 extern USHORT DATA16_GLOBAL usVerMajor;
 extern USHORT DATA16_GLOBAL usVerMinor;
@@ -124 +77 @@
 #if defined(__IBMC__) || defined(__IBMCPP__)
     #pragma map(options,        "_options")
-    #pragma map(fKernel,        "_fKernel")
-    #pragma map(ulKernelBuild,  "_ulKernelBuild")
     #pragma map(usVerMajor,     "_usVerMajor")
     #pragma map(usVerMinor,     "_usVerMinor")

trunk/src/win32k/kKrnlLib/src/OS2KTCB.c

@@ -1 @@
-/* $Id: OS2KTCB.c,v 1.2 2002-04-01 12:47:28 bird Exp $
+/* $Id: OS2KTCB.c,v 1.3 2002-04-01 13:51:17 bird Exp $
  *
  * TCB - Thread Control Block access methods.
@@ -15 +15 @@
 #include <os2.h>
 #include <OS2KTCB.h>
-#include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "options.h"
+#include "kKLKernel.h"
 
 

trunk/src/win32k/kKrnlLib/src/d16ProbeKrnl.c

@@ -1 @@
-/* $Id: d16ProbeKrnl.c,v 1.2 2002-04-01 12:48:08 bird Exp $
+/* $Id: d16ProbeKrnl.c,v 1.3 2002-04-01 13:51:17 bird Exp $
  *
  * Description:   Autoprobes the os2krnl file and os2krnl[*].sym files.
@@ -79 +79 @@
 #include "options.h"
 #include "kKLInitHlp.h"
+#include "kKLkernel.h"
 #include "d16vprintf.h"
 #include "d16crt.h"