From 34f99e926171f49fe11a0e45b47c57822bf40a9b Mon Sep 17 00:00:00 2001 From: ripsaw8080 Date: Sat, 28 Oct 2017 20:30:41 +0000 Subject: [PATCH] Remove some unnecessary things from prior commits; oops. Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4063 --- src/dos/dos_memory.cpp | 8 -------- src/ints/int10_modes.cpp | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/dos/dos_memory.cpp b/src/dos/dos_memory.cpp index ced851d3..00593a85 100644 --- a/src/dos/dos_memory.cpp +++ b/src/dos/dos_memory.cpp @@ -20,7 +20,6 @@ #include "dosbox.h" #include "mem.h" #include "dos_inc.h" -#include "callback.h" #define UMB_START_SEG 0x9fff @@ -387,17 +386,10 @@ bool DOS_LinkUMBsToMemChain(Bit16u linkstate) { } -static Bitu DOS_default_handler(void) { - LOG(LOG_CPU,LOG_ERROR)("DOS rerouted Interrupt Called %X",lastint); - return CBRET_NONE; -} - -static CALLBACK_HandlerObject callbackhandler; void DOS_SetupMemory(void) { /* Let dos claim a few bios interrupts. Makes DOSBox more compatible with * buggy games, which compare against the interrupt table. (probably a * broken linked list implementation) */ - callbackhandler.Allocate(&DOS_default_handler,"DOS default int"); Bit16u ihseg = 0x70; Bit16u ihofs = 0x08; real_writeb(ihseg,ihofs,(Bit8u)0xCF); //An IRET Instruction diff --git a/src/ints/int10_modes.cpp b/src/ints/int10_modes.cpp index 72719d5a..d583b71c 100644 --- a/src/ints/int10_modes.cpp +++ b/src/ints/int10_modes.cpp @@ -1197,7 +1197,7 @@ att_text16: att_data[ct]=ct; att_data[ct+8]=ct+0x38; } - if (IS_EGAVGA_ARCH) att_data[0x06]=0x14; //Odd Color 6 yellow/brown. + att_data[0x06]=0x14; //Odd Color 6 yellow/brown. } break; case M_CGA2: