Remove the need for ADL headers

This commit is contained in:
OhGodAGirl committed 2016-12-07 04:42:30 +01:00
1 parent 7a584faeaa
commit 2ec03cae81
5 files changed
+23 -28

No files matched your search

+6 -5
View File
@@ -8,9 +8,6 @@
*/
#include "config.h"
#if defined(HAVE_ADL) && (defined(__unix__) || defined (WIN32))
#include <stdio.h>
#include <string.h>
#include <math.h>
@@ -20,6 +17,11 @@
#endif
#include "miner.h"
bool adl_active;
#if defined(HAVE_ADL) && (defined(__unix__) || defined (WIN32))
#include "ADL_SDK/adl_sdk.h"
#include "compat.h"
@@ -37,12 +39,11 @@
# define wlogprint(...) applog(LOG_WARNING, __VA_ARGS__)
#endif
bool adl_active;
extern bool opt_reorder;
extern int opt_hysteresis;
extern int opt_targettemp;
extern int opt_overheattemp;
static pthread_mutex_t adl_lock;
struct gpu_adapters {
+2 -1
View File
@@ -1,13 +1,14 @@
#ifndef ADL_H
#define ADL_H
#ifdef HAVE_ADL
extern bool adl_active;
extern bool opt_reorder;
extern int opt_hysteresis;
extern int opt_targettemp;
extern int opt_overheattemp;
#ifdef HAVE_ADL
void init_adl(int nDevs);
float adl_gpu_temp(int gpu);
int adl_gpu_engineclock(int gpu);
-3
View File
@@ -41,10 +41,7 @@
#include "algorithm.h"
#include "pool.h"
#ifdef HAVE_ADL
#include "adl.h"
#endif
#if defined(unix) || defined(__APPLE__)
#include <errno.h>
+12 -16
View File
@@ -56,14 +56,12 @@ extern char *set_default_intensity(const char *arg);
extern char *set_default_xintensity(const char *arg);
extern char *set_default_rawintensity(const char *arg);
extern char *set_default_thread_concurrency(const char *arg);
#ifdef HAVE_ADL
extern char *set_default_gpu_engine(const char *arg);
extern char *set_default_gpu_memclock(const char *arg);
extern char *set_default_gpu_threads(const char *arg);
extern char *set_default_gpu_fan(const char *arg);
extern char *set_default_gpu_powertune(const char *arg);
extern char *set_default_gpu_vddc(const char *arg);
#endif
extern char *set_default_gpu_threads(const char *arg);
extern char *set_default_gpu_engine(const char *arg);
extern char *set_default_gpu_memclock(const char *arg);
extern char *set_default_gpu_fan(const char *arg);
extern char *set_default_gpu_powertune(const char *arg);
extern char *set_default_gpu_vddc(const char *arg);
extern char *set_default_profile(char *arg);
extern char *set_default_shaders(const char *arg);
extern char *set_default_worksize(const char *arg);
@@ -77,14 +75,12 @@ extern char *set_profile_intensity(const char *arg);
extern char *set_profile_xintensity(const char *arg);
extern char *set_profile_rawintensity(const char *arg);
extern char *set_profile_thread_concurrency(const char *arg);
#ifdef HAVE_ADL
extern char *set_profile_gpu_engine(const char *arg);
extern char *set_profile_gpu_memclock(const char *arg);
extern char *set_profile_gpu_threads(const char *arg);
extern char *set_profile_gpu_fan(const char *arg);
extern char *set_profile_gpu_powertune(const char *arg);
extern char *set_profile_gpu_vddc(const char *arg);
#endif
extern char *set_profile_gpu_threads(const char *arg);
extern char *set_profile_gpu_engine(const char *arg);
extern char *set_profile_gpu_memclock(const char *arg);
extern char *set_profile_gpu_fan(const char *arg);
extern char *set_profile_gpu_powertune(const char *arg);
extern char *set_profile_gpu_vddc(const char *arg);
extern char *set_profile_nfactor(const char *arg);
extern char *set_profile_shaders(const char *arg);
extern char *set_profile_worksize(const char *arg);
+3 -3
View File
@@ -311,20 +311,21 @@ extern struct strategies strategies[];
struct cgpu_info;
#ifdef HAVE_ADL
struct gpu_adl {
ADLTemperature lpTemperature;
int iAdapterIndex;
int lpAdapterID;
int iBusNumber;
char strAdapterName[256];
#ifdef HAVE_ADL
ADLTemperature lpTemperature;
ADLPMActivity lpActivity;
ADLODParameters lpOdParameters;
ADLODPerformanceLevels *DefPerfLev;
ADLFanSpeedInfo lpFanSpeedInfo;
ADLFanSpeedValue lpFanSpeedValue;
ADLFanSpeedValue DefFanSpeedValue;
#endif
bool def_fan_valid;
@@ -349,7 +350,6 @@ struct gpu_adl {
bool has_fanspeed;
struct gpu_adl *twin;
};
#endif
/***********************************
* Switcher stuff