Changeset e4f8c77 in mainline for uspace/srv/hw/netif/ne2000/dp8390.c

Timestamp:

2011-07-13T22:39:18Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

e6910c8

Parents:

5974661 (diff), 8ecef91 (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 libposix.

File:

• uspace/srv/hw/netif/ne2000/dp8390.c (modified) (3 diffs)

uspace/srv/hw/netif/ne2000/dp8390.c

@@ -483 +483 @@
 }
 
-static link_t *ne2k_receive(ne2k_t *ne2k)
+static list_t *ne2k_receive(ne2k_t *ne2k)
 {
         /*
@@ -490 +490 @@
          * frames from the network, but they will be lost.
          */
-        link_t *frames = (link_t *) malloc(sizeof(link_t));
+        list_t *frames = (list_t *) malloc(sizeof(list_t));
         if (frames != NULL)
                 list_initialize(frames);
@@ -567 +567 @@
 }
 
-link_t *ne2k_interrupt(ne2k_t *ne2k, uint8_t isr, uint8_t tsr)
+list_t *ne2k_interrupt(ne2k_t *ne2k, uint8_t isr, uint8_t tsr)
 {
         /* List of received frames */
-        link_t *frames = NULL;
+        list_t *frames = NULL;
         
         if (isr & (ISR_PTX | ISR_TXE)) {