Changeset 46c20c8 in mainline for uspace/lib/c/include/device/char.h


Ignore:
Timestamp:
2010-11-26T20:08:10Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
45df59a
Parents:
fb150d78 (diff), ffdd2b9 (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/include/device/char.h

    rfb150d78 r46c20c8  
    11/*
    2  * Copyright (c) 2006 Martin Decky
     2 * Copyright (c) 2010 Lenka Trochtova
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup generic
     29 /** @addtogroup libc
    3030 * @{
    3131 */
     
    3333 */
    3434
    35 #ifndef BOOT_PRINTF_H_
    36 #define BOOT_PRINTF_H_
     35#ifndef LIBC_DEVICE_HW_RES_H_
     36#define LIBC_DEVICE_HW_RES_H_
    3737
    38 #define INT8    1
    39 #define INT16   2
    40 #define INT32   4
    41 #define INT64   8
     38typedef enum {
     39        CHAR_READ_DEV = 0,
     40        CHAR_WRITE_DEV
     41} hw_res_funcs_t;
    4242
    43 extern void puts(const char *str);
    44 extern void printf(const char *fmt, ...);
    45 
    46 extern void write(const char *str, const int len);
     43ssize_t read_dev(int dev_phone, void *buf, size_t len);
     44ssize_t write_dev(int dev_phone, void *buf, size_t len);
    4745
    4846#endif
Note: See TracChangeset for help on using the changeset viewer.