valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

fix compilation with gcc 3.4

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2142
This commit is contained in:
Peter Veenstra 2005-03-24 21:41:26 +00:00
parent ebd0dc79d9
commit b2b5bfeb7e
2 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/mem.h
View file

@ -104,16 +104,16 @@ INLINE void host_writed(HostPt off,Bit32u val) {
#endif
INLINE void var_write(Bit8u & var, Bit8u val) {
host_writeb((HostPt)&var, val);
INLINE void var_write(Bit8u * var, Bit8u val) {
host_writeb((HostPt)var, val);
}
INLINE void var_write(Bit16u & var, Bit16u val) {
host_writew((HostPt)&var, val);
INLINE void var_write(Bit16u * var, Bit16u val) {
host_writew((HostPt)var, val);
}
INLINE void var_write(Bit32u & var, Bit32u val) {
host_writed((HostPt)&var, val);
INLINE void var_write(Bit32u * var, Bit32u val) {
host_writed((HostPt)var, val);
}
/* The Folowing six functions are slower but they recognize the paged memory system */

40
src/ints/int10_vesa.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: int10_vesa.cpp,v 1.14 2005-03-24 09:19:18 harekiet Exp $ */
/* $Id: int10_vesa.cpp,v 1.15 2005-03-24 21:41:26 qbix79 Exp $ */
#include <string.h>
#include <stddef.h>
@ -131,27 +131,27 @@ foundit:
VideoModeBlock * mblock=&ModeList_VGA[i];
switch (mblock->type) {
case M_LIN8: //Linear 8-bit
var_write(minfo.ModeAttributes,0x9b);
var_write(minfo.WinAAttributes,0x7); //Exists/readable/writable
var_write(minfo.WinGranularity,64);
var_write(minfo.WinSize,64);
var_write(minfo.WinASegment,0xa000);
// var_write(minfo.WinBSegment,0xa000);
var_write(minfo.WinFuncPtr,CALLBACK_RealPointer(callback.setwindow));
var_write(minfo.BytesPerScanLine,mblock->swidth);
var_write(minfo.NumberOfPlanes,0x1);
var_write(minfo.BitsPerPixel,0x08);
var_write(minfo.NumberOfBanks,0x1);
var_write(minfo.MemoryModel,0x04); //packed pixel
var_write(minfo.NumberOfImagePages,0x05);
var_write(minfo.Reserved_page,0x1);
var_write(&minfo.ModeAttributes,0x9b);
var_write(&minfo.WinAAttributes,0x7); //Exists/readable/writable
var_write(&minfo.WinGranularity,64);
var_write(&minfo.WinSize,64);
var_write(&minfo.WinASegment,0xa000);
// var_write(&minfo.WinBSegment,0xa000);
var_write(&minfo.WinFuncPtr,CALLBACK_RealPointer(callback.setwindow));
var_write(&minfo.BytesPerScanLine,mblock->swidth);
var_write(&minfo.NumberOfPlanes,0x1);
var_write(&minfo.BitsPerPixel,0x08);
var_write(&minfo.NumberOfBanks,0x1);
var_write(&minfo.MemoryModel,0x04); //packed pixel
var_write(&minfo.NumberOfImagePages,0x05);
var_write(&minfo.Reserved_page,0x1);
break;
}
var_write(minfo.XResolution,mblock->swidth);
var_write(minfo.YResolution,mblock->sheight);
var_write(minfo.XCharSize,mblock->cwidth);
var_write(minfo.YCharSize,mblock->cheight);
var_write(minfo.PhysBasePtr,S3_LFB_BASE);
var_write(&minfo.XResolution,mblock->swidth);
var_write(&minfo.YResolution,mblock->sheight);
var_write(&minfo.XCharSize,mblock->cwidth);
var_write(&minfo.YCharSize,mblock->cheight);
var_write(&minfo.PhysBasePtr,S3_LFB_BASE);
MEM_BlockWrite(buf,&minfo,sizeof(MODE_INFO));
return 0x00;