diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2014-05-01 19:44:23 +0200 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2014-05-11 19:54:47 +0200 |
commit | 17affb8085b408d7b135adfe4972a7057e12d7fd (patch) | |
tree | 926e3fe3781bd3283254b55648273885202ef96d /utils/hwstub/tools | |
parent | 355b5406fafe0d45285e70a0b01d5e674d6a2c16 (diff) | |
download | rockbox-17affb8085b408d7b135adfe4972a7057e12d7fd.tar.gz rockbox-17affb8085b408d7b135adfe4972a7057e12d7fd.zip |
hwstub: fix hwstub_shell
Change-Id: I008a55675054c86fd206cc5248f2bd9475e80b49
Diffstat (limited to 'utils/hwstub/tools')
-rw-r--r-- | utils/hwstub/tools/hwstub_shell.cpp | 5 | ||||
-rw-r--r-- | utils/hwstub/tools/lua/pp.lua | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/utils/hwstub/tools/hwstub_shell.cpp b/utils/hwstub/tools/hwstub_shell.cpp index cdacd81821..082e15aa59 100644 --- a/utils/hwstub/tools/hwstub_shell.cpp +++ b/utils/hwstub/tools/hwstub_shell.cpp | |||
@@ -725,11 +725,14 @@ int main(int argc, char **argv) | |||
725 | // load register descriptions | 725 | // load register descriptions |
726 | std::vector< soc_t > socs; | 726 | std::vector< soc_t > socs; |
727 | for(int i = optind; i < argc; i++) | 727 | for(int i = optind; i < argc; i++) |
728 | if(!soc_desc_parse_xml(argv[i], socs)) | 728 | { |
729 | socs.push_back(soc_t()); | ||
730 | if(!soc_desc_parse_xml(argv[i], socs[socs.size() - 1])) | ||
729 | { | 731 | { |
730 | printf("Cannot load description '%s'\n", argv[i]); | 732 | printf("Cannot load description '%s'\n", argv[i]); |
731 | return 2; | 733 | return 2; |
732 | } | 734 | } |
735 | } | ||
733 | 736 | ||
734 | // create usb context | 737 | // create usb context |
735 | libusb_context *ctx; | 738 | libusb_context *ctx; |
diff --git a/utils/hwstub/tools/lua/pp.lua b/utils/hwstub/tools/lua/pp.lua index e32a878d01..5f2503040c 100644 --- a/utils/hwstub/tools/lua/pp.lua +++ b/utils/hwstub/tools/lua/pp.lua | |||
@@ -43,7 +43,7 @@ function PP.is_pp500x() | |||
43 | end | 43 | end |
44 | 44 | ||
45 | if PP.is_pp611x() then | 45 | if PP.is_pp611x() then |
46 | identify("PP6110x (aka GoForce6110)", "pp6110", "pp6110") | 46 | identify("PP611x (aka GoForce6110)", "pp6110", "pp6110") |
47 | elseif PP.is_pp502x() then | 47 | elseif PP.is_pp502x() then |
48 | identify("PP502x", "pp502x", "pp502x") | 48 | identify("PP502x", "pp502x", "pp502x") |
49 | elseif PP.is_pp500x() then | 49 | elseif PP.is_pp500x() then |