Skip to content

added burn raw file option #133

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
srdgame wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added burn raw file option #133

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
15 changes: 8 additions & 7 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void usage()
printf("DownloadBoot:\t\tdb <Loader>\r\n");
printf("UpgradeLoader:\t\tul <Loader>\r\n");
printf("ReadLBA:\t\trl <BeginSec> <SectorLen> <File>\r\n");
printf("WriteLBA:\t\twl <BeginSec> <File>\r\n");
printf("WriteLBA:\t\twl <BeginSec> <File> [Raw: 0=Image 1=Raw]\r\n");
printf("WriteLBA:\t\twlx <PartitionName> <File>\r\n");
printf("WriteGPT:\t\tgpt <gpt partition table>\r\n");
printf("WriteParameter:\t\tprm <parameter>\r\n");
Expand Down Expand Up @@ -2920,7 +2920,7 @@ bool write_sparse_lba(STRUCT_RKDEVICE_DESC &dev, UINT uiBegin, UINT uiSize, char

}

bool write_lba(STRUCT_RKDEVICE_DESC &dev, UINT uiBegin, char *szFile)
bool write_lba(STRUCT_RKDEVICE_DESC &dev, UINT uiBegin, char *szFile, bool bRaw)
{
if (!check_device_type(dev, RKUSB_LOADER | RKUSB_MASKROM))
return false;
Expand Down Expand Up @@ -2950,7 +2950,7 @@ bool write_lba(STRUCT_RKDEVICE_DESC &dev, UINT uiBegin, char *szFile)
memset(pBuf, 0, nSectorSize * DEFAULT_RW_LBA);
iWrite = iRead= fread(pBuf, 1, nSectorSize * DEFAULT_RW_LBA, file);
uiLen = ((iWrite % 512) == 0) ? (iWrite / 512) : (iWrite / 512 + 1);
iRet = pComm->RKU_WriteLBA( uiBegin, uiLen, pBuf);
iRet = pComm->RKU_WriteLBA( uiBegin, uiLen, pBuf, bRaw ? RWMETHOD_LBA : RWMETHOD_IMAGE);
if(ERR_SUCCESS == iRet) {
uiBegin += uiLen;
iTotalWrite += iWrite;
Expand Down Expand Up @@ -3246,10 +3246,11 @@ bool handle_command(int argc, char* argv[], CRKScan *pScan)
} else
printf("Parameter of [EF] command is invalid, please check help!\r\n");
} else if(strcmp(strCmd.c_str(), "WL") == 0) {
if (argc == 4) {
if (argc >= 4) {
UINT uiBegin;
char *pszEnd;
uiBegin = strtoul(argv[2], &pszEnd, 0);
bool bRaw = argc > 4 ? strtoul(argv[4], &pszEnd, 0) != 0 : false;
if (*pszEnd)
printf("Begin is invalid, please check!\r\n");
else {
Expand All @@ -3260,7 +3261,7 @@ bool handle_command(int argc, char* argv[], CRKScan *pScan)
if (is_ubifs_image(argv[3]))
bSuccess = erase_ubi_block(dev, (u32)uiBegin, (u32)-1);
if (bSuccess)
bSuccess = write_lba(dev, (u32)uiBegin, argv[3]);
bSuccess = write_lba(dev, (u32)uiBegin, argv[3], bRaw);
else
printf("Failure of Erase for writing ubi image!\r\n");
}
Expand All @@ -3285,7 +3286,7 @@ bool handle_command(int argc, char* argv[], CRKScan *pScan)
bSuccess = erase_ubi_block(dev, (u32)lba, (u32)(lba_end - lba + 1));
}
if (bSuccess)
bSuccess = write_lba(dev, (u32)lba, argv[3]);
bSuccess = write_lba(dev, (u32)lba, argv[3], false);
else
printf("Failure of Erase for writing ubi image!\r\n");
}
Expand All @@ -3304,7 +3305,7 @@ bool handle_command(int argc, char* argv[], CRKScan *pScan)
if (is_ubifs_image(argv[3]))
bSuccess = erase_ubi_block(dev, part_offset, part_size);
if (bSuccess)
bSuccess = write_lba(dev, part_offset, argv[3]);
bSuccess = write_lba(dev, part_offset, argv[3], false);
else
printf("Failure of Erase for writing ubi image!\r\n");
}
Expand Down