diff options
| -rw-r--r-- | firmware/target/hosted/samsungypr/gpio_ypr.c | 7 | ||||
| -rw-r--r-- | firmware/target/hosted/samsungypr/ypr0/gpio-target.h | 1 | ||||
| -rw-r--r-- | firmware/target/hosted/samsungypr/ypr0/r0GPIOIoctl.h | 22 |
3 files changed, 12 insertions, 18 deletions
diff --git a/firmware/target/hosted/samsungypr/gpio_ypr.c b/firmware/target/hosted/samsungypr/gpio_ypr.c index cd27e27..40855fb 100644 --- a/firmware/target/hosted/samsungypr/gpio_ypr.c +++ b/firmware/target/hosted/samsungypr/gpio_ypr.c @@ -41,13 +41,8 @@ void gpio_close(void) close(r0_gpio_dev); } -int gpio_control_struct(int request, R0GPIOInfo r) -{ - return ioctl(r0_gpio_dev, request, &r); -} - int gpio_control(int request, int num, int mode, int val) { - R0GPIOInfo r = { .num = num, .mode = mode, .val = val, }; + struct gpio_info r = { .num = num, .mode = mode, .val = val, }; return ioctl(r0_gpio_dev, request, &r); } diff --git a/firmware/target/hosted/samsungypr/ypr0/gpio-target.h b/firmware/target/hosted/samsungypr/ypr0/gpio-target.h index 3c2033b..c27e07b 100644 --- a/firmware/target/hosted/samsungypr/ypr0/gpio-target.h +++ b/firmware/target/hosted/samsungypr/ypr0/gpio-target.h @@ -56,7 +56,6 @@ void gpio_init(void); void gpio_close(void); -int gpio_control_struct(int request, R0GPIOInfo pin); int gpio_control(int request, int num, int mode, int val); #endif diff --git a/firmware/target/hosted/samsungypr/ypr0/r0GPIOIoctl.h b/firmware/target/hosted/samsungypr/ypr0/r0GPIOIoctl.h index e77f35f..7e116ee 100644 --- a/firmware/target/hosted/samsungypr/ypr0/r0GPIOIoctl.h +++ b/firmware/target/hosted/samsungypr/ypr0/r0GPIOIoctl.h @@ -8,11 +8,11 @@ #include <sys/ioctl.h> //#include "iomux.h" -typedef struct { +struct gpio_info { int num; int mode; int val; -}__attribute__((packed)) R0GPIOInfo; +} __attribute__((packed)); #define IOCTL_GPIO_MAGIC 'G' @@ -28,15 +28,15 @@ typedef struct { #define E_IOCTL_GPIO_IS_HIGH 8 #define E_IOCTL_GPIO_MAX_NR 9 -#define DEV_CTRL_GPIO_SET_MUX _IOW(IOCTL_GPIO_MAGIC, 0, R0GPIOInfo) -#define DEV_CTRL_GPIO_UNSET_MUX _IOW(IOCTL_GPIO_MAGIC, 1, R0GPIOInfo) -#define DEV_CTRL_GPIO_SET_TYPE _IOW(IOCTL_GPIO_MAGIC, 2, R0GPIOInfo) -#define DEV_CTRL_GPIO_SET_OUTPUT _IOW(IOCTL_GPIO_MAGIC, 3, R0GPIOInfo) -#define DEV_CTRL_GPIO_SET_INPUT _IOW(IOCTL_GPIO_MAGIC, 4, R0GPIOInfo) -#define DEV_CTRL_GPIO_SET_HIGH _IOW(IOCTL_GPIO_MAGIC, 5, R0GPIOInfo) -#define DEV_CTRL_GPIO_SET_LOW _IOW(IOCTL_GPIO_MAGIC, 6, R0GPIOInfo) -#define DEV_CTRL_GPIO_GET_VAL _IOW(IOCTL_GPIO_MAGIC, 7, R0GPIOInfo) -#define DEV_CTRL_GPIO_IS_HIGH _IOW(IOCTL_GPIO_MAGIC, 8, R0GPIOInfo) +#define DEV_CTRL_GPIO_SET_MUX _IOW(IOCTL_GPIO_MAGIC, 0, struct gpio_info) +#define DEV_CTRL_GPIO_UNSET_MUX _IOW(IOCTL_GPIO_MAGIC, 1, struct gpio_info) +#define DEV_CTRL_GPIO_SET_TYPE _IOW(IOCTL_GPIO_MAGIC, 2, struct gpio_info) +#define DEV_CTRL_GPIO_SET_OUTPUT _IOW(IOCTL_GPIO_MAGIC, 3, struct gpio_info) +#define DEV_CTRL_GPIO_SET_INPUT _IOW(IOCTL_GPIO_MAGIC, 4, struct gpio_info) +#define DEV_CTRL_GPIO_SET_HIGH _IOW(IOCTL_GPIO_MAGIC, 5, struct gpio_info) +#define DEV_CTRL_GPIO_SET_LOW _IOW(IOCTL_GPIO_MAGIC, 6, struct gpio_info) +#define DEV_CTRL_GPIO_GET_VAL _IOW(IOCTL_GPIO_MAGIC, 7, struct gpio_info) +#define DEV_CTRL_GPIO_IS_HIGH _IOW(IOCTL_GPIO_MAGIC, 8, struct gpio_info) typedef enum |