[powerdebug,18/22] cleanup the headers

Message ID 1308145856-6112-18-git-send-email-daniel.lezcano@linaro.org
State Accepted
Headers show

Commit Message

Daniel Lezcano June 15, 2011, 1:50 p.m.
Make some cleanup around the headers.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 clocks.c     |    5 +++++
 display.c    |    4 ++++
 powerdebug.c |    6 +++++-
 powerdebug.h |   24 +-----------------------
 regulator.c  |    2 ++
 regulator.h  |    3 +--
 6 files changed, 18 insertions(+), 26 deletions(-)

Patch

diff --git a/clocks.c b/clocks.c
index 86ae948..684bf88 100644
--- a/clocks.c
+++ b/clocks.c
@@ -22,6 +22,11 @@ 
 #include <stdio.h>
 #undef _GNU_SOURCE
 #endif
+#include <string.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/param.h>
 #include <mntent.h>
 #include <sys/stat.h>
 
diff --git a/display.c b/display.c
index 92fc02a..3c79737 100644
--- a/display.c
+++ b/display.c
@@ -13,6 +13,10 @@ 
  *       - initial API and implementation
  *******************************************************************************/
 
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ncurses.h>
 #include "powerdebug.h"
 #include "regulator.h"
 #include "display.h"
diff --git a/powerdebug.c b/powerdebug.c
index 0b25860..5d834c7 100644
--- a/powerdebug.c
+++ b/powerdebug.c
@@ -15,7 +15,11 @@ 
 
 #include <getopt.h>
 #include <stdbool.h>
-#include <math.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <ncurses.h>
 #include "regulator.h"
 #include "display.h"
 #include "clocks.h"
diff --git a/powerdebug.h b/powerdebug.h
index df39a8a..fb066ce 100644
--- a/powerdebug.h
+++ b/powerdebug.h
@@ -13,32 +13,10 @@ 
  *       - initial API and implementation
  *******************************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <dirent.h>
-#include <getopt.h>
-#include <errno.h>
-#include <ncurses.h>
-
 #define VERSION "0.4.1"
 
-#define TOTAL_FEATURE_WINS 3  /* Regulator, Clock and Sensor (for now) */
-enum {CLOCK, REGULATOR, SENSOR};
-enum {CLOCK_SELECTED = 1, REFRESH_WINDOW};
+enum { CLOCK, REGULATOR, SENSOR };
 
 extern void find_parents_for_clock(char *clkname, int complete);
-extern int display_print_line(int window, int line, char *str,
-			      int bold, void *data);
-
-extern int display_refresh_pad(int window);
-extern int display_reset_cursor(int window);
-extern void *display_get_row_data(int window);
 
-extern int clock_toggle_expanded(void);
-extern int regulator_display(void);
-extern void print_sensor_header(void);
-extern void print_clock_header(void);
-extern void print_regulator_header(void);
 
diff --git a/regulator.c b/regulator.c
index 4b9d36e..696ed10 100644
--- a/regulator.c
+++ b/regulator.c
@@ -18,6 +18,8 @@ 
 #include "regulator.h"
 
 #define SYSFS_REGULATOR "/sys/class/regulator"
+#define VALUE_MAX 16
+
 #define _GNU_SOURCE
 #include <stdio.h>
 #undef _GNU_SOURCE
diff --git a/regulator.h b/regulator.h
index 5f8c473..1b59a57 100644
--- a/regulator.h
+++ b/regulator.h
@@ -13,7 +13,6 @@ 
  *       - initial API and implementation
  *******************************************************************************/
 
-#define VALUE_MAX 16
-
+extern int regulator_display(void);
 extern int regulator_init(void);
 extern int regulator_dump(void);