even more small stuff
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3342
This commit is contained in:
Peter Veenstra
parent
f95d934328
commit
4f379fc870
8 changed files with 28 additions and 26 deletions
|
|
@ -16,7 +16,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* $Id: cmos.cpp,v 1.25 2009-02-01 14:24:37 qbix79 Exp $ */
|
||||
/* $Id: cmos.cpp,v 1.26 2009-04-11 08:02:23 qbix79 Exp $ */
|
||||
|
||||
#include <time.h>
|
||||
|
||||
|
|
@ -280,7 +280,7 @@ static Bitu cmos_readreg(Bitu port,Bitu iolen) {
|
|||
|
||||
void CMOS_SetRegister(Bitu regNr, Bit8u val) {
|
||||
cmos.regs[regNr] = val;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
class CMOS:public Module_base{
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* $Id: gus.cpp,v 1.33 2009-01-14 20:50:23 c2woody Exp $ */
|
||||
/* $Id: gus.cpp,v 1.34 2009-04-11 08:02:23 qbix79 Exp $ */
|
||||
|
||||
#include <string.h>
|
||||
#include <iomanip>
|
||||
|
|
@ -454,7 +454,7 @@ static void GUS_TimerEvent(Bitu val) {
|
|||
}
|
||||
if (myGUS.timers[val].running)
|
||||
PIC_AddEvent(GUS_TimerEvent,myGUS.timers[val].delay,val);
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
static void ExecuteGlobRegister(void) {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* $Id: iohandler.cpp,v 1.28 2007-06-12 20:22:08 c2woody Exp $ */
|
||||
/* $Id: iohandler.cpp,v 1.29 2009-04-11 08:02:23 qbix79 Exp $ */
|
||||
|
||||
#include <string.h>
|
||||
#include "dosbox.h"
|
||||
|
|
@ -32,6 +32,7 @@ IO_ReadHandler * io_readhandlers[3][IO_MAX];
|
|||
static Bitu IO_ReadBlocked(Bitu /*port*/,Bitu /*iolen*/) {
|
||||
return ~0;
|
||||
}
|
||||
|
||||
static void IO_WriteBlocked(Bitu /*port*/,Bitu /*val*/,Bitu /*iolen*/) {
|
||||
}
|
||||
|
||||
|
|
@ -78,6 +79,7 @@ void IO_RegisterReadHandler(Bitu port,IO_ReadHandler * handler,Bitu mask,Bitu ra
|
|||
port++;
|
||||
}
|
||||
}
|
||||
|
||||
void IO_RegisterWriteHandler(Bitu port,IO_WriteHandler * handler,Bitu mask,Bitu range) {
|
||||
while (range--) {
|
||||
if (mask&IO_MB) io_writehandlers[0][port]=handler;
|
||||
|
|
@ -241,7 +243,7 @@ void IO_WriteB(Bitu port,Bitu val) {
|
|||
IO_USEC_write_delay();
|
||||
io_writehandlers[0][port](port,val,1);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
void IO_WriteW(Bitu port,Bitu val) {
|
||||
if (GCC_UNLIKELY(GETFLAG(VM) && (CPU_IO_Exception(port,2)))) {
|
||||
|
|
@ -276,7 +278,7 @@ void IO_WriteW(Bitu port,Bitu val) {
|
|||
IO_USEC_write_delay();
|
||||
io_writehandlers[1][port](port,val,2);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
void IO_WriteD(Bitu port,Bitu val) {
|
||||
if (GCC_UNLIKELY(GETFLAG(VM) && (CPU_IO_Exception(port,4)))) {
|
||||
|
|
@ -308,7 +310,7 @@ void IO_WriteD(Bitu port,Bitu val) {
|
|||
cpudecoder=old_cpudecoder;
|
||||
}
|
||||
else io_writehandlers[2][port](port,val,4);
|
||||
};
|
||||
}
|
||||
|
||||
Bitu IO_ReadB(Bitu port) {
|
||||
if (GCC_UNLIKELY(GETFLAG(VM) && (CPU_IO_Exception(port,1)))) {
|
||||
|
|
@ -343,7 +345,7 @@ Bitu IO_ReadB(Bitu port) {
|
|||
IO_USEC_read_delay();
|
||||
return io_readhandlers[0][port](port,1);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
Bitu IO_ReadW(Bitu port) {
|
||||
if (GCC_UNLIKELY(GETFLAG(VM) && (CPU_IO_Exception(port,2)))) {
|
||||
|
|
@ -378,7 +380,7 @@ Bitu IO_ReadW(Bitu port) {
|
|||
IO_USEC_read_delay();
|
||||
return io_readhandlers[1][port](port,2);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
Bitu IO_ReadD(Bitu port) {
|
||||
if (GCC_UNLIKELY(GETFLAG(VM) && (CPU_IO_Exception(port,4)))) {
|
||||
|
|
@ -410,7 +412,7 @@ Bitu IO_ReadD(Bitu port) {
|
|||
return retval;
|
||||
}
|
||||
else return io_readhandlers[2][port](port,4);
|
||||
};
|
||||
}
|
||||
|
||||
class IO :public Module_base {
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* $Id: serialport.cpp,v 1.10 2008-08-06 18:33:30 c2woody Exp $ */
|
||||
/* $Id: serialport.cpp,v 1.11 2009-04-11 08:02:23 qbix79 Exp $ */
|
||||
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
|
|
@ -82,7 +82,7 @@ bool device_COM::Close() {
|
|||
|
||||
Bit16u device_COM::GetInformation(void) {
|
||||
return 0x80A0;
|
||||
};
|
||||
}
|
||||
|
||||
device_COM::device_COM(class CSerial* sc) {
|
||||
sclass = sc;
|
||||
|
|
@ -1068,7 +1068,7 @@ CSerial::CSerial(Bitu id, CommandLine* cmd) {
|
|||
if(debugfp) fprintf(debugfp,"COM%d: BASE %3x, IRQ %d\r\n\r\n",
|
||||
COMNUMBER,base,irq);
|
||||
#endif
|
||||
};
|
||||
}
|
||||
|
||||
bool CSerial::getBituSubstring(const char* name,Bitu* data, CommandLine* cmd) {
|
||||
std::string tmpstring;
|
||||
|
|
@ -1082,7 +1082,7 @@ CSerial::~CSerial(void) {
|
|||
DOS_DelDevice(mydosdevice);
|
||||
for(Bitu i = 0; i <= SERIAL_BASE_EVENT_COUNT; i++)
|
||||
removeEvent(i);
|
||||
};
|
||||
}
|
||||
bool CSerial::Getchar(Bit8u* data, Bit8u* lsr, bool wait_dsr, Bitu timeout) {
|
||||
|
||||
double starttime=PIC_FullIndex();
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* $Id: softmodem.h,v 1.8 2007-07-19 18:58:39 c2woody Exp $ */
|
||||
/* $Id: softmodem.h,v 1.9 2009-04-11 08:02:23 qbix79 Exp $ */
|
||||
|
||||
#ifndef DOSBOX_SERIALMODEM_H
|
||||
#define DOSBOX_SERIALMODEM_H
|
||||
|
|
@ -45,7 +45,7 @@ enum ResTypes {
|
|||
ResNONE,
|
||||
ResOK,ResERROR,
|
||||
ResCONNECT,ResRING,
|
||||
ResBUSY,ResNODIALTONE,ResNOCARRIER,
|
||||
ResBUSY,ResNODIALTONE,ResNOCARRIER
|
||||
};
|
||||
|
||||
#define TEL_CLIENT 0
|
||||
|
|
|
|||
|
|
@ -240,4 +240,4 @@ void VGA_SetupDAC(void) {
|
|||
if ((i&8)>0) vga.dac.rgb[i].blue+=0x15;
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* $Id: vga_draw.cpp,v 1.106 2009-01-26 20:23:44 qbix79 Exp $ */
|
||||
/* $Id: vga_draw.cpp,v 1.107 2009-04-11 08:02:23 qbix79 Exp $ */
|
||||
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
|
|
@ -1368,7 +1368,7 @@ void VGA_SetupDrawing(Bitu /*val*/) {
|
|||
PIC_AddEvent( VGA_VerticalTimer , (float)vga.draw.delay.vtotal );
|
||||
vga.draw.lines_done = 0;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
void VGA_KillDrawing(void) {
|
||||
PIC_RemoveEvents(VGA_DrawPart);
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* $Id: vga_seq.cpp,v 1.22 2008-01-09 20:34:51 c2woody Exp $ */
|
||||
/* $Id: vga_seq.cpp,v 1.23 2009-04-11 08:02:23 qbix79 Exp $ */
|
||||
|
||||
#include "dosbox.h"
|
||||
#include "inout.h"
|
||||
|
|
@ -24,15 +24,15 @@
|
|||
|
||||
#define seq(blah) vga.seq.blah
|
||||
|
||||
Bitu read_p3c4(Bitu port,Bitu iolen) {
|
||||
Bitu read_p3c4(Bitu /*port*/,Bitu /*iolen*/) {
|
||||
return seq(index);
|
||||
}
|
||||
|
||||
void write_p3c4(Bitu port,Bitu val,Bitu iolen) {
|
||||
void write_p3c4(Bitu /*port*/,Bitu val,Bitu /*iolen*/) {
|
||||
seq(index)=val;
|
||||
};
|
||||
}
|
||||
|
||||
void write_p3c5(Bitu port,Bitu val,Bitu iolen) {
|
||||
void write_p3c5(Bitu /*port*/,Bitu val,Bitu iolen) {
|
||||
// LOG_MSG("SEQ WRITE reg %X val %X",seq(index),val);
|
||||
switch(seq(index)) {
|
||||
case 0: /* Reset */
|
||||
|
|
@ -119,7 +119,7 @@ void write_p3c5(Bitu port,Bitu val,Bitu iolen) {
|
|||
}
|
||||
|
||||
|
||||
Bitu read_p3c5(Bitu port,Bitu iolen) {
|
||||
Bitu read_p3c5(Bitu /*port*/,Bitu iolen) {
|
||||
// LOG_MSG("VGA:SEQ:Read from index %2X",seq(index));
|
||||
switch(seq(index)) {
|
||||
case 0: /* Reset */
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue