Ignore:
Timestamp:
2011-09-04T11:30:58Z (13 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
03bc76a
Parents:
d2c67e7 (diff), deac215e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/arch/mips64/include/elf_linux.h

    rd2c67e7 r8ff0bd2  
    11/*
    2  * Copyright (c) 2009 Jiri Svoboda
     2 * Copyright (c) 2011 Jiri Svoboda
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup kbdgen generic
    30  * @brief HelenOS generic uspace keyboard handler.
    31  * @ingroup kbd
     29/** @addtogroup libcmips64
    3230 * @{
    3331 */
     
    3533 */
    3634
    37 #ifndef KBD_LAYOUT_H_
    38 #define KBD_LAYOUT_H_
     35#ifndef LIBC_mips64_ELF_LINUX_H_
     36#define LBIC_mips64_ELF_LINUX_H_
    3937
     38#include <libarch/istate.h>
    4039#include <sys/types.h>
    41 #include <io/console.h>
    4240
    4341typedef struct {
    44         void (*reset)(void);
    45         wchar_t (*parse_ev)(kbd_event_t *);
    46 } layout_op_t;
     42        /* TODO */
     43        uint64_t pad[16];
     44} elf_regs_t;
    4745
    48 extern layout_op_t us_qwerty_op;
    49 extern layout_op_t us_dvorak_op;
    50 extern layout_op_t cz_op;
     46static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs)
     47{
     48        /* TODO */
     49        (void) istate; (void) elf_regs;
     50}
    5151
    5252#endif
    5353
    54 /**
    55  * @}
     54/** @}
    5655 */
Note: See TracChangeset for help on using the changeset viewer.