Now that the extra stack is used for keyboard and mouse driver code, there is no reason to set noinline (which was done to try and conserve stack space).
Signed-off-by: Kevin O'Connor kevin@koconnor.net --- src/kbd.c | 6 ++---- src/mouse.c | 2 +- src/usb-hid.c | 2 +- src/usb.c | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/kbd.c b/src/kbd.c index 0da13a1..0aa8988 100644 --- a/src/kbd.c +++ b/src/kbd.c @@ -378,10 +378,8 @@ static struct scaninfo { { 0x8600, 0x8800, 0x8a00, 0x8c00, none }, /* F12 */ };
-// Handle a scancode read from the ps2 port. Note that "noinline" is -// used to make sure the call to call16_int in process_key doesn't -// have the overhead of this function's stack. -static void noinline +// Handle a ps2 style scancode read from the keyboard. +static void __process_key(u8 scancode) { u8 flags0 = GET_BDA(kbd_flag0); diff --git a/src/mouse.c b/src/mouse.c index ece69db..e4b25e0 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -303,7 +303,7 @@ invoke_mouse_handler(u16 ebda_seg) : "edi", "esi", "cc", "memory"); }
-void noinline +void process_mouse(u8 data) { if (!CONFIG_MOUSE) diff --git a/src/usb-hid.c b/src/usb-hid.c index a4fe4ae..8c4b803 100644 --- a/src/usb-hid.c +++ b/src/usb-hid.c @@ -224,7 +224,7 @@ struct usbkeyinfo { struct usbkeyinfo LastUSBkey VARLOW;
// Process USB keyboard data. -static void noinline +static void handle_key(struct keyevent *data) { dprintf(9, "Got key %x %x\n", data->modifiers, data->keys[0]); diff --git a/src/usb.c b/src/usb.c index 1391f0e..bde7a58 100644 --- a/src/usb.c +++ b/src/usb.c @@ -70,7 +70,7 @@ usb_send_bulk(struct usb_pipe *pipe_fl, int dir, void *data, int datasize) } }
-int noinline +int usb_poll_intr(struct usb_pipe *pipe_fl, void *data) { switch (GET_LOWFLAT(pipe_fl->type)) {