Menu
▾
▴
[openMSX-commits] CVS: openMSX/src/fdc DSKDiskImage.cc,1.6,1.7 Disk.cc,1.3,1.4 DiskDrive.cc,1.50,1.51 DummyDisk.cc,1.2,1.3 MSXFDC.cc,1.31,1.32 TC8566AF.cc,1.12,1.13 TC8566AF.hh,1.6,1.7 WD2793.cc,1.31,1.32 WD2793.hh,1.16,1.17 XSADiskImage.cc,1.5,1.6
|
From: Wouter V. <m97...@us...> - 2004-06-18 21:35:49
|
Update of /cvsroot/openmsx/openMSX/src/fdc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11080/src/fdc Modified Files: DSKDiskImage.cc Disk.cc DiskDrive.cc DummyDisk.cc MSXFDC.cc TC8566AF.cc TC8566AF.hh WD2793.cc WD2793.hh XSADiskImage.cc Log Message: Compiled with -Wall -W and fixed all warnings Index: DSKDiskImage.cc =================================================================== RCS file: /cvsroot/openmsx/openMSX/src/fdc/DSKDiskImage.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- DSKDiskImage.cc 17 Jun 2004 19:18:40 -0000 1.6 +++ DSKDiskImage.cc 18 Jun 2004 21:35:07 -0000 1.7 @@ -15,7 +15,7 @@ } void DSKDiskImage::read(byte track, byte sector, byte side, - int size, byte* buf) + int /*size*/, byte* buf) { try { int logicalSector = physToLog(track, side, sector); @@ -31,7 +31,7 @@ } void DSKDiskImage::write(byte track, byte sector, byte side, - int size, const byte* buf) + int /*size*/, const byte* buf) { if (writeProtected()) { throw WriteProtectedException(""); Index: Disk.cc =================================================================== RCS file: /cvsroot/openmsx/openMSX/src/fdc/Disk.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Disk.cc 6 Sep 2003 14:36:14 -0000 1.3 +++ Disk.cc 18 Jun 2004 21:35:07 -0000 1.4 @@ -14,26 +14,27 @@ { } -void Disk::getTrackHeader(byte track, byte side, byte* buf) +void Disk::getTrackHeader(byte /*track*/, byte /*side*/, byte* /*buf*/) { PRT_DEBUG("Disk::getTrackHeader [unimplemented]"); } -void Disk::getSectorHeader(byte track, byte sector, byte side, byte* buf) +void Disk::getSectorHeader(byte /*track*/, byte /*sector*/, byte /*side*/, + byte* /*buf*/) { PRT_DEBUG("Disk::getSectorHeader [unimplemented]"); } -void Disk::initWriteTrack(byte track, byte side) +void Disk::initWriteTrack(byte /*track*/, byte /*side*/) { PRT_DEBUG("Disk::initWriteTrack [unimplemented]"); } -void Disk::writeTrackData(byte data) +void Disk::writeTrackData(byte /*data*/) { PRT_DEBUG("Disk::writeTrackData [unimplemented]"); } -void Disk::initReadTrack(byte track, byte side) +void Disk::initReadTrack(byte /*track*/, byte /*side*/) { PRT_DEBUG("Disk::initReadTrack [unimplemented]"); } Index: DiskDrive.cc =================================================================== RCS file: /cvsroot/openmsx/openMSX/src/fdc/DiskDrive.cc,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- DiskDrive.cc 17 Jun 2004 19:18:40 -0000 1.50 +++ DiskDrive.cc 18 Jun 2004 21:35:07 -0000 1.51 @@ -44,67 +44,67 @@ return false; } -void DummyDrive::setSide(bool side) +void DummyDrive::setSide(bool /*side*/) { // ignore } -void DummyDrive::step(bool direction, const EmuTime& time) +void DummyDrive::step(bool /*direction*/, const EmuTime& /*time*/) { // ignore } -bool DummyDrive::track00(const EmuTime& time) +bool DummyDrive::track00(const EmuTime& /*time*/) { return false; // National_FS-5500F1 2nd drive detection depends on this } -void DummyDrive::setMotor(bool status, const EmuTime& time) +void DummyDrive::setMotor(bool /*status*/, const EmuTime& /*time*/) { // ignore } -bool DummyDrive::indexPulse(const EmuTime& time) +bool DummyDrive::indexPulse(const EmuTime& /*time*/) { return false; } -int DummyDrive::indexPulseCount(const EmuTime& begin, - const EmuTime& end) +int DummyDrive::indexPulseCount(const EmuTime& /*begin*/, + const EmuTime& /*end*/) { return 0; } -void DummyDrive::setHeadLoaded(bool status, const EmuTime& time) +void DummyDrive::setHeadLoaded(bool /*status*/, const EmuTime& /*time*/) { // ignore } -bool DummyDrive::headLoaded(const EmuTime& time) +bool DummyDrive::headLoaded(const EmuTime& /*time*/) { return false; } -void DummyDrive::read(byte sector, byte* buf, - byte& onDiskTrack, byte& onDiskSector, - byte& onDiskSide, int& onDiskSize) +void DummyDrive::read(byte /*sector*/, byte* /*buf*/, + byte& /*onDiskTrack*/, byte& /*onDiskSector*/, + byte& /*onDiskSide*/, int& /*onDiskSize*/) { throw DriveEmptyException("No drive connected"); } -void DummyDrive::write(byte sector, const byte* buf, - byte& onDiskTrack, byte& onDiskSector, - byte& onDiskSide, int& onDiskSize) +void DummyDrive::write(byte /*sector*/, const byte* /*buf*/, + byte& /*onDiskTrack*/, byte& /*onDiskSector*/, + byte& /*onDiskSide*/, int& /*onDiskSize*/) { throw DriveEmptyException("No drive connected"); } -void DummyDrive::getSectorHeader(byte sector, byte* buf) +void DummyDrive::getSectorHeader(byte /*sector*/, byte* /*buf*/) { throw DriveEmptyException("No drive connected"); } -void DummyDrive::getTrackHeader(byte* buf) +void DummyDrive::getTrackHeader(byte* /*buf*/) { throw DriveEmptyException("No drive connected"); } @@ -114,7 +114,7 @@ // ignore ??? } -void DummyDrive::writeTrackData(byte data) +void DummyDrive::writeTrackData(byte /*data*/) { // ignore ??? } @@ -174,7 +174,7 @@ return disk->writeProtected(); } -void RealDrive::step(bool direction, const EmuTime& time) +void RealDrive::step(bool direction, const EmuTime& /*time*/) { if (direction) { // step in @@ -190,7 +190,7 @@ PRT_DEBUG("DiskDrive track " << headPos); } -bool RealDrive::track00(const EmuTime& time) +bool RealDrive::track00(const EmuTime& /*time*/) { return headPos == 0; } @@ -311,7 +311,7 @@ return result; } -string RealDrive::help(const vector<string>& tokens) const +string RealDrive::help(const vector<string>& /*tokens*/) const { return name + " eject : remove disk from virtual drive\n" + name + " <filename> : change the disk file\n"; @@ -348,7 +348,7 @@ return false; } -void SingleSidedDrive::setSide(bool side) +void SingleSidedDrive::setSide(bool /*side*/) { // ignore } Index: DummyDisk.cc =================================================================== RCS file: /cvsroot/openmsx/openMSX/src/fdc/DummyDisk.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- DummyDisk.cc 9 Aug 2003 20:48:41 -0000 1.2 +++ DummyDisk.cc 18 Jun 2004 21:35:07 -0000 1.3 @@ -5,26 +5,25 @@ namespace openmsx { -void DummyDisk::read(byte track, byte sector, - byte side, int size, byte* buf) +void DummyDisk::read(byte /*track*/, byte /*sector*/, + byte /*side*/, int /*size*/, byte* /*buf*/) { throw DriveEmptyException("No disk in drive"); } -void DummyDisk::write(byte track, byte sector, - byte side, int size, const byte* buf) +void DummyDisk::write(byte /*track*/, byte /*sector*/, + byte /*side*/, int /*size*/, const byte* /*buf*/) { throw DriveEmptyException("No disk in drive"); } -void DummyDisk::getSectorHeader(byte track, byte sector, - byte side, byte* buf) +void DummyDisk::getSectorHeader(byte /*track*/, byte /*sector*/, + byte /*side*/, byte* /*buf*/) { throw DriveEmptyException("No disk in drive"); } -void DummyDisk::getTrackHeader(byte track, - byte side, byte* buf) +void DummyDisk::getTrackHeader(byte /*track*/, byte /*side*/, byte* /*buf*/) { throw DriveEmptyException("No disk in drive"); } Index: MSXFDC.cc =================================================================== RCS file: /cvsroot/openmsx/openMSX/src/fdc/MSXFDC.cc,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- MSXFDC.cc 17 Jun 2004 19:18:40 -0000 1.31 +++ MSXFDC.cc 18 Jun 2004 21:35:07 -0000 1.32 @@ -31,7 +31,7 @@ } } -byte MSXFDC::readMem(word address, const EmuTime& time) +byte MSXFDC::readMem(word address, const EmuTime& /*time*/) { return rom[address & 0x3FFF]; } Index: TC8566AF.cc =================================================================== RCS file: /cvsroot/openmsx/openMSX/src/fdc/TC8566AF.cc,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- TC8566AF.cc 19 Jan 2004 21:47:49 -0000 1.12 +++ TC8566AF.cc 18 Jun 2004 21:35:07 -0000 1.13 @@ -114,7 +114,7 @@ (ST2_MD); // bit 0 Missing Address Mark in data Field } -byte TC8566AF::makeST3(const EmuTime &time) +byte TC8566AF::makeST3() { return (ST3_FLT << 7) | // bit 7 Fault (ST3_WP << 6) | // bit 6 Write Protect @@ -125,7 +125,7 @@ (ST3_DS); // bit 1,0 Drive Select } -byte TC8566AF::readReg(int reg, const EmuTime &time) +byte TC8566AF::readReg(int reg, const EmuTime& /*time*/) { byte Value = 0xFF; // avoid warning @@ -236,7 +236,7 @@ // Result Phase switch (PhaseStep++) { case 0: - Value = makeST3(time); + Value = makeST3(); FDCBusy = 0; Phase = 0; dataInputOutput = 0; Index: TC8566AF.hh =================================================================== RCS file: /cvsroot/openmsx/openMSX/src/fdc/TC8566AF.hh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- TC8566AF.hh 19 Jan 2004 21:47:49 -0000 1.6 +++ TC8566AF.hh 18 Jun 2004 21:35:07 -0000 1.7 @@ -32,7 +32,7 @@ byte makeST0(); byte makeST1(); byte makeST2(); - byte makeST3(const EmuTime &time); + byte makeST3(); // Control register 0 byte EnableIntDma; // always 0 Index: WD2793.cc =================================================================== RCS file: /cvsroot/openmsx/openMSX/src/fdc/WD2793.cc,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- WD2793.cc 29 May 2004 18:15:50 -0000 1.31 +++ WD2793.cc 18 Jun 2004 21:35:07 -0000 1.32 @@ -8,7 +8,7 @@ namespace openmsx { -WD2793::WD2793(DiskDrive* drive_, const EmuTime &time) +WD2793::WD2793(DiskDrive* drive_, const EmuTime& time) : drive(drive_) { reset(time); @@ -18,7 +18,7 @@ { } -void WD2793::reset(const EmuTime &time) +void WD2793::reset(const EmuTime& /*time*/) { //PRT_DEBUG("WD2793::reset()"); Scheduler::instance().removeSyncPoint(this); @@ -42,7 +42,7 @@ //statusReg bit 7 (Not Ready status) is already reset } -bool WD2793::getDTRQ(const EmuTime &time) +bool WD2793::getDTRQ(const EmuTime& time) { if (((commandReg & 0xF0) == 0xF0) && (statusReg & BUSY)) { @@ -69,7 +69,7 @@ return DRQ; } -bool WD2793::getIRQ(const EmuTime &time) +bool WD2793::getIRQ(const EmuTime& /*time*/) { //PRT_DEBUG("WD2793::getIRQ() " << INTRQ); return INTRQ; @@ -85,7 +85,7 @@ INTRQ = immediateIRQ; } -void WD2793::setCommandReg(byte value, const EmuTime &time) +void WD2793::setCommandReg(byte value, const EmuTime& time) { //PRT_DEBUG("WD2793::setCommandReg() 0x" << hex << (int)value); commandReg = value; @@ -116,12 +116,12 @@ break; case 0xD0: // Force interrupt - startType4Cmd(time); + startType4Cmd(); break; } } -byte WD2793::getStatusReg(const EmuTime &time) +byte WD2793::getStatusReg(const EmuTime& time) { if (((commandReg & 0x80) == 0) || ((commandReg & 0xF0) == 0xD0)) { // Type I or type IV command @@ -169,29 +169,29 @@ return statusReg; } -void WD2793::setTrackReg(byte value, const EmuTime &time) +void WD2793::setTrackReg(byte value, const EmuTime& /*time*/) { //PRT_DEBUG("WD2793::setTrackReg() 0x" << hex << (int)value); trackReg = value; } -byte WD2793::getTrackReg(const EmuTime &time) +byte WD2793::getTrackReg(const EmuTime& /*time*/) { return trackReg; } -void WD2793::setSectorReg(byte value, const EmuTime &time) +void WD2793::setSectorReg(byte value, const EmuTime& /*time*/) { //PRT_DEBUG("WD2793::setSectorReg() 0x" << hex << (int)value); sectorReg = value; } -byte WD2793::getSectorReg(const EmuTime &time) +byte WD2793::getSectorReg(const EmuTime& /*time*/) { return sectorReg; } -void WD2793::setDataReg(byte value, const EmuTime &time) +void WD2793::setDataReg(byte value, const EmuTime& time) { //PRT_DEBUG("WD2793::setDataReg() 0x" << hex << (int)value); // TODO Is this also true in case of sector write? @@ -305,7 +305,7 @@ } } -byte WD2793::getDataReg(const EmuTime &time) +byte WD2793::getDataReg(const EmuTime& /*time*/) { if (((commandReg & 0xE0) == 0x80) && (statusReg & BUSY)) { // READ SECTOR @@ -360,7 +360,7 @@ Scheduler::instance().setSyncPoint(time, this); } -void WD2793::executeUntil(const EmuTime& time, int userData) +void WD2793::executeUntil(const EmuTime& time, int /*userData*/) { FSMState state = fsmState; fsmState = FSM_NONE; @@ -374,7 +374,7 @@ case FSM_TYPE2_WAIT_LOAD: if ((commandReg & 0xC0) == 0x80) { // Type II command - type2WaitLoad(time); + type2WaitLoad(); } break; case FSM_TYPE3_WAIT_LOAD: @@ -395,7 +395,7 @@ return name; } -void WD2793::startType1Cmd(const EmuTime &time) +void WD2793::startType1Cmd(const EmuTime& time) { statusReg &= ~(SEEK_ERROR | CRC_ERROR); statusReg |= BUSY; @@ -433,17 +433,17 @@ } } -void WD2793::seek(const EmuTime &time) +void WD2793::seek(const EmuTime& time) { if (trackReg == dataReg) { - endType1Cmd(time); + endType1Cmd(); } else { directionIn = (dataReg > trackReg); step(time); } } -void WD2793::step(const EmuTime &time) +void WD2793::step(const EmuTime& time) { const int timePerStep[4] = { // in ms, in case a 1MHz clock is used (as in MSX) @@ -460,7 +460,7 @@ } if (!directionIn && drive->track00(time)) { trackReg = 0; - endType1Cmd(time); + endType1Cmd(); } else { drive->step(directionIn, time); EmuTimeFreq<1000> next(time); // ms @@ -469,17 +469,17 @@ } } -void WD2793::seekNext(const EmuTime &time) +void WD2793::seekNext(const EmuTime& time) { if ((commandReg & 0xE0) == 0x00) { // Restore or seek seek(time); } else { - endType1Cmd(time); + endType1Cmd(); } } -void WD2793::endType1Cmd(const EmuTime &time) +void WD2793::endType1Cmd() { if (commandReg & V_FLAG) { // verify sequence @@ -489,7 +489,7 @@ } -void WD2793::startType2Cmd(const EmuTime &time) +void WD2793::startType2Cmd(const EmuTime& time) { statusReg &= ~(LOST_DATA | RECORD_NOT_FOUND | RECORD_TYPE | WRITE_PROTECTED); @@ -508,7 +508,7 @@ next += 30; // when 1MHz clock schedule(FSM_TYPE2_WAIT_LOAD, next); } else { - type2WaitLoad(time); + type2WaitLoad(); } } } catch (DriveEmptyException &e) { @@ -516,7 +516,7 @@ } } -void WD2793::type2WaitLoad(const EmuTime& time) +void WD2793::type2WaitLoad() { // TODO wait till head loaded @@ -542,7 +542,7 @@ } } -void WD2793::startType3Cmd(const EmuTime &time) +void WD2793::startType3Cmd(const EmuTime& time) { statusReg &= ~(LOST_DATA | RECORD_NOT_FOUND | RECORD_TYPE); statusReg |= BUSY; @@ -578,10 +578,10 @@ commandStart = time; switch (commandReg & 0xF0) { case 0xC0: // read Address - readAddressCmd(time); + readAddressCmd(); break; case 0xE0: // read track - readTrackCmd(time); + readTrackCmd(); break; case 0xF0: // write track writeTrackCmd(time); @@ -589,21 +589,21 @@ } } -void WD2793::readAddressCmd(const EmuTime &time) +void WD2793::readAddressCmd() { PRT_DEBUG("WD2793 command: read address"); assert(false); // not yet implemented endCmd(); } -void WD2793::readTrackCmd(const EmuTime &time) +void WD2793::readTrackCmd() { PRT_DEBUG("WD2793 command: read track NOT YET IMPLEMENTED"); // just continue iso assert(false) 'fixes' TNT endCmd(); } -void WD2793::writeTrackCmd(const EmuTime &time) +void WD2793::writeTrackCmd(const EmuTime& time) { PRT_DEBUG("WD2793 command: write track"); @@ -623,7 +623,7 @@ } } -void WD2793::startType4Cmd(const EmuTime &time) +void WD2793::startType4Cmd() { // Force interrupt PRT_DEBUG("WD2793 command: Force interrupt"); Index: WD2793.hh =================================================================== RCS file: /cvsroot/openmsx/openMSX/src/fdc/WD2793.hh,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- WD2793.hh 29 May 2004 18:15:50 -0000 1.16 +++ WD2793.hh 18 Jun 2004 21:35:07 -0000 1.17 @@ -70,18 +70,18 @@ void seek(const EmuTime& time); void step(const EmuTime& time); void seekNext(const EmuTime& time); - void endType1Cmd(const EmuTime& time); + void endType1Cmd(); void startType2Cmd(const EmuTime& time); - void type2WaitLoad(const EmuTime& time); + void type2WaitLoad(); void startType3Cmd(const EmuTime& time); void type3WaitLoad(const EmuTime& time); - void readAddressCmd(const EmuTime& time); - void readTrackCmd(const EmuTime& time); + void readAddressCmd(); + void readTrackCmd(); void writeTrackCmd(const EmuTime& time); - void startType4Cmd(const EmuTime& time); + void startType4Cmd(); void endCmd(); Index: XSADiskImage.cc =================================================================== RCS file: /cvsroot/openmsx/openMSX/src/fdc/XSADiskImage.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- XSADiskImage.cc 17 Jun 2004 19:18:40 -0000 1.5 +++ XSADiskImage.cc 18 Jun 2004 21:35:07 -0000 1.6 @@ -47,7 +47,7 @@ } void XSADiskImage::read(byte track, byte sector, - byte side, int size, byte* buf) + byte side, int /*size*/, byte* buf) { int logSector = physToLog(track, side, sector); if (logSector >= nbSectors) @@ -55,8 +55,8 @@ memcpy(buf, outbuf + logSector * 512, 512); } -void XSADiskImage::write(byte track, byte sector, - byte side, int size, const byte* buf) +void XSADiskImage::write(byte /*track*/, byte /*sector*/, + byte /*side*/, int /*size*/, const byte* /*buf*/) { throw WriteProtectedException("Write protected"); } |