Merge branch 'master' of git.drogon.net:projects/wiringPi

Conflicts:
	gpio/gpio.c

diff --cc gpio/gpio.c
index 2b6295335297405e2bebc3578b4c39daa03ec8fe,1d12aabf8ad782aa549a0b7ab3111840ee2e3907..5a97aabfaf8f8573c8d8a32e6b49131da4ab812e
--- 1/gpio/gpio.c
--- 2/gpio/gpio.c
+++ b/gpio/gpio.c
@@@ -487,7 -509,7 +489,7 @@@ void doMode (int argc, char *argv []
   *********************************************************************************
   */
  
--void doPadDrive (int argc, char *argv [])
++static void doPadDrive (int argc, char *argv [])
  {
    int group, val ;
  
@@@ -522,7 -544,7 +524,7 @@@
   *********************************************************************************
   */
  
--void doWrite (int argc, char *argv [])
++static void doWrite (int argc, char *argv [])
  {
    int pin, val ;
  
@@@ -718,15 -763,25 +753,24 @@@ int main (int argc, char *argv []
      wpMode = WPI_MODE_PINS ;
    }
  
+ // Check for PWM operations
+ 
+   if (wpMode != WPI_MODE_PIFACE)
+   {
+     if (strcasecmp (argv [1], "pwm-bal") == 0)        { doPwmMode  (PWM_MODE_BAL) ; return 0 ; }
+     if (strcasecmp (argv [1], "pwm-ms")  == 0)        { doPwmMode  (PWM_MODE_MS) ;  return 0 ; }
+     if (strcasecmp (argv [1], "pwmr")    == 0)        { doPwmRange (argc, argv) ;   return 0 ; }
+   }
+ 
  // Check for wiring commands
  
 -  /**/ if (strcasecmp (argv [1], "write"   ) == 0) doWrite    (argc, argv) ;
 -  else if (strcasecmp (argv [1], "read"    ) == 0) doRead     (argc, argv) ;
 -  else if (strcasecmp (argv [1], "mode"    ) == 0) doMode     (argc, argv) ;
 -  else if (strcasecmp (argv [1], "pwm"     ) == 0) doPwm      (argc, argv) ;
 -  else if (strcasecmp (argv [1], "drive"   ) == 0) doPadDrive (argc, argv) ;
 +  /**/ if (strcasecmp (argv [1], "read" ) == 0) doRead     (argc, argv) ;
 +  else if (strcasecmp (argv [1], "write") == 0) doWrite    (argc, argv) ;
 +  else if (strcasecmp (argv [1], "pwm"  ) == 0) doPwm      (argc, argv) ;
 +  else if (strcasecmp (argv [1], "mode" ) == 0) doMode     (argc, argv) ;
    else
    {
 -    fprintf (stderr, "%s: Unknown command: %s. (read/write/pwm/mode/drive expected)\n", argv [0], argv [1]) ;
 +    fprintf (stderr, "%s: Unknown command: %s.\n", argv [0], argv [1]) ;
      exit (1) ;
    }
    return 0 ;