From 412b9e663b7d09ac1247359ab122b48395a63e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 30 Oct 2010 12:22:06 +0000 Subject: [PATCH] adb: Don't assume that pointers fit in 32 bits MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The adb_dev_t state field is used to store a adb_kbd_t pointer. It is unused in the mouse driver. v2: * Change field type from uint32_t to void* to avoid uintptr_t casts in keyboard driver. Signed-off-by: Andreas Färber Acked-by: Alexander Graf git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@924 f158a5a8-5612-0410-a976-696ce0be7e32 --- drivers/adb_bus.h | 2 +- drivers/adb_kbd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/adb_bus.h b/drivers/adb_bus.h index e897fe4..205b375 100644 --- a/drivers/adb_bus.h +++ b/drivers/adb_bus.h @@ -32,7 +32,7 @@ struct adb_dev_t { adb_bus_t *bus; uint8_t addr; uint8_t type; - uint32_t state; + void *state; }; #define ADB_BUF_SIZE 8 diff --git a/drivers/adb_kbd.c b/drivers/adb_kbd.c index 0784ec8..e38798a 100644 --- a/drivers/adb_kbd.c +++ b/drivers/adb_kbd.c @@ -483,7 +483,7 @@ static int adb_kbd_read (void *private) int key; int ret; - kbd = (void *)dev->state; + kbd = dev->state; if (kbd->len > 0) { ret = kbd->sequence[kbd->len-- - 1]; @@ -531,7 +531,7 @@ void *adb_kbd_new (char *path, void *private) ADB_kbd_us, ADB_sequences); kbd->next_key = -1; kbd->len = 0; - dev->state = (int32_t)kbd; + dev->state = kbd; my_adb_dev = dev; }