summaryrefslogtreecommitdiffstats
path: root/solaris
diff options
context:
space:
mode:
authorNathan Scott <nathans@redhat.com>2020-11-17 18:12:38 +1100
committerNathan Scott <nathans@redhat.com>2020-11-18 10:17:33 +1100
commitea9622b8c9444d92007f24fc54597f83c498f11d (patch)
tree13cb45909d2c873b7b09ec59580d6a8db4676b0b /solaris
parente3af8d0d0851dd6ce25446a7f9a99e2127795a78 (diff)
Merge individual Battery.[ch] files into Platform.[ch]
Consistent with everything else involving platform-specific calls from core htop code.
Diffstat (limited to 'solaris')
-rw-r--r--solaris/Battery.c8
-rw-r--r--solaris/Battery.h8
-rw-r--r--solaris/Platform.c5
-rw-r--r--solaris/Platform.h2
4 files changed, 7 insertions, 16 deletions
diff --git a/solaris/Battery.c b/solaris/Battery.c
deleted file mode 100644
index c824df24..00000000
--- a/solaris/Battery.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "Battery.h"
-
-#include <math.h>
-
-void Battery_getData(double* level, ACPresence* isOnAC) {
- *level = NAN;
- *isOnAC = AC_ERROR;
-}
diff --git a/solaris/Battery.h b/solaris/Battery.h
deleted file mode 100644
index 74a27fc5..00000000
--- a/solaris/Battery.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef HEADER_Battery
-#define HEADER_Battery
-
-#include "BatteryMeter.h"
-
-void Battery_getData(double* level, ACPresence* isOnAC);
-
-#endif
diff --git a/solaris/Platform.c b/solaris/Platform.c
index 2329590f..7eff2d5f 100644
--- a/solaris/Platform.c
+++ b/solaris/Platform.c
@@ -301,3 +301,8 @@ bool Platform_getNetworkIO(unsigned long int* bytesReceived,
*packetsTransmitted = 0;
return false;
}
+
+void Platform_getBattery(double* level, ACPresence* isOnAC) {
+ *level = NAN;
+ *isOnAC = AC_ERROR;
+}
diff --git a/solaris/Platform.h b/solaris/Platform.h
index 4d83dc7e..051a64da 100644
--- a/solaris/Platform.h
+++ b/solaris/Platform.h
@@ -80,4 +80,6 @@ bool Platform_getNetworkIO(unsigned long int* bytesReceived,
unsigned long int* bytesTransmitted,
unsigned long int* packetsTransmitted);
+void Platform_getBattery(double* level, ACPresence* isOnAC);
+
#endif

© 2014-2024 Faster IT GmbH | imprint | privacy policy