From b397f1b53bbaa6865abd3d506903d25b1ba0f472 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Mon, 27 Sep 2004 08:26:16 +0000 Subject: [PATCH] Should fix the build, things have changed in kb_mouse_driver.h git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9068 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/arch/x86/ps2mouse/ps2mouse.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/drivers/arch/x86/ps2mouse/ps2mouse.c b/src/add-ons/kernel/drivers/arch/x86/ps2mouse/ps2mouse.c index 070671159f..2b4c270fc7 100644 --- a/src/add-ons/kernel/drivers/arch/x86/ps2mouse/ps2mouse.c +++ b/src/add-ons/kernel/drivers/arch/x86/ps2mouse/ps2mouse.c @@ -251,7 +251,7 @@ ps2_enable_mouse(bool enable) /** Converts a packet received by the mouse to a "movement". */ static void -packet_to_movement(uint8 packet[], mouse_pos *pos) +packet_to_movement(uint8 packet[], mouse_movement *pos) { int buttons = packet[0] & 7; int xDelta = ((packet[0] & 0x10) ? 0xFFFFFF00 : 0) | packet[1]; @@ -276,7 +276,7 @@ packet_to_movement(uint8 packet[], mouse_pos *pos) pos->buttons = buttons; pos->clicks = sClickCount; pos->modifiers = 0; - pos->time = currentTime; + pos->timestamp = currentTime; pos->wheel_delta = 0; } } @@ -285,7 +285,7 @@ packet_to_movement(uint8 packet[], mouse_pos *pos) /** Read a mouse event from the mouse events chain buffer. */ static status_t -ps2_mouse_read(mouse_pos *pos) +ps2_mouse_read(mouse_movement *pos) { status_t status; uint8 packet[PS2_PACKET_SIZE]; @@ -422,7 +422,7 @@ mouse_write(void * cookie, off_t pos, const void *buf, size_t *len) static status_t mouse_ioctl(void *cookie, uint32 op, void *buf, size_t len) { - mouse_pos *pos = (mouse_pos *)buf; + mouse_movement *pos = (mouse_movement *)buf; switch (op) { case MS_NUM_EVENTS: {