From Lucho: move NLS #defines to nls.h. Move config structure to config.h.

Some cosmetic changes.


git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@794 6ac86273-5f31-0410-b378-82cca8765d1b

hdr/nls.h

@@ -615,3 +615,12 @@ struct nlsCSys_loadPackage {
 
 /* standard alignment */
 #include <algndflt.h>
+
+#ifdef DEBUG
+        /* Enable debugging of NLS part */
+
+        /* Caution: Enabling NLS debugging usually generates
+           _a_lot_ of noise. */
+/*& #define NLS_DEBUG */
+
+#endif

kernel/config.h

@@ -27,11 +27,29 @@
 /* Cambridge, MA 02139, USA.                                    */
 /****************************************************************/
 
-#ifdef DEBUG
+struct config {     /* Configuration variables */
-        /* Enable debugging of NLS part */
+  UBYTE cfgDosDataUmb;
-
+  BYTE cfgBuffers;           /* number of buffers in the system */
-        /* Caution: Enabling NLS debugging usually generates
+  UBYTE cfgFiles;            /* number of available files */
-           _a_lot_ of noise. */
+  UBYTE cfgFilesHigh;
-/*& #define NLS_DEBUG */
+  UBYTE cfgFcbs;             /* number of available FCBs */
-
+  UBYTE cfgProtFcbs;         /* number of protected FCBs */
-#endif
+  BYTE cfgInit[NAMEMAX];     /* init of command.com */
+  BYTE cfgInitTail[NAMEMAX]; /* command.com's tail */
+  UBYTE cfgLastdrive;        /* last drive */
+  UBYTE cfgLastdriveHigh;
+  BYTE cfgStacks;            /* number of stacks */
+  BYTE cfgStacksHigh;
+  UWORD cfgStackSize;        /* stacks size for each stack */
+  /* COUNTRY=
+   * In Pass #1 these information is collected and in PostConfig()
+   * the NLS package is loaded into memory.      -- 2000/06/11 ska
+   */
+  WORD cfgCSYS_cntry;        /* country ID to be loaded */
+  UWORD cfgCSYS_cp;          /* requested codepage; NLS_DEFAULT if default */
+  BYTE cfgCSYS_fnam[NAMEMAX];/* filename of COUNTRY= */
+  WORD cfgCSYS_memory;       /* # of bytes required for the NLS pkg; 0 if none */
+  VOID FAR *cfgCSYS_data;    /* where the loaded data is for PostConfig() */
+  UBYTE cfgP_0_startmode;    /* load command.com high or not */
+  unsigned ebda2move;        /* value for switches=/E:nnnn */
+};

kernel/globals.h

@@ -54,7 +54,6 @@ static BYTE *Globals_hRcsId =
 #include "error.h"
 #include "version.h"
 #include "network.h"
-#include "config.h"
 #include "buffer.h"
 #include "dcb.h"
 #include "xstructs.h"

kernel/init-mod.h

@@ -80,54 +80,10 @@ void MoveKernel(unsigned NewKernelSegment);
 #define MAX_HARD_DRIVE  8
 #define NDEV            26      /* up to Z:                     */
 
-/* Start of configuration variables                                     */
+#include "config.h" /* config structure */
-struct config {
-  UBYTE cfgDosDataUmb;
-  BYTE cfgBuffers;
-  /* number of buffers in the system      */
-  UBYTE cfgFiles;
-  UBYTE cfgFilesHigh;
-  /* number of available files            */
-  UBYTE cfgFcbs;
-  /* number of available FCBs             */
-  UBYTE cfgProtFcbs;
-  /* number of protected FCBs             */
-  BYTE cfgInit[NAMEMAX];
-  /* init of command.com          */
-  BYTE cfgInitTail[NAMEMAX];
-  /* command.com's tail           */
-  UBYTE cfgLastdrive;
-  UBYTE cfgLastdriveHigh;
-  /* last drive                           */
-  BYTE cfgStacks;
-  BYTE cfgStacksHigh;
-  /* number of stacks                     */
-  UWORD cfgStackSize;
-  /* stacks size for each stack           */
-  /* COUNTRY=
-     In Pass #1 these information is collected and in PostConfig()
-     the NLS package is loaded into memory.
-     -- 2000/06/11 ska */
-  WORD cfgCSYS_cntry;
-  /* country ID to be loaded */
-  UWORD cfgCSYS_cp;
-  /* requested codepage; NLS_DEFAULT if default */
-  BYTE cfgCSYS_fnam[NAMEMAX];
-  /* filename of COUNTRY= */
-  WORD cfgCSYS_memory;
-  /* number of bytes required for the NLS pkg;
-     0 if none */
-  VOID FAR *cfgCSYS_data;
-  /* where the loaded data is for PostConfig() */
-  UBYTE cfgP_0_startmode;
-  /* load command.com high or not */
-  unsigned ebda2move;
-  /* value for switches=/E:nnnn */
-};
-
-extern struct config Config;
 
 /* config.c */
+extern struct config Config;
 VOID PreConfig(VOID);
 VOID PreConfig2(VOID);
 VOID DoConfig(int pass);
@@ -183,7 +139,6 @@ VOID ASMCFUNC int21_service(iregs far * r);
 VOID ASMCFUNC FAR int0_handler(void);
 VOID ASMCFUNC FAR int6_handler(void);
 VOID ASMCFUNC FAR empty_handler(void);
-VOID ASMCFUNC FAR got_cbreak(void);     /* procsupt.asm */
 VOID ASMCFUNC FAR int20_handler(void);
 VOID ASMCFUNC FAR int21_handler(void);
 VOID ASMCFUNC FAR int22_handler(void);
@@ -207,6 +162,9 @@ VOID init_fatal(BYTE * err_msg);
 WORD CDECL init_printf(CONST BYTE * fmt, ...);
 WORD CDECL init_sprintf(BYTE * buff, CONST BYTE * fmt, ...);
 
+/* procsupt.asm */
+VOID ASMCFUNC FAR got_cbreak(void);
+
 /* initclk.c */
 extern void Init_clk_driver(void);