@@ -28,7 +28,8 @@
#include <alsa/asoundlib.h>
-#include "igt.h"
+#include "igt_alsa.h"
+#include "igt_core.h"
#define HANDLES_MAX 8
@@ -29,7 +29,6 @@
#include "config.h"
-#include "igt.h"
#include <stdbool.h>
struct alsa;
@@ -29,7 +29,8 @@
#include <math.h>
#include <gsl/gsl_fft_real.h>
-#include "igt.h"
+#include "igt_audio.h"
+#include "igt_core.h"
#define FREQS_MAX 8
@@ -29,7 +29,6 @@
#include "config.h"
-#include "igt.h"
#include <stdbool.h>
struct audio_signal;
@@ -35,7 +35,11 @@
#include <pixman.h>
#include <cairo.h>
-#include "igt.h"
+#include "igt_chamelium.h"
+#include "igt_core.h"
+#include "igt_aux.h"
+#include "igt_kms.h"
+#include "igt_frame.h"
/**
* SECTION:igt_chamelium
@@ -28,8 +28,12 @@
#include "config.h"
-#include "igt.h"
#include <stdbool.h>
+#include <xf86drmMode.h>
+
+#include "igt_debugfs.h"
+
+struct igt_fb;
struct chamelium;
struct chamelium_port;
@@ -32,7 +32,8 @@
#include <gsl/gsl_statistics_double.h>
#include <gsl/gsl_fit.h>
-#include "igt.h"
+#include "igt_frame.h"
+#include "igt_core.h"
/**
* SECTION:igt_frame
@@ -29,7 +29,6 @@
#include "config.h"
-#include "igt.h"
#include <stdbool.h>
bool igt_frame_dump_is_enabled(void);
@@ -21,16 +21,16 @@
* IN THE SOFTWARE.
*/
-#include "igt.h"
-#include "igt_gvt.h"
-#include "igt_sysfs.h"
-#include "igt_kmod.h"
-
#include <signal.h>
#include <dirent.h>
#include <unistd.h>
#include <fcntl.h>
+#include "igt_gvt.h"
+#include "igt_sysfs.h"
+#include "igt_kmod.h"
+#include "drmtest.h"
+
/**
* SECTION:igt_gvt
* @short_description: Graphics virtualization technology library
@@ -21,13 +21,13 @@
* IN THE SOFTWARE.
*/
-#include "igt.h"
+#include <signal.h>
+#include <errno.h>
+
#include "igt_core.h"
#include "igt_sysfs.h"
#include "igt_kmod.h"
-#include <signal.h>
-
/**
* SECTION:igt_kmod
* @short_description: Wrappers around libkmod for module loading/unloading
@@ -26,6 +26,7 @@
#define __IGT_SYSFS_H__
#include <stdbool.h>
+#include <stdarg.h>
char *igt_sysfs_path(int device, char *path, int pathlen, int *idx);
int igt_sysfs_open(int device, int *idx);
@@ -21,10 +21,14 @@
* IN THE SOFTWARE.
*/
-#include "igt.h"
-#include "igt_vgem.h"
-
#include <sys/mman.h>
+#include <xf86drm.h>
+#include <xf86drmMode.h>
+#include <errno.h>
+
+#include "igt_vgem.h"
+#include "igt_core.h"
+#include "ioctl_wrappers.h"
/**
* SECTION:igt_vgem
@@ -25,6 +25,7 @@
#define IGT_VGEM_H
#include <stdint.h>
+#include <stdbool.h>
struct vgem_bo {
uint32_t handle;
Just a bit of OCD, I like it when connections within library modules are a bit more obvious. igt.h is ok for tests, but let's use individual include lines for libraries consistently. Also order standard includes before igt ones. v2: Rebase. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- lib/igt_alsa.c | 3 ++- lib/igt_alsa.h | 1 - lib/igt_audio.c | 3 ++- lib/igt_audio.h | 1 - lib/igt_chamelium.c | 6 +++++- lib/igt_chamelium.h | 6 +++++- lib/igt_frame.c | 3 ++- lib/igt_frame.h | 1 - lib/igt_gvt.c | 10 +++++----- lib/igt_kmod.c | 6 +++--- lib/igt_sysfs.h | 1 + lib/igt_vgem.c | 10 +++++++--- lib/igt_vgem.h | 1 + 13 files changed, 33 insertions(+), 19 deletions(-)