Changeset 25eec4e in mainline for uspace/drv/char/ns8250/ns8250.c


Ignore:
Timestamp:
2013-04-19T18:38:18Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6d717a4
Parents:
a1e2df13 (diff), 289cb7dd (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 chages.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/char/ns8250/ns8250.c

    ra1e2df13 r25eec4e  
    4040#include <stdio.h>
    4141#include <errno.h>
    42 #include <bool.h>
     42#include <stdbool.h>
    4343#include <fibril_synch.h>
    4444#include <stdlib.h>
     
    5151#include <sys/stat.h>
    5252#include <ddi.h>
    53 #include <libarch/ddi.h>
    5453
    5554#include <ddf/driver.h>
     
    161160        /** I/O registers **/
    162161        ns8250_regs_t *regs;
    163         /** Is there any client conntected to the device? */
     162        /** Is there any client connected to the device? */
    164163        bool client_connected;
    165164        /** The irq assigned to this device. */
     
    169168        /** The i/o port used to access the serial ports registers. */
    170169        ioport8_t *port;
    171         /** The buffer for incomming data. */
     170        /** The buffer for incoming data. */
    172171        cyclic_buffer_t input_buffer;
    173172        /** The fibril mutex for synchronizing the access to the device. */
     
    191190}
    192191
    193 /** Find out if there is some incomming data available on the serial port.
     192/** Find out if there is some incoming data available on the serial port.
    194193 *
    195194 * @param port          The base address of the serial port device's ports.
Note: See TracChangeset for help on using the changeset viewer.