Changeset 95c675b in mainline for uspace/drv/nic/ne2k/dp8390.h

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• uspace/drv/nic/ne2k/dp8390.h (modified) (2 diffs)

uspace/drv/nic/ne2k/dp8390.h

@@ -50 +50 @@
 #define __NET_NETIF_DP8390_H__
 
+#include <async.h>
+#include <ddf/driver.h>
 #include <fibril_synch.h>
 #include <nic.h>
@@ -223 +225 @@
 
 typedef struct {
+        /** DDF device */
+        ddf_dev_t *dev;
+        /** Parent session */
+        async_sess_t *parent_sess;
         /* Device configuration */
         void *base_port; /**< Port assigned from ISA configuration **/