Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Copyright 2024 Accenture.
// Copyright 2026 BMW AG

#include "uds/session/DiagSession.h"

Expand Down Expand Up @@ -45,4 +46,117 @@ bool operator!=(DiagSession const& x, DiagSession const& y) { return !(x == y);

DiagSession::DiagSession(SessionType id, uint8_t index) : fType(id), fId(index) {}

// Default Session

DiagReturnCode::Type
ApplicationDefaultSession::isTransitionPossible(DiagSession::SessionType const targetSession)
{
switch (targetSession)
{
case DiagSession::DEFAULT:
case DiagSession::EXTENDED:
{
return DiagReturnCode::OK;
}
case DiagSession::PROGRAMMING:
{
return DiagReturnCode::ISO_SUBFUNCTION_NOT_SUPPORTED_IN_ACTIVE_SESSION;
}
default:
{
return DiagReturnCode::ISO_SUBFUNCTION_NOT_SUPPORTED;
}
}
}

DiagSession&
ApplicationDefaultSession::getTransitionResult(DiagSession::SessionType const targetSession)
{
switch (targetSession)
{
case DiagSession::EXTENDED:
{
return DiagSession::APPLICATION_EXTENDED_SESSION();
}
default:
{
return *this;
}
}
}

// Extended Session

DiagReturnCode::Type
ApplicationExtendedSession::isTransitionPossible(DiagSession::SessionType const targetSession)
{
switch (targetSession)
{
case DiagSession::DEFAULT:
case DiagSession::EXTENDED:
case DiagSession::PROGRAMMING:
{
return DiagReturnCode::OK;
}
default:
{
return DiagReturnCode::ISO_SUBFUNCTION_NOT_SUPPORTED;
}
}
}

DiagSession&
ApplicationExtendedSession::getTransitionResult(DiagSession::SessionType const targetSession)
{
switch (targetSession)
{
case DiagSession::DEFAULT:
{
return DiagSession::APPLICATION_DEFAULT_SESSION();
}
case DiagSession::PROGRAMMING:
{
return DiagSession::PROGRAMMING_SESSION();
}
default:
{
return *this;
}
}
}

// Programming Session

DiagReturnCode::Type
ProgrammingSession::isTransitionPossible(DiagSession::SessionType const targetSession)
{
switch (targetSession)
{
case DiagSession::DEFAULT:
case DiagSession::PROGRAMMING:
{
return DiagReturnCode::OK;
}
default:
{
return DiagReturnCode::ISO_SUBFUNCTION_NOT_SUPPORTED;
}
}
}

DiagSession& ProgrammingSession::getTransitionResult(DiagSession::SessionType const targetSession)
{
switch (targetSession)
{
case DiagSession::DEFAULT:
{
return DiagSession::APPLICATION_DEFAULT_SESSION();
}
default:
{
return *this;
}
}
}

} // namespace uds
3 changes: 0 additions & 3 deletions libs/bsw/uds/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ add_library(
src/uds/services/sessioncontrol/DiagnosticSessionControl.cpp
src/uds/services/testerpresent/TesterPresent.cpp
src/uds/services/writedata/WriteDataByIdentifier.cpp
src/uds/session/ApplicationDefaultSession.cpp
src/uds/session/ApplicationExtendedSession.cpp
src/uds/session/ProgrammingSession.cpp
src/uds/DiagDispatcher.cpp
src/uds/UdsLogger.cpp
src/util/RoutineControlOptionParser.cpp)
Expand Down
47 changes: 0 additions & 47 deletions libs/bsw/uds/src/uds/session/ApplicationDefaultSession.cpp

This file was deleted.

49 changes: 0 additions & 49 deletions libs/bsw/uds/src/uds/session/ApplicationExtendedSession.cpp

This file was deleted.

42 changes: 0 additions & 42 deletions libs/bsw/uds/src/uds/session/ProgrammingSession.cpp

This file was deleted.