summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2013-03-06 10:11:12 +0100
committerThomas Martitz <kugel@rockbox.org>2013-03-06 10:11:12 +0100
commit8ef8ea2da2fb800832293054dd41be342f77764d (patch)
tree3e73db817adc1e6becce8b0ca9d4b2881973fec0
parent7ef2fe38190670ba231aaf6a23ca59f9b8e370f8 (diff)
downloadrockbox-8ef8ea2da2fb800832293054dd41be342f77764d.tar.gz
rockbox-8ef8ea2da2fb800832293054dd41be342f77764d.zip
ypr0: Align to coding guidelines (no typedef) and remove unused function.
Change-Id: If61e2290f4e0e5c971ece967b7d826624df392df
-rw-r--r--firmware/target/hosted/samsungypr/gpio_ypr.c7
-rw-r--r--firmware/target/hosted/samsungypr/ypr0/gpio-target.h1
-rw-r--r--firmware/target/hosted/samsungypr/ypr0/r0GPIOIoctl.h22
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 cd27e27e9b..40855fba41 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)
41 close(r0_gpio_dev); 41 close(r0_gpio_dev);
42} 42}
43 43
44int gpio_control_struct(int request, R0GPIOInfo r)
45{
46 return ioctl(r0_gpio_dev, request, &r);
47}
48
49int gpio_control(int request, int num, int mode, int val) 44int gpio_control(int request, int num, int mode, int val)
50{ 45{
51 R0GPIOInfo r = { .num = num, .mode = mode, .val = val, }; 46 struct gpio_info r = { .num = num, .mode = mode, .val = val, };
52 return ioctl(r0_gpio_dev, request, &r); 47 return ioctl(r0_gpio_dev, request, &r);
53} 48}
diff --git a/firmware/target/hosted/samsungypr/ypr0/gpio-target.h b/firmware/target/hosted/samsungypr/ypr0/gpio-target.h
index 3c2033baff..c27e07bf40 100644
--- a/firmware/target/hosted/samsungypr/ypr0/gpio-target.h
+++ b/firmware/target/hosted/samsungypr/ypr0/gpio-target.h
@@ -56,7 +56,6 @@
56 56
57void gpio_init(void); 57void gpio_init(void);
58void gpio_close(void); 58void gpio_close(void);
59int gpio_control_struct(int request, R0GPIOInfo pin);
60int gpio_control(int request, int num, int mode, int val); 59int gpio_control(int request, int num, int mode, int val);
61 60
62#endif 61#endif
diff --git a/firmware/target/hosted/samsungypr/ypr0/r0GPIOIoctl.h b/firmware/target/hosted/samsungypr/ypr0/r0GPIOIoctl.h
index e77f35fbb7..7e116eeeee 100644
--- a/firmware/target/hosted/samsungypr/ypr0/r0GPIOIoctl.h
+++ b/firmware/target/hosted/samsungypr/ypr0/r0GPIOIoctl.h
@@ -8,11 +8,11 @@
8#include <sys/ioctl.h> 8#include <sys/ioctl.h>
9//#include "iomux.h" 9//#include "iomux.h"
10 10
11typedef struct { 11struct gpio_info {
12 int num; 12 int num;
13 int mode; 13 int mode;
14 int val; 14 int val;
15}__attribute__((packed)) R0GPIOInfo; 15} __attribute__((packed));
16 16
17 17
18#define IOCTL_GPIO_MAGIC 'G' 18#define IOCTL_GPIO_MAGIC 'G'
@@ -28,15 +28,15 @@ typedef struct {
28#define E_IOCTL_GPIO_IS_HIGH 8 28#define E_IOCTL_GPIO_IS_HIGH 8
29#define E_IOCTL_GPIO_MAX_NR 9 29#define E_IOCTL_GPIO_MAX_NR 9
30 30
31#define DEV_CTRL_GPIO_SET_MUX _IOW(IOCTL_GPIO_MAGIC, 0, R0GPIOInfo) 31#define DEV_CTRL_GPIO_SET_MUX _IOW(IOCTL_GPIO_MAGIC, 0, struct gpio_info)
32#define DEV_CTRL_GPIO_UNSET_MUX _IOW(IOCTL_GPIO_MAGIC, 1, R0GPIOInfo) 32#define DEV_CTRL_GPIO_UNSET_MUX _IOW(IOCTL_GPIO_MAGIC, 1, struct gpio_info)
33#define DEV_CTRL_GPIO_SET_TYPE _IOW(IOCTL_GPIO_MAGIC, 2, R0GPIOInfo) 33#define DEV_CTRL_GPIO_SET_TYPE _IOW(IOCTL_GPIO_MAGIC, 2, struct gpio_info)
34#define DEV_CTRL_GPIO_SET_OUTPUT _IOW(IOCTL_GPIO_MAGIC, 3, R0GPIOInfo) 34#define DEV_CTRL_GPIO_SET_OUTPUT _IOW(IOCTL_GPIO_MAGIC, 3, struct gpio_info)
35#define DEV_CTRL_GPIO_SET_INPUT _IOW(IOCTL_GPIO_MAGIC, 4, R0GPIOInfo) 35#define DEV_CTRL_GPIO_SET_INPUT _IOW(IOCTL_GPIO_MAGIC, 4, struct gpio_info)
36#define DEV_CTRL_GPIO_SET_HIGH _IOW(IOCTL_GPIO_MAGIC, 5, R0GPIOInfo) 36#define DEV_CTRL_GPIO_SET_HIGH _IOW(IOCTL_GPIO_MAGIC, 5, struct gpio_info)
37#define DEV_CTRL_GPIO_SET_LOW _IOW(IOCTL_GPIO_MAGIC, 6, R0GPIOInfo) 37#define DEV_CTRL_GPIO_SET_LOW _IOW(IOCTL_GPIO_MAGIC, 6, struct gpio_info)
38#define DEV_CTRL_GPIO_GET_VAL _IOW(IOCTL_GPIO_MAGIC, 7, R0GPIOInfo) 38#define DEV_CTRL_GPIO_GET_VAL _IOW(IOCTL_GPIO_MAGIC, 7, struct gpio_info)
39#define DEV_CTRL_GPIO_IS_HIGH _IOW(IOCTL_GPIO_MAGIC, 8, R0GPIOInfo) 39#define DEV_CTRL_GPIO_IS_HIGH _IOW(IOCTL_GPIO_MAGIC, 8, struct gpio_info)
40 40
41 41
42typedef enum 42typedef enum