From ce0102b7a64bc0f3a29385dcf4b9835872bfb49d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 7 Feb 2005 23:31:48 +0000 Subject: [PATCH] now builds as a haiku target git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11284 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/input/ps2_hid/Jamfile | 10 ++++++++-- src/add-ons/kernel/drivers/input/ps2_hid/keyboard.c | 4 ++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/add-ons/kernel/drivers/input/ps2_hid/Jamfile b/src/add-ons/kernel/drivers/input/ps2_hid/Jamfile index 5297de1ad7..9c6260be86 100644 --- a/src/add-ons/kernel/drivers/input/ps2_hid/Jamfile +++ b/src/add-ons/kernel/drivers/input/ps2_hid/Jamfile @@ -4,14 +4,20 @@ UsePrivateHeaders input ; UsePrivateHeaders kernel ; if ! $(HAIKU_COMPATIBLE) { - SubDirCcFlags -DCOMPILE_FOR_R5 ; -} +SubDirCcFlags -DCOMPILE_FOR_R5 ; R5KernelAddon ps2_hid : kernel drivers bin : common.c keyboard.c mouse.c ; +} else { +KernelAddon ps2_hid : kernel drivers bin : + common.c + keyboard.c + mouse.c +; +} # Link to kernel/drivers/dev/input/ { diff --git a/src/add-ons/kernel/drivers/input/ps2_hid/keyboard.c b/src/add-ons/kernel/drivers/input/ps2_hid/keyboard.c index a2f552ed03..7b8f4acb15 100644 --- a/src/add-ons/kernel/drivers/input/ps2_hid/keyboard.c +++ b/src/add-ons/kernel/drivers/input/ps2_hid/keyboard.c @@ -13,7 +13,11 @@ // although the kb_mouse replacement driver never locks. #include "common.h" +#ifdef COMPILE_FOR_R5 #include "cbuf_adapter.h" +#else +#include "cbuf.h" +#endif #include //#include