From 98cfe0a5a68267e2ccb9f459c81131065c0ba853 Mon Sep 17 00:00:00 2001
From: Andras Tantos <andras@tantosonline.com>
Date: Wed, 3 Feb 2021 17:17:41 -0800
Subject: [PATCH] Changed handling of years for COS emulation.

Instead of a constant offset, now we bracket
the year to be within 1980 and 1999, which
seems to be acceptable for COS.
---
 cos_117.cfg                        | 2 +-
 simulator/sim_lib/iop_expander.cpp | 5 +++--
 simulator/sim_lib/iop_expander.h   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cos_117.cfg b/cos_117.cfg
index 7bf1b55..b496999 100644
--- a/cos_117.cfg
+++ b/cos_117.cfg
@@ -144,7 +144,7 @@ IopClusters {
 								Interrupt 1
 								Name CK0
 								ResponseTimeout 500
-								YearOffset 30
+								YearLimit yes
 							}
 						}
 						;UseDummyDevices yes
diff --git a/simulator/sim_lib/iop_expander.cpp b/simulator/sim_lib/iop_expander.cpp
index 1ffe592..eb6a43a 100644
--- a/simulator/sim_lib/iop_expander.cpp
+++ b/simulator/sim_lib/iop_expander.cpp
@@ -556,7 +556,7 @@ IopExpClockDevice_c::IopExpClockDevice_c(const Configuration_c &aConfig, IopChan
 	mPrimaryChannelIdx(aConfig.get<uint16_t>("PrimaryChannelIdx")),
 	mRequestChannelIdx(aConfig.get<uint16_t>("RequestChannelIdx", mPrimaryChannelIdx+1)),
 	mResponseChannelIdx(aConfig.get<uint16_t>("ResponseChannelIdx", mPrimaryChannelIdx+0)),
-	mYearOffset(aConfig.get<uint16_t>("YearOffset", 30))
+	mYearLimit(aConfig.get<bool>("YearLimit", true))
 {
 	for(size_t i=0;i<sizeof(mInterruptActive)/sizeof(bool);++i) mInterruptActive[i] = false;
 	mLogger.SetParent(mParent.GetLogger());
@@ -629,7 +629,8 @@ void IopExpClockDevice_c::ProcessRequest() {
 		boost::local_time::local_date_time CurrentTime(boost::posix_time::second_clock::local_time(), boost::local_time::time_zone_ptr());
 		auto Date = CurrentTime.local_time().date().year_month_day();
 		uint16_t Year = Date.year;
-		Year = (Year - mYearOffset) % 100; // Correct with offset and keep only last two digits
+		// COS only accepts years between 1980 and 1999. So, we'll limit ourselves to that 20 year period
+		if (mYearLimit) Year = (Year % 20) + 80;
 		mResponse = (boost::format("%02d%02d%02d\x0d") % Year % Date.month.as_number() % Date.day.as_number()).str();
 	} else if (boost::starts_with(mRequest, "ATSD")) {
 		mLogger << setloglevel(LogLevel_IoActivity) << "Received SD, full request:" << mRequest << std::endl;
diff --git a/simulator/sim_lib/iop_expander.h b/simulator/sim_lib/iop_expander.h
index ffc2ae3..bf64646 100644
--- a/simulator/sim_lib/iop_expander.h
+++ b/simulator/sim_lib/iop_expander.h
@@ -466,7 +466,7 @@ protected:
 	uint16_t mRegA;
 	uint16_t mRegB;
 	uint16_t mRegC;
-	uint16_t mYearOffset;
+	bool mYearLimit;
 	size_t mResponseTimer;
 	size_t mResponseTimeout;
 	bool mBusy;