From 0f5b312c5b84c6957fe3bcc51fb79a8642aab8dc Mon Sep 17 00:00:00 2001 From: Jim Parziale Date: Mon, 21 Mar 2022 08:42:29 -0400 Subject: [PATCH] Change memory size report to strings --- gpio/gpio.c | 2 +- wiringPi/wiringPi.c | 20 ++++++++++---------- wiringPi/wiringPi.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gpio/gpio.c b/gpio/gpio.c index 3380e72..91a7f05 100644 --- a/gpio/gpio.c +++ b/gpio/gpio.c @@ -1172,7 +1172,7 @@ static void doVersion (char *argv[]) " Type : %s\n" " Processor: %s\n" " Revision : %s\n" - " Memory : %dMB\n" + " Memory : %s\n" " Maker : %s\n" " %s\n", piModelNames[model], diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c index fcd60b3..22d0e2b 100644 --- a/wiringPi/wiringPi.c +++ b/wiringPi/wiringPi.c @@ -275,16 +275,16 @@ const char *piProcessorNames[5] = }; // Memory sizes in MB -const int piMemorySize[8] = -{ - 256, // 0 - 512, // 1 - 1024, // 2 - 2048, // 3 - 4096, // 4 - 8192, // 5 - 0, // 6 - 0, // 7 +const char *piMemorySize[8] = +{ + "256MB", // 0 + "512MB", // 1 + "1GB", // 2 + "2GB", // 3 + "4GB", // 4 + "8GB", // 5 + "16GB", // 6 + "32GB", // 7 }; // Time for easy calculations diff --git a/wiringPi/wiringPi.h b/wiringPi/wiringPi.h index 00fbc2e..1400313 100644 --- a/wiringPi/wiringPi.h +++ b/wiringPi/wiringPi.h @@ -142,7 +142,7 @@ extern const char *piModelNames [21]; extern const char *piRevisionNames [ 5]; extern const char *piMakerNames [16]; extern const char *piProcessorNames[ 5]; -extern const int piMemorySize [ 8]; +extern const char *piMemorySize [ 8]; // Intended for the GPIO program