Silence compiler warnings on VC6.0
This commit is contained in:
Mike Lerwill
parent
a50f374a28
commit
e0275c644f
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id: cdrom.cc,v 1.43 2002-09-24 23:45:43 cbothamy Exp $
|
||||
// $Id: cdrom.cc,v 1.44 2002-09-26 09:00:51 mlerwill Exp $
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2002 MandrakeSoft S.A.
|
||||
@ -118,7 +118,7 @@ HANDLE hFile = NULL;
|
||||
|
||||
#ifdef WIN32
|
||||
|
||||
int ReadCDSector(unsigned int hid, unsigned int tid, unsigned int lun, unsigned long frame, unsigned char *buf, int bufsize)
|
||||
bool ReadCDSector(unsigned int hid, unsigned int tid, unsigned int lun, unsigned long frame, unsigned char *buf, int bufsize)
|
||||
{
|
||||
HANDLE hEventSRB;
|
||||
SRB_ExecSCSICmd srb;
|
||||
@ -138,10 +138,10 @@ int ReadCDSector(unsigned int hid, unsigned int tid, unsigned int lun, unsigned
|
||||
srb.SRB_BufLen = bufsize;
|
||||
srb.SRB_CDBLen = 10;
|
||||
srb.CDBByte[0] = SCSI_READ10;
|
||||
srb.CDBByte[2] = frame>>24;
|
||||
srb.CDBByte[3] = frame>>16;
|
||||
srb.CDBByte[4] = frame>>8;
|
||||
srb.CDBByte[5] = frame;
|
||||
srb.CDBByte[2] = (unsigned char) (frame>>24);
|
||||
srb.CDBByte[3] = (unsigned char) (frame>>16);
|
||||
srb.CDBByte[4] = (unsigned char) (frame>>8);
|
||||
srb.CDBByte[5] = (unsigned char) (frame);
|
||||
srb.CDBByte[7] = 0;
|
||||
srb.CDBByte[8] = 1; /* read 1 frames */
|
||||
|
||||
@ -210,7 +210,7 @@ cdrom_interface::cdrom_interface(char *dev)
|
||||
|
||||
void
|
||||
cdrom_interface::init(void) {
|
||||
BX_DEBUG(("Init $Id: cdrom.cc,v 1.43 2002-09-24 23:45:43 cbothamy Exp $"));
|
||||
BX_DEBUG(("Init $Id: cdrom.cc,v 1.44 2002-09-26 09:00:51 mlerwill Exp $"));
|
||||
BX_INFO(("file = '%s'",path));
|
||||
}
|
||||
|
||||
@ -261,7 +261,8 @@ cdrom_interface::insert_cdrom(char *dev)
|
||||
BX_INFO (("Opening image file as a cd"));
|
||||
}
|
||||
if(bUseASPI) {
|
||||
DWORD d, cnt, max;
|
||||
DWORD d;
|
||||
int cnt, max;
|
||||
int i, j, k;
|
||||
SRB_HAInquiry sh;
|
||||
SRB_GDEVBlock sd;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id: eth_null.cc,v 1.6 2001-10-03 13:10:38 bdenney Exp $
|
||||
// $Id: eth_null.cc,v 1.7 2002-09-26 09:00:52 mlerwill Exp $
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2001 MandrakeSoft S.A.
|
||||
@ -107,7 +107,7 @@ bx_null_pktmover_c::sendpkt(void *buf, unsigned io_len)
|
||||
BX_DEBUG (("sendpkt length %u", io_len));
|
||||
// dump raw bytes to a file, eventually dump in pcap format so that
|
||||
// tcpdump -r FILE can interpret them for us.
|
||||
int n = fwrite (buf, io_len, 1, txlog);
|
||||
unsigned int n = fwrite (buf, io_len, 1, txlog);
|
||||
if (n != 1) BX_ERROR (("fwrite to txlog failed", io_len));
|
||||
// dump packet in hex into an ascii log file
|
||||
fprintf (txlog_txt, "NE2K transmitting a packet, length %u\n", io_len);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id: keyboard.cc,v 1.65 2002-09-24 23:52:54 bdenney Exp $
|
||||
// $Id: keyboard.cc,v 1.66 2002-09-26 09:00:52 mlerwill Exp $
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2002 MandrakeSoft S.A.
|
||||
@ -70,7 +70,7 @@ bx_keyb_c::bx_keyb_c(void)
|
||||
memset( &s, 0, sizeof(s) );
|
||||
BX_KEY_THIS put("KBD");
|
||||
BX_KEY_THIS settype(KBDLOG);
|
||||
BX_DEBUG(("Init $Id: keyboard.cc,v 1.65 2002-09-24 23:52:54 bdenney Exp $"));
|
||||
BX_DEBUG(("Init $Id: keyboard.cc,v 1.66 2002-09-26 09:00:52 mlerwill Exp $"));
|
||||
}
|
||||
|
||||
bx_keyb_c::~bx_keyb_c(void)
|
||||
@ -110,7 +110,7 @@ bx_keyb_c::resetinternals(Boolean powerup)
|
||||
void
|
||||
bx_keyb_c::init(bx_devices_c *d, bx_cmos_c *cmos)
|
||||
{
|
||||
BX_DEBUG(("Init $Id: keyboard.cc,v 1.65 2002-09-24 23:52:54 bdenney Exp $"));
|
||||
BX_DEBUG(("Init $Id: keyboard.cc,v 1.66 2002-09-26 09:00:52 mlerwill Exp $"));
|
||||
Bit32u i;
|
||||
|
||||
BX_KEY_THIS devices = d;
|
||||
@ -1454,39 +1454,39 @@ bx_keyb_c::create_mouse_packet(bool force_enq) {
|
||||
b1 = (button_state & 0x0f) | 0x08; // bit3 always set
|
||||
|
||||
if ( (delta_x>=0) && (delta_x<=255) ) {
|
||||
b2 = delta_x;
|
||||
b2 = (Bit8u) delta_x;
|
||||
BX_KEY_THIS s.mouse.delayed_dx-=delta_x;
|
||||
}
|
||||
else if ( delta_x > 255 ) {
|
||||
b2 = 0xff;
|
||||
b2 = (Bit8u) 0xff;
|
||||
BX_KEY_THIS s.mouse.delayed_dx-=255;
|
||||
}
|
||||
else if ( delta_x >= -256 ) {
|
||||
b2 = delta_x;
|
||||
b2 = (Bit8u) delta_x;
|
||||
b1 |= 0x10;
|
||||
BX_KEY_THIS s.mouse.delayed_dx-=delta_x;
|
||||
}
|
||||
else {
|
||||
b2 = 0x00;
|
||||
b2 = (Bit8u) 0x00;
|
||||
b1 |= 0x10;
|
||||
BX_KEY_THIS s.mouse.delayed_dx+=256;
|
||||
}
|
||||
|
||||
if ( (delta_y>=0) && (delta_y<=255) ) {
|
||||
b3 = delta_y;
|
||||
b3 = (Bit8u) delta_y;
|
||||
BX_KEY_THIS s.mouse.delayed_dy-=delta_y;
|
||||
}
|
||||
else if ( delta_y > 255 ) {
|
||||
b3 = 0xff;
|
||||
b3 = (Bit8u) 0xff;
|
||||
BX_KEY_THIS s.mouse.delayed_dy-=255;
|
||||
}
|
||||
else if ( delta_y >= -256 ) {
|
||||
b3 = delta_y;
|
||||
b3 = (Bit8u) delta_y;
|
||||
b1 |= 0x20;
|
||||
BX_KEY_THIS s.mouse.delayed_dy-=delta_y;
|
||||
}
|
||||
else {
|
||||
b3 = 0x00;
|
||||
b3 = (Bit8u) 0x00;
|
||||
b1 |= 0x20;
|
||||
BX_KEY_THIS s.mouse.delayed_dy+=256;
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id: keyboard.h,v 1.16 2002-09-24 23:52:53 bdenney Exp $
|
||||
// $Id: keyboard.h,v 1.17 2002-09-26 09:00:52 mlerwill Exp $
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2001 MandrakeSoft S.A.
|
||||
@ -122,7 +122,7 @@ private:
|
||||
Bit8u get_status_byte ()
|
||||
{
|
||||
// top bit is 0 , bit 6 is 1 if remote mode.
|
||||
Bit8u ret = (mode == MOUSE_MODE_REMOTE) ? 0x40 : 0;
|
||||
Bit8u ret = (Bit8u) ((mode == MOUSE_MODE_REMOTE) ? 0x40 : 0);
|
||||
ret |= (enable << 5);
|
||||
ret |= (scaling == 1) ? 0 : (1 << 4);
|
||||
ret |= ((button_status & 0x1) << 2);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
// $Id: soundwin.cc,v 1.8 2002-03-05 17:22:59 bdenney Exp $
|
||||
// $Id: soundwin.cc,v 1.9 2002-09-26 09:00:52 mlerwill Exp $
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2001 MandrakeSoft S.A.
|
||||
@ -331,7 +331,7 @@ int bx_sound_windows_c::playnextbuffer()
|
||||
|
||||
int bx_sound_windows_c::startwaveplayback(int frequency, int bits, int stereo, int format)
|
||||
{
|
||||
UINT ret;
|
||||
// UINT ret;
|
||||
|
||||
WRITELOG( WAVELOG(4), "startwaveplayback(%d, %d, %d, %x)", frequency, bits, stereo, format);
|
||||
|
||||
@ -374,7 +374,7 @@ int bx_sound_windows_c::startwaveplayback(int frequency, int bits, int stereo, i
|
||||
|
||||
int bx_sound_windows_c::sendwavepacket(int length, Bit8u data[])
|
||||
{
|
||||
UINT ret;
|
||||
// UINT ret;
|
||||
int bufnum;
|
||||
|
||||
WRITELOG( WAVELOG(4), "sendwavepacket(%d, %p)", length, data);
|
||||
@ -451,7 +451,7 @@ int bx_sound_windows_c::stopwaveplayback()
|
||||
|
||||
int bx_sound_windows_c::closewaveoutput()
|
||||
{
|
||||
int bufnum;
|
||||
// int bufnum;
|
||||
|
||||
WRITELOG( WAVELOG(4), "closewaveoutput");
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user