Skip to content

Add board index selection option #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BSKilglass wants to merge 1 commit into
base: master
Choose a base branch
from
+52 −12
Open

Add board index selection option #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions Readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,21 @@ compile and install

rkdeveloptool usage,input "rkdeveloptool -h" to see

When multiple Rockusb boards are connected, select the target board with the
0-based board index option. Use "ld" to list the connected boards and their
indexes.

example:
1.download kernel.img
sudo ./rkdeveloptool db RKXXLoader.bin //download usbplug to device
sudo ./rkdeveloptool wl 0x8000 kernel.img //0x8000 is base of kernel partition,unit is sector.
sudo ./rkdeveloptool rd //reset device
sudo ./rkdeveloptool db RKXXLoader.bin //download usbplug to device
sudo ./rkdeveloptool wl 0x8000 kernel.img //0x8000 is base of kernel partition,unit is sector.
sudo ./rkdeveloptool rd //reset device

2.download kernel.img to the second connected board
sudo ./rkdeveloptool ld //list boards and indexes
sudo ./rkdeveloptool -i 1 db RKXXLoader.bin //select board index 1
sudo ./rkdeveloptool -i 1 wl 0x8000 kernel.img
sudo ./rkdeveloptool -i 1 rd

compile error help
if you encounter the error like below:
Expand Down
48 changes: 39 additions & 9 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ void usage()
printf("\r\n---------------------Tool Usage ---------------------\r\n");
printf("Help:\t\t\t-h or --help\r\n");
printf("Version:\t\t-v or --version\r\n");
printf("BoardIndex:\t\t-i <index> (0-based, use ld to list)\r\n");
printf("ListDevice:\t\tld\r\n");
printf("DownloadBoot:\t\tdb <Loader>\r\n");
printf("UpgradeLoader:\t\tul <Loader>\r\n");
Expand Down Expand Up @@ -3085,14 +3086,14 @@ void list_device(CRKScan *pScan)
strDevType = "Loader";
else
strDevType = "Unknown";
printf("DevNo=%d\tVid=0x%x,Pid=0x%x,LocationID=%x\t%s\r\n",i+1,desc.usVid,
desc.usPid,desc.uiLocationID,strDevType.c_str());
printf("DevNo=%d\tIndex=%d\tVid=0x%x,Pid=0x%x,LocationID=%x\t%s\r\n",i+1,i,
desc.usVid,desc.usPid,desc.uiLocationID,strDevType.c_str());
}

}


bool handle_command(int argc, char* argv[], CRKScan *pScan)
bool handle_command(int argc, char* argv[], CRKScan *pScan, int deviceIndex, bool deviceIndexSet)
{
string strCmd;
strCmd = argv[1];
Expand Down Expand Up @@ -3146,18 +3147,18 @@ bool handle_command(int argc, char* argv[], CRKScan *pScan)
NORMAL_COLOR_ATTR;
printf("\r\n");
return bSuccess;
} else if (cnt > 1) {
} else if ((cnt > 1) && !deviceIndexSet) {
ERROR_COLOR_ATTR;
printf("Found too many rockusb devices, please plug devices out!");
printf("Found too many rockusb devices, please select one with -i <index>!");
NORMAL_COLOR_ATTR;
printf("\r\n");
return bSuccess;
}

bRet = pScan->GetDevice(dev, 0);
bRet = pScan->GetDevice(dev, deviceIndex);
if (!bRet) {
ERROR_COLOR_ATTR;
printf("Getting information about rockusb device failed!");
printf("Getting information about rockusb device index %d failed!", deviceIndex);
NORMAL_COLOR_ATTR;
printf("\r\n");
return bSuccess;
Expand Down Expand Up @@ -3361,9 +3362,38 @@ int main(int argc, char* argv[])
char szProgramDir[256];
string strLogDir,strConfigFile;
struct stat statBuf;
int deviceIndex = 0;
bool deviceIndexSet = false;
int commandArgc;
vector<char *> commandArgv;

g_ConfigItemVec.clear();

commandArgv.push_back(argv[0]);
for (int i = 1; i < argc; i++) {
if ((strcmp(argv[i], "-i") == 0) || (strcmp(argv[i], "--index") == 0)) {
char *pszEnd;
long parsedIndex;
if (i + 1 >= argc) {
printf("Missing board index after %s\r\n", argv[i]);
usage();
return -0xFF;
}
errno = 0;
parsedIndex = strtol(argv[++i], &pszEnd, 0);
if ((errno == ERANGE) || (*pszEnd != '\0') || (parsedIndex < 0) || (parsedIndex > 0x7fffffff)) {
printf("Board index is invalid, please check -i <index>!\r\n");
usage();
return -0xFF;
}
deviceIndex = (int)parsedIndex;
deviceIndexSet = true;
} else {
commandArgv.push_back(argv[i]);
}
}
commandArgc = (int)commandArgv.size();

#ifndef __MINGW32__
snprintf(szProgramProcPath, sizeof(szProgramProcPath), "/proc/%d/exe", getpid());
if (readlink(szProgramProcPath, szProgramDir, 256) == -1)
Expand Down Expand Up @@ -3419,9 +3449,9 @@ int main(int argc, char* argv[])
}
pScan->SetVidPid();

if (argc == 1)
if (commandArgc == 1)
usage();
else if (!handle_command(argc, argv, pScan))
else if (!handle_command(commandArgc, &commandArgv[0], pScan, deviceIndex, deviceIndexSet))
return -0xFF;
if (pScan)
delete pScan;
Expand Down