Ignore:
Timestamp:
2011-01-07T10:43:15Z (13 years ago)
Author:
Matus Dekanek <smekideki@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade
Children:
5097bed4
Parents:
5f7d96e (diff), 0f191a2 (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 usb/development

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/hw/netif/dp8390/dp8390_drv.h

    r5f7d96e r43c3937  
    4040#include "dp8390.h"
    4141
    42 /** Initializes and/or starts the network interface.
    43  *  @param[in,out] dep The network interface structure.
    44  *  @param[in] mode The state mode.
    45  *  @returns EOK on success.
    46  *  @returns EXDEV if the network interface is disabled.
    47  */
    48 int do_init(dpeth_t *dep, int mode);
     42int do_init(dpeth_t *dep);
    4943
    5044/** Stops the network interface.
     
    5549/** Processes the interrupt.
    5650 *  @param[in,out] dep The network interface structure.
    57  *  @param[in] isr The interrupt status register.
    5851 */
    59 void dp_check_ints(dpeth_t *dep, int isr);
     52void dp_check_ints(int nil_phone, device_id_t device_id, dpeth_t *dep, uint8_t isr);
    6053
    6154/** Probes and initializes the network interface.
     
    7063 *  @param[in] packet The packet t be sent.
    7164 *  @param[in] from_int The value indicating whether the sending is initialized from the interrupt handler.
    72  *  @returns 
     65 *  @returns
    7366 */
    7467int do_pwrite(dpeth_t * dep, packet_t *packet, int from_int);
    75 
    76 /** Prints out network interface information.
    77  *  @param[in] dep The network interface structure.
    78  */
    79 void dp8390_dump(dpeth_t * dep);
    8068
    8169#endif
Note: See TracChangeset for help on using the changeset viewer.