diff options
| author | Aleksandr Galiuzov <AGaliuzov@luxoft.com> | 2015-07-02 16:18:50 +0300 |
|---|---|---|
| committer | Aleksandr Galiuzov <AGaliuzov@luxoft.com> | 2015-07-02 17:38:45 +0300 |
| commit | aa0c6e59baf3cded103927321bd2f4b898e5822a (patch) | |
| tree | 73f7870a3b9925e0f63cbd623b468a2c45eb5c5f /src/components/transport_manager | |
| parent | 008f3837ae2a40094024faed111b7526ae9ab1fe (diff) | |
| download | sdl_core-aa0c6e59baf3cded103927321bd2f4b898e5822a.tar.gz | |
Change DeviceInfo structure and extend TransportType
Now DeviceInfo contains String value instead of Integer for id field
to be able to sent either USB serial number or MAC addres within this field.
Also TransportType structure has been extended and now it contains both
USB_IOS and USB_AOA to distinguish transport type during connection.
Implements: APPLINK-14256, RTC 630168
Related-issues: APPLINK-14258
Conflicts:
src/components/interfaces/HMI_API.xml
src/components/interfaces/QT_HMI_API.xml
Diffstat (limited to 'src/components/transport_manager')
| -rw-r--r-- | src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc index 170cb7b734..cb6c4b6018 100644 --- a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc +++ b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc @@ -45,9 +45,9 @@ namespace transport_adapter { CREATE_LOGGERPTR_GLOBAL(logger_, "TransportManager") namespace { DeviceTypes devicesType = { - std::make_pair(AOA, std::string("USB")), - std::make_pair(PASA_AOA, std::string("USB")), - std::make_pair(MME, std::string("USB")), + std::make_pair(AOA, std::string("USB_AOA")), + std::make_pair(PASA_AOA, std::string("USB_AOA")), + std::make_pair(MME, std::string("USB_IOS")), std::make_pair(BLUETOOTH, std::string("BLUETOOTH")), std::make_pair(PASA_BLUETOOTH, std::string("BLUETOOTH")), std::make_pair(TCP, std::string("WIFI")) |