devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

hwstub: port hwstub_load to the new library

Browse source 
Change-Id: I7e8ae50907401a9480a0da809a4470f1728d3a57
This commit is contained in:
Amaury Pouly 2016-02-07 21:45:29 +00:00
parent 3d8a08ca25
commit a2f4c5201d
1 changed files with 50 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

108
utils/hwstub/tools/hwstub_load.cpp
View file

@ -18,13 +18,16 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
****************************************************************************/ ****************************************************************************/
#include "hwstub.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <getopt.h> #include <getopt.h>
#include <stdbool.h> #include <stdbool.h>
#include <ctype.h> #include <ctype.h>
#include "hwstub.hpp"
#include "hwstub_uri.hpp"
using namespace hwstub;
struct player_info_t struct player_info_t
{ {
@ -102,11 +105,12 @@ bool could_be_rockbox(unsigned char *buffer, size_t size)
void usage(void) void usage(void)
{ {
printf("usage: hwstub_load [options] <addr> <file>\n"); printf("usage: hwstub::load [options] <addr> <file>\n");
printf("options:\n"); printf("options:\n");
printf(" --help/-? Display this help\n"); printf(" --help/-? Display this help\n");
printf(" --quiet/-q Quiet output\n"); printf(" --quiet/-q Quiet output\n");
printf(" --type/-t <t> Override file type\n"); printf(" --type/-t <t> Override file type\n");
printf(" --dev/-d <uri> Device URI (see below)\n");
printf("file types:\n"); printf("file types:\n");
printf(" raw Load a raw binary blob\n"); printf(" raw Load a raw binary blob\n");
printf(" rockbox Load a rockbox image produced by scramble\n"); printf(" rockbox Load a rockbox image produced by scramble\n");
@ -115,14 +119,15 @@ void usage(void)
for(int i = 0; players[i].name; i++) for(int i = 0; players[i].name; i++)
printf(" %s", players[i].name); printf(" %s", players[i].name);
printf("\n"); printf("\n");
//hwstub::usage_uri(stdout);
exit(1); exit(1);
} }
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
bool quiet = false; bool quiet = false;
struct hwstub_device_t *hwdev;
enum image_type_t type = IT_DETECT; enum image_type_t type = IT_DETECT;
const char *uri = "usb:";
// parse command line // parse command line
while(1) while(1)
@ -132,10 +137,11 @@ int main(int argc, char **argv)
{"help", no_argument, 0, '?'}, {"help", no_argument, 0, '?'},
{"quiet", no_argument, 0, 'q'}, {"quiet", no_argument, 0, 'q'},
{"type", required_argument, 0, 't'}, {"type", required_argument, 0, 't'},
{"dev", required_argument, 0, 'd'},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
int c = getopt_long(argc, argv, "?qt:", long_options, NULL); int c = getopt_long(argc, argv, "?qt:d:", long_options, NULL);
if(c == -1) if(c == -1)
break; break;
switch(c) switch(c)
@ -161,6 +167,9 @@ int main(int argc, char **argv)
return 1; return 1;
} }
break; break;
case 'd':
uri = optarg;
break;
default: default:
abort(); abort();
} }
@ -220,61 +229,44 @@ int main(int argc, char **argv)
} }
// create usb context // create usb context
libusb_context *ctx; std::string errstr;
libusb_init(&ctx); std::shared_ptr<context> hwctx = uri::create_context(uri::uri(uri), &errstr);
libusb_set_debug(ctx, 3); if(!hwctx)
// look for device
if(!quiet)
printf("Looking for device %#04x:%#04x...\n", HWSTUB_USB_VID, HWSTUB_USB_PID);
libusb_device_handle *handle = libusb_open_device_with_vid_pid(ctx,
HWSTUB_USB_VID, HWSTUB_USB_PID);
if(handle == NULL)
{ {
fprintf(stderr, "No device found\n"); printf("Cannot create context: %s\n", errstr.c_str());
return 1;
}
std::vector<std::shared_ptr<hwstub::device>> list;
hwstub::error ret = hwctx->get_device_list(list);
if(ret != hwstub::error::SUCCESS)
{
printf("Cannot get device list: %d\n", (int)ret);
return 1;
}
if(list.size() == 0)
{
printf("No hwstub device detected!\n");
return 1;
}
/* open first device */
std::shared_ptr<hwstub::handle> hwdev;
ret = list[0]->open(hwdev);
if(ret != hwstub::error::SUCCESS)
{
printf("Cannot open device: %d\n", (int)ret);
return 1; return 1;
} }
// admin stuff size_t out_size = size;
libusb_device *mydev = libusb_get_device(handle); ret = hwdev->write(addr, buffer, out_size, false);
if(!quiet) if(ret != hwstub::error::SUCCESS || out_size != size)
{ {
printf("device found at %d:%d\n", fprintf(stderr, "Image write failed: %s, %zu/%zu\n", error_string(ret).c_str(),
libusb_get_bus_number(mydev), out_size, size);
libusb_get_device_address(mydev));
}
hwdev = hwstub_open(handle);
if(hwdev == NULL)
{
fprintf(stderr, "Cannot probe device!\n");
return 1;
}
// get hwstub information
struct hwstub_version_desc_t hwdev_ver;
int ret = hwstub_get_desc(hwdev, HWSTUB_DT_VERSION, &hwdev_ver, sizeof(hwdev_ver));
if(ret != sizeof(hwdev_ver))
{
fprintf(stderr, "Cannot get version!\n");
goto Lerr; goto Lerr;
} }
if(hwdev_ver.bMajor != HWSTUB_VERSION_MAJOR || hwdev_ver.bMinor < HWSTUB_VERSION_MINOR) hwdev->exec(addr, HWSTUB_EXEC_JUMP);
{
printf("Warning: this tool is possibly incompatible with your device:\n");
printf("Device version: %d.%d.%d\n", hwdev_ver.bMajor, hwdev_ver.bMinor, hwdev_ver.bRevision);
printf("Host version: %d.%d\n", HWSTUB_VERSION_MAJOR, HWSTUB_VERSION_MINOR);
}
ret = hwstub_rw_mem(hwdev, 0, addr, buffer, size);
if(ret != (int)size)
{
fprintf(stderr, "Image write failed: %d\n", ret);
goto Lerr;
}
hwstub_jump(hwdev, addr);
hwstub_release(hwdev);
return 0; return 0;
Lerr: Lerr:
@ -283,13 +275,13 @@ int main(int argc, char **argv)
do do
{ {
char buffer[128]; char buffer[128];
int length = hwstub_get_log(hwdev, buffer, sizeof(buffer) - 1); size_t size = sizeof(buffer) - 1;
if(length <= 0) hwstub::error err = hwdev->get_log(buffer, size);
if(err != hwstub::error::SUCCESS)
break; break;
buffer[length] = 0; buffer[size] = 0;
fprintf(stderr, "%s", buffer); fprintf(stderr, "%s", buffer);
}while(1); }while(1);
hwstub_release(hwdev);
return 1; return 1;
} }