X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=gpio%2Fgpio.c;h=b2f9953c67dd6b46f19baea7c577f489ae85b9b7;hb=7cbb8865c8dc6675618a17492a1175c278d38685;hp=d941db5384ba03988f7b0cc526b95b75c2402bc0;hpb=05e2f67e7f43d83195fff108bcd952e7afe917ce;p=wiringPi.git

diff --git a/gpio/gpio.c b/gpio/gpio.c
index d941db5..b2f9953 100644
--- a/gpio/gpio.c
+++ b/gpio/gpio.c
@@ -55,7 +55,7 @@ extern void doPins       (void) ;
 #  define	FALSE	(1==2)
 #endif
 
-#define	VERSION		"2.14"
+#define	VERSION		"2.15"
 #define	I2CDETECT	"/usr/sbin/i2cdetect"
 
 int wpMode ;
@@ -79,6 +79,7 @@ char *usage = "Usage: gpio -v\n"
 	      "       gpio gbw <channel> <value>" ;	// No trailing newline needed here.
 
 
+#ifdef	NOT_FOR_NOW
 /*
  * decodePin:
  *	Decode a pin "number" which can actually be a pin name to represent
@@ -96,6 +97,7 @@ static int decodePin (const char *str)
 
   return 0 ;
 }
+#endif
 
 
 /*
@@ -1042,6 +1044,8 @@ static void doPwmClock (int argc, char *argv [])
 int main (int argc, char *argv [])
 {
   int i ;
+  int model, rev, mem ;
+  char *maker ;
 
   if (getenv ("WIRINGPI_DEBUG") != NULL)
   {
@@ -1086,7 +1090,10 @@ int main (int argc, char *argv [])
     printf ("This is free software with ABSOLUTELY NO WARRANTY.\n") ;
     printf ("For details type: %s -warranty\n", argv [0]) ;
     printf ("\n") ;
-    printf ("This Raspberry Pi is a revision %d board.\n", piBoardRev ()) ;
+    piBoardId (&model, &rev, &mem, &maker) ;
+    printf ("Raspberry Pi Details:\n") ;
+    printf ("  Type: %s, Revision: %s, Memory: %dMB, Maker: %s\n", 
+	piModelNames [model], piRevisionNames [rev], mem, maker) ;
     return 0 ;
   }