Changeset 6b781c0 in mainline for uspace/kbd

Timestamp:

2007-06-08T15:02:49Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c03ee1c

Parents:

3ee8a075

Message:

Merge arm32 into trunk.

Location:

uspace/kbd

Files:

• Makefile (modified) (2 diffs)
• arch/arm32/include/kbd.h (modified) (2 diffs)
• arch/arm32/src/kbd.c (modified) (2 diffs)
• arch/arm32/src/kbd_gxemul.c (added)

uspace/kbd/Makefile

@@ -33 +33 @@
 SOFTINT_PREFIX = ../softint
 include $(LIBC_PREFIX)/Makefile.toolchain 
+include ../../Makefile.config
 
 CFLAGS += -Iinclude -I../libadt/include
@@ -71 +72 @@
                 genarch/src/kbd.c
 endif
+ifeq ($(ARCH), arm32)
+ifeq ($(MACHINE), gxemul_testarm)
+        ARCH_SOURCES += \
+                arch/$(ARCH)/src/kbd_gxemul.c
+endif
+endif
 
 

uspace/kbd/arch/arm32/include/kbd.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2007 Michal Kebrt
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup kbdarm32 arm32
- * @brief       HelenOS arm32 arch dependent parts of uspace keyboard handler.
- * @ingroup  kbd
+/** @addtogroup kbdarm32
  * @{
  */ 
 /** @file
+ *  @brief Empty.
  */
 

uspace/kbd/arch/arm32/src/kbd.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Martin Decky
+ * Copyright (c) 2007 Michal Kebrt
  * All rights reserved.
  *
@@ -33 +33 @@
  */ 
 /** @file
+ *  @brief Empty, required by generic Makefile.
  */
 
-#include <arch/kbd.h>
-#include <ipc/ipc.h>
-#include <sysinfo.h>
-#include <kbd.h>
-#include <keys.h>
-
-int kbd_arch_init(void)
-{
-        return 0;
-}
-
-
-int kbd_arch_process(keybuffer_t *keybuffer, ipc_call_t *call) 
-{
-        return 1;
-}
 
 /** @}