Advertisement
maximevince

seabios-gcc5.patch

May 25th, 2015
620
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.53 KB | None | 0 0
  1. --- a/tools/firmware/seabios-dir-remote/src/kbd.c
  2. +++ b/tools/firmware/seabios-dir-remote/src/kbd.c
  3. @@ -11,7 +11,7 @@
  4.  #include "hw/ps2port.h" // ps2_kbd_command
  5.  #include "hw/usb-hid.h" // usb_kbd_command
  6.  #include "output.h" // debug_enter
  7. -#include "stacks.h" // stack_hop
  8. +#include "stacks.h" // yield
  9.  #include "string.h" // memset
  10.  #include "util.h" // kbd_init
  11.  
  12. @@ -117,8 +117,8 @@ static int
  13.  kbd_command(int command, u8 *param)
  14.  {
  15.      if (usb_kbd_active())
  16. -        return stack_hop(command, (u32)param, usb_kbd_command);
  17. -    return stack_hop(command, (u32)param, ps2_kbd_command);
  18. +        return usb_kbd_command(command, param);
  19. +    return ps2_kbd_command(command, param);
  20.  }
  21.  
  22.  // read keyboard input
  23. diff --git a/src/mouse.c b/src/mouse.c
  24. index 83e499d..6d1f5b7 100644
  25. --- a/tools/firmware/seabios-dir-remote/src/mouse.c
  26. +++ b/tools/firmware/seabios-dir-remote/src/mouse.c
  27. @@ -10,7 +10,7 @@
  28.  #include "hw/ps2port.h" // ps2_mouse_command
  29.  #include "hw/usb-hid.h" // usb_mouse_command
  30.  #include "output.h" // dprintf
  31. -#include "stacks.h" // stack_hop
  32. +#include "stacks.h" // stack_hop_back
  33.  #include "util.h" // mouse_init
  34.  
  35.  void
  36. @@ -27,8 +27,8 @@ static int
  37.  mouse_command(int command, u8 *param)
  38.  {
  39.      if (usb_mouse_active())
  40. -        return stack_hop(command, (u32)param, usb_mouse_command);
  41. -    return stack_hop(command, (u32)param, ps2_mouse_command);
  42. +        return usb_mouse_command(command, param);
  43. +    return ps2_mouse_command(command, param);
  44.  }
  45.  
  46.  #define RET_SUCCESS      0x00
  47.  
  48. --
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement