Changeset a33f0a6 in mainline for uspace/srv/fs/ext2fs/ext2fs.h


Ignore:
Timestamp:
2011-08-03T17:34:57Z (14 years ago)
Author:
Oleg Romanenko <romanenko.oleg@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1940326
Parents:
52a79081 (diff), 3fab770 (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 from mainline

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/srv/fs/ext2fs/ext2fs.h

    r52a79081 ra33f0a6  
    11/*
    2  * Copyright (c) 2009 Jiri Svoboda
     2 * Copyright (c) 2011 Martin Sucha
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup kbdgen generic
    30  * @brief       HelenOS generic uspace keyboard handler.
    31  * @ingroup  kbd
     29/** @addtogroup fs
    3230 * @{
    3331 */
    34 /** @file
    35  */
    3632
    37 #ifndef KBD_PORT_H_
    38 #define KBD_PORT_H_
     33#ifndef EXT2FS_EXT2FS_H_
     34#define EXT2FS_EXT2FS_H_
    3935
     36#include <libext2.h>
     37#include <libfs.h>
    4038#include <sys/types.h>
    4139
    42 extern int kbd_port_init(void);
    43 extern void kbd_port_yield(void);
    44 extern void kbd_port_reclaim(void);
    45 extern void kbd_port_write(uint8_t);
     40#define min(a, b)               ((a) < (b) ? (a) : (b))
     41
     42extern vfs_out_ops_t ext2fs_ops;
     43extern libfs_ops_t ext2fs_libfs_ops;
     44
     45extern int ext2fs_global_init(void);
     46extern int ext2fs_global_fini(void);
    4647
    4748#endif
     
    4950/**
    5051 * @}
    51  */
    52 
     52 */
Note: See TracChangeset for help on using the changeset viewer.