1
0
Fork 0

argh, committed good file...

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1313
This commit is contained in:
Ulf Wohlers 2003-10-13 22:01:07 +00:00
parent 55591a56da
commit 5e13e5c0e4
12 changed files with 32 additions and 227 deletions

View file

@ -242,20 +242,14 @@ void mem_memcpy(PhysPt dest,PhysPt src,Bitu size) {
void MEM_BlockRead(PhysPt pt,void * data,Bitu size) {
Bit8u * write=(Bit8u *) data;
while (size--) {
// *write++=mem_readb_inline(pt++);
*write = mem_readb(pt);
write++;
pt++;
*write++=mem_readb_inline(pt++);
}
}
void MEM_BlockWrite(PhysPt pt,void * data,Bitu size) {
Bit8u * read=(Bit8u *) data;
while (size--) {
// mem_writeb_inline(pt++,*read++);
mem_writeb(pt,*read);
pt++;
read++;
mem_writeb_inline(pt++,*read++);
}
}
@ -816,7 +810,7 @@ HostPt MEM_GetBlockPage(void) {
memory.block.cur_page+=4096;
} else {
AllocBlock * newblock=new AllocBlock;
memset(newblock,0xcd,sizeof(AllocBlock)); //zero new allocated memory
memset(newblock,0,sizeof(AllocBlock)); //zero new allocated memory
newblock->next=memory.block.cur_block;
memory.block.cur_block=newblock;
@ -836,11 +830,6 @@ static void MEM_ShutDown(Section * sec) {
}
}
void MEM_SetRemainingMem(Bitu remaining)
{
};
void MEM_Init(Section * sec) {
Bitu i;
Section_prop * section=static_cast<Section_prop *>(sec);

View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: timer.cpp,v 1.17 2003-10-13 19:44:47 finsterr Exp $ */
/* $Id: timer.cpp,v 1.18 2003-10-13 21:57:35 finsterr Exp $ */
#include "dosbox.h"
#include "inout.h"
@ -116,7 +116,7 @@ static void write_latch(Bit32u port,Bit8u val) {
case 0x00: /* Timer hooked to IRQ 0 */
PIC_RemoveEvents(PIT0_Event);
PIC_AddEvent(PIT0_Event,p->micro);
// LOG(LOG_PIT,LOG_NORMAL)("PIT 0 Timer at %.3g Hz mode %d",PIT_TICK_RATE/(double)p->cntr,(Bit32u)p->mode);
LOG(LOG_PIT,LOG_NORMAL)("PIT 0 Timer at %.3g Hz mode %d",PIT_TICK_RATE/(double)p->cntr,(Bit32u)p->mode);
break;
case 0x02: /* Timer hooked to PC-Speaker */
// LOG(LOG_PIT,"PIT 2 Timer at %.3g Hz mode %d",PIT_TICK_RATE/(double)p->cntr,p->mode);