Rind 3 éve
szülő
commit
87ce1c97ad
2 módosított fájl, 6 hozzáadás és 6 törlés
  1. 6 6
      GfaSpiStub/src/main.cpp
  2. BIN
      bin/gfaspistub

+ 6 - 6
GfaSpiStub/src/main.cpp

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

BIN
bin/gfaspistub