gpio: encapsulate in port

Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>

Author: borneoa

init.c

@@ -29,6 +29,7 @@
 #include "init.h"
 #include "serial.h"
 #include "stm32.h"
+#include "port.h"
 
 struct gpio_list {
 	struct gpio_list *next;
@@ -105,7 +106,7 @@ static int release_gpio(int n)
 	return write_to("/sys/class/gpio/unexport", num);
 }
 
-static int gpio_sequence(serial_t *serial, const char *s, size_t l)
+static int gpio_sequence(struct port_interface *port, const char *s, size_t l)
 {
 	struct gpio_list *gpio_to_release = NULL, *to_free;
 	int ret, level, gpio;
@@ -154,7 +155,7 @@ static int gpio_sequence(serial_t *serial, const char *s, size_t l)
 			}
 		}
 		if (gpio < 0)
-			ret = (serial_gpio(serial, -gpio, level) == SERIAL_ERR_OK);
+			ret = (port->gpio(port, -gpio, level) == PORT_ERR_OK);
 		else
 			ret = drive_gpio(gpio, level, &gpio_to_release);
 		usleep(100000);
@@ -170,7 +171,7 @@ static int gpio_sequence(serial_t *serial, const char *s, size_t l)
 	return ret;
 }
 
-static int gpio_bl_entry(serial_t *serial, const char *seq)
+static int gpio_bl_entry(struct port_interface *port, const char *seq)
 {
 	char *s;
 
@@ -179,12 +180,12 @@ static int gpio_bl_entry(serial_t *serial, const char *seq)
 
 	s = strchr(seq, ':');
 	if (s == NULL)
-		return gpio_sequence(serial, seq, strlen(seq));
+		return gpio_sequence(port, seq, strlen(seq));
 
-	return gpio_sequence(serial, seq, s - seq);
+	return gpio_sequence(port, seq, s - seq);
 }
 
-static int gpio_bl_exit(serial_t *serial, const char *seq)
+static int gpio_bl_exit(struct port_interface *port, const char *seq)
 {
 	char *s;
 
@@ -195,21 +196,21 @@ static int gpio_bl_exit(serial_t *serial, const char *seq)
 	if (s == NULL || s[1] == '\0')
 		return 1;
 
-	return gpio_sequence(serial, s + 1, strlen(s + 1));
+	return gpio_sequence(port, s + 1, strlen(s + 1));
 }
 
-int init_bl_entry(serial_t *serial, const char *seq)
+int init_bl_entry(struct port_interface *port, const char *seq)
 {
 	if (seq)
-		return gpio_bl_entry(serial, seq);
+		return gpio_bl_entry(port, seq);
 
 	return 1;
 }
 
-int init_bl_exit(stm32_t *stm, serial_t *serial, const char *seq)
+int init_bl_exit(stm32_t *stm, struct port_interface *port, const char *seq)
 {
 	if (seq)
-		return gpio_bl_exit(serial, seq);
+		return gpio_bl_exit(port, seq);
 
 	return stm32_reset_device(stm);
 }

init.h

@@ -22,10 +22,10 @@
 #ifndef _INIT_H
 #define _INIT_H
 
-#include "serial.h"
 #include "stm32.h"
+#include "port.h"
 
-int init_bl_entry(serial_t *serial, const char *seq);
-int init_bl_exit(stm32_t *stm, serial_t *serial, const char *seq);
+int init_bl_entry(struct port_interface *port, const char *seq);
+int init_bl_exit(stm32_t *stm, struct port_interface *port, const char *seq);
 
 #endif

main.c

@@ -148,7 +148,8 @@ int main(int argc, char* argv[]) {
 	serial = (serial_t *)port->private;
 
 	fprintf(diag, "Serial Config: %s\n", serial_get_setup_str(serial));
-	if (init_flag && init_bl_entry(serial, gpio_seq) == 0) goto close;
+	if (init_flag && init_bl_entry(port, gpio_seq) == 0)
+		goto close;
 	stm = stm32_init(port, init_flag);
 	if (!stm)
 		goto close;
@@ -405,7 +406,7 @@ int main(int argc, char* argv[]) {
 	if (stm && reset_flag) {
 		fprintf(diag, "\nResetting device... ");
 		fflush(diag);
-		if (init_bl_exit(stm, serial, gpio_seq))
+		if (init_bl_exit(stm, port, gpio_seq))
 			fprintf(diag, "done.\n");
 		else	fprintf(diag, "failed.\n");
 	}

port.h

@@ -44,6 +44,7 @@ struct port_interface {
 	port_err_t (*close)(struct port_interface *port);
 	port_err_t (*read)(struct port_interface *port, void *buf, size_t nbyte);
 	port_err_t (*write)(struct port_interface *port, void *buf, size_t nbyte);
+	port_err_t (*gpio)(struct port_interface *port, serial_gpio_t n, int level);
 	void *private;
 };
 

serial_posix.c

@@ -372,11 +372,25 @@ static port_err_t serial_posix_write(struct port_interface *port, void *buf,
 	return PORT_ERR_UNKNOWN;
 }
 
+static port_err_t serial_posix_gpio(struct port_interface *port,
+				    serial_gpio_t n, int level)
+{
+	serial_t *h;
+
+	h = (serial_t *)port->private;
+	if (h == NULL)
+		return PORT_ERR_UNKNOWN;
+	if (serial_gpio(h, n, level) == SERIAL_ERR_OK)
+		return PORT_ERR_OK;
+	return PORT_ERR_UNKNOWN;
+}
+
 struct port_interface port_serial = {
 	.name	= "serial_posix",
 	.flags	= PORT_BYTE,
 	.open	= serial_posix_open,
 	.close	= serial_posix_close,
 	.read	= serial_posix_read,
 	.write	= serial_posix_write,
+	.gpio	= serial_posix_gpio,
 };

serial_w32.c

@@ -362,11 +362,25 @@ static port_err_t serial_w32_write(struct port_interface *port, void *buf, size_
 	return PORT_ERR_UNKNOWN;
 }
 
+static port_err_t serial_w32_gpio(struct port_interface *port,
+				  serial_gpio_t n, int level)
+{
+	serial_t *h;
+
+	h = (serial_t *)port->private;
+	if (h == NULL)
+		return PORT_ERR_UNKNOWN;
+	if (serial_gpio(h, n, level) == SERIAL_ERR_OK)
+		return PORT_ERR_OK;
+	return PORT_ERR_UNKNOWN;
+}
+
 struct port_interface port_serial = {
 	.name	= "serial_w32",
 	.flags	= PORT_BYTE,
 	.open	= serial_w32_open,
 	.close	= serial_w32_close,
 	.read	= serial_w32_read,
 	.write	= serial_w32_write,
+	.gpio	= serial_w32_gpio,
 };