diff options
| author | szszszsz <szszszsz@users.noreply.github.com> | 2016-10-19 17:33:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-19 17:33:30 +0200 |
| commit | 82a0fc21f039971acac18df0ee57e2bb010865e1 (patch) | |
| tree | f4f487257c99826a6d208fa6ea6f48b4ab7392ed /include/dissect.h | |
| parent | 10631378c61b7ce54ad6f31dc1d16c3ba4c49d32 (diff) | |
| parent | e81a132c210e03b6b0a7404a8c96ebda889a5676 (diff) | |
| download | libnitrokey-82a0fc21f039971acac18df0ee57e2bb010865e1.tar.gz libnitrokey-82a0fc21f039971acac18df0ee57e2bb010865e1.tar.bz2 | |
Merge pull request #42 from Nitrokey/13-storage_pro_cmds
Support Pro stick commands on Storage device
Diffstat (limited to 'include/dissect.h')
| -rw-r--r-- | include/dissect.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/dissect.h b/include/dissect.h index c83e648..59e6e9c 100644 --- a/include/dissect.h +++ b/include/dissect.h @@ -67,7 +67,7 @@ class ResponseDissector : semantics::non_constructible { out << "Device status:\t" << pod.device_status + 0 << " " << status[pod.device_status] << std::endl; - out << "Command ID:\t" << commandid_to_string((CommandID)(pod.command_id)) + out << "Command ID:\t" << commandid_to_string((CommandID)(pod.command_id)) << " hex: " << std::hex << (int)pod.command_id << std::endl; out << "Last command CRC:\t" << std::hex << std::setw(2) << std::setfill('0') @@ -77,6 +77,14 @@ class ResponseDissector : semantics::non_constructible { out << "CRC:\t" << std::hex << std::setw(2) << std::setfill('0') << pod.crc << std::endl; + out << "Storage stick status:" << std::endl; +#define d(x) out << " "#x": \t"<< std::hex << std::setw(2) \ + << std::setfill('0')<< static_cast<int>(x) << std::endl; + d(pod.storage_status.command_counter); + d(pod.storage_status.command_id); + d(pod.storage_status.device_status); + d(pod.storage_status.progress_bar_value); +#undef d out << "Payload:" << std::endl; out << pod.payload.dissect(); |