mirror of
https://github.com/joncampbell123/dosbox-x.git
synced 2025-06-11 05:49:50 +08:00
More code cleanup
This commit is contained in:
parent
7c6f8abf4e
commit
6b51bed9d4
@ -987,10 +987,8 @@ check_surface:
|
|||||||
else if (flags & GFX_LOVE_16) testbpp=16;
|
else if (flags & GFX_LOVE_16) testbpp=16;
|
||||||
else if (flags & GFX_LOVE_32) testbpp=32;
|
else if (flags & GFX_LOVE_32) testbpp=32;
|
||||||
else testbpp=0;
|
else testbpp=0;
|
||||||
#if (HAVE_DDRAW_H) && defined(WIN32)
|
|
||||||
check_gotbpp:
|
if (sdl.desktop.fullscreen) gotbpp=SDL_VideoModeOK(640,480,testbpp,SDL_FULLSCREEN|SDL_HWSURFACE|SDL_HWPALETTE);
|
||||||
#endif
|
|
||||||
if (sdl.desktop.fullscreen) gotbpp=SDL_VideoModeOK(640,480,testbpp,SDL_FULLSCREEN|SDL_HWSURFACE|SDL_HWPALETTE);
|
|
||||||
else gotbpp=sdl.desktop.bpp;
|
else gotbpp=sdl.desktop.bpp;
|
||||||
|
|
||||||
/* SDL 1.x and sometimes SDL 2.x mistake 15-bit 5:5:5 RGB for 16-bit 5:6:5 RGB
|
/* SDL 1.x and sometimes SDL 2.x mistake 15-bit 5:5:5 RGB for 16-bit 5:6:5 RGB
|
||||||
@ -3193,10 +3191,6 @@ void GFX_OpenGLRedrawScreen(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void GFX_EndUpdate( const Bit16u *changedLines ) {
|
void GFX_EndUpdate( const Bit16u *changedLines ) {
|
||||||
#if (HAVE_DDRAW_H) && defined(WIN32)
|
|
||||||
int ret;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* don't present our output if 3Dfx is in OpenGL mode */
|
/* don't present our output if 3Dfx is in OpenGL mode */
|
||||||
if (sdl.desktop.prevent_fullscreen)
|
if (sdl.desktop.prevent_fullscreen)
|
||||||
return;
|
return;
|
||||||
|
@ -29,6 +29,10 @@
|
|||||||
# define MIN(a,b) std::min(a,b)
|
# define MIN(a,b) std::min(a,b)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(_MSC_VER)
|
||||||
|
# pragma warning(disable:4065) /* switch statement no case labels */
|
||||||
|
#endif
|
||||||
|
|
||||||
static unsigned char init_ide = 0;
|
static unsigned char init_ide = 0;
|
||||||
|
|
||||||
static const unsigned char IDE_default_IRQs[4] = {
|
static const unsigned char IDE_default_IRQs[4] = {
|
||||||
|
@ -227,7 +227,7 @@ bool device_EMM::ReadFromControlChannel(PhysPt bufptr,Bit16u size,Bit16u * retco
|
|||||||
mem_writed(GEMMIS_addr+0x06,0); // reserved
|
mem_writed(GEMMIS_addr+0x06,0); // reserved
|
||||||
|
|
||||||
/* build non-EMS frames (0-0xe000) */
|
/* build non-EMS frames (0-0xe000) */
|
||||||
for (Bitu frct=0; frct<EMM_PAGEFRAME4K/4; frct++) {
|
for (Bitu frct=0; frct<(unsigned int)EMM_PAGEFRAME4K/4U; frct++) {
|
||||||
mem_writeb(GEMMIS_addr+0x0a+frct*6,0x00); // frame type: NONE
|
mem_writeb(GEMMIS_addr+0x0a+frct*6,0x00); // frame type: NONE
|
||||||
mem_writeb(GEMMIS_addr+0x0b+frct*6,0xff); // owner: NONE
|
mem_writeb(GEMMIS_addr+0x0b+frct*6,0xff); // owner: NONE
|
||||||
mem_writew(GEMMIS_addr+0x0c+frct*6,0xffff); // non-EMS frame
|
mem_writew(GEMMIS_addr+0x0c+frct*6,0xffff); // non-EMS frame
|
||||||
@ -235,7 +235,7 @@ bool device_EMM::ReadFromControlChannel(PhysPt bufptr,Bit16u size,Bit16u * retco
|
|||||||
mem_writeb(GEMMIS_addr+0x0f+frct*6,0xaa); // flags: direct mapping
|
mem_writeb(GEMMIS_addr+0x0f+frct*6,0xaa); // flags: direct mapping
|
||||||
}
|
}
|
||||||
/* build EMS page frame (0xe000-0xf000) */
|
/* build EMS page frame (0xe000-0xf000) */
|
||||||
for (Bitu frct=0; frct<0x10/4; frct++) {
|
for (Bitu frct=0; frct<0x10U/4U; frct++) {
|
||||||
Bitu frnr=(frct+EMM_PAGEFRAME4K/4)*6;
|
Bitu frnr=(frct+EMM_PAGEFRAME4K/4)*6;
|
||||||
mem_writeb(GEMMIS_addr+0x0a+frnr,0x03); // frame type: EMS frame in 64k page
|
mem_writeb(GEMMIS_addr+0x0a+frnr,0x03); // frame type: EMS frame in 64k page
|
||||||
mem_writeb(GEMMIS_addr+0x0b+frnr,0xff); // owner: NONE
|
mem_writeb(GEMMIS_addr+0x0b+frnr,0xff); // owner: NONE
|
||||||
@ -578,7 +578,7 @@ static Bit8u EMM_RestoreMappingTable(void) {
|
|||||||
/* Move through the mappings table and setup mapping accordingly */
|
/* Move through the mappings table and setup mapping accordingly */
|
||||||
for (Bitu i=0;i<0x40;i++) {
|
for (Bitu i=0;i<0x40;i++) {
|
||||||
/* Skip the pageframe */
|
/* Skip the pageframe */
|
||||||
if ((i>=EMM_PAGEFRAME/0x400) && (i<(EMM_PAGEFRAME/0x400)+EMM_MAX_PHYS)) continue;
|
if ((i>=(unsigned int)EMM_PAGEFRAME/0x400U) && (i<((unsigned int)EMM_PAGEFRAME/0x400U)+(unsigned int)EMM_MAX_PHYS)) continue;
|
||||||
EMM_MapSegment(i<<10,emm_segmentmappings[i].handle,emm_segmentmappings[i].page);
|
EMM_MapSegment(i<<10,emm_segmentmappings[i].handle,emm_segmentmappings[i].page);
|
||||||
}
|
}
|
||||||
for (Bitu i=0;i<EMM_MAX_PHYS;i++) {
|
for (Bitu i=0;i<EMM_MAX_PHYS;i++) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user