diff options
Diffstat (limited to 'utils/hwstub')
-rw-r--r-- | utils/hwstub/hwstub_protocol.h | 5 | ||||
-rw-r--r-- | utils/hwstub/stub/protocol.h | 2 | ||||
-rw-r--r-- | utils/hwstub/tools/hwstub_shell.cpp | 10 | ||||
-rw-r--r-- | utils/hwstub/tools/init.lua | 4 |
4 files changed, 8 insertions, 13 deletions
diff --git a/utils/hwstub/hwstub_protocol.h b/utils/hwstub/hwstub_protocol.h index 759aa51b55..23bc19ceee 100644 --- a/utils/hwstub/hwstub_protocol.h +++ b/utils/hwstub/hwstub_protocol.h | |||
@@ -27,11 +27,6 @@ | |||
27 | 27 | ||
28 | #define HWSTUB_VERSION_MAJOR 4 | 28 | #define HWSTUB_VERSION_MAJOR 4 |
29 | #define HWSTUB_VERSION_MINOR 0 | 29 | #define HWSTUB_VERSION_MINOR 0 |
30 | #define HWSTUB_VERSION_REV 0 | ||
31 | |||
32 | #define HWSTUB_VERSION__(maj,min,rev) #maj"."#min"."#rev | ||
33 | #define HWSTUB_VERSION_(maj,min,rev) HWSTUB_VERSION__(maj,min,rev) | ||
34 | #define HWSTUB_VERSION HWSTUB_VERSION_(HWSTUB_VERSION_MAJOR,HWSTUB_VERSION_MINOR,HWSTUB_VERSION_REV) | ||
35 | 30 | ||
36 | /** | 31 | /** |
37 | * A device can use any VID:PID but in case hwstub is in full control of the | 32 | * A device can use any VID:PID but in case hwstub is in full control of the |
diff --git a/utils/hwstub/stub/protocol.h b/utils/hwstub/stub/protocol.h index 35510fa9b2..e358bb0a36 100644 --- a/utils/hwstub/stub/protocol.h +++ b/utils/hwstub/stub/protocol.h | |||
@@ -1 +1,3 @@ | |||
1 | #include "../hwstub_protocol.h" | 1 | #include "../hwstub_protocol.h" |
2 | |||
3 | #define HWSTUB_VERSION_REV 1 \ No newline at end of file | ||
diff --git a/utils/hwstub/tools/hwstub_shell.cpp b/utils/hwstub/tools/hwstub_shell.cpp index a10a1dad4e..2f2803da13 100644 --- a/utils/hwstub/tools/hwstub_shell.cpp +++ b/utils/hwstub/tools/hwstub_shell.cpp | |||
@@ -231,7 +231,7 @@ int my_lua_udelay(lua_State *state) | |||
231 | bool my_lua_import_hwstub() | 231 | bool my_lua_import_hwstub() |
232 | { | 232 | { |
233 | int oldtop = lua_gettop(g_lua); | 233 | int oldtop = lua_gettop(g_lua); |
234 | 234 | ||
235 | lua_newtable(g_lua); // hwstub | 235 | lua_newtable(g_lua); // hwstub |
236 | 236 | ||
237 | lua_newtable(g_lua); // options | 237 | lua_newtable(g_lua); // options |
@@ -336,8 +336,6 @@ bool my_lua_import_hwstub() | |||
336 | lua_setfield(g_lua, -2, "major"); | 336 | lua_setfield(g_lua, -2, "major"); |
337 | lua_pushinteger(g_lua, HWSTUB_VERSION_MINOR); | 337 | lua_pushinteger(g_lua, HWSTUB_VERSION_MINOR); |
338 | lua_setfield(g_lua, -2, "minor"); | 338 | lua_setfield(g_lua, -2, "minor"); |
339 | lua_pushinteger(g_lua, HWSTUB_VERSION_REV); | ||
340 | lua_setfield(g_lua, -2, "revision"); | ||
341 | lua_setfield(g_lua, -2, "version"); | 339 | lua_setfield(g_lua, -2, "version"); |
342 | lua_setfield(g_lua, -2, "host"); | 340 | lua_setfield(g_lua, -2, "host"); |
343 | 341 | ||
@@ -677,8 +675,8 @@ bool my_lua_import_soc(const std::vector< soc_t >& socs) | |||
677 | 675 | ||
678 | void usage(void) | 676 | void usage(void) |
679 | { | 677 | { |
680 | printf("hwstub_tool, compiled with hwstub %d.%d.%d\n", | 678 | printf("hwstub_tool, compiled with hwstub protocol %d.%d\n", |
681 | HWSTUB_VERSION_MAJOR, HWSTUB_VERSION_MINOR, HWSTUB_VERSION_REV); | 679 | HWSTUB_VERSION_MAJOR, HWSTUB_VERSION_MINOR); |
682 | printf("\n"); | 680 | printf("\n"); |
683 | printf("usage: hwstub_tool [options] <soc desc files>\n"); | 681 | printf("usage: hwstub_tool [options] <soc desc files>\n"); |
684 | printf("options:\n"); | 682 | printf("options:\n"); |
@@ -797,7 +795,7 @@ int main(int argc, char **argv) | |||
797 | { | 795 | { |
798 | printf("Warning: this tool is possibly incompatible with your device:\n"); | 796 | printf("Warning: this tool is possibly incompatible with your device:\n"); |
799 | printf("Device version: %d.%d.%d\n", g_hwdev_ver.bMajor, g_hwdev_ver.bMinor, g_hwdev_ver.bRevision); | 797 | printf("Device version: %d.%d.%d\n", g_hwdev_ver.bMajor, g_hwdev_ver.bMinor, g_hwdev_ver.bRevision); |
800 | printf("Host version: %d.%d.%d\n", HWSTUB_VERSION_MAJOR, HWSTUB_VERSION_MINOR, HWSTUB_VERSION_REV); | 798 | printf("Host version: %d.%d\n", HWSTUB_VERSION_MAJOR, HWSTUB_VERSION_MINOR); |
801 | } | 799 | } |
802 | 800 | ||
803 | // get memory layout information | 801 | // get memory layout information |
diff --git a/utils/hwstub/tools/init.lua b/utils/hwstub/tools/init.lua index 3c60abf806..1fe0e0d734 100644 --- a/utils/hwstub/tools/init.lua +++ b/utils/hwstub/tools/init.lua | |||
@@ -66,8 +66,8 @@ end | |||
66 | if not hwstub.options.quiet then | 66 | if not hwstub.options.quiet then |
67 | print("information") | 67 | print("information") |
68 | print(" hwstub") | 68 | print(" hwstub") |
69 | print(" version: " .. string.format("%d.%d.%d", hwstub.host.version.major, | 69 | print(" version: " .. string.format("%d.%d", hwstub.host.version.major, |
70 | hwstub.host.version.minor, hwstub.host.version.revision)) | 70 | hwstub.host.version.minor)) |
71 | print(" device") | 71 | print(" device") |
72 | print(" version: " .. string.format("%d.%d.%d", hwstub.dev.version.major, | 72 | print(" version: " .. string.format("%d.%d.%d", hwstub.dev.version.major, |
73 | hwstub.dev.version.minor, hwstub.dev.version.revision)) | 73 | hwstub.dev.version.minor, hwstub.dev.version.revision)) |