pci_ids: no not include loader.h

As per original approach by Rob, each user of the loader lib should include
loader.h and the pci_id_driver_map.h header will be used exclusively by the
loader.

Add back the include guard __IS_LOADER and remove no longer needed include
folder in the scons build.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/include/pci_ids/pci_id_driver_map.h b/include/pci_ids/pci_id_driver_map.h
index 2e88451e018816a849ac22b28a31ad374381272f..db9e07fbb282fad08efe634d4af3797985fa1fe7 100644 (file)
--- a/include/pci_ids/pci_id_driver_map.h
+++ b/include/pci_ids/pci_id_driver_map.h
@@ -2,12 +2,15 @@
 #define _PCI_ID_DRIVER_MAP_H_
 
 #include <stddef.h>
-#include "loader.h"
 
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 #endif
 
+#ifndef __IS_LOADER
+#  error "Only include from loader.c"
+#endif
+
 static const int i915_chip_ids[] = {
 #define CHIPSET(chip, desc, name) chip,
 #include "pci_ids/i915_pci_ids.h"

diff --git a/src/loader/SConscript b/src/loader/SConscript
index 454e3284491b691a5f82892c1d95ca1b06bdd4a3..76b0871005be210049be05276041ba69e7bb20da 100644 (file)
--- a/src/loader/SConscript
+++ b/src/loader/SConscript
@@ -6,7 +6,6 @@ if not env['drm']:
 env = env.Clone()
 
 env.Prepend(CPPPATH = [
-    '.',
     '#include'
 ])