Changeset 973ef9fc in mainline for uspace/srv/hw/netif/dp8390/dp8390.c

Timestamp:

2010-12-25T21:20:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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 changes.

File:

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

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

@@ -65 +65 @@
  *  @return EINVAL 
  */
-int queue_packet(dpeth_t * dep, packet_t packet);
+int queue_packet(dpeth_t * dep, packet_t *packet);
 
 /** Reads a memory block byte by byte.
@@ -336 +336 @@
 }
 
-int queue_packet(dpeth_t * dep, packet_t packet){
-        packet_t tmp;
+int queue_packet(dpeth_t * dep, packet_t *packet){
+        packet_t *tmp;
 
         if(dep->packet_count >= MAX_PACKETS){
@@ -361 +361 @@
  *                      based on        do_vwrite                                    *
  *===========================================================================*/
-int do_pwrite(dpeth_t * dep, packet_t packet, int from_int)
+int do_pwrite(dpeth_t * dep, packet_t *packet, int from_int)
 {
 //      int port, count, size;
@@ -432 +432 @@
         dep->de_write_iovec.iod_iovec[0].iov_size = size;
         dep->de_write_iovec.iod_iovec_s = 1;
-        dep->de_write_iovec.iod_iovec_addr = NULL;
+        dep->de_write_iovec.iod_iovec_addr = (uintptr_t) NULL;
 
         if (size < ETH_MIN_PACK_SIZE || size > ETH_MAX_PACK_SIZE_TAGGED)
@@ -910 +910 @@
 dpeth_t *dep;
 {
-        packet_t packet;
+        packet_t *packet;
 
 //      if (!(dep->de_flags &DEF_SEND_AVAIL))
@@ -1003 +1003 @@
 {
         int last, count;
-        packet_t packet;
+        packet_t *packet;
 
 //      if (!(dep->de_flags &DEF_READING))
@@ -1015 +1015 @@
         dep->de_read_iovec.iod_iovec[0].iov_size = length;
         dep->de_read_iovec.iod_iovec_s = 1;
-        dep->de_read_iovec.iod_iovec_addr = NULL;
+        dep->de_read_iovec.iod_iovec_addr = (uintptr_t) NULL;
 
         last = page + (length - 1) / DP_PAGESIZE;
@@ -1516 +1516 @@
         if (!wdeth_probe(dep) && !ne_probe(dep) && !el2_probe(dep))
         {
-                printf("%s: No ethernet card found at 0x%x\n", 
-                        dep->de_name, dep->de_base_port);
+                printf("%s: No ethernet card found at %#lx\n",
+                    dep->de_name, dep->de_base_port);
                 dep->de_mode= DEM_DISABLED;
                 return;