uint16_t FindPhysicalAddress(void)
{
PrintToStdOut("=== Physical Address Configuration ===\n");
- uint16_t iAddress(0xFFFF);
+ uint16_t iAddress(CEC_INVALID_PHYSICAL_ADDRESS);
PrintToStdOut("Do you want to let libCEC try to autodetect the address (y/n)?");
string input;
else
{
iAddress = g_parser->GetDevicePhysicalAddress(g_primaryAddress);
- if (iAddress == 0 || iAddress == 0xFFFF)
+ if (iAddress == 0 || iAddress == CEC_INVALID_PHYSICAL_ADDRESS)
PrintToStdOut("Failed. Please enter the address manually, or restart this wizard and use different settings.");
}
}
- if (iAddress == 0 || iAddress == 0xFFFF)
+ if (iAddress == 0 || iAddress == CEC_INVALID_PHYSICAL_ADDRESS)
{
- PrintToStdOut("Please enter the physical address (0000 - FFFF), followed by <enter>.");
+ PrintToStdOut("Please enter the physical address (0001 - FFFE), followed by <enter>.");
getline(cin, input);
cin.clear();
int iAddressTmp;
if (sscanf(input.c_str(), "%x", &iAddressTmp) == 1)
{
- if (iAddressTmp < 0 || iAddressTmp > 0xFFFF)
- iAddressTmp = 0xFFFF;
+ if (iAddressTmp <= CEC_PHYSICAL_ADDRESS_TV || iAddressTmp > CEC_MAX_PHYSICAL_ADDRESS)
+ iAddressTmp = CEC_INVALID_PHYSICAL_ADDRESS;
iAddress = (uint16_t)iAddressTmp;
}
}