From 4c2bfb1d47e7d24db86447d148b4247f3aadf852 Mon Sep 17 00:00:00 2001 From: Vineeth Vijayan Date: Tue, 26 Mar 2024 15:12:51 +0100 Subject: [PATCH] zdev: rename site.h to zdev.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add zdev-specific definitions into a lightweight header file. Rather than creating a new one, transform the existing "site.h" into "zdev.h" to house all generic zdev-specific definitions that needs to be shared between chzdev, lszdev and zdev_id going forward. Signed-off-by: Vineeth Vijayan Reviewed-by: Peter Oberparleiter Signed-off-by: Jan Höppner --- zdev/include/device.h | 2 +- zdev/include/{site.h => zdev.h} | 12 ++++++------ zdev/src/zdev_id.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) rename zdev/include/{site.h => zdev.h} (83%) diff --git a/zdev/include/device.h b/zdev/include/device.h index ac6b032b..b060fe71 100644 --- a/zdev/include/device.h +++ b/zdev/include/device.h @@ -15,7 +15,7 @@ #include "exit_code.h" #include "hash.h" #include "misc.h" -#include "site.h" +#include "zdev.h" struct subtype; struct setting_list; diff --git a/zdev/include/site.h b/zdev/include/zdev.h similarity index 83% rename from zdev/include/site.h rename to zdev/include/zdev.h index 46b0c806..11dcfacd 100644 --- a/zdev/include/site.h +++ b/zdev/include/zdev.h @@ -1,15 +1,15 @@ /* - * zdev - Information regarding site-specific configurations used for - * zdev tools. + * zdev - Minimal header file containing generic definitions utilized by + * zdev-tools. * - * Copyright IBM Corp. 2023 + * Copyright IBM Corp. 2024 * * s390-tools is free software; you can redistribute it and/or modify * it under the terms of the MIT license. See LICENSE for details. */ -#ifndef SITE_H -#define SITE_H +#ifndef ZDEV_H +#define ZDEV_H /** * Currently zdev supports 10 sites. Which means, zdev support 10 different @@ -28,4 +28,4 @@ /* Helper to find the availability of site-configuration */ #define dev_site_configured(dev, x) (dev->site_specific[(x)].exists && \ !dev->site_specific[(x)].deconfigured) -#endif /* SITE_H */ +#endif /* ZDEV_H */ diff --git a/zdev/src/zdev_id.c b/zdev/src/zdev_id.c index 3795a4bb..a4cfae62 100644 --- a/zdev/src/zdev_id.c +++ b/zdev/src/zdev_id.c @@ -13,7 +13,7 @@ #include #include -#include "site.h" +#include "zdev.h" #include "zdev_id.h" #define SYSINFO "/proc/sysinfo"