From: Mike Frysinger <vapier@gentoo.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v4 3/8] sandbox: gpio: Add basic driver for simulating GPIOs
Date: Tue, 21 Feb 2012 01:11:47 -0500 [thread overview]
Message-ID: <201202210111.48891.vapier@gentoo.org> (raw)
In-Reply-To: <1329349878-16664-3-git-send-email-sjg@chromium.org>
here's the incremental/full diff against your v4 showing the direction i think
things should end up at ... incremental inline below while full is attached.
-mike
diff --git a/drivers/gpio/sandbox.c b/drivers/gpio/sandbox.c
index 17e601d..aa2aa4c 100644
--- a/drivers/gpio/sandbox.c
+++ b/drivers/gpio/sandbox.c
@@ -20,9 +20,6 @@
*/
#include <common.h>
-#include <asm/io.h>
-#include <asm/bitops.h>
-#include <asm-generic/gpio.h>
#include <asm/gpio.h>
/* Flags for each GPIO */
@@ -42,38 +39,59 @@ struct gpio_state {
static struct gpio_state state[CONFIG_SANDBOX_GPIO_COUNT];
/* Access routines for GPIO state */
-static u8 *get_gpio(unsigned gp)
+static u8 *get_gpio_flags(unsigned gp)
{
- assert(gp < CONFIG_SANDBOX_GPIO_COUNT);
+ if (gp >= ARRAY_SIZE(state)) {
+ static u8 invalid_flags;
+ printf("sandbox_gpio: error: invalid gpio %u\n", gp);
+ return &invalid_flags;
+ }
+
return &state[gp].flags;
}
static int get_gpio_flag(unsigned gp, int flag)
{
- return (*get_gpio(gp) & flag) != 0;
+ return (*get_gpio_flags(gp) & flag) != 0;
}
-static void set_gpio_flag(unsigned gp, int flag, int value)
+static int set_gpio_flag(unsigned gp, int flag, int value)
{
- u8 *gpio = get_gpio(gp);
+ u8 *gpio = get_gpio_flags(gp);
if (value)
*gpio |= flag;
else
*gpio &= ~flag;
+
+ return 0;
}
+static int check_reserved(unsigned gpio, const char *func)
+{
+ if (!get_gpio_flag(gpio, GPIOF_RESERVED)) {
+ printf("sandbox_gpio: %s: error: gpio %u not reserved\n",
+ func, gpio);
+ return -1;
+ }
+
+ return 0;
+}
+
+/*
+ * Back-channel sandbox-internal-only access to GPIO state
+ */
+
int sandbox_gpio_get_value(unsigned gp)
{
if (get_gpio_flag(gp, GPIOF_OUTPUT))
- printf("sandbox_gpio: get_value on output GPIO %d\n", gp);
- return *get_gpio(gp) & GPIOF_HIGH;
+ debug("sandbox_gpio: get_value on output gpio %u\n", gp);
+ return get_gpio_flag(gp, GPIOF_HIGH);
}
int sandbox_gpio_set_value(unsigned gp, int value)
{
- set_gpio_flag(gp, GPIOF_HIGH, value);
- return 0;
+ return set_gpio_flag(gp, GPIOF_HIGH, value);
}
int sandbox_gpio_get_direction(unsigned gp)
@@ -83,95 +101,90 @@ int sandbox_gpio_get_direction(unsigned gp)
int sandbox_gpio_set_direction(unsigned gp, int output)
{
- set_gpio_flag(gp, GPIOF_OUTPUT, output);
- return 0;
+ return set_gpio_flag(gp, GPIOF_OUTPUT, output);
}
-static int check_reserved(unsigned gpio, const char *op_name)
-{
- if (!get_gpio_flag(gpio, GPIOF_RESERVED)) {
- printf("sandbox_gpio: '%s' on unreserved GPIO\n", op_name);
- return -1;
- }
-
- return 0;
-}
-
-/* These functions implement the public interface within U-Boot */
+/*
+ * These functions implement the public interface within U-Boot
+ */
/* set GPIO port 'gp' as an input */
int gpio_direction_input(unsigned gp)
{
- debug("%s: gp = %d\n", __func__, gp);
+ debug("%s: gp:%u\n", __func__, gp);
+
if (check_reserved(gp, __func__))
return -1;
- set_gpio_flag(gp, GPIOF_OUTPUT, 0);
- return 0;
+ return sandbox_gpio_set_direction(gp, 0);
}
/* set GPIO port 'gp' as an output, with polarity 'value' */
int gpio_direction_output(unsigned gp, int value)
{
- debug("%s: gp = %d, value = %d\n", __func__, gp, value);
+ debug("%s: gp:%u, value = %d\n", __func__, gp, value);
+
if (check_reserved(gp, __func__))
return -1;
- set_gpio_flag(gp, GPIOF_OUTPUT, 1);
- set_gpio_flag(gp, GPIOF_HIGH, value);
- return 0;
+ return sandbox_gpio_set_direction(gp, 1) |
+ sandbox_gpio_set_value(gp, value);
}
/* read GPIO IN value of port 'gp' */
int gpio_get_value(unsigned gp)
{
- debug("%s: gp = %d\n", __func__, gp);
+ debug("%s: gp:%u\n", __func__, gp);
+
if (check_reserved(gp, __func__))
return -1;
- if (get_gpio_flag(gp, GPIOF_OUTPUT))
- printf("sandbox_gpio: get_value on output GPIO %d\n", gp);
- return get_gpio_flag(gp, GPIOF_HIGH);
+ return sandbox_gpio_get_value(gp);
}
/* write GPIO OUT value to port 'gp' */
int gpio_set_value(unsigned gp, int value)
{
- debug("%s: gp = %d, value = %d\n", __func__, gp, value);
+ debug("%s: gp:%u, value = %d\n", __func__, gp, value);
+
if (check_reserved(gp, __func__))
return -1;
- if (get_gpio_flag(gp, GPIOF_OUTPUT)) {
- set_gpio_flag(gp, GPIOF_HIGH, value);
- } else {
- printf("sandbox_gpio: set_value on input GPIO %d\n", gp);
+
+ if (!sandbox_gpio_get_direction(gp)) {
+ printf("sandbox_gpio: error: set_value on input gpio %u\n", gp);
return -1;
}
- return 0;
+ return sandbox_gpio_set_value(gp, value);
}
int gpio_request(unsigned gp, const char *label)
{
- debug("%s: gp = %d, label= %s\n", __func__, gp, label);
+ debug("%s: gp:%u, label:%s\n", __func__, gp, label);
+
+ if (gp >= ARRAY_SIZE(state)) {
+ printf("sandbox_gpio: error: invalid gpio %u\n", gp);
+ return -1;
+ }
+
if (get_gpio_flag(gp, GPIOF_RESERVED)) {
- printf("sandbox_gpio: request on reserved GPIO\n");
+ printf("sandbox_gpio: error: gpio %u already reserved\n", gp);
return -1;
}
- set_gpio_flag(gp, GPIOF_RESERVED, 1);
- state[gp].label = label;
- return 0;
+ state[gp].label = label;
+ return set_gpio_flag(gp, GPIOF_RESERVED, 1);
}
int gpio_free(unsigned gp)
{
- debug("%s: gp = %d\n", __func__, gp);
+ debug("%s: gp:%u\n", __func__, gp);
+
if (check_reserved(gp, __func__))
return -1;
- set_gpio_flag(gp, GPIOF_RESERVED, 0);
- state[gp].label = NULL;
- return 0;
+ state[gp].label = NULL;
+ return set_gpio_flag(gp, GPIOF_RESERVED, 0);
}
/* Display GPIO information */
@@ -179,15 +192,15 @@ void gpio_info(void)
{
unsigned gpio;
- printf("Sandbox GPIOs\n");
+ puts("Sandbox GPIOs\n");
- for (gpio = 0; gpio < CONFIG_SANDBOX_GPIO_COUNT; ++gpio) {
+ for (gpio = 0; gpio < ARRAY_SIZE(state); ++gpio) {
const char *label = state[gpio].label;
printf("%4d: %s: %d [%c] %s\n",
gpio,
- get_gpio_flag(gpio, GPIOF_OUTPUT) ? "out" : " in",
- get_gpio_flag(gpio, GPIOF_HIGH),
+ sandbox_gpio_get_direction(gpio) ? "out" : " in",
+ sandbox_gpio_get_value(gpio),
get_gpio_flag(gpio, GPIOF_RESERVED) ? 'x' : ' ',
label ? label : "");
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: sandbox-gpio.patch
Type: text/x-patch
Size: 9199 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120221/62740b64/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120221/62740b64/attachment.pgp>
next prev parent reply other threads:[~2012-02-21 6:11 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-15 23:51 [U-Boot] [PATCH v4 1/8] sandbox: fdt: Add support for CONFIG_OF_CONTROL Simon Glass
2012-02-15 23:51 ` [U-Boot] [PATCH v4 2/8] sandbox: config: Enable fdt and snprintf() options Simon Glass
2012-02-16 6:03 ` Mike Frysinger
2012-02-15 23:51 ` [U-Boot] [PATCH v4 3/8] sandbox: gpio: Add basic driver for simulating GPIOs Simon Glass
2012-02-21 6:11 ` Mike Frysinger [this message]
2012-02-21 6:27 ` Simon Glass
2012-02-21 16:04 ` Mike Frysinger
2012-02-21 21:55 ` Simon Glass
2012-02-21 22:13 ` Mike Frysinger
2012-02-21 22:21 ` Simon Glass
2012-02-22 5:08 ` [U-Boot] [PATCH v5] " Mike Frysinger
2012-02-22 5:45 ` Simon Glass
2012-02-22 18:31 ` Mike Frysinger
2012-02-15 23:51 ` [U-Boot] [PATCH v4 4/8] sandbox: Enable GPIO driver Simon Glass
2012-02-15 23:51 ` [U-Boot] [PATCH v4 5/8] sandbox: Add concept of sandbox state Simon Glass
2012-02-15 23:51 ` [U-Boot] [PATCH v4 6/8] sandbox: Allow processing instead of or before main loop Simon Glass
2012-02-15 23:51 ` [U-Boot] [PATCH v4 7/8] sandbox: Add flags for open() call Simon Glass
2012-02-16 6:09 ` Mike Frysinger
2012-02-21 4:32 ` Simon Glass
2012-02-15 23:51 ` [U-Boot] [PATCH v4 8/8] sandbox: Add basic command line parsing Simon Glass
2012-02-26 21:04 ` Mike Frysinger
2012-02-27 2:50 ` Simon Glass
2012-02-27 4:08 ` Mike Frysinger
2012-02-27 4:33 ` Simon Glass
2012-02-27 4:42 ` Mike Frysinger
2012-02-27 5:43 ` Simon Glass
2012-02-27 18:32 ` Mike Frysinger
2012-02-27 20:55 ` Simon Glass
2012-02-16 6:03 ` [U-Boot] [PATCH v4 1/8] sandbox: fdt: Add support for CONFIG_OF_CONTROL Mike Frysinger
2012-02-16 10:50 ` Marek Vasut
2012-02-16 19:16 ` Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201202210111.48891.vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox