From 562813021631e19826f16e5b6a909b5d582b3840 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Fri, 10 Mar 2017 21:49:33 +0100 Subject: [PATCH] fix generic --- generic-pc/hardware_caps.c | 8 +++++++- generic-pc/init.cpp | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/generic-pc/hardware_caps.c b/generic-pc/hardware_caps.c index 36b2b35..7e3f167 100644 --- a/generic-pc/hardware_caps.c +++ b/generic-pc/hardware_caps.c @@ -2,7 +2,7 @@ * determine the capabilities of the hardware. * part of libstb-hal * - * (C) 2010-2012 Stefan Seyfried + * (C) 2010-2012,2016 Stefan Seyfried * * License: GPL v2 or later */ @@ -14,12 +14,14 @@ #include #include #include +#include static int initialized = 0; static hw_caps_t caps; hw_caps_t *get_hwcaps(void) { + struct utsname u; if (initialized) return ∩︀ @@ -32,6 +34,10 @@ hw_caps_t *get_hwcaps(void) caps.display_xres = 8; strcpy(caps.boxvendor, "Generic"); strcpy(caps.boxname, "PC"); + if (! uname(&u)) + strncpy(caps.boxarch, u.machine, sizeof(caps.boxarch)); + else + fprintf(stderr, "%s: uname() failed: %m\n", __func__); return ∩︀ } diff --git a/generic-pc/init.cpp b/generic-pc/init.cpp index c26048b..50f3ca5 100644 --- a/generic-pc/init.cpp +++ b/generic-pc/init.cpp @@ -50,5 +50,6 @@ void shutdown_td_api() lt_info("%s, initialized = %d\n", __func__, (int)initialized); if (glfb) delete glfb; + glfb = NULL; initialized = false; }