From 2878f3e1eb40363984a557b56a480b3ce00d6be1 Mon Sep 17 00:00:00 2001
From: Deepak Kodihalli <dkodihal@in.ibm.com>
Date: Mon, 6 Mar 2017 00:16:46 -0600
Subject: Move callout error definitions

Move callout error definitions from xyz/openbmc_project/Error/Callout to
xyz/openbmc_project/Common.

Change-Id: I29d1c63f8f82e867993a8f901a4e3b7b3812ce00
Signed-off-by: Deepak Kodihalli <dkodihal@in.ibm.com>
---
 xyz/openbmc_project/Common/Callout.errors.yaml     | 14 ++++++++++
 xyz/openbmc_project/Common/Callout.metadata.yaml   | 32 ++++++++++++++++++++++
 .../Error/Callout/Callout.errors.yaml              | 14 ----------
 .../Error/Callout/Callout.metadata.yaml            | 32 ----------------------
 4 files changed, 46 insertions(+), 46 deletions(-)
 create mode 100644 xyz/openbmc_project/Common/Callout.errors.yaml
 create mode 100644 xyz/openbmc_project/Common/Callout.metadata.yaml
 delete mode 100644 xyz/openbmc_project/Error/Callout/Callout.errors.yaml
 delete mode 100644 xyz/openbmc_project/Error/Callout/Callout.metadata.yaml

diff --git a/xyz/openbmc_project/Common/Callout.errors.yaml b/xyz/openbmc_project/Common/Callout.errors.yaml
new file mode 100644
index 0000000..d51431d
--- /dev/null
+++ b/xyz/openbmc_project/Common/Callout.errors.yaml
@@ -0,0 +1,14 @@
+- name: Device
+  description: Generic device callout
+
+- name: GPIO
+  description: Callout GPIO pin
+
+- name: IIC
+  description: Callout IIC device
+
+- name: Inventory
+  description: Inventory item callout
+
+- name: IPMISensor
+  description: Callout IPMI sensor
diff --git a/xyz/openbmc_project/Common/Callout.metadata.yaml b/xyz/openbmc_project/Common/Callout.metadata.yaml
new file mode 100644
index 0000000..206d164
--- /dev/null
+++ b/xyz/openbmc_project/Common/Callout.metadata.yaml
@@ -0,0 +1,32 @@
+- name: Device
+  meta:
+    - str: "CALLOUT_ERRNO=%d"
+      type: int32
+    - str: "CALLOUT_DEVICE_PATH=%s"
+      type: string
+
+- name: GPIO
+  meta:
+    - str: "CALLOUT_GPIO_NUM=%u"
+      type: uint32
+  #inherits:
+  #- xyz.openbmc_project.Error.Callout.Device
+
+- name: IIC
+  meta:
+    - str: "CALLOUT_IIC_BUS=%s"
+      type: string
+    - str: "CALLOUT_IIC_ADDR=0x%hx"
+      type: uint16
+  #inherits:
+  #- xyz.openbmc_project.Error.Callout.Device
+
+- name: Inventory
+  meta:
+    - str: "CALLOUT_INVENTORY_PATH=%s"
+      type: string
+
+- name: IPMISensor
+  meta:
+    - str: "CALLOUT_IPMI_SENSOR_NUM=%u"
+      type: uint32
diff --git a/xyz/openbmc_project/Error/Callout/Callout.errors.yaml b/xyz/openbmc_project/Error/Callout/Callout.errors.yaml
deleted file mode 100644
index d51431d..0000000
--- a/xyz/openbmc_project/Error/Callout/Callout.errors.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-- name: Device
-  description: Generic device callout
-
-- name: GPIO
-  description: Callout GPIO pin
-
-- name: IIC
-  description: Callout IIC device
-
-- name: Inventory
-  description: Inventory item callout
-
-- name: IPMISensor
-  description: Callout IPMI sensor
diff --git a/xyz/openbmc_project/Error/Callout/Callout.metadata.yaml b/xyz/openbmc_project/Error/Callout/Callout.metadata.yaml
deleted file mode 100644
index 206d164..0000000
--- a/xyz/openbmc_project/Error/Callout/Callout.metadata.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-- name: Device
-  meta:
-    - str: "CALLOUT_ERRNO=%d"
-      type: int32
-    - str: "CALLOUT_DEVICE_PATH=%s"
-      type: string
-
-- name: GPIO
-  meta:
-    - str: "CALLOUT_GPIO_NUM=%u"
-      type: uint32
-  #inherits:
-  #- xyz.openbmc_project.Error.Callout.Device
-
-- name: IIC
-  meta:
-    - str: "CALLOUT_IIC_BUS=%s"
-      type: string
-    - str: "CALLOUT_IIC_ADDR=0x%hx"
-      type: uint16
-  #inherits:
-  #- xyz.openbmc_project.Error.Callout.Device
-
-- name: Inventory
-  meta:
-    - str: "CALLOUT_INVENTORY_PATH=%s"
-      type: string
-
-- name: IPMISensor
-  meta:
-    - str: "CALLOUT_IPMI_SENSOR_NUM=%u"
-      type: uint32
-- 
cgit v1.2.1