diff options
| author | Agney Lopes Roth Ferraz <agney@debian.org> | 2007-04-09 11:45:31 -0300 |
|---|---|---|
| committer | Simon Quigley <tsimonq2@ubuntu.com> | 2017-06-19 14:38:41 -0500 |
| commit | adb3993ba087ede46f62d5f018e17b07e99b5260 (patch) | |
| tree | 67b4fa7e224f09d21eb76060422ca23e50e6dfe0 /arch/linux/s390/processor.h | |
| parent | b3e31ae3787c8806f48c85a52bba9aa3554e2c07 (diff) | |
| parent | 11b8179a57e675c6672cbe649c655230ae3e9744 (diff) | |
Import Debian changes 0.4.2.1-1
hardinfo (0.4.2.1-1) unstable; urgency=low
* New upstream release.
* Fixed segfault on device entry (Closes: #387955)
Diffstat (limited to 'arch/linux/s390/processor.h')
| -rw-r--r-- | arch/linux/s390/processor.h | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/arch/linux/s390/processor.h b/arch/linux/s390/processor.h index 1648b917..ee72b029 100644 --- a/arch/linux/s390/processor.h +++ b/arch/linux/s390/processor.h @@ -16,8 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -static Processor * -computer_get_processor(void) +struct _Processor { + gchar *vendor_id, *model_name; + gint cache_size; + gfloat bogomips; +}; + +static GSList * +__scan_processors(void) { Processor *processor; FILE *cpuinfo; @@ -36,34 +42,34 @@ computer_get_processor(void) tmp[1] = g_strstrip(tmp[1]); get_str("vendor_id", processor->vendor_id); - get_int("# processors", processor->model); - get_float("bogomips per cpu", processor->bogomips); + get_float("# processors", processor->cache_size); + get_int("bogomips per cpu", processor->bogomips); } g_strfreev(tmp); } - gchar *tmp = g_strconcat("S390 ", processor->vendor_id, NULL); - processor->model_name = tmp; + processor->model_name = g_strconcat("S390 ", processor->vendor_id, NULL); + g_free(processor->vendor_id); fclose(cpuinfo); - return processor; + return g_slist_append(NULL, processor); } static gchar * -processor_get_info(Processor *processor) +processor_get_info(GSList *processors) { + Processor *processor = (Processor *)processors->data; + return g_strdup_printf("[Processor]\n" - "Name=%s\n" - "Vendor=%s\n" + "Model=%s\n" + "Processors=%d\n" "BogoMips per CPU=%.2f" - "Processors=%d\n" "Byte Order=%s\n", processor->model_name, - processor->vendor_id, + processor->cache_size, processor->bogomips, - processor->model, #if G_BYTE_ORDER == G_LITTLE_ENDIAN "Little Endian" #else |