reorg

.gitignore

@@ -39,6 +39,7 @@ build/
 *.tmp
 *.tmp_proj
 *.log
+*.vs
 *.vspscc
 *.vssscc
 .builds
@@ -195,4 +196,9 @@ Doxygen/
 # inno installer output
 windows/installer/Output/
 # hacked exe files for different flavors
-windows/installer/exe
+windows/installer/exe
+# Xcode
+## User settings
+xcuserdata/
+
+Version.h

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "macos/oui"]
+	path = macos/CLI/oui
+	url = git@github.com:Drive-Trust-Alliance/oui.git
+	branch = develop
+[submodule "macos/CLI.OpenSource/oui"]
+	path = Customizations/macos/CLI.OpenSource/oui
+	url = git@github.com:Drive-Trust-Alliance/oui.git
+	branch = develop
+[submodule "oui"]
+	path = oui
+	url = git@github.com:Drive-Trust-Alliance/oui.git
+	branch = develop

Common/ATAStructures.h

@@ -0,0 +1,50 @@
+/* C:B**************************************************************************
+This software is Copyright (c) 2014-2024 Bright Plaza Inc. <drivetrust@drivetrust.com>
+
+This file is part of sedutil.
+
+sedutil is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+sedutil is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with sedutil.  If not, see <http://www.gnu.org/licenses/>.
+
+ * C:E********************************************************************** */
+#pragma once
+#if !defined(__ATASTRUCTURES_H_INCLUDED__)
+#define __ATASTRUCTURES_H_INCLUDED__
+
+/** ATA commands needed for TCG storage communication */
+typedef enum _ATACOMMAND {
+    IF_RECV  = 0x5c,
+    IF_SEND  = 0x5e,
+    IDENTIFY = 0xec,
+} ATACOMMAND;
+
+typedef enum _ATAPROTOCOL {
+    // Per e.g. https://www.t10.org/ftp/t10/document.04/04-262r8.pdf
+    HARD_RESET                  =  0,
+    SRST                        =  1,
+    // 2 Reserved
+    NON_DATA                    =  3,
+    PIO_DATA_IN                 =  4,
+    PIO_DATA_OUT                =  5,
+    DMA                         =  6,
+    DMA_QUEUED                  =  7,
+    DEVICE_DIAGNOSTIC           =  8,
+    DEVICE_RESET                =  9,
+    UDMA_DATA_IN                = 10,
+    UDMA_DATA_OUT               = 11,
+    FPDMA                       = 12,
+    // 13, 14 Reserved
+    RETURN_RESPONSE_INFORMATION = 15
+} ATAPROTOCOL;
+
+#endif //!defined(__ATASTRUCTURES_H_INCLUDED__)

Common/Copyright.txt

@@ -1,5 +1,5 @@
 /* C:B**************************************************************************
-This software is Copyright 2014-2017 Bright Plaza Inc. <drivetrust@drivetrust.com>
+This software is Copyright (c) 2014-2024 Bright Plaza Inc. <drivetrust@drivetrust.com>
 
 This file is part of sedutil.
 

Common/Customizations

@@ -0,0 +1 @@
+../Customizations/Common

Common/DtaAnnotatedDump.cpp

@@ -1,5 +1,5 @@
 /* C:B**************************************************************************
-This software is Copyright 2014-2017 Bright Plaza Inc. <drivetrust@drivetrust.com>
+This software is Copyright (c) 2014-2024 Bright Plaza Inc. <drivetrust@drivetrust.com>
 
 This file is part of sedutil.
 
@@ -21,6 +21,8 @@ along with sedutil.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "os.h"
 #include <stdio.h>
+#include <log/log.h>
+
 #include <iostream>
 #include <fstream>
 #include <iomanip>
@@ -356,7 +358,7 @@ uint8_t DtaAnnotatedDump(ATACOMMAND cmd, void * buffer, uint32_t bufferlen)
         fprintf(stream, "<< 0x%2.2X\n >>\n", cmd);
 
     // echo header
-    OPALHeader h;
+    DTA_Header h;
     memcpy(&h, buffer, sizeof(h));
     IFLOG(D1)
     {

Common/DtaAnnotatedDump.h

@@ -1,5 +1,5 @@
 /* C:B**************************************************************************
-This software is Copyright 2014-2017 Bright Plaza Inc. <drivetrust@drivetrust.com>
+This software is Copyright (c) 2014-2024 Bright Plaza Inc. <drivetrust@drivetrust.com>
 
 This file is part of sedutil.
 

Common/DtaAuthorizeSedutilExecution.h

@@ -0,0 +1,26 @@
+/* C:B**************************************************************************
+This software is Copyright (c) 2014-2024 Bright Plaza Inc. <drivetrust@drivetrust.com>
+
+This file is part of sedutil.
+
+sedutil is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+sedutil is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with sedutil.  If not, see <http://www.gnu.org/licenses/>.
+
+* C:E********************************************************************** */
+
+// Authorize this sedutil-cli run.
+//   Check licenses, etc., if appropriate.
+//
+// Returns true if OK to run, false if process should exit.
+//
+extern "C" bool authorize_sedutil_execution(int argc, char * argv[]);