Changeset ea28272 in mainline for uspace/drv/test1/test1.h


Ignore:
Timestamp:
2010-12-30T13:43:27Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d770deb
Parents:
d70d80ed (diff), f418e51 (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/drv/test1/test1.h

    rd70d80ed rea28272  
    11/*
    2  * Copyright (c) 2010 Jakub Jermar
     2 * Copyright (c) 2010 Vojtech Horky
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup libc
    30  * @{
    31  */
    3229/** @file
    3330 */
     31#ifndef DRV_TEST1_TEST1_H_
     32#define DRV_TEST1_TEST1_H_
    3433
    35 #ifndef LIBC_ASYNC_REL_H_
    36 #define LIBC_ASYNC_REL_H_
     34#include <driver.h>
    3735
    38 extern int async_rel_init(void);
    39 extern int async_relation_create(int);
    40 extern void async_relation_destroy(int, int);
     36#define NAME "test1"
     37
     38extern device_ops_t char_device_ops;
    4139
    4240#endif
    43 
    44 /** @}
    45  */
Note: See TracChangeset for help on using the changeset viewer.