From: Mark Pryor <pryorm09@gmail.com>
To: xen-devel@lists.xenproject.org
Cc: ian.campbell@citrix.com
Subject: [PATCH seabios.git rel-1.7.5] fix release-1.7.5 for gcc5
Date: Thu, 8 Oct 2015 12:36:31 -0700 [thread overview]
Message-ID: <1444332991-1706-1-git-send-email-pryorm09@gmail.com> (raw)
Signed-off-by: Mark Pryor <pryorm09@gmail.com>
---
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
next reply other threads:[~2015-10-08 19:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-08 19:36 Mark Pryor [this message]
2015-10-09 7:34 ` [PATCH seabios.git rel-1.7.5] fix release-1.7.5 for gcc5 Jan Beulich
2015-11-19 23:06 ` Luis R. Rodriguez
2016-02-06 1:39 ` Luis R. Rodriguez
2016-02-09 9:58 ` Wei Liu
2016-02-09 14:57 ` Ian Campbell
2016-02-09 16:30 ` Wei Liu
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=1444332991-1706-1-git-send-email-pryorm09@gmail.com \
--to=pryorm09@gmail.com \
--cc=ian.campbell@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/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;
as well as URLs for NNTP newsgroup(s).