From 9c5e66c04cdac4f07c4537433b0f6334f1a43331 Mon Sep 17 00:00:00 2001 From: Dmitry Gnezdilov Date: Mon, 29 Aug 2016 18:39:11 +0300 Subject: [PATCH] More warning fixes --- build | 8 ++-- gpio/gpio.c | 114 +--------------------------------------------------- 2 files changed, 5 insertions(+), 117 deletions(-) diff --git a/build b/build index 7a2126e..a01f2ff 100644 --- a/build +++ b/build @@ -97,10 +97,10 @@ fi echo echo All Done. echo "" -echo "NOTE: To compile programs with wiringBP v2, you need to add:" +echo "NOTE: To compile programs with wiringNP, you need to add:" echo " -lwiringPi" -echo " to your compile line(s) To use the Gertboard, MaxDetect, etc." -echo " code (the devLib), you need to also add:" -echo " -lwiringPiDev" +# echo " to your compile line(s) To use the Gertboard, MaxDetect, etc." +# echo " code (the devLib), you need to also add:" +# echo " -lwiringPiDev" echo " to your compile line(s)." echo "" diff --git a/gpio/gpio.c b/gpio/gpio.c index 14c5926..ff77e73 100644 --- a/gpio/gpio.c +++ b/gpio/gpio.c @@ -795,40 +795,6 @@ void doMode (int argc, char *argv []) } -/* - * doPadDrive: - * gpio drive group value - ********************************************************************************* - */ - -static void doPadDrive (int argc, char *argv []) -{ - int group, val ; - - if (argc != 4) - { - fprintf (stderr, "Usage: %s drive group value\n", argv [0]) ; - exit (1) ; - } - - group = atoi (argv [2]) ; - val = atoi (argv [3]) ; - - if ((group < 0) || (group > 2)) - { - fprintf (stderr, "%s: drive group not 0, 1 or 2: %d\n", argv [0], group) ; - exit (1) ; - } - - if ((val < 0) || (val > 7)) - { - fprintf (stderr, "%s: drive value not 0-7: %d\n", argv [0], val) ; - exit (1) ; - } - - setPadDrive (group, val) ; -} - /* * doUsbP: @@ -839,88 +805,10 @@ static void doPadDrive (int argc, char *argv []) static void doUsbP (int argc, char *argv []) { - fprintf (stderr, "USB power is not supported\n", argv [0]) ; + fprintf (stderr, "USB power is not supported\n") ; return; } - -/* - * doGbw: - * gpio gbw channel value - * Gertboard Write - To the Analog output - ********************************************************************************* - */ - -static void doGbw (int argc, char *argv []) -{ - int channel, value ; - - if (argc != 4) - { - fprintf (stderr, "Usage: %s gbw \n", argv [0]) ; - exit (1) ; - } - - channel = atoi (argv [2]) ; - value = atoi (argv [3]) ; - - if ((channel < 0) || (channel > 1)) - { - fprintf (stderr, "%s: gbw: Channel number must be 0 or 1\n", argv [0]) ; - exit (1) ; - } - - if ((value < 0) || (value > 255)) - { - fprintf (stderr, "%s: gbw: Value must be from 0 to 255\n", argv [0]) ; - exit (1) ; - } - - if (gertboardAnalogSetup (64) < 0) - { - fprintf (stderr, "Unable to initialise the Gertboard SPI interface: %s\n", strerror (errno)) ; - exit (1) ; - } - - analogWrite (64 + channel, value) ; -} - - -/* - * doGbr: - * gpio gbr channel - * From the analog input - ********************************************************************************* - */ - -static void doGbr (int argc, char *argv []) -{ - int channel ; - - if (argc != 3) - { - fprintf (stderr, "Usage: %s gbr \n", argv [0]) ; - exit (1) ; - } - - channel = atoi (argv [2]) ; - - if ((channel < 0) || (channel > 1)) - { - fprintf (stderr, "%s: gbr: Channel number must be 0 or 1\n", argv [0]) ; - exit (1) ; - } - - if (gertboardAnalogSetup (64) < 0) - { - fprintf (stderr, "Unable to initialise the Gertboard SPI interface: %s\n", strerror (errno)) ; - exit (1) ; - } - - printf ("%d\n", analogRead (64 + channel)) ; -} - - /* * doWrite: * gpio write pin value