Rename pin.. to gpio..

[z180-stamp.git] / avr / cmd_gpio.c

diff --git a/avr/cmd_pin.c b/avr/cmd_gpio.c
similarity index 90%
rename from avr/cmd_pin.c
rename to avr/cmd_gpio.c
index 83a55f7eeddb1e69f78c7c4215f9173e5999a05e..84723d2372453f2d14e9f0913284cc4b03bf6f58 100644 (file)
--- a/avr/cmd_pin.c
+++ b/avr/cmd_gpio.c
@@ -7,13 +7,13 @@
 #include "print-utils.h"
 #include "getopt-min.h"
 #include "env.h"
-#include "pin.h"
+#include "gpio.h"
 //#include "debug.h"
 
 
 
-static const int namestr = PIN_MAX;
-static char *pin_names[PIN_MAX+1];
+static const int namestr = GPIO_MAX;
+static char *pin_names[GPIO_MAX+1];
 static uint_least8_t pin_names_width;
 
 static void pinnames_get(void)
@@ -33,7 +33,7 @@ static void pinnames_get(void)
                pin_names[namestr] = strdup(lp);
                ptr = strtok_P(pin_names[namestr], delim1);
                while (ptr != NULL) {
-                       if (((i = strtoul(ptr, &lp, 10)) < PIN_MAX) &&
+                       if (((i = strtoul(ptr, &lp, 10)) < GPIO_MAX) &&
                                        lp != ptr &&
                                        (ptr = strtok_P(NULL, delim2)) != NULL ) {
                                pin_names[i] = ptr;
@@ -41,7 +41,7 @@ static void pinnames_get(void)
                        }
                }
 
-               for (i = 0; i < PIN_MAX; i++)
+               for (i = 0; i < GPIO_MAX; i++)
                        if (strlen(pin_names[i]) > pin_names_width)
                                pin_names_width = strlen(pin_names[i]);
        }
@@ -76,12 +76,12 @@ static int print_pin(int pin, int multi)
        const FLASH char *levelp;
        long div;
 
-       pinconf = pin_config_get(pin);
+       pinconf = gpio_config_get(pin);
        if (pinconf == OUTPUT_TIMER) {
-               div = pin_clockdiv_get(pin);
+               div = gpio_clockdiv_get(pin);
                levelp = pinlevel_str[2];
        } else
-               levelp = pinlevel_str[pin_read(pin)];
+               levelp = pinlevel_str[gpio_read(pin)];
 
        if (multi) {
                printf_P(PSTR("%3d "), pin);
@@ -115,7 +115,7 @@ static int_fast8_t pinarg_insert(int pin, uint_fast8_t count, uint_fast8_t pinar
 {
        uint_fast8_t pos;
 
-       if (pin < 0 || pin >= PIN_MAX)
+       if (pin < 0 || pin >= GPIO_MAX)
                return -1;
 
        for (pos = 0; pos < count; pos++) {
@@ -168,10 +168,10 @@ static uint_fast8_t pinarg_get(char * arg, uint_fast8_t pinarg[])
 }
 
 
-command_ret_t do_pin(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+command_ret_t do_gpio(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 {
        char printheader = 1;
-       uint_fast8_t pinarg[PIN_MAX];
+       uint_fast8_t pinarg[GPIO_MAX];
        uint_fast8_t pinargc;
 
        (void) cmdtp; (void) flag;
@@ -197,7 +197,7 @@ command_ret_t do_pin(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 
        if (argc == 0) {
                /* print cofig of all pins */
-               for (pinargc = 0; pinargc < PIN_MAX; pinargc++)
+               for (pinargc = 0; pinargc < GPIO_MAX; pinargc++)
                        pinarg[pinargc] = pinargc;
        } else {
                /* get first arg */
@@ -240,7 +240,7 @@ command_ret_t do_pin(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 
        while (argc > 0) {
                char *endp;
-               pinmode_t mode = NONE;
+               gpiomode_t mode = NONE;
                int level = 0;
                unsigned long value = 0;
                uint8_t hz_flag = 0;
@@ -301,14 +301,14 @@ command_ret_t do_pin(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
                for (uint_fast8_t i = 0; i < pinargc; i++) {
                        switch (mode) {
                        case OUTPUT:
-                               pin_write(pinarg[i], level);
+                               gpio_write(pinarg[i], level);
                                /* fall thru */
                        case INPUT:
                        case INPUT_PULLUP:
-                               pin_config(pinarg[i], mode);
+                               gpio_config(pinarg[i], mode);
                                break;
                        case OUTPUT_TIMER:
-                               if (pin_clockdiv_set(pinarg[i], value) < 0) {
+                               if (gpio_clockdiv_set(pinarg[i], value) < 0) {
                                        printf_P(PSTR("Setting pin %d to %lu failed.\n"),
                                                                pinarg[i], value);
                                }
@@ -325,4 +325,3 @@ command_ret_t do_pin(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 
        return CMD_RET_SUCCESS;
 }
-