Browse Source

Display error codes should ADL not return ADL_OK in the more critical function calls.

nfactor-troky
Con Kolivas 13 years ago
parent
commit
f0746f0b4c
  1. 32
      adl.c

32
adl.c

@ -114,7 +114,7 @@ static bool fanspeed_twin(struct gpu_adl *ga, struct gpu_adl *other_ga)
void init_adl(int nDevs) void init_adl(int nDevs)
{ {
int i, j, devices = 0, last_adapter = -1, gpu = 0, dummy = 0; int result, i, j, devices = 0, last_adapter = -1, gpu = 0, dummy = 0;
struct gpu_adapters adapters[MAX_GPUDEVICES], vadapters[MAX_GPUDEVICES]; struct gpu_adapters adapters[MAX_GPUDEVICES], vadapters[MAX_GPUDEVICES];
#if defined (LINUX) #if defined (LINUX)
@ -169,19 +169,22 @@ void init_adl(int nDevs)
// Initialise ADL. The second parameter is 1, which means: // Initialise ADL. The second parameter is 1, which means:
// retrieve adapter information only for adapters that are physically present and enabled in the system // retrieve adapter information only for adapters that are physically present and enabled in the system
if (ADL_Main_Control_Create (ADL_Main_Memory_Alloc, 1) != ADL_OK) { result = ADL_Main_Control_Create (ADL_Main_Memory_Alloc, 1);
applog(LOG_INFO, "ADL Initialisation Error!"); if (result != ADL_OK) {
applog(LOG_INFO, "ADL Initialisation Error! Error %d!", result);
return ; return ;
} }
if (ADL_Main_Control_Refresh() != ADL_OK) { result = ADL_Main_Control_Refresh();
applog(LOG_INFO, "ADL Refresh Error!"); if (result != ADL_OK) {
applog(LOG_INFO, "ADL Refresh Error! Error %d!", result);
return ; return ;
} }
// Obtain the number of adapters for the system // Obtain the number of adapters for the system
if (ADL_Adapter_NumberOfAdapters_Get ( &iNumberAdapters ) != ADL_OK) { result = ADL_Adapter_NumberOfAdapters_Get (&iNumberAdapters);
applog(LOG_INFO, "Cannot get the number of adapters!\n"); if (result != ADL_OK) {
applog(LOG_INFO, "Cannot get the number of adapters! Error %d!", result);
return ; return ;
} }
@ -191,8 +194,9 @@ void init_adl(int nDevs)
lpInfo->iSize = sizeof(lpInfo); lpInfo->iSize = sizeof(lpInfo);
// Get the AdapterInfo structure for all adapters in the system // Get the AdapterInfo structure for all adapters in the system
if (ADL_Adapter_AdapterInfo_Get (lpInfo, sizeof (AdapterInfo) * iNumberAdapters) != ADL_OK) { result = ADL_Adapter_AdapterInfo_Get (lpInfo, sizeof (AdapterInfo) * iNumberAdapters);
applog(LOG_INFO, "ADL_Adapter_AdapterInfo_Get Error!"); if (result != ADL_OK) {
applog(LOG_INFO, "ADL_Adapter_AdapterInfo_Get Error! Error %d", result);
return ; return ;
} }
} else { } else {
@ -207,8 +211,9 @@ void init_adl(int nDevs)
iAdapterIndex = lpInfo[i].iAdapterIndex; iAdapterIndex = lpInfo[i].iAdapterIndex;
/* Get unique identifier of the adapter, 0 means not AMD */ /* Get unique identifier of the adapter, 0 means not AMD */
if (ADL_Adapter_ID_Get(iAdapterIndex, &lpAdapterID) != ADL_OK) { result = ADL_Adapter_ID_Get(iAdapterIndex, &lpAdapterID);
applog(LOG_INFO, "Failed to ADL_Adapter_ID_Get"); if (result != ADL_OK) {
applog(LOG_INFO, "Failed to ADL_Adapter_ID_Get. Error %d", result);
continue; continue;
} }
@ -286,8 +291,9 @@ void init_adl(int nDevs)
gpus[gpu].virtual_gpu = vadapters[gpu].virtual_gpu; gpus[gpu].virtual_gpu = vadapters[gpu].virtual_gpu;
/* Get unique identifier of the adapter, 0 means not AMD */ /* Get unique identifier of the adapter, 0 means not AMD */
if (ADL_Adapter_ID_Get(iAdapterIndex, &lpAdapterID) != ADL_OK) { result = ADL_Adapter_ID_Get(iAdapterIndex, &lpAdapterID);
applog(LOG_INFO, "Failed to ADL_Adapter_ID_Get"); if (result != ADL_OK) {
applog(LOG_INFO, "Failed to ADL_Adapter_ID_Get. Error %d", result);
continue; continue;
} }

Loading…
Cancel
Save