summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdriana Kobylak <anoo@us.ibm.com>2018-09-19 12:40:52 -0500
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-10-04 20:15:50 +0000
commitb8da93ed7ceaf5d7eab9f36f6329b99ea1782de6 (patch)
treeae9d8ead955ab84455beced31ecc5e3fb73aa8de
parent7e48038afc79c10c4314433572276ada7e2e20ac (diff)
downloadtalos-skeleton-b8da93ed7ceaf5d7eab9f36f6329b99ea1782de6.tar.gz
talos-skeleton-b8da93ed7ceaf5d7eab9f36f6329b99ea1782de6.zip
Remove pciedetect
The pciedetect app was originally created for the Barreleye system which is not maintained anymore. This app is not included on any other system, so remove it. Change-Id: Id3803f8478e8bc60e4889f4e454ee25d78c5fbc4 Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
-rw-r--r--Makefile1
-rw-r--r--pciedetect/Makefile3
-rw-r--r--pciedetect/pcie_slot_present_obj.c224
3 files changed, 0 insertions, 228 deletions
diff --git a/Makefile b/Makefile
index 6a6422f..bbadf04 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,6 @@ GDBUS_APPS = bmcctl \
op-flasher \
op-hostctl \
op-pwrctl \
- pciedetect \
pwrbutton \
rstbutton
diff --git a/pciedetect/Makefile b/pciedetect/Makefile
deleted file mode 100644
index 21aaadc..0000000
--- a/pciedetect/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-BINS=pcie_slot_present
-include ../gdbus.mk
-include ../rules.mk
diff --git a/pciedetect/pcie_slot_present_obj.c b/pciedetect/pcie_slot_present_obj.c
deleted file mode 100644
index 0dc4475..0000000
--- a/pciedetect/pcie_slot_present_obj.c
+++ /dev/null
@@ -1,224 +0,0 @@
-#include <openbmc_intf.h>
-#include <openbmc.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-#include <gpio.h>
-
-#define NUM_SLOTS 8
-GPIO slots[NUM_SLOTS] = {
- { "SLOT0_RISER_PRESENT" },
- { "SLOT1_RISER_PRESENT" },
- { "SLOT2_RISER_PRESENT" },
- { "SLOT0_PRESENT" },
- { "SLOT1_PRESENT" },
- { "SLOT2_PRESENT" },
- { "MEZZ0_PRESENT" },
- { "MEZZ1_PRESENT" },
-};
-
-typedef struct {
- const char* bus_name;
- const char* path;
- const char* intf_name;
-} object_info;
-
-
-
-/* ------------------------------------------------------------------------- */
-void
-get_service(GDBusConnection *connection, const char *obj,
- const char **service, GError **error)
-{
- GDBusProxy *proxy;
- GVariant *result = NULL;
- GVariantIter *iter;
-
- *error = NULL;
- proxy = g_dbus_proxy_new_sync(connection,
- G_DBUS_PROXY_FLAGS_NONE,
- NULL, /* GDBusInterfaceInfo* */
- "xyz.openbmc_project.ObjectMapper", /* name */
- "/xyz/openbmc_project/object_mapper", /* object path */
- "xyz.openbmc_project.ObjectMapper", /* interface name */
- NULL, /* GCancellable */
- error);
-
- result = g_dbus_proxy_call_sync(proxy,
- "GetObject",
- g_variant_new("(s)", obj),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- NULL,
- error);
- if(*error)
- goto exit;
-
- g_variant_get(result, "(a{sas})", &iter);
- g_variant_iter_next(iter, "{sas}", service, NULL);
-
-exit:
- if(result)
- g_variant_unref(result);
-}
-
-int
-get_object(GDBusConnection *connection, GDBusProxy *proxy,
- GPIO* gpio, object_info* obj_info)
-{
- g_print("Checking Presence: %s\n",gpio->name);
- const char *gpio_bus = NULL;
- GError *error;
- GVariant *parm;
- GVariant *result;
- int rc=0;
-
- error = NULL;
- parm = g_variant_new("(ss)","GPIO_PRESENT",gpio->name);
- result = g_dbus_proxy_call_sync(proxy,
- "getObjectFromId",
- parm,
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- NULL,
- &error);
- g_assert_no_error(error);
- if(error)
- goto exit;
-
- GVariantIter *iter = g_variant_iter_new(result);
- GVariant* v_result = g_variant_iter_next_value(iter);
-
- g_variant_get(v_result,"(ss)",&obj_info->path,&obj_info->intf_name);
-
- get_service(connection, obj_info->path, &gpio_bus, &error);
- if(error)
- goto exit;
-
- obj_info->bus_name = gpio_bus;
-
-exit:
- if(!gpio_bus || strlen(gpio_bus) == 0) {
- rc = 1;
- }
- g_variant_unref(v_result);
- g_variant_unref(result);
-
- return rc;
-}
-
-int
-get_presence(GPIO* gpio, uint8_t* present)
-{
- int rc = GPIO_OK;
- do {
- rc = gpio_init(gpio);
- if(rc != GPIO_OK) { break; }
- uint8_t gpio_val;
- rc = gpio_open(gpio);
- if(rc != GPIO_OK) { break; }
- rc = gpio_read(gpio,&gpio_val);
- if(rc != GPIO_OK) { gpio_close(gpio); break; }
- gpio_close(gpio);
- *present = gpio_val;
- } while(0);
- if(rc != GPIO_OK)
- {
- printf("ERROR pcie_slot_present: GPIO error %s (rc=%d)\n",gpio->name,rc);
- }
- gpio_inits_done();
- return rc;
-}
-
-void
-update_fru_obj(GDBusConnection* connection, object_info* obj_info, const char* present)
-{
- GDBusProxy *proxy;
- GError *error;
- GVariant *parm;
-
- error = NULL;
- proxy = g_dbus_proxy_new_sync(connection,
- G_DBUS_PROXY_FLAGS_NONE,
- NULL, /* GDBusInterfaceInfo* */
- obj_info->bus_name, /* name */
- obj_info->path, /* object path */
- obj_info->intf_name, /* interface name */
- NULL, /* GCancellable */
- &error);
- g_assert_no_error(error);
-
- error = NULL;
- parm = g_variant_new("(s)",present);
-
- g_dbus_proxy_call_sync(proxy,
- "setPresent",
- parm,
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- NULL,
- &error);
-
- g_assert_no_error(error);
-}
-
-gint
-main(gint argc, gchar *argv[])
-{
- const char *sysmgr_path = "/org/openbmc/managers/System";
- const char *sysmgr_bus = NULL;
- GMainLoop *loop;
- GDBusConnection *c;
- GDBusProxy *sys_proxy;
- GError *error;
-
- loop = g_main_loop_new(NULL, FALSE);
-
- error = NULL;
- c = g_bus_get_sync(DBUS_TYPE, NULL, &error);
- if(error)
- goto exit;
-
- get_service(c, sysmgr_path, &sysmgr_bus, &error);
- if(error)
- goto exit;
-
- sys_proxy = g_dbus_proxy_new_sync(c,
- G_DBUS_PROXY_FLAGS_NONE,
- NULL, /* GDBusInterfaceInfo* */
- sysmgr_bus, /* name */
- sysmgr_path, /* object path */
- "org.openbmc.managers.System", /* interface name */
- NULL, /* GCancellable */
- &error);
- g_assert_no_error(error);
- if(error)
- goto exit;
-
- int i = 0;
- int rc = 0;
- for(i=0;i<NUM_SLOTS;i++)
- {
- object_info obj_info;
- uint8_t present;
- do {
- rc = get_object(c,sys_proxy,&slots[i],&obj_info);
- if(rc) { break; }
- rc = get_presence(&slots[i],&present);
- //if (rc) { break; }
- // TODO: send correct state
- if(present == 0) {
- update_fru_obj(c,&obj_info,"True");
- } else {
- update_fru_obj(c,&obj_info,"False");
- }
- } while(0);
- }
-
-exit:
- if(sysmgr_bus)
- g_free((char *)sysmgr_bus);
- g_object_unref(c);
- g_main_loop_unref(loop);
- return 0;
-}
OpenPOWER on IntegriCloud