From 6892ab4d13830419318d444dced7f926bcab7a28 Mon Sep 17 00:00:00 2001 From: plutooo Date: Sun, 17 Feb 2019 17:39:36 +0100 Subject: [PATCH] Revert "hosversion: Add hosversionBetween" This reverts commit cd62b392759279c128a78f6da01d810f9c963689. --- nx/include/switch/runtime/hosversion.h | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/nx/include/switch/runtime/hosversion.h b/nx/include/switch/runtime/hosversion.h index 05611099..8860a07c 100644 --- a/nx/include/switch/runtime/hosversion.h +++ b/nx/include/switch/runtime/hosversion.h @@ -28,8 +28,8 @@ typedef enum { CompareResult_Unknown } CompareResult; -static inline CompareResult cmpresNot(CompareResult in) { - // Does a boolean NOT operation. +CompareResult cmpresNot(CompareResult in) { + // Does a not-operation. True maps to False, False maps to True. Unknown maps to Unknown. switch (in) { case CompareResult_False: return CompareResult_True; @@ -40,19 +40,6 @@ static inline CompareResult cmpresNot(CompareResult in) { } } -static inline CompareResult cmpresAnd(CompareResult a, CompareResult b) { - switch (a) { - case CompareResult_False: - return CompareResult_False; - case CompareResult_True: - return b; - case CompareResult_Unknown: - if (b != CompareResult_True) - return b; - return CompareResult_Unknown; - } -} - /// Returns true if the current HOS version is equal to or above the specified major/minor/micro version. CompareResult hosversionAtLeast(u8 major, u8 minor, u8 micro); @@ -60,8 +47,3 @@ CompareResult hosversionAtLeast(u8 major, u8 minor, u8 micro); static inline CompareResult hosversionBefore(u8 major, u8 minor, u8 micro) { return cmpresNot(hosversionAtLeast(major, minor, micro)); } - -/// Returns true if the current HOS version is between the two specified major versions, i.e. [major1, major2). -static inline CompareResult hosversionBetween(u8 major0, u8 minor0, u8 micro0, u8 major1, u8 minor1, u8 micro1) { - return cmpresAnd(hosversionAtLeast(major0, minor0, micro0), hosversionBefore(major1, minor1, micro1)); -}