Changeset a1347a7 in mainline for uspace/drv/char/ps2mouse/chardev.h


Ignore:
Timestamp:
2012-01-15T13:51:09Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bd79281
Parents:
03e0a244 (diff), f302586 (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/char/ps2mouse/chardev.h

    r03e0a244 ra1347a7  
    11/*
    2  * Copyright (c) 2006 Josef Cejka
     2 * Copyright (c) 2011 Jan Vesely
    33 * All rights reserved.
    44 *
     
    2626 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727 */
    28 
    29 /** @addtogroup kbd_port
    30  * @ingroup  kbd
     28/** @addtogroup drvmouse
    3129 * @{
    3230 */
    33 
    3431/** @file
    35  * @brief i8042 port driver.
     32 * @brief ps/2 mouse driver.
    3633 */
    3734
    38 #ifndef i8042_H_
    39 #define i8042_H_
     35#ifndef _CHARDEV_H_
     36#define _CHARDEV_H_
    4037
    41 #include <sys/types.h>
    42 #include <libarch/ddi.h>
     38#include <libarch/types.h>
    4339#include <async.h>
    4440
    45 /** i8042 HW I/O interface */
    46 struct i8042 {
    47         ioport8_t data;
    48         uint8_t pad[3];
    49         ioport8_t status;
    50 } __attribute__ ((packed));
    51 typedef struct i8042 i8042_t;
    52 
    53 /** Softstate structure, one for each serial port (primary and aux). */
    54 typedef struct {
    55         service_id_t service_id;
    56         async_sess_t *client_sess;
    57 } i8042_port_t;
     41ssize_t chardev_read(async_exch_t *, void *, size_t);
     42ssize_t chardev_write(async_exch_t *, const void *, size_t);
    5843
    5944#endif
    60 
    6145/**
    6246 * @}
Note: See TracChangeset for help on using the changeset viewer.