Changeset 6841 for branches/splittup/src/win32k/include/options.h

Timestamp:

Sep 27, 2001, 5:08:35 AM (24 years ago)

Author:

bird

Message:

Win32k/kKrnlLib splittup: done the major stuff.

File:

• branches/splittup/src/win32k/include/options.h (modified) (9 diffs)

branches/splittup/src/win32k/include/options.h

@@ -1 @@
-/* $Id: options.h,v 1.22 2001-06-14 01:06:47 bird Exp $
+/* $Id: options.h,v 1.22.2.1 2001-09-27 03:08:19 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
-
 /* fPE */
 #define FLAGS_PE_NOT        0x00000000UL
@@ -74 +35 @@
 #define INFOLEVEL_INFOALL   0x00000004UL
 
-/* default heapsizes */
-#define CB_SWP_INIT         ((unsigned long)1024*512)      /* 512KB */
-#define CB_SWP_MAX          ((unsigned long)1024*1024*16)  /*  16MB  */
-#define CB_RES_INIT         ((unsigned long)1024*256)      /* 256KB */
-#define CB_RES_MAX          ((unsigned long)1024*1024*10)  /*  10MB  */
-
 /* NOINC */
 /* default assignments */
 #define DEFAULT_OPTION_ASSIGMENTS                           \
             {FALSE,                 /* fQuiet        */     \
-            OUTPUT_COM2,            /* usCom         */     \
             FALSE,                  /* fLogging      */     \
-            KF_UNI,                 /* fKernel       */     \
-            ~0UL,                   /* ulBuild       */     \
-            (unsigned short)~0,     /* usVerMajor    */     \
-            (unsigned short)~0,     /* usVerMinor    */     \
             FLAGS_PE_PE,            /* fPE           */     \
             FLAGS_PEOO_FORCED,      /* fPEOneObject  */     \
@@ -101 +51 @@
             TRUE,                   /* fExeFixes     */     \
             FALSE,                  /* fForcePreload */     \
-            FALSE,                  /* fApiEnh       */     \
-            CB_SWP_INIT,            /* cbSwpHeapInit */     \
-            CB_SWP_MAX,             /* cbSwpHeapMax  */     \
-            CB_RES_INIT,            /* cbResHeapInit */     \
-            CB_RES_MAX}             /* cbResHeapMax  */
+            FALSE                   /* fApiEnh       */     \
+            }
 
 #define isAnyLoaderEnabled()        (!options.fNoLoader && \
@@ -126 +73 @@
 #define isJAVAEnabled()             (options.fJava)
 
-#define isSMPKernel()               (options.fKernel & KF_SMP)
-#define isUNIKernel()               (!(options.fKernel & KF_SMP))
-
-#define isHighMemorySupported()     (options.ulBuild >= 14000 || isSMPKernel())
-
 #define isDllFixesEnabled()         (options.fDllFixes)
 #define isDllFixesDisabled()        (!options.fDllFixes)
@@ -150 +92 @@
 /** Option struct */
 #pragma pack(4)
-struct options
+struct Win32kOptions
 {
     /** @cat misc */
@@ -156 +98 @@
 
     /** @cat logging options */
-    USHORT      usCom;                  /* Output port no. */
     USHORT      fLogging;               /* Logging. */
-
-    /** @cat kernel selection */
-    ULONG       fKernel;                /* Smp or uni kernel. */
-    ULONG       ulBuild;                /* Kernel build. */
-    USHORT      usVerMajor;             /* OS/2 major ver - 20 */
-    USHORT      usVerMinor;             /* OS/2 minor ver - 30,40 */
 
     /** @cat Options affecting the generated LX executables */
@@ -190 +125 @@
     ULONG       fForcePreload;          /* Forces the loader to preload executable images. Handy for ICAT Ring-3 debugging. */
     ULONG       fApiEnh;                /* Enables the API enhancements */
-
-    /** @cat Options affecting the heap. */
-    ULONG       cbSwpHeapInit;          /* Initial heapsize. */
-    ULONG       cbSwpHeapMax;           /* Maximum heapsize. */
-    ULONG       cbResHeapInit;          /* Initial residentheapsize. */
-    ULONG       cbResHeapMax;           /* Maxiumem residentheapsize. */
 };
 #pragma pack()
@@ -203 +132 @@
 *******************************************************************************/
 /* NOINC */
-extern struct options DATA16_GLOBAL options;    /* defined in d16globals.c */
+extern struct Win32kOptions DATA16_GLOBAL options;    /* defined in d16globals.c */
 extern char   szWin32kIni[160];                 /* defined in d16globals.c */
 #ifdef RING0