|
@@ -145,10 +145,10 @@ static LPCTIVA_LEGACY_ADDRESS _LookupLegacyAddressMap(unsigned int addr)
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
-static bool _StrToULong(const char *pszNum, unsigned long &l)
|
|
|
|
|
|
+static bool _StrToULong(const char *pszNum, unsigned long &l, int base)
|
|
{
|
|
{
|
|
char *pszEndPtr = NULL;
|
|
char *pszEndPtr = NULL;
|
|
- unsigned long v = strtoul(pszNum, &pszEndPtr, 16);
|
|
|
|
|
|
+ unsigned long v = strtoul(pszNum, &pszEndPtr, base);
|
|
|
|
|
|
if(((v == ULONG_MAX) && (errno == ERANGE)) || *pszEndPtr)
|
|
if(((v == ULONG_MAX) && (errno == ERANGE)) || *pszEndPtr)
|
|
return false;
|
|
return false;
|
|
@@ -227,7 +227,7 @@ int main(int argc, char *argv[])
|
|
switch(cmd)
|
|
switch(cmd)
|
|
{
|
|
{
|
|
case 1:
|
|
case 1:
|
|
- if(!_StrToULong(optarg, opt2))
|
|
|
|
|
|
+ if(!_StrToULong(optarg, opt2, 16))
|
|
{
|
|
{
|
|
ETRACE("Invalid argument: %s\n", optarg);
|
|
ETRACE("Invalid argument: %s\n", optarg);
|
|
return -1;
|
|
return -1;
|
|
@@ -261,7 +261,7 @@ int main(int argc, char *argv[])
|
|
++cmdCnt;
|
|
++cmdCnt;
|
|
break;
|
|
break;
|
|
case 'i': // <Addr HEX> read from addr
|
|
case 'i': // <Addr HEX> read from addr
|
|
- if(!_StrToULong(optarg, opt1))
|
|
|
|
|
|
+ if(!_StrToULong(optarg, opt1, 16))
|
|
{
|
|
{
|
|
ETRACE("Invalid argument: %s\n", optarg);
|
|
ETRACE("Invalid argument: %s\n", optarg);
|
|
_ShowUsage();
|
|
_ShowUsage();
|
|
@@ -273,7 +273,7 @@ int main(int argc, char *argv[])
|
|
++cmdCnt;
|
|
++cmdCnt;
|
|
break;
|
|
break;
|
|
case 'o': // <Addr HEX> <data HEX> write to addr
|
|
case 'o': // <Addr HEX> <data HEX> write to addr
|
|
- if(!_StrToULong(optarg, opt1))
|
|
|
|
|
|
+ if(!_StrToULong(optarg, opt1, 16))
|
|
{
|
|
{
|
|
ETRACE("Invalid argument: %s\n", optarg);
|
|
ETRACE("Invalid argument: %s\n", optarg);
|
|
_ShowUsage();
|
|
_ShowUsage();
|
|
@@ -301,7 +301,7 @@ int main(int argc, char *argv[])
|
|
++cmdCnt;
|
|
++cmdCnt;
|
|
break;
|
|
break;
|
|
case 'b': // Backlight in %, <0-100>
|
|
case 'b': // Backlight in %, <0-100>
|
|
- if(!_StrToULong(optarg, opt1))
|
|
|
|
|
|
+ if(!_StrToULong(optarg, opt1, 10))
|
|
{
|
|
{
|
|
ETRACE("Invalid argument: %s\n", optarg);
|
|
ETRACE("Invalid argument: %s\n", optarg);
|
|
_ShowUsage();
|
|
_ShowUsage();
|