moving lib/machinemodel to schemas directory

Signed-off-by: Reto Achermann <reto.achermann@inf.ethz.ch>

diff --git a/lib/machinemodel/pci.sockeye b/lib/machinemodel/pci.sockeye
deleted file mode 100644 (file)
index 37e8cfb..0000000
--- a/lib/machinemodel/pci.sockeye
+++ /dev/null
@@ -1,35 +0,0 @@
-schema pci {
-
-    fact memory_region {
-        uintptr BaseAddress;
-        uint8 Bits;
-        uintptr Size;
-    };
-
-    /* We want to mark this as a non-top level fact */
-    fact addr {
-        uint8 bus;
-        uint8 device;
-        uint8 function;
-    };
-
-    fact childbus {
-        uint8 min;
-        uint8 max;
-    };
-
-    fact mem {
-        uintptr start;
-        uintptr end;
-    };
-
-    fact core {
-        uint8 acpi_id;
-    };
-
-    fact rootbridge {
-        addr addr;
-        childbus child;
-        mem range;
-    };
-};

diff --git a/lib/machinemodel/Hakefile b/schemas/Hakefile
similarity index 50%
rename from lib/machinemodel/Hakefile
rename to schemas/Hakefile
index 7d4ec82..adac24c 100644 (file)
--- a/lib/machinemodel/Hakefile
+++ b/schemas/Hakefile
@@ -1,18 +1,20 @@
 --------------------------------------------------------------------------
--- Copyright (c) 2015, ETH Zurich.
+-- Copyright (c) 2017, ETH Zurich.
 -- All rights reserved.
 --
 -- This file is distributed under the terms in the attached LICENSE file.
 -- If you do not find this file, copies can be found by writing to:
--- ETH Zurich D-INFK, Universitaetstrasse 4, CH-8092 Zurich. Attn: Systems Group.
+-- ETH Zurich D-INFK, CAB F.78, Universitaetstr. 6, CH-8092 Zurich,
+-- Attn: Systems Group.
 --
--- Hakefile for /usr/machinemodel
+-- Hakefile for schema/
 --
 --------------------------------------------------------------------------
 
-[
-    build library {
-        target = "machinemodel",
-        sockeyeSchema = [ "pci", "cpuid" ]
-    }
-]
+-- whereas these are using the new-style bindings
+[ skateGenSchemas (options arch) f | f <- [ 
+          "pci",
+          "cpuid"
+     ],
+     arch <- allArchitectures
+] 

diff --git a/lib/machinemodel/cpuid.sockeye b/schemas/cpuid.sks
similarity index 100%
rename from lib/machinemodel/cpuid.sockeye
rename to schemas/cpuid.sks

diff --git a/schemas/pci.sks b/schemas/pci.sks
new file mode 100644 (file)
index 0000000..47763d0
--- /dev/null
+++ b/schemas/pci.sks
@@ -0,0 +1,37 @@
+schema pci "" {
+
+    fact memoryregion "" {
+        uintptr BaseAddress "";
+        uint8 Bits "";
+        uintptr Size "";
+    };
+
+    /* We want to mark this as a non-top level fact */
+    fact addr "" {
+        uint8 bus "";
+        uint8 device "";
+        uint8 function "";
+    };
+
+    fact childbus "" {
+        uint8 min "";
+        uint8 max "";
+    };
+
+    fact mem "" {
+        uintptr start "";
+        uintptr end "";
+    };
+
+    fact core "" {
+        uint8 acpiid "";
+    };
+
+
+
+    /*fact rootbridge "" {
+        fact addr addr "";
+        fact childbus child "";
+        fact mem range "";
+    };*/
+};