diff --git a/tools/src/librlink/ReventLoop.cpp b/tools/src/librlink/ReventLoop.cpp index 3ddfc94a..a5411da9 100644 --- a/tools/src/librlink/ReventLoop.cpp +++ b/tools/src/librlink/ReventLoop.cpp @@ -1,6 +1,6 @@ -// $Id: ReventLoop.cpp 686 2015-06-04 21:08:08Z mueller $ +// $Id: ReventLoop.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013-2015 by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.2.1 Dump(): add detail arg // 2015-04-04 662 1.2 BUGFIX: fix race in Stop(), add UnStop,StopPending // 2013-04-27 511 1.1.3 BUGFIX: logic in DoCall() fixed (loop range) // 2013-03-05 495 1.1.2 add exception catcher to EventLoop @@ -23,7 +24,7 @@ /*! \file - \version $Id: ReventLoop.cpp 686 2015-06-04 21:08:08Z mueller $ + \version $Id: ReventLoop.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of class ReventLoop. */ @@ -184,7 +185,8 @@ void ReventLoop::EventLoop() //------------------------------------------+----------------------------------- //! FIXME_docs -void ReventLoop::Dump(std::ostream& os, int ind, const char* text) const +void ReventLoop::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "ReventLoop @ " << this << endl; diff --git a/tools/src/librlink/ReventLoop.hpp b/tools/src/librlink/ReventLoop.hpp index 25617a0a..5ea65d50 100644 --- a/tools/src/librlink/ReventLoop.hpp +++ b/tools/src/librlink/ReventLoop.hpp @@ -1,6 +1,6 @@ -// $Id: ReventLoop.hpp 662 2015-04-05 08:02:54Z mueller $ +// $Id: ReventLoop.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013-2015 by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.2.1 Dump(): add detail arg // 2015-04-04 662 1.2 BUGFIX: fix race in Stop(), add UnStop,StopPending // 2013-05-01 513 1.1.1 fTraceLevel now uint32_t // 2013-02-22 491 1.1 use new RlogFile/RlogMsg interfaces @@ -22,7 +23,7 @@ /*! \file - \version $Id: ReventLoop.hpp 662 2015-04-05 08:02:54Z mueller $ + \version $Id: ReventLoop.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class \c ReventLoop. */ @@ -65,7 +66,8 @@ namespace Retro { bool StopPending(); virtual void EventLoop(); - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; protected: diff --git a/tools/src/librlink/RlinkAddrMap.cpp b/tools/src/librlink/RlinkAddrMap.cpp index 7d9e9868..15f8bf6f 100644 --- a/tools/src/librlink/RlinkAddrMap.cpp +++ b/tools/src/librlink/RlinkAddrMap.cpp @@ -1,6 +1,6 @@ -// $Id: RlinkAddrMap.cpp 603 2014-11-09 22:50:26Z mueller $ +// $Id: RlinkAddrMap.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2011-2013 by Walter F.J. Mueller +// Copyright 2011-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.3 Dump(): add detail arg // 2013-02-03 481 1.0.2 use Rexception // 2011-11-28 434 1.0.1 Print(): use proper cast for lp64 compatibility // 2011-03-06 367 1.0 Initial version @@ -21,7 +22,7 @@ /*! \file - \version $Id: RlinkAddrMap.cpp 603 2014-11-09 22:50:26Z mueller $ + \version $Id: RlinkAddrMap.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of class RlinkAddrMap. */ @@ -180,11 +181,16 @@ void RlinkAddrMap::Print(std::ostream& os, int ind) const //------------------------------------------+----------------------------------- //! FIXME_docs -void RlinkAddrMap::Dump(std::ostream& os, int ind, const char* text) const +void RlinkAddrMap::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "RlinkAddrMap @ " << this << endl; - Print(os,ind+2); + if (detail < 0) { + os << bl << " fAddrMap.size(): " << fAddrMap.size() << endl; + } else { + Print(os,ind+2); + } return; } diff --git a/tools/src/librlink/RlinkAddrMap.hpp b/tools/src/librlink/RlinkAddrMap.hpp index 6c1bd286..58d6b953 100644 --- a/tools/src/librlink/RlinkAddrMap.hpp +++ b/tools/src/librlink/RlinkAddrMap.hpp @@ -1,6 +1,6 @@ -// $Id: RlinkAddrMap.hpp 486 2013-02-10 22:34:43Z mueller $ +// $Id: RlinkAddrMap.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2011- by Walter F.J. Mueller +// Copyright 2011-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2011-03-05 366 1.0 Initial version // --------------------------------------------------------------------------- /*! \file - \version $Id: RlinkAddrMap.hpp 486 2013-02-10 22:34:43Z mueller $ + \version $Id: RlinkAddrMap.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class \c RlinkAddrMap. */ @@ -62,7 +63,8 @@ namespace Retro { size_t MaxNameLength() const; void Print(std::ostream& os, int ind=0) const; - void Dump(std::ostream& os, int ind=0, const char* text=0) const; + void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; protected: nmap_t fNameMap; //!< name->addr map diff --git a/tools/src/librlink/RlinkChannel.cpp b/tools/src/librlink/RlinkChannel.cpp index 403654f3..3a31a372 100644 --- a/tools/src/librlink/RlinkChannel.cpp +++ b/tools/src/librlink/RlinkChannel.cpp @@ -1,6 +1,6 @@ -// $Id: RlinkChannel.cpp 492 2013-02-24 22:14:47Z mueller $ +// $Id: RlinkChannel.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,12 +13,13 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-02-23 492 1.0 Initial version // --------------------------------------------------------------------------- /*! \file - \version $Id: RlinkChannel.cpp 492 2013-02-24 22:14:47Z mueller $ + \version $Id: RlinkChannel.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of class RlinkChannel. */ @@ -67,7 +68,8 @@ bool RlinkChannel::Exec(RlinkCommandList& clist, RerrMsg& emsg) //------------------------------------------+----------------------------------- //! FIXME_docs -void RlinkChannel::Dump(std::ostream& os, int ind, const char* text) const +void RlinkChannel::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "RlinkChannel @ " << this << endl; diff --git a/tools/src/librlink/RlinkChannel.hpp b/tools/src/librlink/RlinkChannel.hpp index 34c1e7ad..a0bf0a21 100644 --- a/tools/src/librlink/RlinkChannel.hpp +++ b/tools/src/librlink/RlinkChannel.hpp @@ -1,6 +1,6 @@ -// $Id: RlinkChannel.hpp 492 2013-02-24 22:14:47Z mueller $ +// $Id: RlinkChannel.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-02-23 492 1.0 Initial version // --------------------------------------------------------------------------- /*! \file - \version $Id: RlinkChannel.hpp 492 2013-02-24 22:14:47Z mueller $ + \version $Id: RlinkChannel.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class RlinkChannel. */ @@ -44,7 +45,8 @@ namespace Retro { bool Exec(RlinkCommandList& clist, RerrMsg& emsg); - void Dump(std::ostream& os, int ind=0, const char* text=0) const; + void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; protected: RlinkContext fContext; //!< stat check and errcnt context diff --git a/tools/src/librlink/RlinkCommand.cpp b/tools/src/librlink/RlinkCommand.cpp index 36e4cedd..13ba0f1e 100644 --- a/tools/src/librlink/RlinkCommand.cpp +++ b/tools/src/librlink/RlinkCommand.cpp @@ -1,4 +1,4 @@ -// $Id: RlinkCommand.cpp 859 2017-03-11 22:36:45Z mueller $ +// $Id: RlinkCommand.cpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2011-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.3.2 Dump(): add detail arg // 2017-03-11 859 1.3.1 add CommandInfo() // 2015-04-02 661 1.3 expect logic: add stat check, Print() without cntx // 2015-02-07 642 1.2.3 Print()+Dump(): adopt for large nblk; @@ -28,7 +29,7 @@ /*! \file - \version $Id: RlinkCommand.cpp 859 2017-03-11 22:36:45Z mueller $ + \version $Id: RlinkCommand.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of class RlinkCommand. */ @@ -502,7 +503,8 @@ std::string RlinkCommand::CommandInfo() const //------------------------------------------+----------------------------------- //! FIXME_docs -void RlinkCommand::Dump(std::ostream& os, int ind, const char* text) const +void RlinkCommand::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "RlinkCommand @ " << this << endl; @@ -532,7 +534,7 @@ void RlinkCommand::Dump(std::ostream& os, int ind, const char* text) const } os << bl << " fExpectStatusVal:" << RosPrintBvi(fExpectStatusVal,0) << endl; os << bl << " fExpectStatusMsk:" << RosPrintBvi(fExpectStatusMsk,0) << endl; - if (fpExpect) fpExpect->Dump(os, ind+2, "fpExpect: "); + if (fpExpect) fpExpect->Dump(os, ind+2, "fpExpect: ", detail); return; } diff --git a/tools/src/librlink/RlinkCommand.hpp b/tools/src/librlink/RlinkCommand.hpp index c22e52d8..66d524ba 100644 --- a/tools/src/librlink/RlinkCommand.hpp +++ b/tools/src/librlink/RlinkCommand.hpp @@ -1,4 +1,4 @@ -// $Id: RlinkCommand.hpp 859 2017-03-11 22:36:45Z mueller $ +// $Id: RlinkCommand.hpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2011-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.3.2 Dump(): add detail arg // 2017-03-11 859 1.3.1 add CommandInfo() // 2015-04-02 661 1.3 expect logic: add stat check, Print() without cntx // 2014-12-21 617 1.2.2 use kStat_M_RbTout for rbus timeout @@ -26,7 +27,7 @@ /*! \file - \version $Id: RlinkCommand.hpp 859 2017-03-11 22:36:45Z mueller $ + \version $Id: RlinkCommand.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class RlinkCommand. */ @@ -110,7 +111,8 @@ namespace Retro { size_t abase=16, size_t dbase=16, size_t sbase=16) const; std::string CommandInfo() const; - void Dump(std::ostream& os, int ind=0, const char* text=0) const; + void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; static const char* CommandName(uint8_t cmd); static const RflagName* FlagNames(); diff --git a/tools/src/librlink/RlinkCommandExpect.cpp b/tools/src/librlink/RlinkCommandExpect.cpp index 875ef064..2a517197 100644 --- a/tools/src/librlink/RlinkCommandExpect.cpp +++ b/tools/src/librlink/RlinkCommandExpect.cpp @@ -1,6 +1,6 @@ -// $Id: RlinkCommandExpect.cpp 661 2015-04-03 18:28:41Z mueller $ +// $Id: RlinkCommandExpect.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2011-2015 by Walter F.J. Mueller +// Copyright 2011-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2015-04-02 661 1.1 expect logic: remove stat from Expect, invert mask // 2011-11-28 434 1.0.1 Dump(): use proper cast for lp64 compatibility // 2011-03-12 368 1.0 Initial version @@ -21,7 +22,7 @@ /*! \file - \version $Id: RlinkCommandExpect.cpp 661 2015-04-03 18:28:41Z mueller $ + \version $Id: RlinkCommandExpect.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of class RlinkCommandExpect. */ @@ -133,7 +134,8 @@ bool RlinkCommandExpect::BlockIsChecked(size_t ind) const //------------------------------------------+----------------------------------- //! FIXME_docs -void RlinkCommandExpect::Dump(std::ostream& os, int ind, const char* text) const +void RlinkCommandExpect::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "RlinkCommandExpect @ " << this << endl; diff --git a/tools/src/librlink/RlinkCommandExpect.hpp b/tools/src/librlink/RlinkCommandExpect.hpp index b5cbd009..989d00e9 100644 --- a/tools/src/librlink/RlinkCommandExpect.hpp +++ b/tools/src/librlink/RlinkCommandExpect.hpp @@ -1,6 +1,6 @@ -// $Id: RlinkCommandExpect.hpp 661 2015-04-03 18:28:41Z mueller $ +// $Id: RlinkCommandExpect.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2011-2015 by Walter F.J. Mueller +// Copyright 2011-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.2.1 Dump(): add detail arg // 2015-04-02 661 1.2 expect logic: remove stat from Expect, invert mask // 2014-12-20 616 1.1 add Done count methods (for rblk/wblk) // 2011-03-12 368 1.0 Initial version @@ -22,7 +23,7 @@ /*! \file - \version $Id: RlinkCommandExpect.hpp 661 2015-04-03 18:28:41Z mueller $ + \version $Id: RlinkCommandExpect.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class RlinkCommandExpect. */ @@ -65,7 +66,8 @@ namespace Retro { bool DoneIsChecked() const; bool BlockIsChecked(size_t ind) const; - void Dump(std::ostream& os, int ind=0, const char* text=0) const; + void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; protected: uint16_t fDataVal; //!< data value diff --git a/tools/src/librlink/RlinkConnect.cpp b/tools/src/librlink/RlinkConnect.cpp index 8a6180e1..6c9e9316 100644 --- a/tools/src/librlink/RlinkConnect.cpp +++ b/tools/src/librlink/RlinkConnect.cpp @@ -1,4 +1,4 @@ -// $Id: RlinkConnect.cpp 854 2017-02-25 14:46:03Z mueller $ +// $Id: RlinkConnect.cpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2011-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 2.6.1 Dump(): add detail arg // 2017-02-20 854 2.6 use Rtime, drop TimeOfDayAsDouble // 2016-04-02 758 2.5 add USR_ACCESS register support (RLUA0/RLUA1) // 2016-03-20 748 2.4 add fTimeout,(Set)Timeout(); @@ -39,7 +40,7 @@ /*! \file - \version $Id: RlinkConnect.cpp 854 2017-02-25 14:46:03Z mueller $ + \version $Id: RlinkConnect.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of RlinkConnect. */ @@ -669,13 +670,14 @@ void RlinkConnect::Print(std::ostream& os) const //------------------------------------------+----------------------------------- //! FIXME_docs -void RlinkConnect::Dump(std::ostream& os, int ind, const char* text) const +void RlinkConnect::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "RlinkConnect @ " << this << endl; if (fpPort) { - fpPort->Dump(os, ind+2, "fpPort: "); + fpPort->Dump(os, ind+2, "fpPort: ", detail); } else { os << bl << " fpPort: " << fpPort.get() << endl; } @@ -687,11 +689,11 @@ void RlinkConnect::Dump(std::ostream& os, int ind, const char* text) const for (size_t i=0; i<8; i++) os << RosPrintBvi(fSeqNumber[i],16) << " "; os << endl; - fSndPkt.Dump(os, ind+2, "fSndPkt: "); - fRcvPkt.Dump(os, ind+2, "fRcvPkt: "); - fContext.Dump(os, ind+2, "fContext: "); - fAddrMap.Dump(os, ind+2, "fAddrMap: "); - fStats.Dump(os, ind+2, "fStats: "); + fSndPkt.Dump(os, ind+2, "fSndPkt: ", detail); + fRcvPkt.Dump(os, ind+2, "fRcvPkt: ", detail); + fContext.Dump(os, ind+2, "fContext: ", detail); + fAddrMap.Dump(os, ind+2, "fAddrMap: ", detail-1); + fStats.Dump(os, ind+2, "fStats: ", detail-1); os << bl << " fLogBaseAddr: " << fLogBaseAddr << endl; os << bl << " fLogBaseData: " << fLogBaseData << endl; os << bl << " fLogBaseStat: " << fLogBaseStat << endl; diff --git a/tools/src/librlink/RlinkConnect.hpp b/tools/src/librlink/RlinkConnect.hpp index d2848e04..db62422b 100644 --- a/tools/src/librlink/RlinkConnect.hpp +++ b/tools/src/librlink/RlinkConnect.hpp @@ -1,4 +1,4 @@ -// $Id: RlinkConnect.hpp 854 2017-02-25 14:46:03Z mueller $ +// $Id: RlinkConnect.hpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2011-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 2.6.1 Dump(): add detail arg // 2017-02-20 854 2.6 use Rtime, drop TimeOfDayAsDouble // 2016-04-02 758 2.5 add USR_ACCESS register support (RLUA0/RLUA1) // 2016-03-20 748 2.4 add fTimeout,(Set)Timeout(); @@ -40,7 +41,7 @@ /*! \file - \version $Id: RlinkConnect.hpp 854 2017-02-25 14:46:03Z mueller $ + \version $Id: RlinkConnect.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class \c RlinkConnect. */ @@ -155,7 +156,8 @@ namespace Retro { std::string LogFileName() const; void Print(std::ostream& os) const; - void Dump(std::ostream& os, int ind=0, const char* text=0) const; + void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; void HandleUnsolicitedData(); diff --git a/tools/src/librlink/RlinkContext.cpp b/tools/src/librlink/RlinkContext.cpp index 63bbde62..4c058483 100644 --- a/tools/src/librlink/RlinkContext.cpp +++ b/tools/src/librlink/RlinkContext.cpp @@ -1,6 +1,6 @@ -// $Id: RlinkContext.cpp 492 2013-02-24 22:14:47Z mueller $ +// $Id: RlinkContext.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,12 +13,13 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-02-23 492 1.0 Initial version // --------------------------------------------------------------------------- /*! \file - \version $Id: RlinkContext.cpp 492 2013-02-24 22:14:47Z mueller $ + \version $Id: RlinkContext.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of class RlinkContext. */ @@ -56,7 +57,8 @@ RlinkContext::~RlinkContext() //------------------------------------------+----------------------------------- //! FIXME_docs -void RlinkContext::Dump(std::ostream& os, int ind, const char* text) const +void RlinkContext::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "RlinkContext @ " << this << endl; diff --git a/tools/src/librlink/RlinkContext.hpp b/tools/src/librlink/RlinkContext.hpp index b5da7e11..b82b9c0c 100644 --- a/tools/src/librlink/RlinkContext.hpp +++ b/tools/src/librlink/RlinkContext.hpp @@ -1,6 +1,6 @@ -// $Id: RlinkContext.hpp 661 2015-04-03 18:28:41Z mueller $ +// $Id: RlinkContext.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013-2015 by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2015-03-28 660 1.1 add SetStatus(Value|Mask)() // 2013-02-23 492 1.0 Initial version // --------------------------------------------------------------------------- @@ -20,7 +21,7 @@ /*! \file - \version $Id: RlinkContext.hpp 661 2015-04-03 18:28:41Z mueller $ + \version $Id: RlinkContext.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class RlinkContext. */ @@ -51,7 +52,8 @@ namespace Retro { void ClearErrorCount(); size_t ErrorCount() const; - void Dump(std::ostream& os, int ind=0, const char* text=0) const; + void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; protected: uint8_t fStatusVal; //!< status value diff --git a/tools/src/librlink/RlinkPacketBuf.cpp b/tools/src/librlink/RlinkPacketBuf.cpp index d5814e11..188d8a0f 100644 --- a/tools/src/librlink/RlinkPacketBuf.cpp +++ b/tools/src/librlink/RlinkPacketBuf.cpp @@ -1,6 +1,6 @@ -// $Id: RlinkPacketBuf.cpp 606 2014-11-24 07:08:51Z mueller $ +// $Id: RlinkPacketBuf.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2011-2014 by Walter F.J. Mueller +// Copyright 2011-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 2.0.1 Dump(): add detail arg // 2014-11-23 606 2.0 re-organize for rlink v4 // 2013-04-21 509 1.0.4 add SndAttn() method // 2013-02-03 481 1.0.3 use Rexception @@ -24,7 +25,7 @@ /*! \file - \version $Id: RlinkPacketBuf.cpp 606 2014-11-24 07:08:51Z mueller $ + \version $Id: RlinkPacketBuf.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of class RlinkPacketBuf. */ @@ -90,13 +91,14 @@ RlinkPacketBuf::~RlinkPacketBuf() //------------------------------------------+----------------------------------- //! FIXME_docs -void RlinkPacketBuf::Dump(std::ostream& os, int ind, const char* text) const +void RlinkPacketBuf::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "RlinkPacketBuf @ " << this << endl; os << bl << " fCrc: " << RosPrintBvi(fCrc.Crc(), 0) << endl; os << bl << " fFlags: " << RosPrintBvi(fFlags, 0) << endl; - fStats.Dump(os, ind+2, "fStats: "); + fStats.Dump(os, ind+2, "fStats: ", detail-1); os << bl << " fPktBuf(size): " << RosPrintf(fPktBuf.size(),"d",4); size_t ncol = max(1, (80-ind-4-6)/(2+1)); diff --git a/tools/src/librlink/RlinkPacketBuf.hpp b/tools/src/librlink/RlinkPacketBuf.hpp index 5ccb36a6..6e64b7d7 100644 --- a/tools/src/librlink/RlinkPacketBuf.hpp +++ b/tools/src/librlink/RlinkPacketBuf.hpp @@ -1,6 +1,6 @@ -// $Id: RlinkPacketBuf.hpp 606 2014-11-24 07:08:51Z mueller $ +// $Id: RlinkPacketBuf.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2011-2014 by Walter F.J. Mueller +// Copyright 2011-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 2.0.1 Dump(): add detail arg // 2014-11-23 606 2.0 re-organize for rlink v4 // 2013-04-21 509 1.0.2 add SndAttn() method // 2013-01-13 474 1.0.1 add PollAttn() method @@ -23,7 +24,7 @@ /*! \file - \version $Id: RlinkPacketBuf.hpp 606 2014-11-24 07:08:51Z mueller $ + \version $Id: RlinkPacketBuf.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class RlinkPacketBuf. */ @@ -55,7 +56,8 @@ namespace Retro { const Rstats& Stats() const; - void Dump(std::ostream& os, int ind=0, const char* text=0) const; + void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; // flag bits (also defined in cpp) static const uint32_t kFlagSopSeen = 1<<0; //!< sop was seen diff --git a/tools/src/librlink/RlinkPacketBufRcv.cpp b/tools/src/librlink/RlinkPacketBufRcv.cpp index 07eb47d2..68e2edf6 100644 --- a/tools/src/librlink/RlinkPacketBufRcv.cpp +++ b/tools/src/librlink/RlinkPacketBufRcv.cpp @@ -1,4 +1,4 @@ -// $Id: RlinkPacketBufRcv.cpp 853 2017-02-19 18:54:30Z mueller $ +// $Id: RlinkPacketBufRcv.cpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2014-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2017-02-19 853 1.1 use Rtime // 2014-12-25 621 1.0.1 Reorganize packet send/revd stats // 2014-11-30 607 1.0 Initial version @@ -21,7 +22,7 @@ /*! \file - \version $Id: RlinkPacketBufRcv.cpp 853 2017-02-19 18:54:30Z mueller $ + \version $Id: RlinkPacketBufRcv.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of class RlinkPacketBuf. */ @@ -182,7 +183,8 @@ void RlinkPacketBufRcv::GetWithCrc(uint16_t* pdata, size_t count) //------------------------------------------+----------------------------------- //! FIXME_docs -void RlinkPacketBufRcv::Dump(std::ostream& os, int ind, const char* text) const +void RlinkPacketBufRcv::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "RlinkPacketBufRcv @ " << this << endl; @@ -205,7 +207,7 @@ void RlinkPacketBufRcv::Dump(std::ostream& os, int ind, const char* text) const } os << endl; - RlinkPacketBuf::Dump(os, ind, " ^"); + RlinkPacketBuf::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librlink/RlinkPacketBufRcv.hpp b/tools/src/librlink/RlinkPacketBufRcv.hpp index c923f05d..75991373 100644 --- a/tools/src/librlink/RlinkPacketBufRcv.hpp +++ b/tools/src/librlink/RlinkPacketBufRcv.hpp @@ -1,4 +1,4 @@ -// $Id: RlinkPacketBufRcv.hpp 853 2017-02-19 18:54:30Z mueller $ +// $Id: RlinkPacketBufRcv.hpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2014-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2017-02-19 853 1.1 use Rtime // 2014-12-25 621 1.0.1 Reorganize packet send/revd stats // 2014-11-30 607 1.0 Initial version @@ -22,7 +23,7 @@ /*! \file - \version $Id: RlinkPacketBufRcv.hpp 853 2017-02-19 18:54:30Z mueller $ + \version $Id: RlinkPacketBufRcv.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class RlinkPacketBuf. */ @@ -62,7 +63,8 @@ namespace Retro { int NakIndex() const; - void Dump(std::ostream& os, int ind=0, const char* text=0) const; + void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; // statistics counter indices enum stats { diff --git a/tools/src/librlink/RlinkPacketBufSnd.cpp b/tools/src/librlink/RlinkPacketBufSnd.cpp index 523e4dd4..ecd52cfd 100644 --- a/tools/src/librlink/RlinkPacketBufSnd.cpp +++ b/tools/src/librlink/RlinkPacketBufSnd.cpp @@ -1,6 +1,6 @@ -// $Id: RlinkPacketBufSnd.cpp 666 2015-04-12 21:17:54Z mueller $ +// $Id: RlinkPacketBufSnd.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2014-2015 by Walter F.J. Mueller +// Copyright 2014-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2015-04-11 666 1.1 handle xon/xoff escaping, add (Set)XonEscape() // 2014-12-25 621 1.0.1 Reorganize packet send/revd stats // 2014-11-15 604 1.0 Initial version @@ -21,7 +22,7 @@ /*! \file - \version $Id: RlinkPacketBufSnd.cpp 666 2015-04-12 21:17:54Z mueller $ + \version $Id: RlinkPacketBufSnd.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of class RlinkPacketBuf. */ @@ -211,7 +212,8 @@ bool RlinkPacketBufSnd::SndUnJam(RlinkPort* port, RerrMsg& emsg) //------------------------------------------+----------------------------------- //! FIXME_docs -void RlinkPacketBufSnd::Dump(std::ostream& os, int ind, const char* text) const +void RlinkPacketBufSnd::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "RlinkPacketBufSnd @ " << this << endl; @@ -227,7 +229,7 @@ void RlinkPacketBufSnd::Dump(std::ostream& os, int ind, const char* text) const } os << endl; - RlinkPacketBuf::Dump(os, ind, " ^"); + RlinkPacketBuf::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librlink/RlinkPacketBufSnd.hpp b/tools/src/librlink/RlinkPacketBufSnd.hpp index 870a1983..09c6118a 100644 --- a/tools/src/librlink/RlinkPacketBufSnd.hpp +++ b/tools/src/librlink/RlinkPacketBufSnd.hpp @@ -1,6 +1,6 @@ -// $Id: RlinkPacketBufSnd.hpp 666 2015-04-12 21:17:54Z mueller $ +// $Id: RlinkPacketBufSnd.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2014-2015 by Walter F.J. Mueller +// Copyright 2014-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.2 Dump(): add detail arg // 2015-04-11 666 1.1 handle xon/xoff escaping, add (Set)XonEscape() // 2014-12-25 621 1.0.1 Reorganize packet send/revd stats // 2014-11-14 604 1.0 Initial version @@ -22,7 +23,7 @@ /*! \file - \version $Id: RlinkPacketBufSnd.hpp 666 2015-04-12 21:17:54Z mueller $ + \version $Id: RlinkPacketBufSnd.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class RlinkPacketBufSnd. */ @@ -62,7 +63,8 @@ namespace Retro { size_t RawSize() const; - void Dump(std::ostream& os, int ind=0, const char* text=0) const; + void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; // statistics counter indices enum stats { diff --git a/tools/src/librlink/RlinkPort.cpp b/tools/src/librlink/RlinkPort.cpp index 2f4e4f7a..5038ee81 100644 --- a/tools/src/librlink/RlinkPort.cpp +++ b/tools/src/librlink/RlinkPort.cpp @@ -1,4 +1,4 @@ -// $Id: RlinkPort.cpp 853 2017-02-19 18:54:30Z mueller $ +// $Id: RlinkPort.cpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2011-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.4.1 Dump(): add detail arg // 2017-02-19 853 1.4 use Rtime, drop TimeOfDayAsDouble // 2015-04-11 666 1.3 add fXon, XonEnable() // 2014-12-10 611 1.2.4 add time stamps for Read/Write for logs @@ -32,7 +33,7 @@ /*! \file - \version $Id: RlinkPort.cpp 853 2017-02-19 18:54:30Z mueller $ + \version $Id: RlinkPort.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of RlinkPort. */ @@ -292,7 +293,8 @@ int RlinkPort::RawWrite(const uint8_t* buf, size_t size, RerrMsg& emsg) //------------------------------------------+----------------------------------- //! FIXME_docs -void RlinkPort::Dump(std::ostream& os, int ind, const char* text) const +void RlinkPort::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "RlinkPort @ " << this << endl; @@ -306,7 +308,7 @@ void RlinkPort::Dump(std::ostream& os, int ind, const char* text) const os << bl << " fTraceLevel: " << fTraceLevel << endl; os << bl << " fTsLastRead: " << fTsLastRead << endl; os << bl << " fTsLastWrite: " << fTsLastWrite << endl; - fStats.Dump(os, ind+2, "fStats: "); + fStats.Dump(os, ind+2, "fStats: ", detail); return; } diff --git a/tools/src/librlink/RlinkPort.hpp b/tools/src/librlink/RlinkPort.hpp index 20b75c77..2308fa20 100644 --- a/tools/src/librlink/RlinkPort.hpp +++ b/tools/src/librlink/RlinkPort.hpp @@ -1,4 +1,4 @@ -// $Id: RlinkPort.hpp 853 2017-02-19 18:54:30Z mueller $ +// $Id: RlinkPort.hpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2011-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.4.1 Dump(): add detail arg // 2017-02-19 853 1.4 use Rtime, drop TimeOfDayAsDouble // 2015-04-11 666 1.3 add fXon, XonEnable() // 2014-12-10 611 1.2.2 add time stamps for Read/Write for logs @@ -29,7 +30,7 @@ /*! \file - \version $Id: RlinkPort.hpp 853 2017-02-19 18:54:30Z mueller $ + \version $Id: RlinkPort.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class RlinkPort. */ @@ -81,7 +82,8 @@ namespace Retro { const Rstats& Stats() const; - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; // some constants (also defined in cpp) static const int kEof = 0; // +// Copyright 2011-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.3.1 Dump(): add detail arg // 2015-04-12 666 1.3 drop xon/xoff excaping; add noinit attribute // 2015-02-01 641 1.2 support custom baud rates (5M,6M,10M,12M) // 2013-02-23 492 1.1 use RparseUrl @@ -27,7 +28,7 @@ /*! \file - \version $Id: RlinkPortTerm.cpp 666 2015-04-12 21:17:54Z mueller $ + \version $Id: RlinkPortTerm.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of RlinkPortTerm. */ @@ -314,13 +315,14 @@ void RlinkPortTerm::Close() //------------------------------------------+----------------------------------- //! FIXME_docs -void RlinkPortTerm::Dump(std::ostream& os, int ind, const char* text) const +void RlinkPortTerm::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "RlinkPortTerm @ " << this << endl; DumpTios(os, ind, "fTiosOld", fTiosOld); DumpTios(os, ind, "fTiosNew", fTiosNew); - RlinkPort::Dump(os, ind, " ^"); + RlinkPort::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librlink/RlinkPortTerm.hpp b/tools/src/librlink/RlinkPortTerm.hpp index d9014120..e083e3a0 100644 --- a/tools/src/librlink/RlinkPortTerm.hpp +++ b/tools/src/librlink/RlinkPortTerm.hpp @@ -1,4 +1,4 @@ -// $Id: RlinkPortTerm.hpp 666 2015-04-12 21:17:54Z mueller $ +// $Id: RlinkPortTerm.hpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2011-2015 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2015-04-11 666 1.1 drop xon/xoff excaping, now done in RlinkPacketBuf // 2011-12-18 440 1.0.2 add kStatNPort stats // 2011-12-11 438 1.0.1 Read(),Write(): added for xon handling, tcdrain(); @@ -22,7 +23,7 @@ /*! \file - \version $Id: RlinkPortTerm.hpp 666 2015-04-12 21:17:54Z mueller $ + \version $Id: RlinkPortTerm.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class RlinkPortTerm. */ @@ -45,7 +46,8 @@ namespace Retro { virtual bool Open(const std::string& url, RerrMsg& emsg); virtual void Close(); - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; // some constants (also defined in cpp) static const uint8_t kc_xon = 0x11; // XON char -> ^Q = hex 11 diff --git a/tools/src/librlink/RlinkServer.cpp b/tools/src/librlink/RlinkServer.cpp index df977726..45089d0e 100644 --- a/tools/src/librlink/RlinkServer.cpp +++ b/tools/src/librlink/RlinkServer.cpp @@ -1,6 +1,6 @@ -// $Id: RlinkServer.cpp 686 2015-06-04 21:08:08Z mueller $ +// $Id: RlinkServer.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013-2015 by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.2.2 Dump(): add detail arg // 2015-06-05 686 1.2.1 BUGFIX: CallAttnHandler(): fix race in hnext // 2015-04-04 662 1.2 BUGFIX: fix race in Stop(), use UnStop() // 2015-01-10 632 2.2 Exec() without emsg now void, will throw @@ -27,7 +28,7 @@ /*! \file - \version $Id: RlinkServer.cpp 686 2015-06-04 21:08:08Z mueller $ + \version $Id: RlinkServer.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of RlinkServer. */ @@ -368,7 +369,8 @@ void RlinkServer::Print(std::ostream& os) const //------------------------------------------+----------------------------------- //! FIXME_docs -void RlinkServer::Dump(std::ostream& os, int ind, const char* text) const +void RlinkServer::Dump(std::ostream& os, int ind, const char* text, + int detail) const { // FIXME_code: is that thread safe ??? fActnList.size() ??? RosFill bl(ind); @@ -381,11 +383,11 @@ void RlinkServer::Dump(std::ostream& os, int ind, const char* text) const << RosPrintBvi(fAttnDsc[i].fId.fMask,16) << ", " << fAttnDsc[i].fId.fCdata << endl; os << bl << " fActnList.size: " << fActnList.size() << endl; - fELoop.Dump(os, ind+2, "fELoop"); + fELoop.Dump(os, ind+2, "fELoop", detail); os << bl << " fServerThread: " << fServerThread.get_id() << endl; os << bl << " fAttnPatt: " << RosPrintBvi(fAttnPatt,16) << endl; os << bl << " fAttnNotiPatt: " << RosPrintBvi(fAttnNotiPatt,16) << endl; - fStats.Dump(os, ind+2, "fStats: "); + fStats.Dump(os, ind+2, "fStats: ", detail-1); return; } diff --git a/tools/src/librlink/RlinkServer.hpp b/tools/src/librlink/RlinkServer.hpp index cda9cc44..3f76eb42 100644 --- a/tools/src/librlink/RlinkServer.hpp +++ b/tools/src/librlink/RlinkServer.hpp @@ -1,6 +1,6 @@ -// $Id: RlinkServer.hpp 632 2015-01-11 12:30:03Z mueller $ +// $Id: RlinkServer.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013-2015 by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 2.2.1 Dump(): add detail arg // 2015-01-10 632 2.2 Exec() without emsg now void, will throw // 2014-12-30 625 2.1 adopt to Rlink V4 attn logic // 2014-11-30 607 2.0 re-organize for rlink v4 @@ -24,7 +25,7 @@ /*! \file - \version $Id: RlinkServer.hpp 632 2015-01-11 12:30:03Z mueller $ + \version $Id: RlinkServer.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class \c RlinkServer. */ @@ -108,7 +109,8 @@ namespace Retro { const Rstats& Stats() const; void Print(std::ostream& os) const; - void Dump(std::ostream& os, int ind=0, const char* text=0) const; + void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; // statistics counter indices enum stats { diff --git a/tools/src/librlinktpp/RtclRlinkConnect.cpp b/tools/src/librlinktpp/RtclRlinkConnect.cpp index 546d8d5c..dbc311d2 100644 --- a/tools/src/librlinktpp/RtclRlinkConnect.cpp +++ b/tools/src/librlinktpp/RtclRlinkConnect.cpp @@ -1,4 +1,4 @@ -// $Id: RtclRlinkConnect.cpp 854 2017-02-25 14:46:03Z mueller $ +// $Id: RtclRlinkConnect.cpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2011-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-02 865 1.5.1 M_dump: use GetArgsDump and Dump detail // 2017-02-20 854 1.5 use Rtime // 2016-04-02 758 1.4.6 add USR_ACCESS register support (UsrAcc->usracc) // 2016-03-20 748 1.4.5 M_get/set: add timeout @@ -41,7 +42,7 @@ /*! \file - \version $Id: RtclRlinkConnect.cpp 854 2017-02-25 14:46:03Z mueller $ + \version $Id: RtclRlinkConnect.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of class RtclRlinkConnect. */ @@ -742,10 +743,12 @@ int RtclRlinkConnect::M_print(RtclArgs& args) int RtclRlinkConnect::M_dump(RtclArgs& args) { + int detail=0; + if (!GetArgsDump(args, detail)) return kERR; if (!args.AllDone()) return kERR; ostringstream sos; - Obj().Dump(sos, 0); + Obj().Dump(sos, 0, "", detail); args.SetResult(sos); return kOK; } diff --git a/tools/src/librlinktpp/RtclRlinkPort.cpp b/tools/src/librlinktpp/RtclRlinkPort.cpp index 2118504f..e81b1c5e 100644 --- a/tools/src/librlinktpp/RtclRlinkPort.cpp +++ b/tools/src/librlinktpp/RtclRlinkPort.cpp @@ -1,4 +1,4 @@ -// $Id: RtclRlinkPort.cpp 853 2017-02-19 18:54:30Z mueller $ +// $Id: RtclRlinkPort.cpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2013-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-02 865 1.1.1 M_dump: use GetArgsDump and Dump detail // 2017-02-19 853 1.1 use Rtime // 2015-01-09 632 1.0.4 add M_get, M_set, remove M_config // 2014-08-22 584 1.0.3 use nullptr @@ -23,7 +24,7 @@ /*! \file - \version $Id: RtclRlinkPort.cpp 853 2017-02-19 18:54:30Z mueller $ + \version $Id: RtclRlinkPort.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of class RtclRlinkPort. */ @@ -182,11 +183,13 @@ int RtclRlinkPort::M_log(RtclArgs& args) int RtclRlinkPort::M_dump(RtclArgs& args) { + int detail=0; + if (!GetArgsDump(args, detail)) return kERR; if (!args.AllDone()) return kERR; if (!TestOpen(args)) return kERR; ostringstream sos; - fpObj->Dump(sos, 0); + fpObj->Dump(sos, 0, "", 0); args.SetResult(sos); return kOK; } diff --git a/tools/src/librlinktpp/RtclRlinkServer.cpp b/tools/src/librlinktpp/RtclRlinkServer.cpp index 6f8e0248..a845305a 100644 --- a/tools/src/librlinktpp/RtclRlinkServer.cpp +++ b/tools/src/librlinktpp/RtclRlinkServer.cpp @@ -1,6 +1,6 @@ -// $Id: RtclRlinkServer.cpp 662 2015-04-05 08:02:54Z mueller $ +// $Id: RtclRlinkServer.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013-2015 by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-02 865 1.1.1 M_dump: use GetArgsDump and Dump detail // 2015-04-04 662 1.1 add M_get, M_set; remove 'server -trace' // 2014-08-22 584 1.0.6 use nullptr // 2013-05-01 513 1.0.5 TraceLevel now uint32_t @@ -25,7 +26,7 @@ /*! \file - \version $Id: RtclRlinkServer.cpp 662 2015-04-05 08:02:54Z mueller $ + \version $Id: RtclRlinkServer.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of class RtclRlinkServer. */ @@ -291,10 +292,12 @@ int RtclRlinkServer::M_print(RtclArgs& args) int RtclRlinkServer::M_dump(RtclArgs& args) { + int detail=0; + if (!GetArgsDump(args, detail)) return kERR; if (!args.AllDone()) return kERR; ostringstream sos; - Obj().Dump(sos, 0); + Obj().Dump(sos, 0, "", detail); args.SetResult(sos); return kOK; } diff --git a/tools/src/librw11/Rw11.cpp b/tools/src/librw11/Rw11.cpp index 4a0efb28..0b760dc5 100644 --- a/tools/src/librw11/Rw11.cpp +++ b/tools/src/librw11/Rw11.cpp @@ -1,6 +1,6 @@ -// $Id: Rw11.cpp 625 2014-12-30 16:17:45Z mueller $ +// $Id: Rw11.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013-2014 by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2014-12-30 625 1.1 adopt to Rlink V4 attn logic // 2013-03-06 495 1.0 Initial version // 2013-01-27 478 0.1 First draft @@ -20,7 +21,7 @@ /*! \file - \version $Id: Rw11.cpp 625 2014-12-30 16:17:45Z mueller $ + \version $Id: Rw11.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11. */ @@ -117,7 +118,7 @@ void Rw11::Start() //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11::Dump(std::ostream& os, int ind, const char* text) const +void Rw11::Dump(std::ostream& os, int ind, const char* text, int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11 @ " << this << endl; diff --git a/tools/src/librw11/Rw11.hpp b/tools/src/librw11/Rw11.hpp index 7f9ae366..809aa753 100644 --- a/tools/src/librw11/Rw11.hpp +++ b/tools/src/librw11/Rw11.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11.hpp 625 2014-12-30 16:17:45Z mueller $ +// $Id: Rw11.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013-2014 by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2014-12-29 624 1.1 adopt to Rlink V4 attn logic // 2013-03-06 495 1.0 Initial version // 2013-01-27 478 0.1 First draft @@ -21,7 +22,7 @@ /*! \file - \version $Id: Rw11.hpp 625 2014-12-30 16:17:45Z mueller $ + \version $Id: Rw11.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11. */ @@ -56,7 +57,8 @@ namespace Retro { void Start(); bool IsStarted() const; - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; // some constants (also defined in cpp) static const int kLam = 0; //!< W11 CPU cluster lam diff --git a/tools/src/librw11/Rw11Cpu.cpp b/tools/src/librw11/Rw11Cpu.cpp index 9f564629..ff628b49 100644 --- a/tools/src/librw11/Rw11Cpu.cpp +++ b/tools/src/librw11/Rw11Cpu.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11Cpu.cpp 857 2017-02-26 15:27:41Z mueller $ +// $Id: Rw11Cpu.cpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2013-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.2.12 Dump(): add detail arg // 2017-02-26 857 1.2.11 add kCPAH_M_UBM22 // 2017-02-19 853 1.2.10 use Rtime // 2017-02-17 851 1.2.9 probe/setup auxilliary devices: kw11l,kw11p,iist @@ -37,7 +38,7 @@ /*! \file - \version $Id: Rw11Cpu.cpp 857 2017-02-26 15:27:41Z mueller $ + \version $Id: Rw11Cpu.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11Cpu. */ #include @@ -858,7 +859,8 @@ void Rw11Cpu::W11AttnHandler() //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11Cpu::Dump(std::ostream& os, int ind, const char* text) const +void Rw11Cpu::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11Cpu @ " << this << endl; @@ -879,9 +881,9 @@ void Rw11Cpu::Dump(std::ostream& os, int ind, const char* text) const os << bl << " " << RosPrintf((it->first).c_str(), "-s",8) << " : " << it->second << endl; } - fIAddrMap.Dump(os, ind+2, "fIAddrMap: "); - fRAddrMap.Dump(os, ind+2, "fRAddrMap: "); - fStats.Dump(os, ind+2, "fStats: "); + fIAddrMap.Dump(os, ind+2, "fIAddrMap: ", detail-1); + fRAddrMap.Dump(os, ind+2, "fRAddrMap: ", detail-1); + fStats.Dump(os, ind+2, "fStats: ", detail); return; } diff --git a/tools/src/librw11/Rw11Cpu.hpp b/tools/src/librw11/Rw11Cpu.hpp index 7df9d050..641d63a1 100644 --- a/tools/src/librw11/Rw11Cpu.hpp +++ b/tools/src/librw11/Rw11Cpu.hpp @@ -1,4 +1,4 @@ -// $Id: Rw11Cpu.hpp 866 2017-04-02 17:20:13Z mueller $ +// $Id: Rw11Cpu.hpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2013-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.2.10 Dump(): add detail arg // 2017-02-26 857 1.2.9 add kCPAH_M_UBM22 // 2017-02-19 853 1.2.8 use Rtime // 2017-02-17 851 1.2.7 probe/setup auxilliary devices: kw11l,kw11p,iist @@ -33,7 +34,7 @@ /*! \file - \version $Id: Rw11Cpu.hpp 866 2017-04-02 17:20:13Z mueller $ + \version $Id: Rw11Cpu.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11Cpu. */ @@ -163,7 +164,8 @@ namespace Retro { void W11AttnHandler(); const Rstats& Stats() const; - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; // some constants (also defined in cpp) static const uint16_t kCPCONF = 0x0000; //!< CPCONF reg offset diff --git a/tools/src/librw11/Rw11CpuW11a.cpp b/tools/src/librw11/Rw11CpuW11a.cpp index 63ce165d..0ed47543 100644 --- a/tools/src/librw11/Rw11CpuW11a.cpp +++ b/tools/src/librw11/Rw11CpuW11a.cpp @@ -1,6 +1,6 @@ -// $Id: Rw11CpuW11a.cpp 621 2014-12-26 21:20:05Z mueller $ +// $Id: Rw11CpuW11a.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013-2014 by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2014-12-25 621 1.1 adopt to 4k word ibus window // 2013-03-03 494 1.0 Initial version // 2013-01-27 478 0.1 First draft @@ -20,7 +21,7 @@ /*! \file - \version $Id: Rw11CpuW11a.cpp 621 2014-12-26 21:20:05Z mueller $ + \version $Id: Rw11CpuW11a.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11CpuW11a. */ @@ -65,11 +66,12 @@ void Rw11CpuW11a::Setup(size_t ind, uint16_t base, uint16_t ibase) //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11CpuW11a::Dump(std::ostream& os, int ind, const char* text) const +void Rw11CpuW11a::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11CpuW11a @ " << this << endl; - Rw11Cpu::Dump(os, ind, " ^"); + Rw11Cpu::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11CpuW11a.hpp b/tools/src/librw11/Rw11CpuW11a.hpp index 73f6738c..d688bee0 100644 --- a/tools/src/librw11/Rw11CpuW11a.hpp +++ b/tools/src/librw11/Rw11CpuW11a.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11CpuW11a.hpp 621 2014-12-26 21:20:05Z mueller $ +// $Id: Rw11CpuW11a.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013-2014 by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2014-12-25 621 1.1 adopt to 4k word ibus window // 2013-03-03 494 1.0 Initial version // 2013-01-27 478 0.1 First draft @@ -21,7 +22,7 @@ /*! \file - \version $Id: Rw11CpuW11a.hpp 621 2014-12-26 21:20:05Z mueller $ + \version $Id: Rw11CpuW11a.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11CpuW11a. */ @@ -40,7 +41,8 @@ namespace Retro { void Setup(size_t ind, uint16_t base, uint16_t ibase); - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; protected: }; diff --git a/tools/src/librw11/Rw11Probe.cpp b/tools/src/librw11/Rw11Probe.cpp index 170e119f..6aa67587 100644 --- a/tools/src/librw11/Rw11Probe.cpp +++ b/tools/src/librw11/Rw11Probe.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11Probe.cpp 848 2017-02-04 14:55:30Z mueller $ +// $Id: Rw11Probe.cpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2013-2017 by Walter F.J. Mueller // @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2017-02-04 848 1.1 Keep probe data; add DataInt(), DataRem() // 2013-03-05 495 1.0 Initial version // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11Probe.cpp 848 2017-02-04 14:55:30Z mueller $ + \version $Id: Rw11Probe.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11Probe. */ @@ -88,7 +89,8 @@ char Rw11Probe::IndicatorRem() const //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11Probe::Dump(std::ostream& os, int ind, const char* text) const +void Rw11Probe::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11Probe @ " << this << endl; diff --git a/tools/src/librw11/Rw11Probe.hpp b/tools/src/librw11/Rw11Probe.hpp index be2de69c..214f5629 100644 --- a/tools/src/librw11/Rw11Probe.hpp +++ b/tools/src/librw11/Rw11Probe.hpp @@ -1,4 +1,4 @@ -// $Id: Rw11Probe.hpp 848 2017-02-04 14:55:30Z mueller $ +// $Id: Rw11Probe.hpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2013-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2017-02-04 848 1.1 Keep probe data; add DataInt(), DataRem() // 2013-03-05 495 1.0 Initial version // --------------------------------------------------------------------------- @@ -20,7 +21,7 @@ /*! \file - \version $Id: Rw11Probe.hpp 848 2017-02-04 14:55:30Z mueller $ + \version $Id: Rw11Probe.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11Probe. */ @@ -49,7 +50,8 @@ namespace Retro { uint16_t DataInt() const; uint16_t DataRem() const; - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; }; } // end namespace Retro diff --git a/tools/src/librw11/Rw11Unit.cpp b/tools/src/librw11/Rw11Unit.cpp index 6e71aa84..7ae12c8a 100644 --- a/tools/src/librw11/Rw11Unit.cpp +++ b/tools/src/librw11/Rw11Unit.cpp @@ -1,6 +1,6 @@ -// $Id: Rw11Unit.cpp 680 2015-05-14 13:29:46Z mueller $ +// $Id: Rw11Unit.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013-2015 by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.2 Dump(): add detail arg // 2015-05-13 680 1.1.1 add Enabled() // 2013-05-03 515 1.1 use AttachDone(),DetachCleanup(),DetachDone() // 2013-03-06 495 1.0 Initial version @@ -21,7 +22,7 @@ /*! \file - \version $Id: Rw11Unit.cpp 680 2015-05-14 13:29:46Z mueller $ + \version $Id: Rw11Unit.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11Unit. */ @@ -83,14 +84,15 @@ void Rw11Unit::Detach() //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11Unit::Dump(std::ostream& os, int ind, const char* text) const +void Rw11Unit::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11Unit @ " << this << endl; os << bl << " fIndex: " << fIndex << endl; os << bl << " fAttachOpts: " << fAttachOpts << endl; - fStats.Dump(os, ind+2, "fStats: "); + fStats.Dump(os, ind+2, "fStats: ", detail-1); return; } diff --git a/tools/src/librw11/Rw11Unit.hpp b/tools/src/librw11/Rw11Unit.hpp index 4e264eab..46a87630 100644 --- a/tools/src/librw11/Rw11Unit.hpp +++ b/tools/src/librw11/Rw11Unit.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11Unit.hpp 680 2015-05-14 13:29:46Z mueller $ +// $Id: Rw11Unit.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013-2015 by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.2 Dump(): add detail arg // 2015-05-13 680 1.1.1 add Enabled() // 2013-05-03 515 1.1 use AttachDone(),DetachCleanup(),DetachDone() // 2013-05-01 513 1.0.1 add fAttachOpts, (Set)AttachOpts() @@ -23,7 +24,7 @@ /*! \file - \version $Id: Rw11Unit.hpp 680 2015-05-14 13:29:46Z mueller $ + \version $Id: Rw11Unit.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11Unit. */ @@ -68,7 +69,8 @@ namespace Retro { virtual void Detach(); const Rstats& Stats() const; - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; // statistics counter indices enum stats { diff --git a/tools/src/librw11/Rw11UnitDL11.cpp b/tools/src/librw11/Rw11UnitDL11.cpp index 469c2a8d..5060e0c2 100644 --- a/tools/src/librw11/Rw11UnitDL11.cpp +++ b/tools/src/librw11/Rw11UnitDL11.cpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitDL11.cpp 504 2013-04-13 15:37:24Z mueller $ +// $Id: Rw11UnitDL11.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-03-03 494 1.0 Initial version // 2013-02-13 488 0.1 First draft // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11UnitDL11.cpp 504 2013-04-13 15:37:24Z mueller $ + \version $Id: Rw11UnitDL11.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11UnitDL11. */ @@ -56,11 +57,12 @@ Rw11UnitDL11::~Rw11UnitDL11() //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11UnitDL11::Dump(std::ostream& os, int ind, const char* text) const +void Rw11UnitDL11::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11UnitDL11 @ " << this << endl; - Rw11UnitTermBase::Dump(os, ind, " ^"); + Rw11UnitTermBase::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11UnitDL11.hpp b/tools/src/librw11/Rw11UnitDL11.hpp index 2a4dffac..c677304d 100644 --- a/tools/src/librw11/Rw11UnitDL11.hpp +++ b/tools/src/librw11/Rw11UnitDL11.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitDL11.hpp 856 2017-02-25 20:09:10Z mueller $ +// $Id: Rw11UnitDL11.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-03-03 494 1.0 Initial version // 2013-02-13 488 0.1 First draft // --------------------------------------------------------------------------- @@ -20,7 +21,7 @@ /*! \file - \version $Id: Rw11UnitDL11.hpp 856 2017-02-25 20:09:10Z mueller $ + \version $Id: Rw11UnitDL11.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11UnitDL11. */ @@ -39,7 +40,8 @@ namespace Retro { Rw11UnitDL11(Rw11CntlDL11* pcntl, size_t index); ~Rw11UnitDL11(); - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; protected: diff --git a/tools/src/librw11/Rw11UnitDisk.cpp b/tools/src/librw11/Rw11UnitDisk.cpp index ceb59359..214ed155 100644 --- a/tools/src/librw11/Rw11UnitDisk.cpp +++ b/tools/src/librw11/Rw11UnitDisk.cpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitDisk.cpp 659 2015-03-22 23:15:51Z mueller $ +// $Id: Rw11UnitDisk.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.2 Dump(): add detail arg // 2015-03-21 659 1.0.1 add fEnabled, Enabled() // 2013-04-19 507 1.0 Initial version // 2013-02-19 490 0.1 First draft @@ -20,7 +21,7 @@ /*! \file - \version $Id: Rw11UnitDisk.cpp 659 2015-03-22 23:15:51Z mueller $ + \version $Id: Rw11UnitDisk.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11UnitDisk. */ @@ -98,7 +99,8 @@ bool Rw11UnitDisk::VirtWrite(size_t lba, size_t nblk, const uint8_t* data, //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11UnitDisk::Dump(std::ostream& os, int ind, const char* text) const +void Rw11UnitDisk::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11UnitDisk @ " << this << endl; @@ -111,7 +113,7 @@ void Rw11UnitDisk::Dump(std::ostream& os, int ind, const char* text) const os << bl << " fNBlock: " << fNBlock << endl; os << bl << " fWProt: " << fWProt << endl; - Rw11UnitVirt::Dump(os, ind, " ^"); + Rw11UnitVirt::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11UnitDisk.hpp b/tools/src/librw11/Rw11UnitDisk.hpp index ac1b1dab..9093e7a7 100644 --- a/tools/src/librw11/Rw11UnitDisk.hpp +++ b/tools/src/librw11/Rw11UnitDisk.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitDisk.hpp 680 2015-05-14 13:29:46Z mueller $ +// $Id: Rw11UnitDisk.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013-2015 by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.3 Dump(): add detail arg // 2015-03-21 659 1.0.2 add fEnabled, Enabled() // 2015-02-18 647 1.0.1 add Nwrd2Nblk() // 2013-04-19 507 1.0 Initial version @@ -22,7 +23,7 @@ /*! \file - \version $Id: Rw11UnitDisk.hpp 680 2015-05-14 13:29:46Z mueller $ + \version $Id: Rw11UnitDisk.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11UnitDisk. */ @@ -63,7 +64,8 @@ namespace Retro { bool VirtWrite(size_t lba, size_t nblk, const uint8_t* data, RerrMsg& emsg); - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; protected: std::string fType; //!< drive type diff --git a/tools/src/librw11/Rw11UnitDiskBase.hpp b/tools/src/librw11/Rw11UnitDiskBase.hpp index 5aa289ce..2e582e24 100644 --- a/tools/src/librw11/Rw11UnitDiskBase.hpp +++ b/tools/src/librw11/Rw11UnitDiskBase.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitDiskBase.hpp 515 2013-05-04 17:28:59Z mueller $ +// $Id: Rw11UnitDiskBase.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2013-05-03 515 1.1 use AttachDone(),DetachCleanup(),DetachDone() // 2013-04-14 506 1.0 Initial version // 2013-02-22 490 0.1 First draft @@ -21,7 +22,7 @@ /*! \file - \version $Id: Rw11UnitDiskBase.hpp 515 2013-05-04 17:28:59Z mueller $ + \version $Id: Rw11UnitDiskBase.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11UnitDiskBase. */ @@ -41,7 +42,8 @@ namespace Retro { TC& Cntl() const; - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; protected: virtual void AttachDone(); diff --git a/tools/src/librw11/Rw11UnitDiskBase.ipp b/tools/src/librw11/Rw11UnitDiskBase.ipp index 4ec24ed0..f3a91a42 100644 --- a/tools/src/librw11/Rw11UnitDiskBase.ipp +++ b/tools/src/librw11/Rw11UnitDiskBase.ipp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitDiskBase.ipp 515 2013-05-04 17:28:59Z mueller $ +// $Id: Rw11UnitDiskBase.ipp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2013-05-03 515 1.1 use AttachDone(),DetachCleanup(),DetachDone() // 2013-04-14 506 1.0 Initial version // 2013-02-22 490 0.1 First draft @@ -20,7 +21,7 @@ /*! \file - \version $Id: Rw11UnitDiskBase.ipp 515 2013-05-04 17:28:59Z mueller $ + \version $Id: Rw11UnitDiskBase.ipp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation (inline) of Rw11UnitDiskBase. */ @@ -63,13 +64,13 @@ inline TC& Rw11UnitDiskBase::Cntl() const //! FIXME_docs template -void Rw11UnitDiskBase::Dump(std::ostream& os, int ind, - const char* text) const +void Rw11UnitDiskBase::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11UnitDiskBase @ " << this << std::endl; os << bl << " fpCntl: " << fpCntl << std::endl; - Rw11UnitDisk::Dump(os, ind, " ^"); + Rw11UnitDisk::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11UnitLP11.cpp b/tools/src/librw11/Rw11UnitLP11.cpp index c82faf81..d479a247 100644 --- a/tools/src/librw11/Rw11UnitLP11.cpp +++ b/tools/src/librw11/Rw11UnitLP11.cpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitLP11.cpp 515 2013-05-04 17:28:59Z mueller $ +// $Id: Rw11UnitLP11.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,12 +13,13 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-05-01 513 1.0 Initial version // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11UnitLP11.cpp 515 2013-05-04 17:28:59Z mueller $ + \version $Id: Rw11UnitLP11.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11UnitLP11. */ @@ -57,11 +58,12 @@ Rw11UnitLP11::~Rw11UnitLP11() //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11UnitLP11::Dump(std::ostream& os, int ind, const char* text) const +void Rw11UnitLP11::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11UnitLP11 @ " << this << endl; - Rw11UnitStreamBase::Dump(os, ind, " ^"); + Rw11UnitStreamBase::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11UnitLP11.hpp b/tools/src/librw11/Rw11UnitLP11.hpp index 324cdd4b..8c8fd6f8 100644 --- a/tools/src/librw11/Rw11UnitLP11.hpp +++ b/tools/src/librw11/Rw11UnitLP11.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitLP11.hpp 856 2017-02-25 20:09:10Z mueller $ +// $Id: Rw11UnitLP11.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-05-01 513 1.0 Initial version // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11UnitLP11.hpp 856 2017-02-25 20:09:10Z mueller $ + \version $Id: Rw11UnitLP11.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11UnitLP11. */ @@ -38,7 +39,8 @@ namespace Retro { Rw11UnitLP11(Rw11CntlLP11* pcntl, size_t index); ~Rw11UnitLP11(); - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; protected: diff --git a/tools/src/librw11/Rw11UnitPC11.cpp b/tools/src/librw11/Rw11UnitPC11.cpp index 6af19987..a3328d4d 100644 --- a/tools/src/librw11/Rw11UnitPC11.cpp +++ b/tools/src/librw11/Rw11UnitPC11.cpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitPC11.cpp 515 2013-05-04 17:28:59Z mueller $ +// $Id: Rw11UnitPC11.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,12 +13,13 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-05-03 515 1.0 Initial version // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11UnitPC11.cpp 515 2013-05-04 17:28:59Z mueller $ + \version $Id: Rw11UnitPC11.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11UnitPC11. */ @@ -60,11 +61,12 @@ Rw11UnitPC11::~Rw11UnitPC11() //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11UnitPC11::Dump(std::ostream& os, int ind, const char* text) const +void Rw11UnitPC11::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11UnitPC11 @ " << this << endl; - Rw11UnitStreamBase::Dump(os, ind, " ^"); + Rw11UnitStreamBase::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11UnitPC11.hpp b/tools/src/librw11/Rw11UnitPC11.hpp index 9482f583..f85d3c14 100644 --- a/tools/src/librw11/Rw11UnitPC11.hpp +++ b/tools/src/librw11/Rw11UnitPC11.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitPC11.hpp 856 2017-02-25 20:09:10Z mueller $ +// $Id: Rw11UnitPC11.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-05-03 515 1.0 Initial version // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11UnitPC11.hpp 856 2017-02-25 20:09:10Z mueller $ + \version $Id: Rw11UnitPC11.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11UnitPC11. */ @@ -38,7 +39,8 @@ namespace Retro { Rw11UnitPC11(Rw11CntlPC11* pcntl, size_t index); ~Rw11UnitPC11(); - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; protected: diff --git a/tools/src/librw11/Rw11UnitRHRP.cpp b/tools/src/librw11/Rw11UnitRHRP.cpp index a382182b..115811a8 100644 --- a/tools/src/librw11/Rw11UnitRHRP.cpp +++ b/tools/src/librw11/Rw11UnitRHRP.cpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitRHRP.cpp 680 2015-05-14 13:29:46Z mueller $ +// $Id: Rw11UnitRHRP.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2015- by Walter F.J. Mueller +// Copyright 2015-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2015-05-14 680 1.0 Initial version // 2015-03-21 659 0.1 First draft // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11UnitRHRP.cpp 680 2015-05-14 13:29:46Z mueller $ + \version $Id: Rw11UnitRHRP.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11UnitRHRP. */ @@ -134,14 +135,15 @@ void Rw11UnitRHRP::SetType(const std::string& type) //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11UnitRHRP::Dump(std::ostream& os, int ind, const char* text) const +void Rw11UnitRHRP::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11UnitRHRP @ " << this << endl; os << bl << " fRpdt: " << RosPrintf(fRpdt,"o",6) << endl; os << bl << " fRpds: " << RosPrintf(fRpds,"o",6) << endl; - Rw11UnitDiskBase::Dump(os, ind, " ^"); + Rw11UnitDiskBase::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11UnitRHRP.hpp b/tools/src/librw11/Rw11UnitRHRP.hpp index 83ada863..26053ff7 100644 --- a/tools/src/librw11/Rw11UnitRHRP.hpp +++ b/tools/src/librw11/Rw11UnitRHRP.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitRHRP.hpp 680 2015-05-14 13:29:46Z mueller $ +// $Id: Rw11UnitRHRP.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2015- by Walter F.J. Mueller +// Copyright 2015-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2015-05-14 680 1.0 Initial version // 2015-03-21 659 0.1 First draft // --------------------------------------------------------------------------- @@ -20,7 +21,7 @@ /*! \file - \version $Id: Rw11UnitRHRP.hpp 680 2015-05-14 13:29:46Z mueller $ + \version $Id: Rw11UnitRHRP.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11UnitRHRP. */ @@ -45,7 +46,8 @@ namespace Retro { void SetRpds(uint16_t rpds); uint16_t Rpds() const; - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; // some constants (also defined in cpp) static const uint16_t kDTE_M_RM = kWBit02; //!< rm type flag diff --git a/tools/src/librw11/Rw11UnitRK11.cpp b/tools/src/librw11/Rw11UnitRK11.cpp index b15e2515..916b9590 100644 --- a/tools/src/librw11/Rw11UnitRK11.cpp +++ b/tools/src/librw11/Rw11UnitRK11.cpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitRK11.cpp 659 2015-03-22 23:15:51Z mueller $ +// $Id: Rw11UnitRK11.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-04-20 508 1.0 Initial version // 2013-02-05 483 0.1 First draft // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11UnitRK11.cpp 659 2015-03-22 23:15:51Z mueller $ + \version $Id: Rw11UnitRK11.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11UnitRK11. */ @@ -66,13 +67,14 @@ Rw11UnitRK11::~Rw11UnitRK11() //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11UnitRK11::Dump(std::ostream& os, int ind, const char* text) const +void Rw11UnitRK11::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11UnitRK11 @ " << this << endl; os << bl << " fRkds: " << fRkds << endl; - Rw11UnitDiskBase::Dump(os, ind, " ^"); + Rw11UnitDiskBase::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11UnitRK11.hpp b/tools/src/librw11/Rw11UnitRK11.hpp index 49939b91..886ba35c 100644 --- a/tools/src/librw11/Rw11UnitRK11.hpp +++ b/tools/src/librw11/Rw11UnitRK11.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitRK11.hpp 509 2013-04-21 20:46:20Z mueller $ +// $Id: Rw11UnitRK11.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-04-20 508 1.0 Initial version // 2013-02-13 488 0.1 First draft // --------------------------------------------------------------------------- @@ -20,7 +21,7 @@ /*! \file - \version $Id: Rw11UnitRK11.hpp 509 2013-04-21 20:46:20Z mueller $ + \version $Id: Rw11UnitRK11.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11UnitRK11. */ @@ -41,7 +42,8 @@ namespace Retro { void SetRkds(uint16_t rkds); uint16_t Rkds() const; - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; protected: uint16_t fRkds; diff --git a/tools/src/librw11/Rw11UnitRL11.cpp b/tools/src/librw11/Rw11UnitRL11.cpp index f531ac8e..2f53153a 100644 --- a/tools/src/librw11/Rw11UnitRL11.cpp +++ b/tools/src/librw11/Rw11UnitRL11.cpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitRL11.cpp 659 2015-03-22 23:15:51Z mueller $ +// $Id: Rw11UnitRL11.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2014- by Walter F.J. Mueller +// Copyright 2014-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.2 Dump(): add detail arg // 2015-03-21 659 1.0.1 BUGFIX: SetType(): set fType; // 2014-06-08 561 1.0 Initial version // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11UnitRL11.cpp 659 2015-03-22 23:15:51Z mueller $ + \version $Id: Rw11UnitRL11.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11UnitRL11. */ @@ -92,14 +93,15 @@ void Rw11UnitRL11::SetType(const std::string& type) //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11UnitRL11::Dump(std::ostream& os, int ind, const char* text) const +void Rw11UnitRL11::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11UnitRL11 @ " << this << endl; os << bl << " fRlsta: " << RosPrintf(fRlsta,"o",6) << endl; os << bl << " fRlpos: " << RosPrintf(fRlpos,"o",6) << endl; - Rw11UnitDiskBase::Dump(os, ind, " ^"); + Rw11UnitDiskBase::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11UnitRL11.hpp b/tools/src/librw11/Rw11UnitRL11.hpp index d2becc17..3279ea34 100644 --- a/tools/src/librw11/Rw11UnitRL11.hpp +++ b/tools/src/librw11/Rw11UnitRL11.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitRL11.hpp 653 2015-03-01 12:53:01Z mueller $ +// $Id: Rw11UnitRL11.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2014- by Walter F.J. Mueller +// Copyright 2014-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2014-06-08 561 1.0 Initial version // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11UnitRL11.hpp 653 2015-03-01 12:53:01Z mueller $ + \version $Id: Rw11UnitRL11.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11UnitRL11. */ @@ -44,7 +45,8 @@ namespace Retro { uint16_t Rlsta() const; uint16_t Rlpos() const; - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; protected: uint16_t fRlsta; diff --git a/tools/src/librw11/Rw11UnitStream.cpp b/tools/src/librw11/Rw11UnitStream.cpp index ebb2fa38..4a0eb047 100644 --- a/tools/src/librw11/Rw11UnitStream.cpp +++ b/tools/src/librw11/Rw11UnitStream.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11UnitStream.cpp 848 2017-02-04 14:55:30Z mueller $ +// $Id: Rw11UnitStream.cpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2013-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2017-02-04 848 1.1 Pos(): return -1 if not attached // 2013-05-04 515 1.0 Initial version // 2013-05-01 513 0.1 First draft @@ -20,7 +21,7 @@ /*! \file - \version $Id: Rw11UnitStream.cpp 848 2017-02-04 14:55:30Z mueller $ + \version $Id: Rw11UnitStream.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11UnitStream. */ @@ -123,11 +124,12 @@ bool Rw11UnitStream::VirtFlush(RerrMsg& emsg) //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11UnitStream::Dump(std::ostream& os, int ind, const char* text) const +void Rw11UnitStream::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11UnitStream @ " << this << endl; - Rw11UnitVirt::Dump(os, ind, " ^"); + Rw11UnitVirt::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11UnitStream.hpp b/tools/src/librw11/Rw11UnitStream.hpp index 7fa5f906..389cd9ad 100644 --- a/tools/src/librw11/Rw11UnitStream.hpp +++ b/tools/src/librw11/Rw11UnitStream.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitStream.hpp 515 2013-05-04 17:28:59Z mueller $ +// $Id: Rw11UnitStream.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-05-04 515 1.0 Initial version // 2013-05-01 513 0.1 First draft // --------------------------------------------------------------------------- @@ -20,7 +21,7 @@ /*! \file - \version $Id: Rw11UnitStream.hpp 515 2013-05-04 17:28:59Z mueller $ + \version $Id: Rw11UnitStream.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11UnitStream. */ @@ -45,7 +46,8 @@ namespace Retro { bool VirtWrite(const uint8_t* data, size_t count, RerrMsg& emsg); bool VirtFlush(RerrMsg& emsg); - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; // statistics counter indices enum stats { diff --git a/tools/src/librw11/Rw11UnitStreamBase.hpp b/tools/src/librw11/Rw11UnitStreamBase.hpp index 0df1914d..a0b658db 100644 --- a/tools/src/librw11/Rw11UnitStreamBase.hpp +++ b/tools/src/librw11/Rw11UnitStreamBase.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitStreamBase.hpp 515 2013-05-04 17:28:59Z mueller $ +// $Id: Rw11UnitStreamBase.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-05-04 515 1.0 Initial version // 2013-05-01 513 0.1 First draft // --------------------------------------------------------------------------- @@ -20,7 +21,7 @@ /*! \file - \version $Id: Rw11UnitStreamBase.hpp 515 2013-05-04 17:28:59Z mueller $ + \version $Id: Rw11UnitStreamBase.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11UnitStreamBase. */ @@ -40,7 +41,8 @@ namespace Retro { TC& Cntl() const; - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; protected: virtual void AttachDone(); diff --git a/tools/src/librw11/Rw11UnitStreamBase.ipp b/tools/src/librw11/Rw11UnitStreamBase.ipp index a2967e4b..ad557fbf 100644 --- a/tools/src/librw11/Rw11UnitStreamBase.ipp +++ b/tools/src/librw11/Rw11UnitStreamBase.ipp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitStreamBase.ipp 515 2013-05-04 17:28:59Z mueller $ +// $Id: Rw11UnitStreamBase.ipp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-05-04 515 1.0 Initial version // 2013-05-01 513 0.1 First draft // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11UnitStreamBase.ipp 515 2013-05-04 17:28:59Z mueller $ + \version $Id: Rw11UnitStreamBase.ipp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation (inline) of Rw11UnitStreamBase. */ @@ -62,13 +63,13 @@ inline TC& Rw11UnitStreamBase::Cntl() const //! FIXME_docs template -void Rw11UnitStreamBase::Dump(std::ostream& os, int ind, - const char* text) const +void Rw11UnitStreamBase::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11UnitStreamBase @ " << this << std::endl; os << bl << " fpCntl: " << fpCntl << std::endl; - Rw11UnitStream::Dump(os, ind, " ^"); + Rw11UnitStream::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11UnitTM11.cpp b/tools/src/librw11/Rw11UnitTM11.cpp index 004fabdb..c418d965 100644 --- a/tools/src/librw11/Rw11UnitTM11.cpp +++ b/tools/src/librw11/Rw11UnitTM11.cpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitTM11.cpp 686 2015-06-04 21:08:08Z mueller $ +// $Id: Rw11UnitTM11.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2015- by Walter F.J. Mueller +// Copyright 2015-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,12 +13,13 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2015-05-17 683 1.0 Initial version // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11UnitTM11.cpp 686 2015-06-04 21:08:08Z mueller $ + \version $Id: Rw11UnitTM11.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11UnitTM11. */ @@ -60,13 +61,14 @@ Rw11UnitTM11::~Rw11UnitTM11() //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11UnitTM11::Dump(std::ostream& os, int ind, const char* text) const +void Rw11UnitTM11::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11UnitTM11 @ " << this << endl; os << bl << " fTmds: " << fTmds << endl; - Rw11UnitTapeBase::Dump(os, ind, " ^"); + Rw11UnitTapeBase::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11UnitTM11.hpp b/tools/src/librw11/Rw11UnitTM11.hpp index 71f09ce2..2b8cc6e5 100644 --- a/tools/src/librw11/Rw11UnitTM11.hpp +++ b/tools/src/librw11/Rw11UnitTM11.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitTM11.hpp 686 2015-06-04 21:08:08Z mueller $ +// $Id: Rw11UnitTM11.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2015- by Walter F.J. Mueller +// Copyright 2015-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2015-05-17 683 1.0 Initial version // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11UnitTM11.hpp 686 2015-06-04 21:08:08Z mueller $ + \version $Id: Rw11UnitTM11.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11UnitTM11. */ @@ -40,7 +41,8 @@ namespace Retro { void SetTmds(uint16_t tmds); uint16_t Tmds() const; - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; protected: uint16_t fTmds; diff --git a/tools/src/librw11/Rw11UnitTape.cpp b/tools/src/librw11/Rw11UnitTape.cpp index 4b6279f0..c86268e6 100644 --- a/tools/src/librw11/Rw11UnitTape.cpp +++ b/tools/src/librw11/Rw11UnitTape.cpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitTape.cpp 686 2015-06-04 21:08:08Z mueller $ +// $Id: Rw11UnitTape.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2015- by Walter F.J. Mueller +// Copyright 2015-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2015-06-04 686 1.0 Initial version // 2015-05-17 683 0.1 First draft // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11UnitTape.cpp 686 2015-06-04 21:08:08Z mueller $ + \version $Id: Rw11UnitTape.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11UnitTape. */ @@ -232,7 +233,8 @@ bool Rw11UnitTape::VirtRewind(int& opcode, RerrMsg& emsg) //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11UnitTape::Dump(std::ostream& os, int ind, const char* text) const +void Rw11UnitTape::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11UnitTape @ " << this << endl; @@ -241,7 +243,7 @@ void Rw11UnitTape::Dump(std::ostream& os, int ind, const char* text) const os << bl << " fWProt: " << fWProt << endl; os << bl << " fCapacity: " << fCapacity << endl; - Rw11UnitVirt::Dump(os, ind, " ^"); + Rw11UnitVirt::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11UnitTape.hpp b/tools/src/librw11/Rw11UnitTape.hpp index f3c610b4..64db5507 100644 --- a/tools/src/librw11/Rw11UnitTape.hpp +++ b/tools/src/librw11/Rw11UnitTape.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitTape.hpp 686 2015-06-04 21:08:08Z mueller $ +// $Id: Rw11UnitTape.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2015- by Walter F.J. Mueller +// Copyright 2015-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2015-06-04 686 1.0 Initial version // 2015-05-17 683 0.1 First draft // --------------------------------------------------------------------------- @@ -20,7 +21,7 @@ /*! \file - \version $Id: Rw11UnitTape.hpp 686 2015-06-04 21:08:08Z mueller $ + \version $Id: Rw11UnitTape.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11UnitTape. */ @@ -69,7 +70,8 @@ namespace Retro { int& opcode, RerrMsg& emsg); bool VirtRewind(int& opcode, RerrMsg& emsg); - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; protected: std::string fType; //!< drive type diff --git a/tools/src/librw11/Rw11UnitTapeBase.hpp b/tools/src/librw11/Rw11UnitTapeBase.hpp index 84842d99..3210304e 100644 --- a/tools/src/librw11/Rw11UnitTapeBase.hpp +++ b/tools/src/librw11/Rw11UnitTapeBase.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitTapeBase.hpp 686 2015-06-04 21:08:08Z mueller $ +// $Id: Rw11UnitTapeBase.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2015- by Walter F.J. Mueller +// Copyright 2015-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2015-05-17 683 1.0 Initial version // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11UnitTapeBase.hpp 686 2015-06-04 21:08:08Z mueller $ + \version $Id: Rw11UnitTapeBase.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11UnitTapeBase. */ @@ -39,7 +40,8 @@ namespace Retro { TC& Cntl() const; - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; protected: virtual void AttachDone(); diff --git a/tools/src/librw11/Rw11UnitTapeBase.ipp b/tools/src/librw11/Rw11UnitTapeBase.ipp index e6d188bc..2381d78f 100644 --- a/tools/src/librw11/Rw11UnitTapeBase.ipp +++ b/tools/src/librw11/Rw11UnitTapeBase.ipp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitTapeBase.ipp 864 2017-04-02 13:20:18Z mueller $ +// $Id: Rw11UnitTapeBase.ipp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2015- by Walter F.J. Mueller +// Copyright 2015-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2015-06-04 686 1.0 Initial version // 2015-05-17 683 0.1 First draft // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11UnitTapeBase.ipp 864 2017-04-02 13:20:18Z mueller $ + \version $Id: Rw11UnitTapeBase.ipp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation (inline) of Rw11UnitTapeBase. */ @@ -62,13 +63,13 @@ inline TC& Rw11UnitTapeBase::Cntl() const //! FIXME_docs template -void Rw11UnitTapeBase::Dump(std::ostream& os, int ind, - const char* text) const +void Rw11UnitTapeBase::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11UnitTapeBase @ " << this << std::endl; os << bl << " fpCntl: " << fpCntl << std::endl; - Rw11UnitTape::Dump(os, ind, " ^"); + Rw11UnitTape::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11UnitTerm.cpp b/tools/src/librw11/Rw11UnitTerm.cpp index c278a004..a84df58e 100644 --- a/tools/src/librw11/Rw11UnitTerm.cpp +++ b/tools/src/librw11/Rw11UnitTerm.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11UnitTerm.cpp 855 2017-02-25 16:30:37Z mueller $ +// $Id: Rw11UnitTerm.cpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2013-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.2 Dump(): add detail arg // 2017-02-25 855 1.1.1 RcvNext() --> RcvQueueNext(); WakeupCntl() now pure // 2013-05-03 515 1.1 use AttachDone(),DetachCleanup(),DetachDone() // 2013-04-13 504 1.0 Initial version @@ -21,7 +22,7 @@ /*! \file - \version $Id: Rw11UnitTerm.cpp 855 2017-02-25 16:30:37Z mueller $ + \version $Id: Rw11UnitTerm.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11UnitTerm. */ @@ -243,7 +244,8 @@ bool Rw11UnitTerm::RcvCallback(const uint8_t* buf, size_t count) //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11UnitTerm::Dump(std::ostream& os, int ind, const char* text) const +void Rw11UnitTerm::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11UnitTerm @ " << this << endl; @@ -282,7 +284,7 @@ void Rw11UnitTerm::Dump(std::ostream& os, int ind, const char* text) const os << bl << " fLogCrPend: " << fLogCrPend << endl; os << bl << " fLogLfLast: " << fLogLfLast << endl; - Rw11UnitVirt::Dump(os, ind, " ^"); + Rw11UnitVirt::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11UnitTerm.hpp b/tools/src/librw11/Rw11UnitTerm.hpp index 2eab8beb..2a44f63c 100644 --- a/tools/src/librw11/Rw11UnitTerm.hpp +++ b/tools/src/librw11/Rw11UnitTerm.hpp @@ -1,4 +1,4 @@ -// $Id: Rw11UnitTerm.hpp 855 2017-02-25 16:30:37Z mueller $ +// $Id: Rw11UnitTerm.hpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2013-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.2 Dump(): add detail arg // 2017-02-25 855 1.1.1 RcvNext() --> RcvQueueNext(); WakeupCntl() now pure // 2013-05-03 515 1.1 use AttachDone(),DetachCleanup(),DetachDone() // 2013-04-20 508 1.0.1 add 7bit and non-printable masking; add log file @@ -23,7 +24,7 @@ /*! \file - \version $Id: Rw11UnitTerm.hpp 855 2017-02-25 16:30:37Z mueller $ + \version $Id: Rw11UnitTerm.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11UnitTerm. */ @@ -67,7 +68,8 @@ namespace Retro { virtual bool RcvCallback(const uint8_t* buf, size_t count); virtual void WakeupCntl() = 0; - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; // statistics counter indices enum stats { diff --git a/tools/src/librw11/Rw11UnitTermBase.hpp b/tools/src/librw11/Rw11UnitTermBase.hpp index 201a923a..3353f5c1 100644 --- a/tools/src/librw11/Rw11UnitTermBase.hpp +++ b/tools/src/librw11/Rw11UnitTermBase.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitTermBase.hpp 504 2013-04-13 15:37:24Z mueller $ +// $Id: Rw11UnitTermBase.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-03-03 494 1.0 Initial version // 2013-02-22 490 0.1 First draft // --------------------------------------------------------------------------- @@ -20,7 +21,7 @@ /*! \file - \version $Id: Rw11UnitTermBase.hpp 504 2013-04-13 15:37:24Z mueller $ + \version $Id: Rw11UnitTermBase.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11UnitTermBase. */ @@ -42,7 +43,8 @@ namespace Retro { virtual void WakeupCntl(); - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; protected: TC* fpCntl; diff --git a/tools/src/librw11/Rw11UnitTermBase.ipp b/tools/src/librw11/Rw11UnitTermBase.ipp index 0d569497..64f4dea1 100644 --- a/tools/src/librw11/Rw11UnitTermBase.ipp +++ b/tools/src/librw11/Rw11UnitTermBase.ipp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitTermBase.ipp 504 2013-04-13 15:37:24Z mueller $ +// $Id: Rw11UnitTermBase.ipp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-03-03 494 1.0 Initial version // 2013-02-22 490 0.1 First draft // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11UnitTermBase.ipp 504 2013-04-13 15:37:24Z mueller $ + \version $Id: Rw11UnitTermBase.ipp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation (inline) of Rw11UnitTermBase. */ @@ -72,13 +73,13 @@ inline void Rw11UnitTermBase::WakeupCntl() //! FIXME_docs template -void Rw11UnitTermBase::Dump(std::ostream& os, int ind, - const char* text) const +void Rw11UnitTermBase::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11UnitTermBase @ " << this << std::endl; os << bl << " fpCntl: " << fpCntl << std::endl; - Rw11UnitTerm::Dump(os, ind, " ^"); + Rw11UnitTerm::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11UnitVirt.hpp b/tools/src/librw11/Rw11UnitVirt.hpp index b948d85e..f0a60c2b 100644 --- a/tools/src/librw11/Rw11UnitVirt.hpp +++ b/tools/src/librw11/Rw11UnitVirt.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitVirt.hpp 504 2013-04-13 15:37:24Z mueller $ +// $Id: Rw11UnitVirt.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-03-03 494 1.0 Initial version // 2013-02-22 490 0.1 First draft // --------------------------------------------------------------------------- @@ -20,7 +21,7 @@ /*! \file - \version $Id: Rw11UnitVirt.hpp 504 2013-04-13 15:37:24Z mueller $ + \version $Id: Rw11UnitVirt.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11UnitVirt. */ @@ -45,7 +46,8 @@ namespace Retro { virtual bool Attach(const std::string& url, RerrMsg& emsg); virtual void Detach(); - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; protected: boost::scoped_ptr fpVirt; diff --git a/tools/src/librw11/Rw11UnitVirt.ipp b/tools/src/librw11/Rw11UnitVirt.ipp index d015759e..8dc0fa85 100644 --- a/tools/src/librw11/Rw11UnitVirt.ipp +++ b/tools/src/librw11/Rw11UnitVirt.ipp @@ -1,6 +1,6 @@ -// $Id: Rw11UnitVirt.ipp 680 2015-05-14 13:29:46Z mueller $ +// $Id: Rw11UnitVirt.ipp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013-2015 by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.2.1 Dump(): add detail arg // 2015-05-13 680 1.2 Attach(): check for Enabled() // 2014-11-02 600 1.1.1 add (bool) cast, needed in 4.8.2 // 2013-05-03 515 1.1 use AttachDone(),DetachCleanup(),DetachDone() @@ -22,7 +23,7 @@ /*! \file - \version $Id: Rw11UnitVirt.ipp 680 2015-05-14 13:29:46Z mueller $ + \version $Id: Rw11UnitVirt.ipp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation (inline) of Rw11UnitVirt. */ @@ -102,18 +103,18 @@ inline void Rw11UnitVirt::Detach() //! FIXME_docs template -void Rw11UnitVirt::Dump(std::ostream& os, int ind, - const char* text) const +void Rw11UnitVirt::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11UnitVirt @ " << this << std::endl; if (fpVirt) { - fpVirt->Dump(os, ind+2, "*fpVirt: "); + fpVirt->Dump(os, ind+2, "*fpVirt: ", detail); } else { os << bl << " fpVirt: " << fpVirt.get() << std::endl; } - Rw11Unit::Dump(os, ind, " ^"); + Rw11Unit::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11Virt.cpp b/tools/src/librw11/Rw11Virt.cpp index d26fc992..9fbc4afe 100644 --- a/tools/src/librw11/Rw11Virt.cpp +++ b/tools/src/librw11/Rw11Virt.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11Virt.cpp 864 2017-04-02 13:20:18Z mueller $ +// $Id: Rw11Virt.cpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2013-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2017-04-02 864 1.1 add fWProt,WProt() // 2013-03-06 495 1.0 Initial version // 2013-02-13 488 0.1 First draft @@ -20,7 +21,7 @@ /*! \file - \version $Id: Rw11Virt.cpp 864 2017-04-02 13:20:18Z mueller $ + \version $Id: Rw11Virt.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11Virt. */ @@ -65,7 +66,8 @@ bool Rw11Virt::WProt() const //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11Virt::Dump(std::ostream& os, int ind, const char* text) const +void Rw11Virt::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11Virt @ " << this << endl; @@ -73,7 +75,7 @@ void Rw11Virt::Dump(std::ostream& os, int ind, const char* text) const os << bl << " fpUnit: " << fpUnit << endl; fUrl.Dump(os, ind+2, "fUrl: "); os << bl << " fWProt: " << fWProt << endl; - fStats.Dump(os, ind+2, "fStats: "); + fStats.Dump(os, ind+2, "fStats: ", detail-1); return; } diff --git a/tools/src/librw11/Rw11Virt.hpp b/tools/src/librw11/Rw11Virt.hpp index e66f9e6c..df1e4355 100644 --- a/tools/src/librw11/Rw11Virt.hpp +++ b/tools/src/librw11/Rw11Virt.hpp @@ -1,4 +1,4 @@ -// $Id: Rw11Virt.hpp 864 2017-04-02 13:20:18Z mueller $ +// $Id: Rw11Virt.hpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2013-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2017-04-02 864 1.1 add fWProt,WProt() // 2013-03-06 495 1.0 Initial version // 2013-02-13 488 0.1 First draft @@ -21,7 +22,7 @@ /*! \file - \version $Id: Rw11Virt.hpp 864 2017-04-02 13:20:18Z mueller $ + \version $Id: Rw11Virt.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11Virt. */ @@ -57,7 +58,8 @@ namespace Retro { const Rstats& Stats() const; - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; // statistics counter indices enum stats { diff --git a/tools/src/librw11/Rw11VirtDisk.cpp b/tools/src/librw11/Rw11VirtDisk.cpp index c5118f48..52adc71f 100644 --- a/tools/src/librw11/Rw11VirtDisk.cpp +++ b/tools/src/librw11/Rw11VirtDisk.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11VirtDisk.cpp 867 2017-04-02 18:16:33Z mueller $ +// $Id: Rw11VirtDisk.cpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2013-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.2.1 Dump(): add detail arg // 2017-04-02 866 1.2 add default scheme handling // 2017-04-02 864 1.1 add Rw11VirtDiskOver // 2013-03-03 494 1.0 Initial version @@ -21,7 +22,7 @@ /*! \file - \version $Id: Rw11VirtDisk.cpp 867 2017-04-02 18:16:33Z mueller $ + \version $Id: Rw11VirtDisk.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11VirtDisk. */ #include @@ -72,14 +73,15 @@ Rw11VirtDisk::~Rw11VirtDisk() //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11VirtDisk::Dump(std::ostream& os, int ind, const char* text) const +void Rw11VirtDisk::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11VirtDisk @ " << this << endl; os << bl << " fBlkSize: " << fBlkSize << endl; os << bl << " fNBlock: " << fNBlock << endl; - Rw11Virt::Dump(os, ind, " ^"); + Rw11Virt::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11VirtDisk.hpp b/tools/src/librw11/Rw11VirtDisk.hpp index e5c247f6..fcf570b0 100644 --- a/tools/src/librw11/Rw11VirtDisk.hpp +++ b/tools/src/librw11/Rw11VirtDisk.hpp @@ -1,4 +1,4 @@ -// $Id: Rw11VirtDisk.hpp 867 2017-04-02 18:16:33Z mueller $ +// $Id: Rw11VirtDisk.hpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2013-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2017-04-02 866 1.1 add default scheme handling // 2013-03-03 494 1.0 Initial version // 2013-02-13 488 0.1 First draft @@ -21,7 +22,7 @@ /*! \file - \version $Id: Rw11VirtDisk.hpp 867 2017-04-02 18:16:33Z mueller $ + \version $Id: Rw11VirtDisk.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11VirtDisk. */ @@ -48,7 +49,8 @@ namespace Retro { virtual bool Write(size_t lba, size_t nblk, const uint8_t* data, RerrMsg& emsg) = 0; - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; static Rw11VirtDisk* New(const std::string& url, Rw11Unit* punit, RerrMsg& emsg); diff --git a/tools/src/librw11/Rw11VirtDiskFile.cpp b/tools/src/librw11/Rw11VirtDiskFile.cpp index 2a96a8e6..028fd32c 100644 --- a/tools/src/librw11/Rw11VirtDiskFile.cpp +++ b/tools/src/librw11/Rw11VirtDiskFile.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11VirtDiskFile.cpp 859 2017-03-11 22:36:45Z mueller $ +// $Id: Rw11VirtDiskFile.cpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2013-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2017-03-11 859 1.1 use fWProt // 2013-04-14 506 1.0 Initial version // 2013-02-13 488 0.1 First draft @@ -20,7 +21,7 @@ /*! \file - \version $Id: Rw11VirtDiskFile.cpp 859 2017-03-11 22:36:45Z mueller $ + \version $Id: Rw11VirtDiskFile.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11VirtDiskFile. */ @@ -151,14 +152,15 @@ bool Rw11VirtDiskFile::Write(size_t lba, size_t nblk, const uint8_t* data, //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11VirtDiskFile::Dump(std::ostream& os, int ind, const char* text) const +void Rw11VirtDiskFile::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11VirtDiskFile @ " << this << endl; os << bl << " fFd: " << fFd << endl; os << bl << " fSize: " << fSize << endl; - Rw11VirtDisk::Dump(os, ind, " ^"); + Rw11VirtDisk::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11VirtDiskFile.hpp b/tools/src/librw11/Rw11VirtDiskFile.hpp index 6fa4231a..746ca872 100644 --- a/tools/src/librw11/Rw11VirtDiskFile.hpp +++ b/tools/src/librw11/Rw11VirtDiskFile.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11VirtDiskFile.hpp 859 2017-03-11 22:36:45Z mueller $ +// $Id: Rw11VirtDiskFile.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-04-14 506 1.0 Initial version // 2013-02-13 488 0.1 First draft // --------------------------------------------------------------------------- @@ -20,7 +21,7 @@ /*! \file - \version $Id: Rw11VirtDiskFile.hpp 859 2017-03-11 22:36:45Z mueller $ + \version $Id: Rw11VirtDiskFile.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11VirtDiskFile. */ @@ -44,7 +45,8 @@ namespace Retro { virtual bool Write(size_t lba, size_t nblk, const uint8_t* data, RerrMsg& emsg); - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; // statistics counter indices (now new) enum stats { diff --git a/tools/src/librw11/Rw11VirtDiskOver.cpp b/tools/src/librw11/Rw11VirtDiskOver.cpp index 29b0125d..0e869a65 100644 --- a/tools/src/librw11/Rw11VirtDiskOver.cpp +++ b/tools/src/librw11/Rw11VirtDiskOver.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11VirtDiskOver.cpp 864 2017-04-02 13:20:18Z mueller $ +// $Id: Rw11VirtDiskOver.cpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2017- by Walter F.J. Mueller // @@ -13,12 +13,13 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2017-03-10 859 1.0 Initial version // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11VirtDiskOver.cpp 864 2017-04-02 13:20:18Z mueller $ + \version $Id: Rw11VirtDiskOver.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11VirtDiskOver. */ @@ -167,13 +168,14 @@ void Rw11VirtDiskOver::List(std::ostream& os) const //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11VirtDiskOver::Dump(std::ostream& os, int ind, const char* text) const +void Rw11VirtDiskOver::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11VirtDiskOver @ " << this << endl; os << bl << " fBlkMap.size " << fBlkMap.size() << endl; - Rw11VirtDiskFile::Dump(os, ind, " ^"); + Rw11VirtDiskFile::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11VirtDiskOver.hpp b/tools/src/librw11/Rw11VirtDiskOver.hpp index 134ec9f7..594341c4 100644 --- a/tools/src/librw11/Rw11VirtDiskOver.hpp +++ b/tools/src/librw11/Rw11VirtDiskOver.hpp @@ -1,4 +1,4 @@ -// $Id: Rw11VirtDiskOver.hpp 859 2017-03-11 22:36:45Z mueller $ +// $Id: Rw11VirtDiskOver.hpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2017- by Walter F.J. Mueller // @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2017-03-10 859 1.0 Initial version // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11VirtDiskOver.hpp 859 2017-03-11 22:36:45Z mueller $ + \version $Id: Rw11VirtDiskOver.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11VirtDiskOver. */ @@ -57,7 +58,8 @@ namespace Retro { bool Flush(RerrMsg& emsg); void List(std::ostream& os) const; - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; // statistics counter indices (now new) enum stats { diff --git a/tools/src/librw11/Rw11VirtStream.cpp b/tools/src/librw11/Rw11VirtStream.cpp index ebc75ef2..05b208a0 100644 --- a/tools/src/librw11/Rw11VirtStream.cpp +++ b/tools/src/librw11/Rw11VirtStream.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11VirtStream.cpp 864 2017-04-02 13:20:18Z mueller $ +// $Id: Rw11VirtStream.cpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2013-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.3 Dump(): add detail arg // 2017-04-02 864 1.0.2 signal for input streams WProt // 2013-05-05 516 1.0.1 Open(): support ?app and ?bck=n options // 2013-05-04 515 1.0 Initial version @@ -21,7 +22,7 @@ /*! \file - \version $Id: Rw11VirtStream.cpp 864 2017-04-02 13:20:18Z mueller $ + \version $Id: Rw11VirtStream.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11VirtStream. */ #include @@ -212,7 +213,8 @@ bool Rw11VirtStream::Seek(int pos, RerrMsg& emsg) //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11VirtStream::Dump(std::ostream& os, int ind, const char* text) const +void Rw11VirtStream::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11VirtStream @ " << this << endl; @@ -220,7 +222,7 @@ void Rw11VirtStream::Dump(std::ostream& os, int ind, const char* text) const os << bl << " fIStream: " << fIStream << endl; os << bl << " fOStream: " << fOStream << endl; os << bl << " fFile: " << fFile << endl; - Rw11Virt::Dump(os, ind, " ^"); + Rw11Virt::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11VirtStream.hpp b/tools/src/librw11/Rw11VirtStream.hpp index 833e00d9..208a8ef2 100644 --- a/tools/src/librw11/Rw11VirtStream.hpp +++ b/tools/src/librw11/Rw11VirtStream.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11VirtStream.hpp 515 2013-05-04 17:28:59Z mueller $ +// $Id: Rw11VirtStream.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-05-04 515 1.0 Initial version // 2013-05-01 513 0.1 First draft // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11VirtStream.hpp 515 2013-05-04 17:28:59Z mueller $ + \version $Id: Rw11VirtStream.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11VirtStream. */ @@ -45,7 +46,8 @@ namespace Retro { int Tell(RerrMsg& emsg); bool Seek(int pos, RerrMsg& emsg); - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; static Rw11VirtStream* New(const std::string& url, Rw11Unit* punit, RerrMsg& emsg); diff --git a/tools/src/librw11/Rw11VirtTape.cpp b/tools/src/librw11/Rw11VirtTape.cpp index 00a78eb8..30c676a5 100644 --- a/tools/src/librw11/Rw11VirtTape.cpp +++ b/tools/src/librw11/Rw11VirtTape.cpp @@ -1,6 +1,6 @@ -// $Id: Rw11VirtTape.cpp 864 2017-04-02 13:20:18Z mueller $ +// $Id: Rw11VirtTape.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2015- by Walter F.J. Mueller +// Copyright 2015-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2017-04-02 864 1.1 move fWProt,WProt() to Rw11Virt base // 2015-06-04 686 1.0 Initial version // 2015-05-17 683 0.1 First draft @@ -20,7 +21,7 @@ /*! \file - \version $Id: Rw11VirtTape.cpp 864 2017-04-02 13:20:18Z mueller $ + \version $Id: Rw11VirtTape.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11VirtTape. */ #include @@ -152,7 +153,8 @@ void Rw11VirtTape::SetPosRecord(int posrec) //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11VirtTape::Dump(std::ostream& os, int ind, const char* text) const +void Rw11VirtTape::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11VirtTape @ " << this << endl; @@ -163,7 +165,7 @@ void Rw11VirtTape::Dump(std::ostream& os, int ind, const char* text) const os << bl << " fEom: " << fEom << endl; os << bl << " fPosFile: " << fPosFile << endl; os << bl << " fPosRecord: " << fPosRecord << endl; - Rw11Virt::Dump(os, ind, " ^"); + Rw11Virt::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11VirtTape.hpp b/tools/src/librw11/Rw11VirtTape.hpp index 3dc63a5b..26fb94ef 100644 --- a/tools/src/librw11/Rw11VirtTape.hpp +++ b/tools/src/librw11/Rw11VirtTape.hpp @@ -1,4 +1,4 @@ -// $Id: Rw11VirtTape.hpp 864 2017-04-02 13:20:18Z mueller $ +// $Id: Rw11VirtTape.hpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2015-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 Dump(): add detail arg // 2017-04-02 864 1.1 move fWProt,WProt() to Rw11Virt base // 2015-06-04 686 1.0 Initial version // 2015-05-17 683 0.1 First draft @@ -21,7 +22,7 @@ /*! \file - \version $Id: Rw11VirtTape.hpp 864 2017-04-02 13:20:18Z mueller $ + \version $Id: Rw11VirtTape.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11VirtTape. */ @@ -61,7 +62,8 @@ namespace Retro { int PosFile() const; int PosRecord() const; - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; static Rw11VirtTape* New(const std::string& url, Rw11Unit* punit, RerrMsg& emsg); diff --git a/tools/src/librw11/Rw11VirtTapeTap.cpp b/tools/src/librw11/Rw11VirtTapeTap.cpp index f80f3b19..41dd343d 100644 --- a/tools/src/librw11/Rw11VirtTapeTap.cpp +++ b/tools/src/librw11/Rw11VirtTapeTap.cpp @@ -1,6 +1,6 @@ -// $Id: Rw11VirtTapeTap.cpp 686 2015-06-04 21:08:08Z mueller $ +// $Id: Rw11VirtTapeTap.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2015- by Walter F.J. Mueller +// Copyright 2015-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2015-06-04 686 1.0 Initial version // 2015-05-17 683 0.1 First draft // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11VirtTapeTap.cpp 686 2015-06-04 21:08:08Z mueller $ + \version $Id: Rw11VirtTapeTap.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11VirtTapeTap. */ @@ -439,7 +440,8 @@ bool Rw11VirtTapeTap::Rewind(int& opcode, RerrMsg& emsg) //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11VirtTapeTap::Dump(std::ostream& os, int ind, const char* text) const +void Rw11VirtTapeTap::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11VirtTapeTap @ " << this << endl; @@ -449,7 +451,7 @@ void Rw11VirtTapeTap::Dump(std::ostream& os, int ind, const char* text) const os << bl << " fPos: " << fPos << endl; os << bl << " fBad: " << fBad << endl; os << bl << " fPadOdd: " << fPadOdd << endl; - Rw11VirtTape::Dump(os, ind, " ^"); + Rw11VirtTape::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11VirtTapeTap.hpp b/tools/src/librw11/Rw11VirtTapeTap.hpp index 592ec30b..f64247d1 100644 --- a/tools/src/librw11/Rw11VirtTapeTap.hpp +++ b/tools/src/librw11/Rw11VirtTapeTap.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11VirtTapeTap.hpp 686 2015-06-04 21:08:08Z mueller $ +// $Id: Rw11VirtTapeTap.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2015- by Walter F.J. Mueller +// Copyright 2015-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2015-06-04 686 1.0 Initial version // 2015-05-17 683 0.1 First draft // --------------------------------------------------------------------------- @@ -20,7 +21,7 @@ /*! \file - \version $Id: Rw11VirtTapeTap.hpp 686 2015-06-04 21:08:08Z mueller $ + \version $Id: Rw11VirtTapeTap.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11VirtTapeTap. */ @@ -50,7 +51,8 @@ namespace Retro { int& opcode, RerrMsg& emsg); virtual bool Rewind(int& opcode, RerrMsg& emsg); - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; // some constants (also defined in cpp) static const uint32_t kMetaEof = 0x00000000; //!< EOF marker diff --git a/tools/src/librw11/Rw11VirtTerm.cpp b/tools/src/librw11/Rw11VirtTerm.cpp index cc62bac4..54ae5d88 100644 --- a/tools/src/librw11/Rw11VirtTerm.cpp +++ b/tools/src/librw11/Rw11VirtTerm.cpp @@ -1,6 +1,6 @@ -// $Id: Rw11VirtTerm.cpp 508 2013-04-20 18:43:28Z mueller $ +// $Id: Rw11VirtTerm.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-03-06 495 1.0 Initial version // 2013-02-13 488 0.1 First draft // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11VirtTerm.cpp 508 2013-04-20 18:43:28Z mueller $ + \version $Id: Rw11VirtTerm.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11VirtTerm. */ #include @@ -89,13 +90,14 @@ Rw11VirtTerm* Rw11VirtTerm::New(const std::string& url, Rw11Unit* punit, //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11VirtTerm::Dump(std::ostream& os, int ind, const char* text) const +void Rw11VirtTerm::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11VirtTerm @ " << this << endl; os << bl << " fChannelId: " << fChannelId << endl; - Rw11Virt::Dump(os, ind, " ^"); + Rw11Virt::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11VirtTerm.hpp b/tools/src/librw11/Rw11VirtTerm.hpp index abcf9633..40bb9481 100644 --- a/tools/src/librw11/Rw11VirtTerm.hpp +++ b/tools/src/librw11/Rw11VirtTerm.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11VirtTerm.hpp 504 2013-04-13 15:37:24Z mueller $ +// $Id: Rw11VirtTerm.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-03-06 495 1.0 Initial version // 2013-02-13 488 0.1 First draft // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11VirtTerm.hpp 504 2013-04-13 15:37:24Z mueller $ + \version $Id: Rw11VirtTerm.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11VirtTerm. */ @@ -44,7 +45,8 @@ namespace Retro { void SetupRcvCallback(const rcvcbfo_t& rcvcbfo); virtual bool Snd(const uint8_t* data, size_t count, RerrMsg& emsg) = 0; - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; static Rw11VirtTerm* New(const std::string& url, Rw11Unit* punit, RerrMsg& emsg); diff --git a/tools/src/librw11/Rw11VirtTermPty.cpp b/tools/src/librw11/Rw11VirtTermPty.cpp index e43e7fa6..745de947 100644 --- a/tools/src/librw11/Rw11VirtTermPty.cpp +++ b/tools/src/librw11/Rw11VirtTermPty.cpp @@ -1,6 +1,6 @@ -// $Id: Rw11VirtTermPty.cpp 632 2015-01-11 12:30:03Z mueller $ +// $Id: Rw11VirtTermPty.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,13 +13,14 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-03-06 495 1.0 Initial version // 2013-02-24 492 0.1 First draft // --------------------------------------------------------------------------- /*! \file - \version $Id: Rw11VirtTermPty.cpp 632 2015-01-11 12:30:03Z mueller $ + \version $Id: Rw11VirtTermPty.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11VirtTermPty. */ #define _XOPEN_SOURCE 600 @@ -143,13 +144,14 @@ int Rw11VirtTermPty::RcvPollHandler(const pollfd& pfd) //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11VirtTermPty::Dump(std::ostream& os, int ind, const char* text) const +void Rw11VirtTermPty::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11VirtTermPty @ " << this << endl; os << bl << " fFd: " << fFd << endl; - Rw11VirtTerm::Dump(os, ind+2, ""); + Rw11VirtTerm::Dump(os, ind+2, "", detail); return; } diff --git a/tools/src/librw11/Rw11VirtTermPty.hpp b/tools/src/librw11/Rw11VirtTermPty.hpp index a5e7d6bc..59503417 100644 --- a/tools/src/librw11/Rw11VirtTermPty.hpp +++ b/tools/src/librw11/Rw11VirtTermPty.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11VirtTermPty.hpp 504 2013-04-13 15:37:24Z mueller $ +// $Id: Rw11VirtTermPty.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 Dump(): add detail arg // 2013-03-06 495 1.0 Initial version // 2013-02-24 492 0.1 First draft // --------------------------------------------------------------------------- @@ -20,7 +21,7 @@ /*! \file - \version $Id: Rw11VirtTermPty.hpp 504 2013-04-13 15:37:24Z mueller $ + \version $Id: Rw11VirtTermPty.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11VirtTermPty. */ @@ -43,7 +44,8 @@ namespace Retro { virtual bool Snd(const uint8_t* data, size_t count, RerrMsg& emsg); - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; protected: int RcvPollHandler(const pollfd& pfd); diff --git a/tools/src/librw11/Rw11VirtTermTcp.cpp b/tools/src/librw11/Rw11VirtTermTcp.cpp index 1f5e8eac..943566ee 100644 --- a/tools/src/librw11/Rw11VirtTermTcp.cpp +++ b/tools/src/librw11/Rw11VirtTermTcp.cpp @@ -1,6 +1,6 @@ -// $Id: Rw11VirtTermTcp.cpp 632 2015-01-11 12:30:03Z mueller $ +// $Id: Rw11VirtTermTcp.cpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013-2014 by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.5 Dump(): add detail arg // 2014-08-22 584 1.0.4 use nullptr // 2013-05-17 512 1.0.3 use Rtools::String2Long // 2013-05-05 516 1.0.2 fix mistakes in emsg generation with errno @@ -23,7 +24,7 @@ /*! \file - \version $Id: Rw11VirtTermTcp.cpp 632 2015-01-11 12:30:03Z mueller $ + \version $Id: Rw11VirtTermTcp.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of Rw11VirtTermTcp. */ @@ -232,7 +233,8 @@ bool Rw11VirtTermTcp::Snd(const uint8_t* data, size_t count, RerrMsg& emsg) //------------------------------------------+----------------------------------- //! FIXME_docs -void Rw11VirtTermTcp::Dump(std::ostream& os, int ind, const char* text) const +void Rw11VirtTermTcp::Dump(std::ostream& os, int ind, const char* text, + int detail) const { RosFill bl(ind); os << bl << (text?text:"--") << "Rw11VirtTermTcp @ " << this << endl; @@ -253,7 +255,7 @@ void Rw11VirtTermTcp::Dump(std::ostream& os, int ind, const char* text) const os << bl << " fState: " << t_state << endl; os << bl << " fTcpTrace: " << fTcpTrace << endl; os << bl << " fSndPreConQue.size" << fSndPreConQue.size() << endl; - Rw11VirtTerm::Dump(os, ind, " ^"); + Rw11VirtTerm::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11VirtTermTcp.hpp b/tools/src/librw11/Rw11VirtTermTcp.hpp index b118c03a..e04f674d 100644 --- a/tools/src/librw11/Rw11VirtTermTcp.hpp +++ b/tools/src/librw11/Rw11VirtTermTcp.hpp @@ -1,6 +1,6 @@ -// $Id: Rw11VirtTermTcp.hpp 508 2013-04-20 18:43:28Z mueller $ +// $Id: Rw11VirtTermTcp.hpp 868 2017-04-07 20:09:33Z mueller $ // -// Copyright 2013- by Walter F.J. Mueller +// Copyright 2013-2017 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.2 Dump(): add detail arg // 2013-04-20 508 1.0.1 add fSndPreConQue handling // 2013-03-06 495 1.0 Initial version // 2013-02-13 488 0.1 First draft @@ -21,7 +22,7 @@ /*! \file - \version $Id: Rw11VirtTermTcp.hpp 508 2013-04-20 18:43:28Z mueller $ + \version $Id: Rw11VirtTermTcp.hpp 868 2017-04-07 20:09:33Z mueller $ \brief Declaration of class Rw11VirtTermTcp. */ @@ -44,7 +45,8 @@ namespace Retro { virtual bool Snd(const uint8_t* data, size_t count, RerrMsg& emsg); - virtual void Dump(std::ostream& os, int ind=0, const char* text=0) const; + virtual void Dump(std::ostream& os, int ind=0, const char* text=0, + int detail=0) const; // statistics counter indices enum stats { diff --git a/tools/src/librwxxtpp/RtclRw11.cpp b/tools/src/librwxxtpp/RtclRw11.cpp index 59c4df02..772d6773 100644 --- a/tools/src/librwxxtpp/RtclRw11.cpp +++ b/tools/src/librwxxtpp/RtclRw11.cpp @@ -1,4 +1,4 @@ -// $Id: RtclRw11.cpp 867 2017-04-02 18:16:33Z mueller $ +// $Id: RtclRw11.cpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2013-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.3 M_dump: use GetArgsDump and Dump detail // 2017-04-02 866 1.0.2 add M_set; handle default disk scheme // 2015-03-28 660 1.0.1 add M_get // 2014-12-25 621 1.1 adopt to 4k word ibus window @@ -22,7 +23,7 @@ /*! \file - \version $Id: RtclRw11.cpp 867 2017-04-02 18:16:33Z mueller $ + \version $Id: RtclRw11.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of class RtclRw11. */ @@ -163,10 +164,12 @@ int RtclRw11::M_start(RtclArgs& args) int RtclRw11::M_dump(RtclArgs& args) { + int detail=0; + if (!GetArgsDump(args, detail)) return kERR; if (!args.AllDone()) return kERR; ostringstream sos; - Obj().Dump(sos, 0); + Obj().Dump(sos, 0, "", detail); args.SetResult(sos); return kOK; } diff --git a/tools/src/librwxxtpp/RtclRw11Cpu.cpp b/tools/src/librwxxtpp/RtclRw11Cpu.cpp index b8895eb4..15fa9dcc 100644 --- a/tools/src/librwxxtpp/RtclRw11Cpu.cpp +++ b/tools/src/librwxxtpp/RtclRw11Cpu.cpp @@ -1,4 +1,4 @@ -// $Id: RtclRw11Cpu.cpp 857 2017-02-26 15:27:41Z mueller $ +// $Id: RtclRw11Cpu.cpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2013-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.2.14 M_dump: use GetArgsDump and Dump detail // 2017-02-26 857 1.2.13 use kCPAH_M_UBM22 for cp -wa -ubm // 2017-02-19 853 1.2.12 use Rtime // 2017-02-17 851 1.2.11 probe/setup auxilliary devices: kw11l,kw11p,iist @@ -42,7 +43,7 @@ /*! \file - \version $Id: RtclRw11Cpu.cpp 857 2017-02-26 15:27:41Z mueller $ + \version $Id: RtclRw11Cpu.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of RtclRw11Cpu. */ @@ -1401,10 +1402,12 @@ int RtclRw11Cpu::M_stats(RtclArgs& args) int RtclRw11Cpu::M_dump(RtclArgs& args) { + int detail=0; + if (!GetArgsDump(args, detail)) return kERR; if (!args.AllDone()) return kERR; ostringstream sos; - Obj().Dump(sos, 0); + Obj().Dump(sos, 0, "", detail); args.SetResult(sos); return kOK; } diff --git a/tools/src/librwxxtpp/RtclRw11Unit.cpp b/tools/src/librwxxtpp/RtclRw11Unit.cpp index bd754a17..7e917fe6 100644 --- a/tools/src/librwxxtpp/RtclRw11Unit.cpp +++ b/tools/src/librwxxtpp/RtclRw11Unit.cpp @@ -1,4 +1,4 @@ -// $Id: RtclRw11Unit.cpp 863 2017-04-02 11:43:15Z mueller $ +// $Id: RtclRw11Unit.cpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2013-2017 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.1.1 M_dump: use GetArgsDump and Dump detail // 2017-04-02 863 1.1 add fpVirt; add DetachCleanup() // 2013-03-03 494 1.0 Initial version // 2013-02-16 488 0.1 First draft @@ -20,7 +21,7 @@ /*! \file - \version $Id: RtclRw11Unit.cpp 863 2017-04-02 11:43:15Z mueller $ + \version $Id: RtclRw11Unit.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of RtclRw11Unit. */ @@ -148,10 +149,12 @@ int RtclRw11Unit::M_virt(RtclArgs& args) int RtclRw11Unit::M_dump(RtclArgs& args) { + int detail=0; + if (!GetArgsDump(args, detail)) return kERR; if (!args.AllDone()) return kERR; ostringstream sos; - Obj().Dump(sos, 0); + Obj().Dump(sos, 0, "", detail); args.SetResult(sos); return kOK; } diff --git a/tools/src/librwxxtpp/RtclRw11Virt.cpp b/tools/src/librwxxtpp/RtclRw11Virt.cpp index 81335321..b9f3f9a1 100644 --- a/tools/src/librwxxtpp/RtclRw11Virt.cpp +++ b/tools/src/librwxxtpp/RtclRw11Virt.cpp @@ -1,4 +1,4 @@ -// $Id: RtclRw11Virt.cpp 859 2017-03-11 22:36:45Z mueller $ +// $Id: RtclRw11Virt.cpp 868 2017-04-07 20:09:33Z mueller $ // // Copyright 2017- by Walter F.J. Mueller // @@ -13,12 +13,13 @@ // // Revision History: // Date Rev Version Comment +// 2017-04-07 868 1.0.1 M_dump: use GetArgsDump and Dump detail // 2017-03-11 859 1.0 Initial version // --------------------------------------------------------------------------- /*! \file - \version $Id: RtclRw11Virt.cpp 859 2017-03-11 22:36:45Z mueller $ + \version $Id: RtclRw11Virt.cpp 868 2017-04-07 20:09:33Z mueller $ \brief Implemenation of RtclRw11Virt. */ @@ -94,10 +95,12 @@ int RtclRw11Virt::M_stats(RtclArgs& args) int RtclRw11Virt::M_dump(RtclArgs& args) { + int detail=0; + if (!GetArgsDump(args, detail)) return kERR; if (!args.AllDone()) return kERR; std::ostringstream sos; - Virt()->Dump(sos, 0); + Virt()->Dump(sos, 0, "", detail); args.SetResult(sos); return kOK; }