Ignore:
Timestamp:
2010-01-10T12:16:59Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c77a64f
Parents:
309ede1 (diff), 1ac3a52 (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/srv/hid/c_mouse/include/mouse_proto.h

    r309ede1 r5f70118  
    11/*
    2  * Copyright (c) 2005 Jakub Jermar
     2 * Copyright (c) 2009 Jiri Svoboda
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup arm32   
     29/** @addtogroup mouse
     30 * @brief
    3031 * @{
    3132 */
    3233/** @file
    33  *  @brief Empty.
    3434 */
    3535
    36 #ifndef KERN_arm32_ARG_H_
    37 #define KERN_arm32_ARG_H_
     36#ifndef MOUSE_PROTO_H_
     37#define MOUSE_PROTO_H_
    3838
    39 #include <stdarg.h>
     39extern void mouse_proto_parse_byte(int);
     40extern int mouse_proto_init(void);
    4041
    4142#endif
    4243
    43 /** @}
     44/**
     45 * @}
    4446 */
Note: See TracChangeset for help on using the changeset viewer.