Changeset d5ba17f in mainline for uspace/drv/char/ns8250/ns8250.c


Ignore:
Timestamp:
2011-11-18T15:32:24Z (13 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
528e5b3
Parents:
b12ca16 (diff), 0c0f823b (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 with mainline

File:
1 edited

Legend:

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

    rb12ca16 rd5ba17f  
    223223};
    224224
    225 static int ns8250_add_device(ddf_dev_t *dev);
     225static int ns8250_dev_add(ddf_dev_t *dev);
    226226static int ns8250_dev_remove(ddf_dev_t *dev);
    227227
    228228/** The serial port device driver's standard operations. */
    229229static driver_ops_t ns8250_ops = {
    230         .add_device = &ns8250_add_device,
     230        .dev_add = &ns8250_dev_add,
    231231        .dev_remove = &ns8250_dev_remove
    232232};
     
    717717}
    718718
    719 /** The add_device callback method of the serial port driver.
     719/** The dev_add callback method of the serial port driver.
    720720 *
    721721 * Probe and initialize the newly added device.
     
    723723 * @param dev           The serial port device.
    724724 */
    725 static int ns8250_add_device(ddf_dev_t *dev)
     725static int ns8250_dev_add(ddf_dev_t *dev)
    726726{
    727727        ns8250_t *ns = NULL;
     
    730730        int rc;
    731731       
    732         ddf_msg(LVL_DEBUG, "ns8250_add_device %s (handle = %d)",
     732        ddf_msg(LVL_DEBUG, "ns8250_dev_add %s (handle = %d)",
    733733            dev->name, (int) dev->handle);
    734734       
Note: See TracChangeset for help on using the changeset viewer.