Merge pull request #194 from dgarske/nuvoton_fixups

Author: elms

examples/README.md

@@ -441,7 +441,7 @@ Some TPM 2.0 modules have extra I/O functionalities and additional GPIO that the
 
 Currently, the GPIO control examples support ST33 and NPCT75x TPM 2.0 modules.
 
-There are four examples available: `gpio/gpio_config` for ST33 and `gpio/gpio_nuvoton` for NPCT75x.
+There are four examples available. Configuration using `gpio/gpio_config`.
 
 Every example has a help option `-h`. Please consult with `gpio_config -h` about the various GPIO modes.
 
@@ -495,12 +495,12 @@ NV Index for GPIO access created
 
 ### GPIO Config (NPCT75xx)
 
-NPCT75x supports 3 output modes (no input modes), information from `gpio/gpio_nuvoton` below:
+NPCT75x supports 3 output modes (no input modes), information from `gpio/gpio_config` below:
 
 ```
-$ ./examples/gpio/gpio_nuvoton -h
+$ ./examples/gpio/gpio_config -h
 Expected usage:
-./examples/gpio/gpio_nuvoton [num] [mode]
+./examples/gpio/gpio_config [num] [mode]
 * num is a GPIO number between 3 and 4 (default 3)
 * mode is either push-pull, open-drain or open-drain with pull-up
 	1. pushpull  - output in push pull configuration
@@ -526,7 +526,7 @@ NV Index for GPIO access created
 
 Switching a GPIO configuration is seamless.
 * For ST33 `gpio/gpio_config` takes care of deleting existing NV Index, so a new GPIO configuration can be chosen.
-* For NPCT75xx `gpio/gpio_nuvoton` can reconfigure any GPIO without deleting the created NV index.
+* For NPCT75xx `gpio/gpio_config` can reconfigure any GPIO without deleting the created NV index.
 
 ```
 $ ./examples/gpio/gpio_set 0 -high

examples/gpio/gpio.h

@@ -26,24 +26,9 @@
     extern "C" {
 #endif
 
-#if defined(WOLFTPM_ST33) || defined(WOLFTPM_NUVOTON) || defined(WOLFTPM_AUTODETECT)
-#define GPIO_NUM_MIN TPM_GPIO_A
-#define GPIO_NUM_MAX TPM_GPIO_A+TPM_GPIO_COUNT-1 /* see wolftpm/tpm2.h */
-#endif
-
-#ifdef WOLFTPM_NUVOTON
-/* Nuvoton GPIO Modes - only output */
-#define NUVOTON_GPIO_MODE_PUSHPULL  1
-#define NUVOTON_GPIO_MODE_OPENDRAIN 2
-#define NUVOTON_GPIO_MODE_PULLUP    3
-#define NUVOTON_GPIO_MODE_UNCONFIG  4 /* Not a real GPIO mode, deleting NV index */
-#define NUVOTON_GPIO_MODE_MAX 4
-#endif
-
 int TPM2_GPIO_Config_Example(void* userCtx, int argc, char *argv[]);
 int TPM2_GPIO_Read_Example(void* userCtx, int argc, char *argv[]);
 int TPM2_GPIO_Set_Example(void* userCtx, int argc, char *argv[]);
-int TPM2_GPIO_Nuvoton_Example(void* userCtx, int argc, char *argv[]);
 
 #ifdef __cplusplus
     }  /* extern "C" */