summaryrefslogtreecommitdiff
path: root/utils/hwstub/tools
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2014-08-05 18:18:17 +0200
committerAmaury Pouly <amaury.pouly@gmail.com>2014-09-07 17:45:28 +0200
commitdd05dc76a45718ad327d3fec69c259b873c39154 (patch)
tree827055a4545f1c370a6ccafc84d19deb2cdb5f73 /utils/hwstub/tools
parent43ca127ebfe9766c84a0456dbac5cafd5f4cb451 (diff)
downloadrockbox-dd05dc76a45718ad327d3fec69c259b873c39154.tar.gz
rockbox-dd05dc76a45718ad327d3fec69c259b873c39154.zip
hwstub: don't put revision in the protocol, it's specific to the implementation
Change-Id: I1311a22da41fe977f1613f1e313a864baa03027c
Diffstat (limited to 'utils/hwstub/tools')
-rw-r--r--utils/hwstub/tools/hwstub_shell.cpp10
-rw-r--r--utils/hwstub/tools/init.lua4
2 files changed, 6 insertions, 8 deletions
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)
231bool my_lua_import_hwstub() 231bool 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
678void usage(void) 676void 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
66if not hwstub.options.quiet then 66if 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))