Commit 18bb9da5 authored by Alexandre Julliard's avatar Alexandre Julliard

krnl386.exe: Get rid of the useless config.sys parser.

parent 1f3873aa
...@@ -10,7 +10,6 @@ C_SRCS = \ ...@@ -10,7 +10,6 @@ C_SRCS = \
atom.c \ atom.c \
dma.c \ dma.c \
dosaspi.c \ dosaspi.c \
dosconf.c \
dosdev.c \ dosdev.c \
dosexe.c \ dosexe.c \
dosmem.c \ dosmem.c \
......
...@@ -64,25 +64,6 @@ typedef struct { ...@@ -64,25 +64,6 @@ typedef struct {
DWORD offset; DWORD offset;
} SEGPTR48, FARPROC48; } SEGPTR48, FARPROC48;
#define DOSCONF_MEM_HIGH 0x0001
#define DOSCONF_MEM_UMB 0x0002
#define DOSCONF_NUMLOCK 0x0004
#define DOSCONF_KEYB_CONV 0x0008
typedef struct {
char lastdrive;
int brk_flag;
int files;
int stacks_nr;
int stacks_sz;
int buf;
int buf2;
int fcbs;
int flags;
char *shell;
char *country;
} DOSCONF;
typedef void (*DOSRELAY)(CONTEXT86*,void*); typedef void (*DOSRELAY)(CONTEXT86*,void*);
typedef void (WINAPI *RMCBPROC)(CONTEXT86*); typedef void (WINAPI *RMCBPROC)(CONTEXT86*);
typedef void (WINAPI *INTPROC)(CONTEXT86*); typedef void (WINAPI *INTPROC)(CONTEXT86*);
...@@ -388,9 +369,6 @@ extern BYTE DMA_ioport_in( WORD port ); ...@@ -388,9 +369,6 @@ extern BYTE DMA_ioport_in( WORD port );
/* dosaspi.c */ /* dosaspi.c */
extern void DOSVM_ASPIHandler(CONTEXT86*); extern void DOSVM_ASPIHandler(CONTEXT86*);
/* dosconf.c */
extern DOSCONF *DOSCONF_GetConfig( void );
/* dosmem.c */ /* dosmem.c */
extern BIOSDATA *DOSVM_BiosData( void ); extern BIOSDATA *DOSVM_BiosData( void );
extern void DOSVM_start_bios_timer(void); extern void DOSVM_start_bios_timer(void);
......
...@@ -263,6 +263,7 @@ typedef struct ...@@ -263,6 +263,7 @@ typedef struct
#define KEY_NPAGE 0x49 #define KEY_NPAGE 0x49
#define KEY_PPAGE 0x51 #define KEY_PPAGE 0x51
static int brk_flag;
struct magic_device struct magic_device
{ {
...@@ -408,10 +409,6 @@ static BOOL INT21_ReadChar( BYTE *input, CONTEXT86 *waitctx ) ...@@ -408,10 +409,6 @@ static BOOL INT21_ReadChar( BYTE *input, CONTEXT86 *waitctx )
*/ */
static WORD INT21_GetSystemCountryCode( void ) static WORD INT21_GetSystemCountryCode( void )
{ {
/*
* FIXME: Determine country code. We should probably use
* DOSCONF structure for that.
*/
return GetSystemDefaultLangID(); return GetSystemDefaultLangID();
} }
...@@ -4594,12 +4591,12 @@ void WINAPI DOSVM_Int21Handler( CONTEXT86 *context ) ...@@ -4594,12 +4591,12 @@ void WINAPI DOSVM_Int21Handler( CONTEXT86 *context )
{ {
case 0x00: /* GET CURRENT EXTENDED BREAK STATE */ case 0x00: /* GET CURRENT EXTENDED BREAK STATE */
TRACE("GET CURRENT EXTENDED BREAK STATE\n"); TRACE("GET CURRENT EXTENDED BREAK STATE\n");
SET_DL( context, DOSCONF_GetConfig()->brk_flag ); SET_DL( context, brk_flag );
break; break;
case 0x01: /* SET EXTENDED BREAK STATE */ case 0x01: /* SET EXTENDED BREAK STATE */
TRACE("SET CURRENT EXTENDED BREAK STATE\n"); TRACE("SET CURRENT EXTENDED BREAK STATE\n");
DOSCONF_GetConfig()->brk_flag = (DL_reg(context) > 0) ? 1 : 0; brk_flag = (DL_reg(context) > 0) ? 1 : 0;
break; break;
case 0x02: /* GET AND SET EXTENDED CONTROL-BREAK CHECKING STATE*/ case 0x02: /* GET AND SET EXTENDED CONTROL-BREAK CHECKING STATE*/
...@@ -4607,13 +4604,13 @@ void WINAPI DOSVM_Int21Handler( CONTEXT86 *context ) ...@@ -4607,13 +4604,13 @@ void WINAPI DOSVM_Int21Handler( CONTEXT86 *context )
/* ugly coding in order to stay reentrant */ /* ugly coding in order to stay reentrant */
if (DL_reg(context)) if (DL_reg(context))
{ {
SET_DL( context, DOSCONF_GetConfig()->brk_flag ); SET_DL( context, brk_flag );
DOSCONF_GetConfig()->brk_flag = 1; brk_flag = 1;
} }
else else
{ {
SET_DL( context, DOSCONF_GetConfig()->brk_flag ); SET_DL( context, brk_flag );
DOSCONF_GetConfig()->brk_flag = 0; brk_flag = 0;
} }
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment