Skip to content

Commit

Permalink
Rebrand to Drive Trust Alliance
Browse files Browse the repository at this point in the history
  • Loading branch information
r0m30 committed Feb 15, 2016
1 parent 6900f54 commit 45e1aed
Show file tree
Hide file tree
Showing 89 changed files with 2,502 additions and 2,499 deletions.
29 changes: 0 additions & 29 deletions Common/Class_Skeleton.cpp

This file was deleted.

27 changes: 0 additions & 27 deletions Common/Class_Skeleton.h

This file was deleted.

26 changes: 13 additions & 13 deletions Common/Copyright.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
/* C:B**************************************************************************
This software is Copyright 2014,2015 Michael Romeo <r0m30@r0m30.com>
This software is Copyright 2014-2016 Bright Plaza Inc. <drivetrust@drivetrust.com>

This file is part of msed.
This file is part of sedutil.

msed 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 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.

msed 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.
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 msed. If not, see <http://www.gnu.org/licenses/>.
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********************************************************************** */
* C:E********************************************************************** */
44 changes: 22 additions & 22 deletions Common/MsedAnnotatedDump.cpp → Common/DtaAnnotatedDump.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* C:B**************************************************************************
This software is Copyright 2014,2015 Michael Romeo <r0m30@r0m30.com>
This software is Copyright 2014-2016 Bright Plaza Inc. <drivetrust@drivetrust.com>
THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
Expand All @@ -20,20 +20,20 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <iostream>
#include <fstream>
#include <iomanip>
#include "MsedDevEnterprise.h"
#include "MsedHashPwd.h"
#include "MsedEndianFixup.h"
#include "MsedStructures.h"
#include "MsedCommand.h"
#include "MsedResponse.h"
#include "MsedSession.h"
#include "MsedHexDump.h"
#include "MsedAnnotatedDump.h"
#include "DtaDevEnterprise.h"
#include "DtaHashPwd.h"
#include "DtaEndianFixup.h"
#include "DtaStructures.h"
#include "DtaCommand.h"
#include "DtaResponse.h"
#include "DtaSession.h"
#include "DtaHexDump.h"
#include "DtaAnnotatedDump.h"

using namespace std;

////////////////////////////////////////////////////////////////////////////////
CMsedToken::CMsedToken(void) :
///////////////////////////////////////////////////////////////////////////////
DtaToken::DtaToken(void) :
////////////////////////////////////////////////////////////////////////////////
m_TokenType (NONE),
m_HeaderLength (0),
Expand All @@ -47,13 +47,13 @@ CMsedToken::CMsedToken(void) :
}

////////////////////////////////////////////////////////////////////////////////
CMsedToken::~CMsedToken(void)
DtaToken::~DtaToken(void)
////////////////////////////////////////////////////////////////////////////////
{
}

////////////////////////////////////////////////////////////////////////////////
void CMsedToken::str2int(uint8_t * buf, bool byte)
void DtaToken::str2int(uint8_t * buf, bool byte)
////////////////////////////////////////////////////////////////////////////////
{
// user says it's a byte string, or it's so large it must be
Expand Down Expand Up @@ -98,10 +98,10 @@ void CMsedToken::str2int(uint8_t * buf, bool byte)
}

////////////////////////////////////////////////////////////////////////////////
void CMsedToken::parse(uint8_t * buf, uint32_t buflen)
void DtaToken::parse(uint8_t * buf, uint32_t buflen)
////////////////////////////////////////////////////////////////////////////////
{
LOG(D1) << "Entering CMsedToken::parse " << buflen;
LOG(D1) << "Entering CDtaToken::parse " << buflen;
m_token = buf;

const CAtomHeader & atom = * (CAtomHeader *) buf;
Expand Down Expand Up @@ -163,7 +163,7 @@ void CMsedToken::parse(uint8_t * buf, uint32_t buflen)
}

////////////////////////////////////////////////////////////////////////////////
int CMsedToken::print(FILE *stream, uint32_t buflen)
int DtaToken::print(FILE *stream, uint32_t buflen)
////////////////////////////////////////////////////////////////////////////////
{
int ret = 0;
Expand Down Expand Up @@ -202,7 +202,7 @@ int CMsedToken::print(FILE *stream, uint32_t buflen)
}

////////////////////////////////////////////////////////////////////////////////
int CMsedToken::printTokenType(FILE *stream, uint8_t token)
int DtaToken::printTokenType(FILE *stream, uint8_t token)
////////////////////////////////////////////////////////////////////////////////
{
// see Table 04 p. 35 in TSG Storage Architecture Core Specification 2.0
Expand Down Expand Up @@ -248,7 +248,7 @@ int CMsedToken::printTokenType(FILE *stream, uint8_t token)
}

////////////////////////////////////////////////////////////////////////////////
int CMsedToken::printUID(FILE *stream, uint8_t buf[8])
int DtaToken::printUID(FILE *stream, uint8_t buf[8])
////////////////////////////////////////////////////////////////////////////////
{
struct uidlist
Expand Down Expand Up @@ -313,7 +313,7 @@ int CMsedToken::printUID(FILE *stream, uint8_t buf[8])
}

////////////////////////////////////////////////////////////////////////////////
int CMsedToken::printAscii(FILE *stream, uint8_t * buf, uint32_t buflen)
int DtaToken::printAscii(FILE *stream, uint8_t * buf, uint32_t buflen)
////////////////////////////////////////////////////////////////////////////////
{
int ret = 0;
Expand All @@ -337,7 +337,7 @@ int CMsedToken::printAscii(FILE *stream, uint8_t * buf, uint32_t buflen)
}

////////////////////////////////////////////////////////////////////////////////
uint8_t MsedAnnotatedDump(ATACOMMAND cmd, void * buffer, uint32_t bufferlen)
uint8_t DtaAnnotatedDump(ATACOMMAND cmd, void * buffer, uint32_t bufferlen)
////////////////////////////////////////////////////////////////////////////////
{
FILE * stream = stderr;
Expand Down Expand Up @@ -384,7 +384,7 @@ uint8_t MsedAnnotatedDump(ATACOMMAND cmd, void * buffer, uint32_t bufferlen)
// scan buffer
while(p < q)
{
CMsedToken token;
DtaToken token;
token.parse(p, (uint32_t)(q-p));
token.print(stream, (uint32_t)(q-p));

Expand Down
10 changes: 5 additions & 5 deletions Common/MsedAnnotatedDump.h → Common/DtaAnnotatedDump.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* C:B**************************************************************************
This software is Copyright 2014,2015 Michael Romeo <r0m30@r0m30.com>
This software is Copyright 2014-2016 Bright Plaza Inc. <drivetrust@drivetrust.com>
THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
Expand Down Expand Up @@ -100,12 +100,12 @@ typedef union
} CAtomHeader;
#pragma pack(pop)
////////////////////////////////////////////////////////////////////////////////
class CMsedToken
class DtaToken
////////////////////////////////////////////////////////////////////////////////
{
public:
CMsedToken(void);
~CMsedToken(void);
DtaToken(void);
~DtaToken(void);

void parse(uint8_t * buf, uint32_t buflen);

Expand Down Expand Up @@ -138,5 +138,5 @@ class CMsedToken
};

////////////////////////////////////////////////////////////////////////////////
extern uint8_t MsedAnnotatedDump(ATACOMMAND cmd, void * buffer, uint32_t bufferlen);
extern uint8_t DtaAnnotatedDump(ATACOMMAND cmd, void * buffer, uint32_t bufferlen);
////////////////////////////////////////////////////////////////////////////////
Loading

0 comments on commit 45e1aed

Please sign in to comment.