diff options
| author | Deepak Kodihalli <dkodihal@in.ibm.com> | 2017-03-06 00:10:35 -0600 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-03-09 21:52:41 +0000 |
| commit | bd33f31a3b8aa7be1b21c7359f7b6abf1b4eff29 (patch) | |
| tree | 5f57d965a473e24933a08607cbe6a9bc9bdb9281 /xyz/openbmc_project | |
| parent | b9bbfb57f98123f87254ba94fd86fb62c231005a (diff) | |
| download | phosphor-dbus-interfaces-bd33f31a3b8aa7be1b21c7359f7b6abf1b4eff29.tar.gz phosphor-dbus-interfaces-bd33f31a3b8aa7be1b21c7359f7b6abf1b4eff29.zip | |
Combine callout definitions
Instead of having a per callout class file, place all callout error
definitions in Callout.errors.yaml, and all callout metadata definitions
in Callout.metadata.yaml.
Change-Id: I7d84de6b5335c4940c06824bca66bc4996aed4c9
Signed-off-by: Deepak Kodihalli <dkodihal@in.ibm.com>
Diffstat (limited to 'xyz/openbmc_project')
12 files changed, 46 insertions, 43 deletions
diff --git a/xyz/openbmc_project/Error/Callout/Callout.errors.yaml b/xyz/openbmc_project/Error/Callout/Callout.errors.yaml new file mode 100644 index 0000000..d51431d --- /dev/null +++ b/xyz/openbmc_project/Error/Callout/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/Error/Callout/Callout.metadata.yaml b/xyz/openbmc_project/Error/Callout/Callout.metadata.yaml new file mode 100644 index 0000000..206d164 --- /dev/null +++ b/xyz/openbmc_project/Error/Callout/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/Device.errors.yaml b/xyz/openbmc_project/Error/Callout/Device.errors.yaml deleted file mode 100644 index 06e816d..0000000 --- a/xyz/openbmc_project/Error/Callout/Device.errors.yaml +++ /dev/null @@ -1,3 +0,0 @@ -# xyz.openbmc_project.Error.Callout.Device -- name: Device - description: Generic device callout diff --git a/xyz/openbmc_project/Error/Callout/Device.metadata.yaml b/xyz/openbmc_project/Error/Callout/Device.metadata.yaml deleted file mode 100644 index dc7914e..0000000 --- a/xyz/openbmc_project/Error/Callout/Device.metadata.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- name: Device - meta: - - str: "CALLOUT_ERRNO=%d" - type: int32 - - str: "CALLOUT_DEVICE_PATH=%s" - type: string diff --git a/xyz/openbmc_project/Error/Callout/GPIO.errors.yaml b/xyz/openbmc_project/Error/Callout/GPIO.errors.yaml deleted file mode 100644 index 3ad0de8..0000000 --- a/xyz/openbmc_project/Error/Callout/GPIO.errors.yaml +++ /dev/null @@ -1,3 +0,0 @@ -# xyz.openbmc_project.Error.Callout.GPIO -- name: GPIO - description: Callout GPIO pin diff --git a/xyz/openbmc_project/Error/Callout/GPIO.metadata.yaml b/xyz/openbmc_project/Error/Callout/GPIO.metadata.yaml deleted file mode 100644 index aa42284..0000000 --- a/xyz/openbmc_project/Error/Callout/GPIO.metadata.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- name: GPIO - meta: - - str: "CALLOUT_GPIO_NUM=%u" - type: uint32 - #inherits: - #- xyz.openbmc_project.Error.Callout.Device diff --git a/xyz/openbmc_project/Error/Callout/IIC.errors.yaml b/xyz/openbmc_project/Error/Callout/IIC.errors.yaml deleted file mode 100644 index 7ed3df1..0000000 --- a/xyz/openbmc_project/Error/Callout/IIC.errors.yaml +++ /dev/null @@ -1,3 +0,0 @@ -# xyz.openbmc_project.Error.Callout.IIC -- name: IIC - description: Callout IIC device diff --git a/xyz/openbmc_project/Error/Callout/IIC.metadata.yaml b/xyz/openbmc_project/Error/Callout/IIC.metadata.yaml deleted file mode 100644 index d6194f1..0000000 --- a/xyz/openbmc_project/Error/Callout/IIC.metadata.yaml +++ /dev/null @@ -1,8 +0,0 @@ -- 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 diff --git a/xyz/openbmc_project/Error/Callout/IPMISensor.errors.yaml b/xyz/openbmc_project/Error/Callout/IPMISensor.errors.yaml deleted file mode 100644 index ced9eae..0000000 --- a/xyz/openbmc_project/Error/Callout/IPMISensor.errors.yaml +++ /dev/null @@ -1,3 +0,0 @@ -#xyz.openbmc_project.Error.Callout.IPMISensor -- name: IPMISensor - description: Callout IPMI sensor diff --git a/xyz/openbmc_project/Error/Callout/IPMISensor.metadata.yaml b/xyz/openbmc_project/Error/Callout/IPMISensor.metadata.yaml deleted file mode 100644 index 714f021..0000000 --- a/xyz/openbmc_project/Error/Callout/IPMISensor.metadata.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- name: IPMISensor - meta: - - str: "CALLOUT_IPMI_SENSOR_NUM=%u" - type: uint32 diff --git a/xyz/openbmc_project/Error/Callout/Inventory.errors.yaml b/xyz/openbmc_project/Error/Callout/Inventory.errors.yaml deleted file mode 100644 index ea95875..0000000 --- a/xyz/openbmc_project/Error/Callout/Inventory.errors.yaml +++ /dev/null @@ -1,3 +0,0 @@ -# xyz.openbmc_project.Error.Callout.Inventory -- name: Inventory - description: Inventory item callout diff --git a/xyz/openbmc_project/Error/Callout/Inventory.metadata.yaml b/xyz/openbmc_project/Error/Callout/Inventory.metadata.yaml deleted file mode 100644 index 8ed1479..0000000 --- a/xyz/openbmc_project/Error/Callout/Inventory.metadata.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- name: Inventory - meta: - - str: "CALLOUT_INVENTORY_PATH=%s" - type: string |
