From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Pryor Subject: [PATCH seabios.git rel-1.7.5] fix release-1.7.5 for gcc5 Date: Thu, 8 Oct 2015 12:36:31 -0700 Message-ID: <1444332991-1706-1-git-send-email-pryorm09@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Resent-Message-ID: <20151009071046.GB28701@aepfle.de> Resent-To: xen-devel@lists.xen.org Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZkGzY-0006UA-Sn for xen-devel@lists.xenproject.org; Thu, 08 Oct 2015 19:36:41 +0000 Received: by padhy16 with SMTP id hy16so62994369pad.1 for ; Thu, 08 Oct 2015 12:36:37 -0700 (PDT) List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: ian.campbell@citrix.com List-Id: xen-devel@lists.xenproject.org Signed-off-by: Mark Pryor --- src/kbd.c | 6 +++--- src/mouse.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/kbd.c b/src/kbd.c index 33a95a3..fbcecc3 100644 --- a/src/kbd.c +++ b/src/kbd.c @@ -11,7 +11,7 @@ #include "hw/ps2port.h" // ps2_kbd_command #include "hw/usb-hid.h" // usb_kbd_command #include "output.h" // debug_enter -#include "stacks.h" // stack_hop +#include "stacks.h" // yield #include "string.h" // memset #include "util.h" // kbd_init @@ -117,8 +117,8 @@ static int kbd_command(int command, u8 *param) { if (usb_kbd_active()) - return stack_hop(command, (u32)param, usb_kbd_command); - return stack_hop(command, (u32)param, ps2_kbd_command); + return usb_kbd_command(command, param); + return ps2_kbd_command(command, param); } // read keyboard input diff --git a/src/mouse.c b/src/mouse.c index 92ae921..100255d 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -10,7 +10,7 @@ #include "hw/ps2port.h" // ps2_mouse_command #include "hw/usb-hid.h" // usb_mouse_command #include "output.h" // dprintf -#include "stacks.h" // stack_hop +#include "stacks.h" // stack_hop_back #include "util.h" // mouse_init void @@ -27,8 +27,8 @@ static int mouse_command(int command, u8 *param) { if (usb_mouse_active()) - return stack_hop(command, (u32)param, usb_mouse_command); - return stack_hop(command, (u32)param, ps2_mouse_command); + return usb_mouse_command(command, param); + return ps2_mouse_command(command, param); } #define RET_SUCCESS 0x00 -- 2.1.4