From ea9a9d738e7a53ceca93de6e41501b6b31bb1844 Mon Sep 17 00:00:00 2001 From: Elie Tournier Date: Thu, 20 Apr 2017 11:15:40 +0100 Subject: Rename #define: s/STICK10/NKPRO and s/STICK20/NKSTORAGE Signed-off-by: Elie Tournier --- include/NKPro_commands.h | 4 ++-- include/NKPro_commands_0.8.h | 7 +++---- include/NKStorage_commands.h | 8 ++++---- include/device_proto.h | 4 ++-- 4 files changed, 11 insertions(+), 12 deletions(-) (limited to 'include') diff --git a/include/NKPro_commands.h b/include/NKPro_commands.h index 60ab1b7..35837ca 100644 --- a/include/NKPro_commands.h +++ b/include/NKPro_commands.h @@ -1,5 +1,5 @@ -#ifndef STICK10_COMMANDS_H -#define STICK10_COMMANDS_H +#ifndef NKPRO_COMMANDS_H +#define NKPRO_COMMANDS_H #include #include diff --git a/include/NKPro_commands_0.8.h b/include/NKPro_commands_0.8.h index 5fffdfe..5d205ed 100644 --- a/include/NKPro_commands_0.8.h +++ b/include/NKPro_commands_0.8.h @@ -2,8 +2,8 @@ // Created by sz on 08.11.16. // -#ifndef LIBNITROKEY_STICK10_COMMANDS_0_8_H -#define LIBNITROKEY_STICK10_COMMANDS_0_8_H +#ifndef LIBNITROKEY_NKPRO_COMMANDS_0_8_H +#define LIBNITROKEY_NKPRO_COMMANDS_0_8_H #include #include @@ -322,5 +322,4 @@ namespace nitrokey { } } #pragma pack (pop) - -#endif //LIBNITROKEY_STICK10_COMMANDS_0_8_H +#endif //LIBNITROKEY_NKPRO_COMMANDS_0_8_H diff --git a/include/NKStorage_commands.h b/include/NKStorage_commands.h index b375617..7bbebe0 100644 --- a/include/NKStorage_commands.h +++ b/include/NKStorage_commands.h @@ -1,5 +1,5 @@ -#ifndef STICK20_COMMANDS_H -#define STICK20_COMMANDS_H +#ifndef NKSTORAGE_COMMANDS_H +#define NKSTORAGE_COMMANDS_H @@ -15,8 +15,8 @@ namespace nitrokey { namespace proto { /* -* STICK20 protocol command ids -* a superset (almost) of STICK10 +* NKSTORAGE protocol command ids +* a superset (almost) of NKPRO */ namespace NKStorage { diff --git a/include/device_proto.h b/include/device_proto.h index 4abb7b8..935739e 100644 --- a/include/device_proto.h +++ b/include/device_proto.h @@ -17,8 +17,8 @@ #include "CommandFailedException.h" #include "LongOperationInProgressException.h" -#define STICK20_UPDATE_MODE_VID 0x03EB -#define STICK20_UPDATE_MODE_PID 0x2FF1 +#define NKSTORAGE_UPDATE_MODE_VID 0x03EB +#define NKSTORAGE_UPDATE_MODE_PID 0x2FF1 #define PAYLOAD_SIZE 53 #define PWS_SLOT_COUNT 16 -- cgit v1.2.1